diff --git a/bin/cherry-pick.mjs b/bin/cherry-pick.mjs
index 0c6a6c613638b..dc71eed751cfd 100644
--- a/bin/cherry-pick.mjs
+++ b/bin/cherry-pick.mjs
@@ -10,7 +10,7 @@ const LABEL = process.argv[ 2 ] || 'Backport to WP Beta/RC';
 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;
 
@@ -114,16 +114,23 @@ async function fetchPRs() {
 	const { items } = await GitHubFetch(
 		`/search/issues?q=is:pr state:closed sort:updated label:"${ LABEL }" repo:WordPress/gutenberg`
 	);
-	const PRs = items.map( ( { id, number, title, pull_request, closed_at } ) => ( {
-		id,
-		number,
-		title,
-		pull_request,
-	} ) )
+	const PRs = items
+		.map( ( { id, number, title, pull_request, closed_at } ) => ( {
+			id,
+			number,
+			title,
+			pull_request,
+		} ) )
 		.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 }` ) )
 	);
diff --git a/bin/generate-php-sync-issue.mjs b/bin/generate-php-sync-issue.mjs
new file mode 100644
index 0000000000000..a45d77d354107
--- /dev/null
+++ b/bin/generate-php-sync-issue.mjs
@@ -0,0 +1,505 @@
+/**
+ * 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 = [
+	'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', // this is handled automatically.
+];
+
+// PRs containing the following labels will be ignored when generating the issue content.
+const LABELS_TO_IGNORE = [ 'Backport from WordPress Core' ];
+
+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 );
+	}
+
+	const lastRcDateArg = getArg( 'lastrcdate' );
+	let lastRcDate;
+
+	if ( lastRcDateArg ) {
+		if (
+			validateDate( lastRcDateArg ) &&
+			isAfter( lastRcDateArg, since )
+		) {
+			lastRcDate = lastRcDateArg;
+		} else {
+			console.error(
+				`Error: The --lastrcdate argument must be a date after the --since date.`
+			);
+			process.exit( 1 );
+		}
+	} else {
+		console.error(
+			`Error: The --lastrcdate argument is required (e.g. YYYY-MM-DD).`
+		);
+		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 );
+
+			// In the future we will want to exclude PRs based on label
+			// so we will need to fetch the full PR data for each commit.
+			// For now we can just set this to null.
+			const fullPRData = null;
+			// const fullPRData = 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;
+			}
+
+			// This is temporarily required because PRs merged between Beta 1 (since)
+			// and the final RC may have already been manually backported to Core.
+			// This is however no reliable way to identify these PRs as the `Backport to WP beta/RC`
+			// label is manually removed once the PR has been backported.
+			// In future releases we will add a **new** label `Backported`
+			// to indicate the PR was backported to Core.
+			// As a result, in the future we will be able to exclude any PRs that have
+			// already been backported using the `Backported` label.
+			if ( isAfter( lastRcDate, commitData.commit.committer.date ) ) {
+				commitData.isBeforeLastRCDate = true;
+			}
+
+			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, isBeforeLastRCDate } ) {
+	return `- [ ] ${ pr.url } - @${
+		pr.creator
+	} | Trac ticket | Core backport PR ${
+		isBeforeLastRCDate ? '(⚠️ Check for existing WP Core backport)' : ''
+	}\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 await 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 = 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/changelog.txt b/changelog.txt
index 9268dc7edd1fb..b24b8294744d6 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,8 +1,6 @@
 == Changelog ==
 
-= 17.5.0-rc.1 =
-
-
+= 17.5.0 =
 
 ## Changelog
 
@@ -207,7 +205,7 @@
 - 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))
@@ -256,6 +254,8 @@ 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
diff --git a/docs/README.md b/docs/README.md
index ba6b35a761f6e..94f640ae46bfc 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -1,6 +1,6 @@
 # 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.
 
diff --git a/docs/contributors/versions-in-wordpress.md b/docs/contributors/versions-in-wordpress.md
index 4449f13996c62..ce9eb458e7372 100644
--- a/docs/contributors/versions-in-wordpress.md
+++ b/docs/contributors/versions-in-wordpress.md
@@ -6,6 +6,7 @@ If anything looks incorrect here, please bring it up in #core-editor in [WordPre
 
 | Gutenberg Versions | WordPress Version |
 | ------------------ | ----------------- |
+| 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.1             |
diff --git a/docs/reference-guides/core-blocks.md b/docs/reference-guides/core-blocks.md
index 84396caefbf47..bee68530eeb23 100644
--- a/docs/reference-guides/core-blocks.md
+++ b/docs/reference-guides/core-blocks.md
@@ -694,7 +694,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, color (background, gradients, link, text), spacing (margin, padding), typography (fontSize, lineHeight)
 -	**Attributes:** citation, textAlign, value
 
 ## Query Loop
diff --git a/gutenberg.php b/gutenberg.php
index 9559f838608da..febd63e0be030 100644
--- a/gutenberg.php
+++ b/gutenberg.php
@@ -5,7 +5,7 @@
  * 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.5.0-rc.1
+ * Version: 17.5.0
  * Author: Gutenberg Team
  * Text Domain: gutenberg
  *
diff --git a/lib/block-supports/pattern.php b/lib/block-supports/pattern.php
index 2f7717091ff50..0c5868c1fea0c 100644
--- a/lib/block-supports/pattern.php
+++ b/lib/block-supports/pattern.php
@@ -13,7 +13,17 @@
 	 * @param WP_Block_Type $block_type Block Type.
 	 */
 	function gutenberg_register_pattern_support( $block_type ) {
-		$pattern_support = 'core/paragraph' === $block_type->name ? true : false;
+		// Note that this should be a duplicate or a subset of the $allowed_blocks
+		// defined in the `process_block_bindings` function.
+		// It should also match the client side config defined in
+		// `packages/patterns/src/constants.js`.
+		$allowed_blocks  = array(
+			'core/paragraph' => array( 'content' ),
+			'core/heading'   => array( 'content' ),
+			'core/image'     => array( 'url', 'title', 'alt' ),
+			'core/button'    => array( 'url', 'text' ),
+		);
+		$pattern_support = array_key_exists( $block_type->name, $allowed_blocks );
 
 		if ( $pattern_support ) {
 			if ( ! $block_type->uses_context ) {
diff --git a/lib/block-supports/typography.php b/lib/block-supports/typography.php
index 3cda86cf0a257..b3fa4b4252eed 100644
--- a/lib/block-supports/typography.php
+++ b/lib/block-supports/typography.php
@@ -401,10 +401,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)";
diff --git a/lib/compat/wordpress-6.5/blocks.php b/lib/compat/wordpress-6.5/blocks.php
new file mode 100644
index 0000000000000..b6890c14dc1f9
--- /dev/null
+++ b/lib/compat/wordpress-6.5/blocks.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Temporary compatibility shims for block APIs present in Gutenberg.
+ *
+ * @package gutenberg
+ */
+
+/**
+ * Shim for the `variation_callback` block type argument.
+ *
+ * @param array $args The block type arguments.
+ * @return array The updated block type arguments.
+ */
+function gutenberg_register_block_type_args_shim( $args ) {
+	if ( isset( $args['variation_callback'] ) && is_callable( $args['variation_callback'] ) ) {
+		$args['variations'] = call_user_func( $args['variation_callback'] );
+		unset( $args['variation_callback'] );
+	}
+	return $args;
+}
+
+if ( ! method_exists( 'WP_Block_Type', 'get_variations' ) ) {
+	add_filter( 'register_block_type_args', 'gutenberg_register_block_type_args_shim' );
+}
diff --git a/lib/compat/wordpress-6.5/html-api/class-gutenberg-html-open-elements-6-5.php b/lib/compat/wordpress-6.5/html-api/class-gutenberg-html-open-elements-6-5.php
new file mode 100644
index 0000000000000..0d8901225c792
--- /dev/null
+++ b/lib/compat/wordpress-6.5/html-api/class-gutenberg-html-open-elements-6-5.php
@@ -0,0 +1,462 @@
+<?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_5 {
+	/**
+	 * 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 ) {
+		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;
+		}
+
+		$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 (
+				'(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 ) {
+		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;
+		}
+	}
+
+	/**
+	 * 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.5/html-api/class-gutenberg-html-processor-6-5.php b/lib/compat/wordpress-6.5/html-api/class-gutenberg-html-processor-6-5.php
new file mode 100644
index 0000000000000..eae2b1eda815c
--- /dev/null
+++ b/lib/compat/wordpress-6.5/html-api/class-gutenberg-html-processor-6-5.php
@@ -0,0 +1,1745 @@
+<?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, LABEL, LEGEND, METER, PROGRESS, SEARCH.
+ *  - Formatting elements: B, BIG, CODE, EM, FONT, I, SMALL, STRIKE, STRONG, TT, U.
+ *  - Heading elements: H1, H2, H3, H4, H5, H6, HGROUP.
+ *  - Links: A.
+ *  - Lists: DD, DL, DT, LI, OL, LI.
+ *  - Media elements: AUDIO, CANVAS, FIGCAPTION, FIGURE, IMG, MAP, PICTURE, VIDEO.
+ *  - Paragraph: P.
+ *  - Phrasing elements: ABBR, BDI, BDO, CITE, DATA, DEL, DFN, INS, MARK, OUTPUT, Q, SAMP, SUB, SUP, TIME, VAR.
+ *  - Sectioning elements: ARTICLE, ASIDE, NAV, SECTION.
+ *  - Templating elements: SLOT.
+ *  - Text decoration: RUBY.
+ *  - Deprecated elements: ACRONYM, BLINK, CENTER, DIR, ISINDEX, MULTICOL, NEXTID, 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_5 extends Gutenberg_HTML_Tag_Processor_6_5 {
+	/**
+	 * 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 Gutenberg_HTML_Processor_State_6_5();
+
+		/*
+		 * 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 '+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 '-MAIN':
+			case '-MENU':
+			case '-NAV':
+			case '-OL':
+			case '-SEARCH':
+			case '-SECTION':
+			case '-SUMMARY':
+			case '-UL':
+				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;
+
+			/*
+			 * > 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;
+
+			/*
+			 * > 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 !== $tag_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' === $tag_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' === $tag_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' !== $tag_name &&
+						! $this->state->stack_of_open_elements->has_element_in_scope( $tag_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( $tag_name );
+
+				if ( $tag_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( $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;
+		}
+
+		/*
+		 * 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 ( $tag_name ) {
+			case 'APPLET':
+			case 'AREA':
+			case 'BASE':
+			case 'BASEFONT':
+			case 'BGSOUND':
+			case 'BODY':
+			case 'BR':
+			case 'CAPTION':
+			case 'COL':
+			case 'COLGROUP':
+			case 'DD':
+			case 'DT':
+			case 'EMBED':
+			case 'FORM':
+			case 'FRAME':
+			case 'FRAMESET':
+			case 'HEAD':
+			case 'HR':
+			case 'HTML':
+			case 'IFRAME':
+			case 'INPUT':
+			case 'KEYGEN':
+			case 'LI':
+			case 'LINK':
+			case 'LISTING':
+			case 'MARQUEE':
+			case 'MATH':
+			case 'META':
+			case 'NOBR':
+			case 'NOEMBED':
+			case 'NOFRAMES':
+			case 'NOSCRIPT':
+			case 'OBJECT':
+			case 'OL':
+			case 'OPTGROUP':
+			case 'OPTION':
+			case 'PARAM':
+			case 'PLAINTEXT':
+			case 'PRE':
+			case 'RB':
+			case 'RP':
+			case 'RT':
+			case 'RTC':
+			case 'SARCASM':
+			case 'SCRIPT':
+			case 'SELECT':
+			case 'SOURCE':
+			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 'TRACK':
+			case 'UL':
+			case 'WBR':
+			case 'XMP':
+				$this->last_error = self::ERROR_UNSUPPORTED;
+				throw new WP_HTML_Unsupported_Exception( "Cannot process {$tag_name} element." );
+		}
+
+		if ( ! $this->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 ( $tag_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( $tag_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 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(
+			'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 ||
+			'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.5/html-api/class-gutenberg-html-processor-state-6-5.php b/lib/compat/wordpress-6.5/html-api/class-gutenberg-html-processor-state-6-5.php
new file mode 100644
index 0000000000000..890e19fb5da4d
--- /dev/null
+++ b/lib/compat/wordpress-6.5/html-api/class-gutenberg-html-processor-state-6-5.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_5 {
+	/*
+	 * 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_5();
+		$this->active_formatting_elements = new WP_HTML_Active_Formatting_Elements();
+	}
+}
diff --git a/lib/compat/wordpress-6.5/html-api/class-gutenberg-html-tag-processor-6-5.php b/lib/compat/wordpress-6.5/html-api/class-gutenberg-html-tag-processor-6-5.php
index f14bc15adf999..de3823d2b2703 100644
--- a/lib/compat/wordpress-6.5/html-api/class-gutenberg-html-tag-processor-6-5.php
+++ b/lib/compat/wordpress-6.5/html-api/class-gutenberg-html-tag-processor-6-5.php
@@ -15,9 +15,6 @@
  *  - 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
@@ -107,6 +104,56 @@
  * 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
@@ -241,9 +288,39 @@
  * 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. STYLE.
  */
 class Gutenberg_HTML_Tag_Processor_6_5 {
 	/**
@@ -316,6 +393,27 @@ class Gutenberg_HTML_Tag_Processor_6_5 {
 	 */
 	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.           |
+	 *
+	 * @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
+	 * @see WP_HTML_Tag_Processor::STATE_MATCHED_TAG
+	 *
+	 * @var string
+	 */
+	private $parser_state = self::STATE_READY;
+
 	/**
 	 * How many bytes from the original HTML document have been read and parsed.
 	 *
@@ -544,6 +642,7 @@ public function __construct( $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.
@@ -562,90 +661,177 @@ public function next_tag( $query = null ) {
 		$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 );
-
+			if ( false === $this->next_token() ) {
 				return false;
 			}
 
-			// Parse all of its attributes.
-			while ( $this->parse_next_attribute() ) {
+			if ( self::STATE_MATCHED_TAG !== $this->parser_state ) {
 				continue;
 			}
 
-			// Ensure that the tag closes before the end of the document.
-			if ( $this->bytes_already_parsed >= strlen( $this->html ) ) {
-				return false;
+			if ( $this->matches() ) {
+				++$already_found;
 			}
+		} while ( $already_found < $this->sought_match_offset );
 
-			$tag_ends_at = strpos( $this->html, '>', $this->bytes_already_parsed );
-			if ( false === $tag_ends_at ) {
-				return false;
-			}
-			$this->token_length         = $tag_ends_at - $this->token_starts_at;
-			$this->bytes_already_parsed = $tag_ends_at;
+		return true;
+	}
 
-			// Finally, check if the parsed tag and its attributes match the search query.
-			if ( $this->matches() ) {
-				++$already_found;
+	/**
+	 * 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() {
+		$this->get_updated_html();
+		$was_at = $this->bytes_already_parsed;
+
+		// Don't proceed if there's nothing more to scan.
+		if (
+			self::STATE_COMPLETE === $this->parser_state ||
+			self::STATE_INCOMPLETE === $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 === $this->parser_state ) {
+				$this->bytes_already_parsed = $was_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 &&
+			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 (
+			self::STATE_INCOMPLETE === $this->parser_state ||
+			$this->bytes_already_parsed >= strlen( $this->html )
+		) {
+			// Does this appropriately clear state (parsed attributes)?
+			$this->parser_state         = self::STATE_INCOMPLETE;
+			$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;
+			$this->bytes_already_parsed = $was_at;
+
+			return false;
+		}
+		$this->parser_state         = self::STATE_MATCHED_TAG;
+		$this->token_length         = $tag_ends_at - $this->token_starts_at;
+		$this->bytes_already_parsed = $tag_ends_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
+			)
+		) {
+			$tag_name = $this->get_tag();
+
+			if ( 'SCRIPT' === $tag_name && ! $this->skip_script_data() ) {
+				$this->parser_state         = self::STATE_INCOMPLETE;
+				$this->bytes_already_parsed = $was_at;
+
+				return false;
+			} elseif (
+				( 'TEXTAREA' === $tag_name || 'TITLE' === $tag_name ) &&
+				! $this->skip_rcdata( $tag_name )
+			) {
+				$this->parser_state         = self::STATE_INCOMPLETE;
+				$this->bytes_already_parsed = $was_at;
+
+				return false;
+			} elseif (
 				(
-					'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;
-				}
+					'IFRAME' === $tag_name ||
+					'NOEMBED' === $tag_name ||
+					'NOFRAMES' === $tag_name ||
+					'STYLE' === $tag_name ||
+					'XMP' === $tag_name
+				) &&
+				! $this->skip_rawtext( $tag_name )
+			) {
+				$this->parser_state         = self::STATE_INCOMPLETE;
+				$this->bytes_already_parsed = $was_at;
+
+				return false;
 			}
-		} while ( $already_found < $this->sought_match_offset );
+		}
 
 		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 === $this->parser_state;
+	}
 
 	/**
 	 * Generator for a foreach loop to step through each class name for the matched tag.
@@ -664,6 +850,10 @@ public function next_tag( $query = null ) {
 	 * @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' );
 
@@ -719,7 +909,7 @@ public function class_list() {
 	 * @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 ) {
+		if ( self::STATE_MATCHED_TAG !== $this->parser_state ) {
 			return null;
 		}
 
@@ -816,7 +1006,8 @@ public function has_class( $wanted_class ) {
 	 * @return bool Whether the bookmark was successfully created.
 	 */
 	public function set_bookmark( $name ) {
-		if ( null === $this->tag_name_starts_at ) {
+		// It only makes sense to set a bookmark if the parser has paused on a concrete token.
+		if ( self::STATE_MATCHED_TAG !== $this->parser_state ) {
 			return false;
 		}
 
@@ -895,7 +1086,6 @@ private function skip_rcdata( $tag_name ) {
 
 			// Fail if there is no possible tag closer.
 			if ( false === $at || ( $at + $tag_length ) >= $doc_length ) {
-				$this->bytes_already_parsed = $doc_length;
 				return false;
 			}
 
@@ -923,6 +1113,10 @@ private function skip_rcdata( $tag_name ) {
 			$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
@@ -1073,6 +1267,12 @@ private function skip_script_data() {
 					continue;
 				}
 
+				if ( $this->bytes_already_parsed >= $doc_length ) {
+					$this->parser_state = self::STATE_INCOMPLETE;
+
+					return false;
+				}
+
 				if ( '>' === $html[ $this->bytes_already_parsed ] ) {
 					$this->bytes_already_parsed = $closer_potentially_starts_at;
 					return true;
@@ -1107,13 +1307,18 @@ private function parse_next_tag() {
 
 		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 ) {
 				return false;
 			}
 
 			$this->token_starts_at = $at;
 
-			if ( '/' === $this->html[ $at + 1 ] ) {
+			if ( $at + 1 < $doc_length && '/' === $this->html[ $at + 1 ] ) {
 				$this->is_closing_tag = true;
 				++$at;
 			} else {
@@ -1147,7 +1352,9 @@ private function parse_next_tag() {
 			 * Abort if no tag is found before the end of
 			 * the document. There is nothing left to parse.
 			 */
-			if ( $at + 1 >= strlen( $html ) ) {
+			if ( $at + 1 >= $doc_length ) {
+				$this->parser_state = self::STATE_INCOMPLETE;
+
 				return false;
 			}
 
@@ -1161,13 +1368,15 @@ private function parse_next_tag() {
 				 * https://html.spec.whatwg.org/multipage/parsing.html#tag-open-state
 				 */
 				if (
-					strlen( $html ) > $at + 3 &&
+					$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 ( strlen( $html ) <= $closer_at ) {
+					if ( $doc_length <= $closer_at ) {
+						$this->parser_state = self::STATE_INCOMPLETE;
+
 						return false;
 					}
 
@@ -1185,18 +1394,20 @@ private function parse_next_tag() {
 					 * 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 ) ) {
+					while ( ++$closer_at < $doc_length ) {
 						$closer_at = strpos( $html, '--', $closer_at );
 						if ( false === $closer_at ) {
+							$this->parser_state = self::STATE_INCOMPLETE;
+
 							return false;
 						}
 
-						if ( $closer_at + 2 < strlen( $html ) && '>' === $html[ $closer_at + 2 ] ) {
+						if ( $closer_at + 2 < $doc_length && '>' === $html[ $closer_at + 2 ] ) {
 							$at = $closer_at + 3;
 							continue 2;
 						}
 
-						if ( $closer_at + 3 < strlen( $html ) && '!' === $html[ $closer_at + 2 ] && '>' === $html[ $closer_at + 3 ] ) {
+						if ( $closer_at + 3 < $doc_length && '!' === $html[ $closer_at + 2 ] && '>' === $html[ $closer_at + 3 ] ) {
 							$at = $closer_at + 4;
 							continue 2;
 						}
@@ -1209,7 +1420,7 @@ private function parse_next_tag() {
 				 * https://html.spec.whatwg.org/multipage/parsing.html#tag-open-state
 				 */
 				if (
-					strlen( $html ) > $at + 8 &&
+					$doc_length > $at + 8 &&
 					'[' === $html[ $at + 2 ] &&
 					'C' === $html[ $at + 3 ] &&
 					'D' === $html[ $at + 4 ] &&
@@ -1220,6 +1431,8 @@ private function parse_next_tag() {
 				) {
 					$closer_at = strpos( $html, ']]>', $at + 9 );
 					if ( false === $closer_at ) {
+						$this->parser_state = self::STATE_INCOMPLETE;
+
 						return false;
 					}
 
@@ -1233,7 +1446,7 @@ private function parse_next_tag() {
 				 * https://html.spec.whatwg.org/multipage/parsing.html#tag-open-state
 				 */
 				if (
-					strlen( $html ) > $at + 8 &&
+					$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 ] ) &&
@@ -1244,6 +1457,8 @@ private function parse_next_tag() {
 				) {
 					$closer_at = strpos( $html, '>', $at + 9 );
 					if ( false === $closer_at ) {
+						$this->parser_state = self::STATE_INCOMPLETE;
+
 						return false;
 					}
 
@@ -1253,15 +1468,26 @@ private function parse_next_tag() {
 
 				/*
 				 * Anything else here is an incorrectly-opened comment and transitions
-				 * to the bogus comment state - skip to the nearest >.
+				 * to the bogus comment state - skip to the nearest >. If no closer is
+				 * found then the HTML was truncated inside the markup declaration.
 				 */
 				$at = strpos( $html, '>', $at + 1 );
+				if ( false === $at ) {
+					$this->parser_state = self::STATE_INCOMPLETE;
+
+					return false;
+				}
+
 				continue;
 			}
 
 			/*
 			 * </> 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 ] ) {
@@ -1276,6 +1502,8 @@ private function parse_next_tag() {
 			if ( '?' === $html[ $at + 1 ] ) {
 				$closer_at = strpos( $html, '>', $at + 2 );
 				if ( false === $closer_at ) {
+					$this->parser_state = self::STATE_INCOMPLETE;
+
 					return false;
 				}
 
@@ -1290,8 +1518,15 @@ private function parse_next_tag() {
 			 * 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 + 3 );
 				if ( false === $closer_at ) {
+					$this->parser_state = self::STATE_INCOMPLETE;
+
 					return false;
 				}
 
@@ -1316,6 +1551,8 @@ 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;
+
 			return false;
 		}
 
@@ -1338,11 +1575,15 @@ private function parse_next_attribute() {
 		$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;
+
 			return false;
 		}
 
 		$this->skip_whitespace();
 		if ( $this->bytes_already_parsed >= strlen( $this->html ) ) {
+			$this->parser_state = self::STATE_INCOMPLETE;
+
 			return false;
 		}
 
@@ -1351,6 +1592,8 @@ private function parse_next_attribute() {
 			++$this->bytes_already_parsed;
 			$this->skip_whitespace();
 			if ( $this->bytes_already_parsed >= strlen( $this->html ) ) {
+				$this->parser_state = self::STATE_INCOMPLETE;
+
 				return false;
 			}
 
@@ -1377,6 +1620,8 @@ private function parse_next_attribute() {
 		}
 
 		if ( $attribute_end >= strlen( $this->html ) ) {
+			$this->parser_state = self::STATE_INCOMPLETE;
+
 			return false;
 		}
 
@@ -1443,7 +1688,6 @@ private function skip_whitespace() {
 	 * @since 6.2.0
 	 */
 	private function after_tag() {
-		$this->get_updated_html();
 		$this->token_starts_at      = null;
 		$this->token_length         = null;
 		$this->tag_name_starts_at   = null;
@@ -1786,6 +2030,10 @@ private static function sort_start_ascending( $a, $b ) {
 	 * @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;
 		}
@@ -1853,7 +2101,7 @@ private function get_enqueued_attribute_value( $comparable_name ) {
 	 * @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 ) {
+		if ( self::STATE_MATCHED_TAG !== $this->parser_state ) {
 			return null;
 		}
 
@@ -1933,7 +2181,10 @@ public function get_attribute( $name ) {
 	 * @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 ) {
+		if (
+			self::STATE_MATCHED_TAG !== $this->parser_state ||
+			$this->is_closing_tag
+		) {
 			return null;
 		}
 
@@ -1965,7 +2216,7 @@ public function get_attribute_names_with_prefix( $prefix ) {
 	 * @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 ) {
+		if ( self::STATE_MATCHED_TAG !== $this->parser_state ) {
 			return null;
 		}
 
@@ -1992,7 +2243,7 @@ public function get_tag() {
 	 * @return bool Whether the currently matched tag contains the self-closing flag.
 	 */
 	public function has_self_closing_flag() {
-		if ( ! $this->tag_name_starts_at ) {
+		if ( self::STATE_MATCHED_TAG !== $this->parser_state ) {
 			return false;
 		}
 
@@ -2024,7 +2275,10 @@ public function has_self_closing_flag() {
 	 * @return bool Whether the current tag is a tag closer.
 	 */
 	public function is_tag_closer() {
-		return $this->is_closing_tag;
+		return (
+			self::STATE_MATCHED_TAG === $this->parser_state &&
+			$this->is_closing_tag
+		);
 	}
 
 	/**
@@ -2044,7 +2298,10 @@ public function is_tag_closer() {
 	 * @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 ) {
+		if (
+			self::STATE_MATCHED_TAG !== $this->parser_state ||
+			$this->is_closing_tag
+		) {
 			return false;
 		}
 
@@ -2177,7 +2434,10 @@ public function set_attribute( $name, $value ) {
 	 * @return bool Whether an attribute was removed.
 	 */
 	public function remove_attribute( $name ) {
-		if ( $this->is_closing_tag ) {
+		if (
+			self::STATE_MATCHED_TAG !== $this->parser_state ||
+			$this->is_closing_tag
+		) {
 			return false;
 		}
 
@@ -2254,13 +2514,14 @@ public function remove_attribute( $name ) {
 	 * @return bool Whether the class was set to be added.
 	 */
 	public function add_class( $class_name ) {
-		if ( $this->is_closing_tag ) {
+		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::ADD_CLASS;
-		}
+		$this->classname_updates[ $class_name ] = self::ADD_CLASS;
 
 		return true;
 	}
@@ -2274,7 +2535,10 @@ public function add_class( $class_name ) {
 	 * @return bool Whether the class was set to be removed.
 	 */
 	public function remove_class( $class_name ) {
-		if ( $this->is_closing_tag ) {
+		if (
+			self::STATE_MATCHED_TAG !== $this->parser_state ||
+			$this->is_closing_tag
+		) {
 			return false;
 		}
 
@@ -2480,4 +2744,57 @@ private function matches() {
 
 		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 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 = 'STATE_INCOMPLETE';
+
+	/**
+	 * 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';
 }
diff --git a/lib/experimental/block-bindings/block-bindings.php b/lib/experimental/block-bindings/block-bindings.php
new file mode 100644
index 0000000000000..83a1d6132f5f4
--- /dev/null
+++ b/lib/experimental/block-bindings/block-bindings.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Block Bindings API
+ *
+ * This file contains functions for managing block bindings in WordPress.
+ *
+ * @since 17.6.0
+ * @package gutenberg
+ */
+
+/**
+ * Retrieves the singleton instance of WP_Block_Bindings.
+ *
+ * @return WP_Block_Bindings The WP_Block_Bindings instance.
+ */
+if ( ! function_exists( 'wp_block_bindings' ) ) {
+	function wp_block_bindings() {
+		static $instance = null;
+		if ( is_null( $instance ) ) {
+			$instance = new WP_Block_Bindings();
+		}
+		return $instance;
+	}
+}
+
+/**
+ * Registers a new source for block bindings.
+ *
+ * @param string   $source_name The name of the source.
+ * @param string   $label The label of the source.
+ * @param callable $apply The callback executed when the source is processed during block rendering. The callable should have the following signature:
+ *                        function (object $source_attrs, object $block_instance, string $attribute_name): string
+ *                        - object $source_attrs: Object containing source ID used to look up the override value, i.e. {"value": "{ID}"}.
+ *                        - object $block_instance: The block instance.
+ *                        - string $attribute_name: The name of an attribute used to retrieve an override value from the block context.
+ *                        The callable should return a string that will be used to override the block's original value.
+ * @return void
+ */
+if ( ! function_exists( 'wp_block_bindings_register_source' ) ) {
+	function wp_block_bindings_register_source( $source_name, $label, $apply ) {
+		wp_block_bindings()->register_source( $source_name, $label, $apply );
+	}
+}
+
+/**
+ * Retrieves the list of registered block sources.
+ *
+ * @return array The list of registered block sources.
+ */
+if ( ! function_exists( 'wp_block_bindings_get_sources' ) ) {
+	function wp_block_bindings_get_sources() {
+		return wp_block_bindings()->get_sources();
+	}
+}
+
+/**
+ * Replaces the HTML content of a block based on the provided source value.
+ *
+ * @param string $block_content Block Content.
+ * @param string $block_name The name of the block to process.
+ * @param string $block_attr The attribute of the block we want to process.
+ * @param string $source_value The value used to replace the HTML.
+ * @return string The modified block content.
+ */
+if ( ! function_exists( 'wp_block_bindings_replace_html' ) ) {
+	function wp_block_bindings_replace_html( $block_content, $block_name, $block_attr, $source_value ) {
+		return wp_block_bindings()->replace_html( $block_content, $block_name, $block_attr, $source_value );
+	}
+}
diff --git a/lib/experimental/block-bindings/html-processing.php b/lib/experimental/block-bindings/class-wp-block-bindings.php
similarity index 70%
rename from lib/experimental/block-bindings/html-processing.php
rename to lib/experimental/block-bindings/class-wp-block-bindings.php
index 515749d0a8e75..7eb443dd367a6 100644
--- a/lib/experimental/block-bindings/html-processing.php
+++ b/lib/experimental/block-bindings/class-wp-block-bindings.php
@@ -1,11 +1,50 @@
 <?php
 /**
- * Define the mechanism to replace the HTML depending on the block attributes.
+ * Block Bindings API: WP_Block_Bindings class.
  *
+ * Support for overriding content in blocks by connecting them to different sources.
+ *
+ * @since 17.6.0
  * @package gutenberg
  */
 
-if ( ! function_exists( 'block_bindings_replace_html' ) ) {
+if ( class_exists( 'WP_Block_Bindings' ) ) {
+	return;
+}
+
+/**
+ * Core class used to define supported blocks, register sources, and populate HTML with content from those sources.
+ */
+class WP_Block_Bindings {
+
+	/**
+	 * Holds the registered block bindings sources, keyed by source identifier.
+	 *
+	 * @var array
+	 */
+	private $sources = array();
+
+	/**
+	 * Function to register a new source.
+	 *
+	 * @param string   $source_name The name of the source.
+	 * @param string   $label The label of the source.
+	 * @param callable $apply The callback executed when the source is processed during block rendering. The callable should have the following signature:
+	 *                        function (object $source_attrs, object $block_instance, string $attribute_name): string
+	 *                        - object $source_attrs: Object containing source ID used to look up the override value, i.e. {"value": "{ID}"}.
+	 *                        - object $block_instance: The block instance.
+	 *                        - string $attribute_name: The name of an attribute used to retrieve an override value from the block context.
+	 *                        The callable should return a string that will be used to override the block's original value.
+	 *
+	 * @return void
+	 */
+	public function register_source( $source_name, $label, $apply ) {
+		$this->sources[ $source_name ] = array(
+			'label' => $label,
+			'apply' => $apply,
+		);
+	}
+
 	/**
 	 * Depending on the block attributes, replace the proper HTML based on the value returned by the source.
 	 *
@@ -14,7 +53,7 @@
 	 * @param string $block_attr The attribute of the block we want to process.
 	 * @param string $source_value The value used to replace the HTML.
 	 */
-	function block_bindings_replace_html( $block_content, $block_name, $block_attr, $source_value ) {
+	public function replace_html( $block_content, $block_name, $block_attr, $source_value ) {
 		$block_type = WP_Block_Type_Registry::get_instance()->get_registered( $block_name );
 		if ( null === $block_type ) {
 			return;
@@ -107,4 +146,13 @@ function block_bindings_replace_html( $block_content, $block_name, $block_attr,
 		}
 		return;
 	}
+
+	/**
+	 * Retrieves the list of registered block sources.
+	 *
+	 * @return array The array of registered sources.
+	 */
+	public function get_sources() {
+		return $this->sources;
+	}
 }
diff --git a/lib/experimental/block-bindings/index.php b/lib/experimental/block-bindings/index.php
index cca857e93702f..dc9a6c9b96957 100644
--- a/lib/experimental/block-bindings/index.php
+++ b/lib/experimental/block-bindings/index.php
@@ -5,9 +5,8 @@
  * @package gutenberg
  */
 
-require_once __DIR__ . '/sources/index.php';
-require_once __DIR__ . '/html-processing.php';
-
+require_once __DIR__ . '/class-wp-block-bindings.php';
+require_once __DIR__ . '/block-bindings.php';
 // Register the sources.
 $gutenberg_experiments = get_option( 'gutenberg-experiments' );
 if ( $gutenberg_experiments ) {
diff --git a/lib/experimental/block-bindings/sources/index.php b/lib/experimental/block-bindings/sources/index.php
deleted file mode 100644
index 6d14bc96d86ba..0000000000000
--- a/lib/experimental/block-bindings/sources/index.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Define the mechanism to add new sources available in the block bindings API.
- *
- * @package gutenberg
- */
-
-global $block_bindings_sources;
-$block_bindings_sources = array();
-if ( ! function_exists( 'register_block_bindings_source' ) ) {
-	/**
-	 * Function to register a new source.
-	 *
-	 * @param string   $source_name The name of the source.
-	 * @param string   $label The label of the source.
-	 * @param callable(object, object, string): string $apply - The callback executed when the source is processed during block rendering.
-	 *                        - object $source_attrs: Object containing source ID used to look up the override value, i.e. {"value": "{ID}"}.
-	 *                        - object $block_instance: The block instance.
-	 *                        - string $attribute_name: The name of an attribute used to retrieve an override value from the block context.
-	 *                        The callable should return a string that will be used to override the block's original value.
-	 *
-	 *
-	 * @return void
-	 */
-	function register_block_bindings_source( $source_name, $label, $apply ) {
-		global $block_bindings_sources;
-		$block_bindings_sources[ $source_name ] = array(
-			'label' => $label,
-			'apply' => $apply,
-		);
-	}
-}
diff --git a/lib/experimental/block-bindings/sources/pattern.php b/lib/experimental/block-bindings/sources/pattern.php
index e3456aa468d3e..16bf46f4f06ab 100644
--- a/lib/experimental/block-bindings/sources/pattern.php
+++ b/lib/experimental/block-bindings/sources/pattern.php
@@ -4,8 +4,7 @@
  *
  * @package gutenberg
  */
-
-if ( function_exists( 'register_block_bindings_source' ) ) {
+if ( function_exists( 'wp_block_bindings_register_source' ) ) {
 	$pattern_source_callback = function ( $source_attrs, $block_instance, $attribute_name ) {
 		if ( ! _wp_array_get( $block_instance->attributes, array( 'metadata', 'id' ), false ) ) {
 			return null;
@@ -13,7 +12,7 @@
 		$block_id = $block_instance->attributes['metadata']['id'];
 		return _wp_array_get( $block_instance->context, array( 'pattern/overrides', $block_id, $attribute_name ), null );
 	};
-	register_block_bindings_source(
+	wp_block_bindings_register_source(
 		'pattern_attributes',
 		__( 'Pattern Attributes', 'gutenberg' ),
 		$pattern_source_callback
diff --git a/lib/experimental/block-bindings/sources/post-meta.php b/lib/experimental/block-bindings/sources/post-meta.php
index 99b6afc03c0d4..2d53dab6d321a 100644
--- a/lib/experimental/block-bindings/sources/post-meta.php
+++ b/lib/experimental/block-bindings/sources/post-meta.php
@@ -4,8 +4,7 @@
  *
  * @package gutenberg
  */
-
-if ( function_exists( 'register_block_bindings_source' ) ) {
+if ( function_exists( 'wp_block_bindings_register_source' ) ) {
 	$post_meta_source_callback = function ( $source_attrs ) {
 		// Use the postId attribute if available
 		if ( isset( $source_attrs['postId'] ) ) {
@@ -17,7 +16,7 @@
 
 		return get_post_meta( $post_id, $source_attrs['value'], true );
 	};
-	register_block_bindings_source(
+	wp_block_bindings_register_source(
 		'post_meta',
 		__( 'Post Meta', 'gutenberg' ),
 		$post_meta_source_callback
diff --git a/lib/experimental/blocks.php b/lib/experimental/blocks.php
index 42663e127870c..93b65f95fc61a 100644
--- a/lib/experimental/blocks.php
+++ b/lib/experimental/blocks.php
@@ -88,16 +88,8 @@ function wp_enqueue_block_view_script( $block_name, $args ) {
 ) ) {
 
 	require_once __DIR__ . '/block-bindings/index.php';
-		// Allowed blocks that support block bindings.
-	// TODO: Look for a mechanism to opt-in for this. Maybe adding a property to block attributes?
-	global $block_bindings_allowed_blocks;
-	$block_bindings_allowed_blocks = array(
-		'core/paragraph' => array( 'content' ),
-		'core/heading'   => array( 'content' ),
-		'core/image'     => array( 'url', 'title', 'alt' ),
-		'core/button'    => array( 'url', 'text' ),
-	);
-	if ( ! function_exists( 'process_block_bindings' ) ) {
+
+	if ( ! function_exists( 'gutenberg_process_block_bindings' ) ) {
 		/**
 		 * Process the block bindings attribute.
 		 *
@@ -105,9 +97,19 @@ function wp_enqueue_block_view_script( $block_name, $args ) {
 		 * @param array    $block Block attributes.
 		 * @param WP_Block $block_instance The block instance.
 		 */
-		function process_block_bindings( $block_content, $block, $block_instance ) {
-			// If the block doesn't have the bindings property, return.
-			if ( ! isset( $block['attrs']['metadata']['bindings'] ) ) {
+		function gutenberg_process_block_bindings( $block_content, $block, $block_instance ) {
+
+			// Allowed blocks that support block bindings.
+			// TODO: Look for a mechanism to opt-in for this. Maybe adding a property to block attributes?
+			$allowed_blocks = array(
+				'core/paragraph' => array( 'content' ),
+				'core/heading'   => array( 'content' ),
+				'core/image'     => array( 'url', 'title', 'alt' ),
+				'core/button'    => array( 'url', 'text' ),
+			);
+
+			// If the block doesn't have the bindings property or isn't one of the allowed block types, return.
+			if ( ! isset( $block['attrs']['metadata']['bindings'] ) || ! isset( $allowed_blocks[ $block_instance->name ] ) ) {
 				return $block_content;
 			}
 
@@ -128,16 +130,13 @@ function process_block_bindings( $block_content, $block, $block_instance ) {
 			//   }
 			// }
 			//
-			global $block_bindings_allowed_blocks;
-			global $block_bindings_sources;
+
+			$block_bindings_sources = wp_block_bindings_get_sources();
 			$modified_block_content = $block_content;
 			foreach ( $block['attrs']['metadata']['bindings'] as $binding_attribute => $binding_source ) {
-				// If the block is not in the list, stop processing.
-				if ( ! isset( $block_bindings_allowed_blocks[ $block['blockName'] ] ) ) {
-					return $block_content;
-				}
+
 				// If the attribute is not in the list, process next attribute.
-				if ( ! in_array( $binding_attribute, $block_bindings_allowed_blocks[ $block['blockName'] ], true ) ) {
+				if ( ! in_array( $binding_attribute, $allowed_blocks[ $block_instance->name ], true ) ) {
 					continue;
 				}
 				// If no source is provided, or that source is not registered, process next attribute.
@@ -159,14 +158,11 @@ function process_block_bindings( $block_content, $block, $block_instance ) {
 				}
 
 				// Process the HTML based on the block and the attribute.
-				$modified_block_content = block_bindings_replace_html( $modified_block_content, $block['blockName'], $binding_attribute, $source_value );
+				$modified_block_content = wp_block_bindings_replace_html( $modified_block_content, $block_instance->name, $binding_attribute, $source_value );
 			}
 			return $modified_block_content;
 		}
-
-		// Add filter only to the blocks in the list.
-		foreach ( $block_bindings_allowed_blocks as $block_name => $attributes ) {
-			add_filter( 'render_block_' . $block_name, 'process_block_bindings', 20, 3 );
-		}
 	}
+
+	add_filter( 'render_block', 'gutenberg_process_block_bindings', 20, 3 );
 }
diff --git a/lib/load.php b/lib/load.php
index 8988a05820425..61a300447415d 100644
--- a/lib/load.php
+++ b/lib/load.php
@@ -79,7 +79,10 @@ function gutenberg_is_experiment_enabled( $name ) {
 require __DIR__ . '/compat/wordpress-6.5/html-api/class-gutenberg-html-attribute-token-6-5.php';
 require __DIR__ . '/compat/wordpress-6.5/html-api/class-gutenberg-html-span-6-5.php';
 require __DIR__ . '/compat/wordpress-6.5/html-api/class-gutenberg-html-text-replacement-6-5.php';
+require __DIR__ . '/compat/wordpress-6.5/html-api/class-gutenberg-html-open-elements-6-5.php';
+require __DIR__ . '/compat/wordpress-6.5/html-api/class-gutenberg-html-processor-state-6-5.php';
 require __DIR__ . '/compat/wordpress-6.5/html-api/class-gutenberg-html-tag-processor-6-5.php';
+require __DIR__ . '/compat/wordpress-6.5/html-api/class-gutenberg-html-processor-6-5.php';
 
 /*
  * The HTML Processor appeared after WordPress 6.3. If Gutenberg is running on a version of
@@ -101,6 +104,7 @@ function gutenberg_is_experiment_enabled( $name ) {
 require __DIR__ . '/compat/wordpress-6.4/kses.php';
 
 // WordPress 6.5 compat.
+require __DIR__ . '/compat/wordpress-6.5/blocks.php';
 require __DIR__ . '/compat/wordpress-6.5/block-patterns.php';
 require __DIR__ . '/compat/wordpress-6.5/class-wp-navigation-block-renderer.php';
 require __DIR__ . '/compat/wordpress-6.5/kses.php';
diff --git a/package-lock.json b/package-lock.json
index 626b31a3ee9f8..56374e1eeb89a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "gutenberg",
-	"version": "17.5.0-rc.1",
+	"version": "17.5.0",
 	"lockfileVersion": 2,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "gutenberg",
-			"version": "17.5.0-rc.1",
+			"version": "17.5.0",
 			"hasInstallScript": true,
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
@@ -7317,21 +7317,6 @@
 				"url": "https://opencollective.com/popperjs"
 			}
 		},
-		"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==",
-			"dependencies": {
-				"@preact/signals-core": "^1.2.3"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/preact"
-			},
-			"peerDependencies": {
-				"preact": "10.x"
-			}
-		},
 		"node_modules/@preact/signals-core": {
 			"version": "1.4.0",
 			"resolved": "https://registry.npmjs.org/@preact/signals-core/-/signals-core-1.4.0.tgz",
@@ -21922,16 +21907,6 @@
 			"integrity": "sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==",
 			"dev": true
 		},
-		"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/cliui": {
 			"version": "6.0.0",
 			"resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
@@ -24250,31 +24225,6 @@
 				"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",
@@ -43631,15 +43581,6 @@
 				"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==",
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/preact"
-			}
-		},
 		"node_modules/prebuild-install": {
 			"version": "7.1.1",
 			"resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.1.tgz",
@@ -53831,7 +53772,7 @@
 		},
 		"packages/a11y": {
 			"name": "@wordpress/a11y",
-			"version": "3.48.0",
+			"version": "3.49.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -53844,7 +53785,7 @@
 		},
 		"packages/annotations": {
 			"name": "@wordpress/annotations",
-			"version": "2.48.0",
+			"version": "2.49.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -53872,7 +53813,7 @@
 		},
 		"packages/api-fetch": {
 			"name": "@wordpress/api-fetch",
-			"version": "6.45.0",
+			"version": "6.46.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -53885,7 +53826,7 @@
 		},
 		"packages/autop": {
 			"name": "@wordpress/autop",
-			"version": "3.48.0",
+			"version": "3.49.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0"
@@ -53896,7 +53837,7 @@
 		},
 		"packages/babel-plugin-import-jsx-pragma": {
 			"name": "@wordpress/babel-plugin-import-jsx-pragma",
-			"version": "4.31.0",
+			"version": "4.32.0",
 			"dev": true,
 			"license": "GPL-2.0-or-later",
 			"engines": {
@@ -53908,7 +53849,7 @@
 		},
 		"packages/babel-plugin-makepot": {
 			"name": "@wordpress/babel-plugin-makepot",
-			"version": "5.32.0",
+			"version": "5.33.0",
 			"dev": true,
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
@@ -53925,7 +53866,7 @@
 		},
 		"packages/babel-preset-default": {
 			"name": "@wordpress/babel-preset-default",
-			"version": "7.32.0",
+			"version": "7.33.0",
 			"dev": true,
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
@@ -53948,13 +53889,13 @@
 		},
 		"packages/base-styles": {
 			"name": "@wordpress/base-styles",
-			"version": "4.39.0",
+			"version": "4.40.0",
 			"dev": true,
 			"license": "GPL-2.0-or-later"
 		},
 		"packages/blob": {
 			"name": "@wordpress/blob",
-			"version": "3.48.0",
+			"version": "3.49.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0"
@@ -53965,7 +53906,7 @@
 		},
 		"packages/block-directory": {
 			"name": "@wordpress/block-directory",
-			"version": "4.25.0",
+			"version": "4.26.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -54000,7 +53941,7 @@
 		},
 		"packages/block-editor": {
 			"name": "@wordpress/block-editor",
-			"version": "12.16.0",
+			"version": "12.17.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -54097,7 +54038,7 @@
 		},
 		"packages/block-library": {
 			"name": "@wordpress/block-library",
-			"version": "8.25.0",
+			"version": "8.26.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -54123,6 +54064,7 @@
 				"@wordpress/interactivity": "file:../interactivity",
 				"@wordpress/keycodes": "file:../keycodes",
 				"@wordpress/notices": "file:../notices",
+				"@wordpress/patterns": "file:../patterns",
 				"@wordpress/primitives": "file:../primitives",
 				"@wordpress/private-apis": "file:../private-apis",
 				"@wordpress/reusable-blocks": "file:../reusable-blocks",
@@ -54159,7 +54101,7 @@
 		},
 		"packages/block-serialization-default-parser": {
 			"name": "@wordpress/block-serialization-default-parser",
-			"version": "4.48.0",
+			"version": "4.49.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0"
@@ -54170,7 +54112,7 @@
 		},
 		"packages/block-serialization-spec-parser": {
 			"name": "@wordpress/block-serialization-spec-parser",
-			"version": "4.48.0",
+			"version": "4.49.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"pegjs": "^0.10.0",
@@ -54182,7 +54124,7 @@
 		},
 		"packages/blocks": {
 			"name": "@wordpress/blocks",
-			"version": "12.25.0",
+			"version": "12.26.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -54236,7 +54178,7 @@
 		},
 		"packages/browserslist-config": {
 			"name": "@wordpress/browserslist-config",
-			"version": "5.31.0",
+			"version": "5.32.0",
 			"dev": true,
 			"license": "GPL-2.0-or-later",
 			"engines": {
@@ -54245,7 +54187,7 @@
 		},
 		"packages/commands": {
 			"name": "@wordpress/commands",
-			"version": "0.19.0",
+			"version": "0.20.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -54270,7 +54212,7 @@
 		},
 		"packages/components": {
 			"name": "@wordpress/components",
-			"version": "25.14.0",
+			"version": "25.15.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@ariakit/react": "^0.3.12",
@@ -54375,7 +54317,7 @@
 		},
 		"packages/compose": {
 			"name": "@wordpress/compose",
-			"version": "6.25.0",
+			"version": "6.26.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -54388,7 +54330,7 @@
 				"@wordpress/priority-queue": "file:../priority-queue",
 				"@wordpress/undo-manager": "file:../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"
 			},
@@ -54399,9 +54341,19 @@
 				"react": "^18.0.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": "0.17.0",
+			"version": "0.18.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -54426,7 +54378,7 @@
 		},
 		"packages/core-data": {
 			"name": "@wordpress/core-data",
-			"version": "6.25.0",
+			"version": "6.26.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -54470,7 +54422,7 @@
 		},
 		"packages/create-block": {
 			"name": "@wordpress/create-block",
-			"version": "4.32.0",
+			"version": "4.33.0",
 			"dev": true,
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
@@ -54498,13 +54450,13 @@
 		},
 		"packages/create-block-tutorial-template": {
 			"name": "@wordpress/create-block-tutorial-template",
-			"version": "3.2.0",
+			"version": "3.3.0",
 			"dev": true,
 			"license": "GPL-2.0-or-later"
 		},
 		"packages/customize-widgets": {
 			"name": "@wordpress/customize-widgets",
-			"version": "4.25.0",
+			"version": "4.26.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -54541,7 +54493,7 @@
 		},
 		"packages/data": {
 			"name": "@wordpress/data",
-			"version": "9.18.0",
+			"version": "9.19.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -54569,7 +54521,7 @@
 		},
 		"packages/data-controls": {
 			"name": "@wordpress/data-controls",
-			"version": "3.17.0",
+			"version": "3.18.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -54586,7 +54538,7 @@
 		},
 		"packages/dataviews": {
 			"name": "@wordpress/dataviews",
-			"version": "0.2.0",
+			"version": "0.3.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -54611,7 +54563,7 @@
 		},
 		"packages/date": {
 			"name": "@wordpress/date",
-			"version": "4.48.0",
+			"version": "4.49.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -54625,7 +54577,7 @@
 		},
 		"packages/dependency-extraction-webpack-plugin": {
 			"name": "@wordpress/dependency-extraction-webpack-plugin",
-			"version": "4.31.0",
+			"version": "5.0.0",
 			"dev": true,
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
@@ -54640,7 +54592,7 @@
 		},
 		"packages/deprecated": {
 			"name": "@wordpress/deprecated",
-			"version": "3.48.0",
+			"version": "3.49.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -54652,7 +54604,7 @@
 		},
 		"packages/docgen": {
 			"name": "@wordpress/docgen",
-			"version": "1.57.0",
+			"version": "1.58.0",
 			"dev": true,
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
@@ -54670,7 +54622,7 @@
 		},
 		"packages/dom": {
 			"name": "@wordpress/dom",
-			"version": "3.48.0",
+			"version": "3.49.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -54682,7 +54634,7 @@
 		},
 		"packages/dom-ready": {
 			"name": "@wordpress/dom-ready",
-			"version": "3.48.0",
+			"version": "3.49.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0"
@@ -54693,7 +54645,7 @@
 		},
 		"packages/e2e-test-utils": {
 			"name": "@wordpress/e2e-test-utils",
-			"version": "10.19.0",
+			"version": "10.20.0",
 			"dev": true,
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
@@ -54715,7 +54667,7 @@
 		},
 		"packages/e2e-test-utils-playwright": {
 			"name": "@wordpress/e2e-test-utils-playwright",
-			"version": "0.16.0",
+			"version": "0.17.0",
 			"dev": true,
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
@@ -54738,7 +54690,7 @@
 		},
 		"packages/e2e-tests": {
 			"name": "@wordpress/e2e-tests",
-			"version": "7.19.0",
+			"version": "7.20.0",
 			"dev": true,
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
@@ -54776,7 +54728,7 @@
 		},
 		"packages/edit-post": {
 			"name": "@wordpress/edit-post",
-			"version": "7.25.0",
+			"version": "7.26.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -54824,7 +54776,7 @@
 		},
 		"packages/edit-site": {
 			"name": "@wordpress/edit-site",
-			"version": "5.25.0",
+			"version": "5.26.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -54889,7 +54841,7 @@
 		},
 		"packages/edit-widgets": {
 			"name": "@wordpress/edit-widgets",
-			"version": "5.25.0",
+			"version": "5.26.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -54932,7 +54884,7 @@
 		},
 		"packages/editor": {
 			"name": "@wordpress/editor",
-			"version": "13.25.0",
+			"version": "13.26.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -54983,7 +54935,7 @@
 		},
 		"packages/element": {
 			"name": "@wordpress/element",
-			"version": "5.25.0",
+			"version": "5.26.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -55001,7 +54953,7 @@
 		},
 		"packages/env": {
 			"name": "@wordpress/env",
-			"version": "9.0.0",
+			"version": "9.1.0",
 			"dev": true,
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
@@ -55135,7 +55087,7 @@
 		},
 		"packages/escape-html": {
 			"name": "@wordpress/escape-html",
-			"version": "2.48.0",
+			"version": "2.49.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0"
@@ -55146,7 +55098,7 @@
 		},
 		"packages/eslint-plugin": {
 			"name": "@wordpress/eslint-plugin",
-			"version": "17.5.0",
+			"version": "17.6.0",
 			"dev": true,
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
@@ -55189,7 +55141,7 @@
 		},
 		"packages/format-library": {
 			"name": "@wordpress/format-library",
-			"version": "4.25.0",
+			"version": "4.26.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -55216,7 +55168,7 @@
 		},
 		"packages/hooks": {
 			"name": "@wordpress/hooks",
-			"version": "3.48.0",
+			"version": "3.49.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0"
@@ -55227,7 +55179,7 @@
 		},
 		"packages/html-entities": {
 			"name": "@wordpress/html-entities",
-			"version": "3.48.0",
+			"version": "3.49.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0"
@@ -55238,7 +55190,7 @@
 		},
 		"packages/i18n": {
 			"name": "@wordpress/i18n",
-			"version": "4.48.0",
+			"version": "4.49.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -55257,7 +55209,7 @@
 		},
 		"packages/icons": {
 			"name": "@wordpress/icons",
-			"version": "9.39.0",
+			"version": "9.40.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -55270,20 +55222,69 @@
 		},
 		"packages/interactivity": {
 			"name": "@wordpress/interactivity",
-			"version": "3.1.0",
+			"version": "3.2.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
-				"@preact/signals": "^1.1.3",
-				"deepsignal": "^1.3.6",
-				"preact": "^10.13.2"
+				"@preact/signals": "^1.2.2",
+				"deepsignal": "^1.4.0",
+				"preact": "^10.19.3"
 			},
 			"engines": {
 				"node": ">=12"
 			}
 		},
+		"packages/interactivity/node_modules/@preact/signals": {
+			"version": "1.2.2",
+			"resolved": "https://registry.npmjs.org/@preact/signals/-/signals-1.2.2.tgz",
+			"integrity": "sha512-ColCqdo4cRP18bAuIR4Oik5rDpiyFtPIJIygaYPMEAwTnl4buWkBOflGBSzhYyPyJfKpkwlekrvK+1pzQ2ldWw==",
+			"dependencies": {
+				"@preact/signals-core": "^1.4.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/preact"
+			},
+			"peerDependencies": {
+				"preact": "10.x"
+			}
+		},
+		"packages/interactivity/node_modules/deepsignal": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/deepsignal/-/deepsignal-1.4.0.tgz",
+			"integrity": "sha512-x0XUMT48s+xQRLc2fPFfxnYLCJ46vffw47OQ5NcHFzacOjfW5eA0NrEmI0bhQHL6MgUHkBVT4TIiWTVwzTEwpg==",
+			"peerDependencies": {
+				"@preact/signals": "^1.1.4",
+				"@preact/signals-core": "^1.5.1",
+				"@preact/signals-react": "^1.3.8 || ^2.0.0",
+				"preact": "^10.16.0"
+			},
+			"peerDependenciesMeta": {
+				"@preact/signals": {
+					"optional": true
+				},
+				"@preact/signals-core": {
+					"optional": true
+				},
+				"@preact/signals-react": {
+					"optional": true
+				},
+				"preact": {
+					"optional": true
+				}
+			}
+		},
+		"packages/interactivity/node_modules/preact": {
+			"version": "10.19.3",
+			"resolved": "https://registry.npmjs.org/preact/-/preact-10.19.3.tgz",
+			"integrity": "sha512-nHHTeFVBTHRGxJXKkKu5hT8C/YWBkPso4/Gad6xuj5dbptt9iF9NZr9pHbPhBrnT2klheu7mHTxTZ/LjwJiEiQ==",
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/preact"
+			}
+		},
 		"packages/interface": {
 			"name": "@wordpress/interface",
-			"version": "5.25.0",
+			"version": "5.26.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -55311,7 +55312,7 @@
 		},
 		"packages/is-shallow-equal": {
 			"name": "@wordpress/is-shallow-equal",
-			"version": "4.48.0",
+			"version": "4.49.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0"
@@ -55322,7 +55323,7 @@
 		},
 		"packages/jest-console": {
 			"name": "@wordpress/jest-console",
-			"version": "7.19.0",
+			"version": "7.20.0",
 			"dev": true,
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
@@ -55338,7 +55339,7 @@
 		},
 		"packages/jest-preset-default": {
 			"name": "@wordpress/jest-preset-default",
-			"version": "11.19.0",
+			"version": "11.20.0",
 			"dev": true,
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
@@ -55355,7 +55356,7 @@
 		},
 		"packages/jest-puppeteer-axe": {
 			"name": "@wordpress/jest-puppeteer-axe",
-			"version": "6.19.0",
+			"version": "6.20.0",
 			"dev": true,
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
@@ -55377,7 +55378,7 @@
 		},
 		"packages/keyboard-shortcuts": {
 			"name": "@wordpress/keyboard-shortcuts",
-			"version": "4.25.0",
+			"version": "4.26.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -55395,7 +55396,7 @@
 		},
 		"packages/keycodes": {
 			"name": "@wordpress/keycodes",
-			"version": "3.48.0",
+			"version": "3.49.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -55407,7 +55408,7 @@
 		},
 		"packages/lazy-import": {
 			"name": "@wordpress/lazy-import",
-			"version": "1.35.0",
+			"version": "1.36.0",
 			"dev": true,
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
@@ -55421,7 +55422,7 @@
 		},
 		"packages/list-reusable-blocks": {
 			"name": "@wordpress/list-reusable-blocks",
-			"version": "4.25.0",
+			"version": "4.26.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -55443,7 +55444,7 @@
 		},
 		"packages/media-utils": {
 			"name": "@wordpress/media-utils",
-			"version": "4.39.0",
+			"version": "4.40.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -55458,7 +55459,7 @@
 		},
 		"packages/notices": {
 			"name": "@wordpress/notices",
-			"version": "4.16.0",
+			"version": "4.17.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -55474,7 +55475,7 @@
 		},
 		"packages/npm-package-json-lint-config": {
 			"name": "@wordpress/npm-package-json-lint-config",
-			"version": "4.33.0",
+			"version": "4.34.0",
 			"dev": true,
 			"license": "GPL-2.0-or-later",
 			"engines": {
@@ -55486,7 +55487,7 @@
 		},
 		"packages/nux": {
 			"name": "@wordpress/nux",
-			"version": "8.10.0",
+			"version": "8.11.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -55509,7 +55510,7 @@
 		},
 		"packages/patterns": {
 			"name": "@wordpress/patterns",
-			"version": "1.9.0",
+			"version": "1.10.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -55539,7 +55540,7 @@
 		},
 		"packages/plugins": {
 			"name": "@wordpress/plugins",
-			"version": "6.16.0",
+			"version": "6.17.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -55561,7 +55562,7 @@
 		},
 		"packages/postcss-plugins-preset": {
 			"name": "@wordpress/postcss-plugins-preset",
-			"version": "4.32.0",
+			"version": "4.33.0",
 			"dev": true,
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
@@ -55577,7 +55578,7 @@
 		},
 		"packages/postcss-themes": {
 			"name": "@wordpress/postcss-themes",
-			"version": "5.31.0",
+			"version": "5.32.0",
 			"dev": true,
 			"license": "GPL-2.0-or-later",
 			"engines": {
@@ -55589,7 +55590,7 @@
 		},
 		"packages/preferences": {
 			"name": "@wordpress/preferences",
-			"version": "3.25.0",
+			"version": "3.26.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -55597,6 +55598,7 @@
 				"@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",
@@ -55613,7 +55615,7 @@
 		},
 		"packages/preferences-persistence": {
 			"name": "@wordpress/preferences-persistence",
-			"version": "1.40.0",
+			"version": "1.41.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -55625,7 +55627,7 @@
 		},
 		"packages/prettier-config": {
 			"name": "@wordpress/prettier-config",
-			"version": "3.5.0",
+			"version": "3.6.0",
 			"dev": true,
 			"license": "GPL-2.0-or-later",
 			"engines": {
@@ -55637,7 +55639,7 @@
 		},
 		"packages/primitives": {
 			"name": "@wordpress/primitives",
-			"version": "3.46.0",
+			"version": "3.47.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -55650,7 +55652,7 @@
 		},
 		"packages/priority-queue": {
 			"name": "@wordpress/priority-queue",
-			"version": "2.48.0",
+			"version": "2.49.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -55662,7 +55664,7 @@
 		},
 		"packages/private-apis": {
 			"name": "@wordpress/private-apis",
-			"version": "0.30.0",
+			"version": "0.31.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0"
@@ -55673,7 +55675,7 @@
 		},
 		"packages/project-management-automation": {
 			"name": "@wordpress/project-management-automation",
-			"version": "1.47.0",
+			"version": "1.48.0",
 			"dev": true,
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
@@ -55686,7 +55688,7 @@
 		},
 		"packages/react-i18n": {
 			"name": "@wordpress/react-i18n",
-			"version": "3.46.0",
+			"version": "3.47.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -55700,7 +55702,7 @@
 		},
 		"packages/react-native-aztec": {
 			"name": "@wordpress/react-native-aztec",
-			"version": "1.110.0",
+			"version": "1.111.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@wordpress/element": "file:../element",
@@ -55713,7 +55715,7 @@
 		},
 		"packages/react-native-bridge": {
 			"name": "@wordpress/react-native-bridge",
-			"version": "1.110.0",
+			"version": "1.111.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@wordpress/react-native-aztec": "file:../react-native-aztec"
@@ -55724,7 +55726,7 @@
 		},
 		"packages/react-native-editor": {
 			"name": "@wordpress/react-native-editor",
-			"version": "1.110.0",
+			"version": "1.111.0",
 			"hasInstallScript": true,
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
@@ -55834,7 +55836,7 @@
 		},
 		"packages/readable-js-assets-webpack-plugin": {
 			"name": "@wordpress/readable-js-assets-webpack-plugin",
-			"version": "2.31.0",
+			"version": "2.32.0",
 			"dev": true,
 			"license": "GPL-2.0-or-later",
 			"engines": {
@@ -55846,7 +55848,7 @@
 		},
 		"packages/redux-routine": {
 			"name": "@wordpress/redux-routine",
-			"version": "4.48.0",
+			"version": "4.49.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -55890,7 +55892,7 @@
 		},
 		"packages/reusable-blocks": {
 			"name": "@wordpress/reusable-blocks",
-			"version": "4.25.0",
+			"version": "4.26.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -55916,7 +55918,7 @@
 		},
 		"packages/rich-text": {
 			"name": "@wordpress/rich-text",
-			"version": "6.25.0",
+			"version": "6.26.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -55940,7 +55942,7 @@
 		},
 		"packages/router": {
 			"name": "@wordpress/router",
-			"version": "0.17.0",
+			"version": "0.18.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -55958,7 +55960,7 @@
 		},
 		"packages/scripts": {
 			"name": "@wordpress/scripts",
-			"version": "26.19.0",
+			"version": "27.0.0",
 			"dev": true,
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
@@ -56180,7 +56182,7 @@
 		},
 		"packages/server-side-render": {
 			"name": "@wordpress/server-side-render",
-			"version": "4.25.0",
+			"version": "4.26.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -56205,7 +56207,7 @@
 		},
 		"packages/shortcode": {
 			"name": "@wordpress/shortcode",
-			"version": "3.48.0",
+			"version": "3.49.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -56217,7 +56219,7 @@
 		},
 		"packages/style-engine": {
 			"name": "@wordpress/style-engine",
-			"version": "1.31.0",
+			"version": "1.32.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -56229,7 +56231,7 @@
 		},
 		"packages/stylelint-config": {
 			"name": "@wordpress/stylelint-config",
-			"version": "21.31.0",
+			"version": "21.32.0",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -56245,7 +56247,7 @@
 		},
 		"packages/sync": {
 			"name": "@wordpress/sync",
-			"version": "0.10.0",
+			"version": "0.11.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -56265,7 +56267,7 @@
 		},
 		"packages/token-list": {
 			"name": "@wordpress/token-list",
-			"version": "2.48.0",
+			"version": "2.49.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0"
@@ -56276,7 +56278,7 @@
 		},
 		"packages/undo-manager": {
 			"name": "@wordpress/undo-manager",
-			"version": "0.8.0",
+			"version": "0.9.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -56288,7 +56290,7 @@
 		},
 		"packages/url": {
 			"name": "@wordpress/url",
-			"version": "3.49.0",
+			"version": "3.50.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -56300,7 +56302,7 @@
 		},
 		"packages/viewport": {
 			"name": "@wordpress/viewport",
-			"version": "5.25.0",
+			"version": "5.26.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -56317,7 +56319,7 @@
 		},
 		"packages/warning": {
 			"name": "@wordpress/warning",
-			"version": "2.48.0",
+			"version": "2.49.0",
 			"license": "GPL-2.0-or-later",
 			"engines": {
 				"node": ">=12"
@@ -56325,7 +56327,7 @@
 		},
 		"packages/widgets": {
 			"name": "@wordpress/widgets",
-			"version": "3.25.0",
+			"version": "3.26.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -56349,7 +56351,7 @@
 		},
 		"packages/wordcount": {
 			"name": "@wordpress/wordcount",
-			"version": "3.48.0",
+			"version": "3.49.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0"
@@ -61424,14 +61426,6 @@
 			"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",
@@ -69271,6 +69265,7 @@
 				"@wordpress/interactivity": "file:../interactivity",
 				"@wordpress/keycodes": "file:../keycodes",
 				"@wordpress/notices": "file:../notices",
+				"@wordpress/patterns": "file:../patterns",
 				"@wordpress/primitives": "file:../primitives",
 				"@wordpress/private-apis": "file:../private-apis",
 				"@wordpress/reusable-blocks": "file:../reusable-blocks",
@@ -69473,9 +69468,21 @@
 				"@wordpress/priority-queue": "file:../priority-queue",
 				"@wordpress/undo-manager": "file:../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"
+			},
+			"dependencies": {
+				"clipboard": {
+					"version": "2.0.11",
+					"resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.11.tgz",
+					"integrity": "sha512-C+0bbOqkezLIsmWSvlsXS0Q0bmkugu7jcfMIACB+RDEntIzQIkdr148we28AfSloQLRdZlYL/QYyrq05j/3Faw==",
+					"requires": {
+						"good-listener": "^1.2.2",
+						"select": "^1.1.2",
+						"tiny-emitter": "^2.0.0"
+					}
+				}
 			}
 		},
 		"@wordpress/core-commands": {
@@ -70088,9 +70095,29 @@
 		"@wordpress/interactivity": {
 			"version": "file:packages/interactivity",
 			"requires": {
-				"@preact/signals": "^1.1.3",
-				"deepsignal": "^1.3.6",
-				"preact": "^10.13.2"
+				"@preact/signals": "^1.2.2",
+				"deepsignal": "^1.4.0",
+				"preact": "^10.19.3"
+			},
+			"dependencies": {
+				"@preact/signals": {
+					"version": "1.2.2",
+					"resolved": "https://registry.npmjs.org/@preact/signals/-/signals-1.2.2.tgz",
+					"integrity": "sha512-ColCqdo4cRP18bAuIR4Oik5rDpiyFtPIJIygaYPMEAwTnl4buWkBOflGBSzhYyPyJfKpkwlekrvK+1pzQ2ldWw==",
+					"requires": {
+						"@preact/signals-core": "^1.4.0"
+					}
+				},
+				"deepsignal": {
+					"version": "1.4.0",
+					"resolved": "https://registry.npmjs.org/deepsignal/-/deepsignal-1.4.0.tgz",
+					"integrity": "sha512-x0XUMT48s+xQRLc2fPFfxnYLCJ46vffw47OQ5NcHFzacOjfW5eA0NrEmI0bhQHL6MgUHkBVT4TIiWTVwzTEwpg=="
+				},
+				"preact": {
+					"version": "10.19.3",
+					"resolved": "https://registry.npmjs.org/preact/-/preact-10.19.3.tgz",
+					"integrity": "sha512-nHHTeFVBTHRGxJXKkKu5hT8C/YWBkPso4/Gad6xuj5dbptt9iF9NZr9pHbPhBrnT2klheu7mHTxTZ/LjwJiEiQ=="
+				}
 			}
 		},
 		"@wordpress/interface": {
@@ -70264,6 +70291,7 @@
 				"@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",
@@ -73682,16 +73710,6 @@
 			"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",
@@ -75505,11 +75523,6 @@
 			"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",
@@ -90297,11 +90310,6 @@
 			"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",
diff --git a/package.json b/package.json
index aae8275e714ab..39f4ab82105e8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "gutenberg",
-	"version": "17.5.0-rc.1",
+	"version": "17.5.0",
 	"private": true,
 	"description": "A new WordPress editor experience.",
 	"author": "The WordPress Contributors",
diff --git a/packages/a11y/CHANGELOG.md b/packages/a11y/CHANGELOG.md
index b78906a8b23e1..7c5c9d7978410 100644
--- a/packages/a11y/CHANGELOG.md
+++ b/packages/a11y/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 3.49.0 (2024-01-10)
+
 ## 3.48.0 (2023-12-13)
 
 ## 3.47.0 (2023-11-29)
diff --git a/packages/a11y/package.json b/packages/a11y/package.json
index 399b5bd451455..c2d1b666339bf 100644
--- a/packages/a11y/package.json
+++ b/packages/a11y/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/a11y",
-	"version": "3.48.0",
+	"version": "3.49.0",
 	"description": "Accessibility (a11y) utilities for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/annotations/CHANGELOG.md b/packages/annotations/CHANGELOG.md
index 98c1d6e0f9621..42c3783652797 100644
--- a/packages/annotations/CHANGELOG.md
+++ b/packages/annotations/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 2.49.0 (2024-01-10)
+
 ## 2.48.0 (2023-12-13)
 
 ## 2.47.0 (2023-11-29)
diff --git a/packages/annotations/package.json b/packages/annotations/package.json
index 01ac7d7961f26..007b02ad29a71 100644
--- a/packages/annotations/package.json
+++ b/packages/annotations/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/annotations",
-	"version": "2.48.0",
+	"version": "2.49.0",
 	"description": "Annotate content in the Gutenberg editor.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/api-fetch/CHANGELOG.md b/packages/api-fetch/CHANGELOG.md
index cd9a3d8582dd9..67df4dad50c64 100644
--- a/packages/api-fetch/CHANGELOG.md
+++ b/packages/api-fetch/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 6.46.0 (2024-01-10)
+
 ## 6.45.0 (2023-12-13)
 
 ## 6.44.0 (2023-11-29)
diff --git a/packages/api-fetch/package.json b/packages/api-fetch/package.json
index be6d4adb079ee..02d0474156bfc 100644
--- a/packages/api-fetch/package.json
+++ b/packages/api-fetch/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/api-fetch",
-	"version": "6.45.0",
+	"version": "6.46.0",
 	"description": "Utility to make WordPress REST API requests.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/autop/CHANGELOG.md b/packages/autop/CHANGELOG.md
index 301f58946ecdd..4e4c9a91bc781 100644
--- a/packages/autop/CHANGELOG.md
+++ b/packages/autop/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 3.49.0 (2024-01-10)
+
 ## 3.48.0 (2023-12-13)
 
 ## 3.47.0 (2023-11-29)
diff --git a/packages/autop/package.json b/packages/autop/package.json
index 8acd56c43fc8c..e335e4ac7349b 100644
--- a/packages/autop/package.json
+++ b/packages/autop/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/autop",
-	"version": "3.48.0",
+	"version": "3.49.0",
 	"description": "WordPress's automatic paragraph functions `autop` and `removep`.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/babel-plugin-import-jsx-pragma/CHANGELOG.md b/packages/babel-plugin-import-jsx-pragma/CHANGELOG.md
index bab957e21b3ae..19269095d73d7 100644
--- a/packages/babel-plugin-import-jsx-pragma/CHANGELOG.md
+++ b/packages/babel-plugin-import-jsx-pragma/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 4.32.0 (2024-01-10)
+
 ## 4.31.0 (2023-12-13)
 
 ## 4.30.0 (2023-11-29)
diff --git a/packages/babel-plugin-import-jsx-pragma/package.json b/packages/babel-plugin-import-jsx-pragma/package.json
index e9f2b1b19596f..3af7e30b2e234 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.31.0",
+	"version": "4.32.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",
diff --git a/packages/babel-plugin-makepot/CHANGELOG.md b/packages/babel-plugin-makepot/CHANGELOG.md
index af6099fa128a1..fd1a0546da3ad 100644
--- a/packages/babel-plugin-makepot/CHANGELOG.md
+++ b/packages/babel-plugin-makepot/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 5.33.0 (2024-01-10)
+
 ## 5.32.0 (2023-12-13)
 
 ## 5.31.0 (2023-11-29)
diff --git a/packages/babel-plugin-makepot/package.json b/packages/babel-plugin-makepot/package.json
index 14d1364e72bf1..6163ad1df3ff1 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.32.0",
+	"version": "5.33.0",
 	"description": "WordPress Babel internationalization (i18n) plugin.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/babel-preset-default/CHANGELOG.md b/packages/babel-preset-default/CHANGELOG.md
index 1b4af03b532b0..4149381dce16f 100644
--- a/packages/babel-preset-default/CHANGELOG.md
+++ b/packages/babel-preset-default/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 7.33.0 (2024-01-10)
+
 ## 7.32.0 (2023-12-13)
 
 ## 7.31.0 (2023-11-29)
diff --git a/packages/babel-preset-default/package.json b/packages/babel-preset-default/package.json
index 2461fb083c3fa..66e63b24ff51e 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.32.0",
+	"version": "7.33.0",
 	"description": "Default Babel preset for WordPress development.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/base-styles/CHANGELOG.md b/packages/base-styles/CHANGELOG.md
index 3f1e818df2efd..a399317b2aef0 100644
--- a/packages/base-styles/CHANGELOG.md
+++ b/packages/base-styles/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 4.40.0 (2024-01-10)
+
 ## 4.39.0 (2023-12-13)
 
 ## 4.38.0 (2023-11-29)
diff --git a/packages/base-styles/package.json b/packages/base-styles/package.json
index bc5984014ee6c..64d3835a00aca 100644
--- a/packages/base-styles/package.json
+++ b/packages/base-styles/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/base-styles",
-	"version": "4.39.0",
+	"version": "4.40.0",
 	"description": "Base SCSS utilities and variables for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/blob/CHANGELOG.md b/packages/blob/CHANGELOG.md
index 7dd54454a0488..b2a501021c5aa 100644
--- a/packages/blob/CHANGELOG.md
+++ b/packages/blob/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 3.49.0 (2024-01-10)
+
 ## 3.48.0 (2023-12-13)
 
 ## 3.47.0 (2023-11-29)
diff --git a/packages/blob/package.json b/packages/blob/package.json
index b1bc807dfd0b4..53071228e0af1 100644
--- a/packages/blob/package.json
+++ b/packages/blob/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/blob",
-	"version": "3.48.0",
+	"version": "3.49.0",
 	"description": "Blob utilities for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/block-directory/CHANGELOG.md b/packages/block-directory/CHANGELOG.md
index 2a9b8c670db45..608fc4c4f005c 100644
--- a/packages/block-directory/CHANGELOG.md
+++ b/packages/block-directory/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 4.26.0 (2024-01-10)
+
 ## 4.25.0 (2023-12-13)
 
 ## 4.24.0 (2023-11-29)
diff --git a/packages/block-directory/package.json b/packages/block-directory/package.json
index 2962204ac36e6..466d1fd783e95 100644
--- a/packages/block-directory/package.json
+++ b/packages/block-directory/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/block-directory",
-	"version": "4.25.0",
+	"version": "4.26.0",
 	"description": "Extend editor with block directory features to search, download and install blocks.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/block-editor/CHANGELOG.md b/packages/block-editor/CHANGELOG.md
index 64763eb66f7a8..a66143dd30ac9 100644
--- a/packages/block-editor/CHANGELOG.md
+++ b/packages/block-editor/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 12.17.0 (2024-01-10)
+
 ## 12.16.0 (2023-12-13)
 
 ## 12.15.0 (2023-11-29)
diff --git a/packages/block-editor/package.json b/packages/block-editor/package.json
index 1f9be9e2608b9..cf8f13a0b9f11 100644
--- a/packages/block-editor/package.json
+++ b/packages/block-editor/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/block-editor",
-	"version": "12.16.0",
+	"version": "12.17.0",
 	"description": "Generic block editor.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/block-editor/src/components/block-edit/context.js b/packages/block-editor/src/components/block-edit/context.js
index 6b0b1af9ea22d..b280cc9c51f6b 100644
--- a/packages/block-editor/src/components/block-edit/context.js
+++ b/packages/block-editor/src/components/block-edit/context.js
@@ -5,6 +5,7 @@ import { createContext, useContext } from '@wordpress/element';
 
 export const mayDisplayControlsKey = Symbol( 'mayDisplayControls' );
 export const mayDisplayParentControlsKey = Symbol( 'mayDisplayParentControls' );
+export const blockEditingModeKey = Symbol( 'blockEditingMode' );
 
 export const DEFAULT_BLOCK_EDIT_CONTEXT = {
 	name: '',
diff --git a/packages/block-editor/src/components/block-edit/index.js b/packages/block-editor/src/components/block-edit/index.js
index bbef47b27c579..457cd919f8938 100644
--- a/packages/block-editor/src/components/block-edit/index.js
+++ b/packages/block-editor/src/components/block-edit/index.js
@@ -13,6 +13,7 @@ import {
 	useBlockEditContext,
 	mayDisplayControlsKey,
 	mayDisplayParentControlsKey,
+	blockEditingModeKey,
 } from './context';
 
 /**
@@ -28,6 +29,7 @@ export { useBlockEditContext };
 export default function BlockEdit( {
 	mayDisplayControls,
 	mayDisplayParentControls,
+	blockEditingMode,
 	// The remaining props are passed through the BlockEdit filters and are thus
 	// public API!
 	...props
@@ -59,6 +61,7 @@ export default function BlockEdit( {
 					// usage outside of the package (this context is exposed).
 					[ mayDisplayControlsKey ]: mayDisplayControls,
 					[ mayDisplayParentControlsKey ]: mayDisplayParentControls,
+					[ blockEditingModeKey ]: blockEditingMode,
 				} ),
 				[
 					name,
@@ -69,6 +72,7 @@ export default function BlockEdit( {
 					__unstableLayoutClassNames,
 					mayDisplayControls,
 					mayDisplayParentControls,
+					blockEditingMode,
 				]
 			) }
 		>
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 20f93f6b36f90..7cb500af1e9c0 100644
--- a/packages/block-editor/src/components/block-editing-mode/index.js
+++ b/packages/block-editor/src/components/block-editing-mode/index.js
@@ -8,7 +8,10 @@ import { useEffect } from '@wordpress/element';
  * Internal dependencies
  */
 import { store as blockEditorStore } from '../../store';
-import { useBlockEditContext } from '../block-edit/context';
+import {
+	useBlockEditContext,
+	blockEditingModeKey,
+} from '../block-edit/context';
 
 /**
  * @typedef {'disabled'|'contentOnly'|'default'} BlockEditingMode
@@ -45,14 +48,16 @@ import { useBlockEditContext } from '../block-edit/context';
  * @return {BlockEditingMode} The current editing mode.
  */
 export function useBlockEditingMode( mode ) {
-	const { clientId = '' } = useBlockEditContext();
-	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-list/block.js b/packages/block-editor/src/components/block-list/block.js
index 0bfc940865a09..7690386764f6c 100644
--- a/packages/block-editor/src/components/block-list/block.js
+++ b/packages/block-editor/src/components/block-list/block.js
@@ -6,7 +6,7 @@ import classnames from 'classnames';
 /**
  * WordPress dependencies
  */
-import { useCallback, RawHTML, useContext } from '@wordpress/element';
+import { memo, useCallback, RawHTML, useContext } from '@wordpress/element';
 import {
 	getBlockType,
 	getSaveContent,
@@ -21,7 +21,7 @@ import {
 } from '@wordpress/blocks';
 import { withFilters } from '@wordpress/components';
 import { withDispatch, useDispatch, useSelect } from '@wordpress/data';
-import { compose, pure } from '@wordpress/compose';
+import { compose } from '@wordpress/compose';
 import { safeHTML } from '@wordpress/dom';
 
 /**
@@ -133,6 +133,7 @@ function BlockListBlock( {
 			}
 			mayDisplayControls={ mayDisplayControls }
 			mayDisplayParentControls={ mayDisplayParentControls }
+			blockEditingMode={ context.blockEditingMode }
 		/>
 	);
 
@@ -738,4 +739,4 @@ function BlockListBlockProvider( props ) {
 	);
 }
 
-export default pure( BlockListBlockProvider );
+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 f58251ee66583..1c0de681bd4c2 100644
--- a/packages/block-editor/src/components/block-list/block.native.js
+++ b/packages/block-editor/src/components/block-list/block.native.js
@@ -7,7 +7,13 @@ import classnames from 'classnames';
 /**
  * WordPress dependencies
  */
-import { useCallback, useMemo, useState, useRef } from '@wordpress/element';
+import {
+	useCallback,
+	useMemo,
+	useState,
+	useRef,
+	memo,
+} from '@wordpress/element';
 import {
 	GlobalStylesContext,
 	getMergedGlobalStyles,
@@ -29,7 +35,7 @@ import {
 	withDispatch,
 	withSelect,
 } from '@wordpress/data';
-import { compose, ifCondition, pure } from '@wordpress/compose';
+import { compose, ifCondition } from '@wordpress/compose';
 
 /**
  * Internal dependencies
@@ -183,6 +189,7 @@ function BlockListBlock( {
 		isParentSelected,
 		order,
 		mayDisplayControls,
+		blockEditingMode,
 	} = useSelect(
 		( select ) => {
 			const {
@@ -196,6 +203,7 @@ function BlockListBlock( {
 				getBlockName,
 				isFirstMultiSelectedBlock,
 				getMultiSelectedBlockClientIds,
+				getBlockEditingMode,
 			} = select( blockEditorStore );
 			const currentBlockType = getBlockType( name || 'core/missing' );
 			const currentBlockCategory = currentBlockType?.category;
@@ -249,6 +257,7 @@ function BlockListBlock( {
 						getMultiSelectedBlockClientIds().every(
 							( id ) => getBlockName( id ) === name
 						) ),
+				blockEditingMode: getBlockEditingMode( clientId ),
 			};
 		},
 		[ clientId, isSelected, name, rootClientId ]
@@ -393,6 +402,7 @@ function BlockListBlock( {
 							}
 							wrapperProps={ wrapperProps }
 							mayDisplayControls={ mayDisplayControls }
+							blockEditingMode={ blockEditingMode }
 						/>
 						<View onLayout={ onLayout } />
 					</GlobalStylesContext.Provider>
@@ -678,7 +688,7 @@ 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
diff --git a/packages/block-editor/src/components/block-list/content.scss b/packages/block-editor/src/components/block-list/content.scss
index d907ffd81d9dd..8cd75f6855b62 100644
--- a/packages/block-editor/src/components/block-list/content.scss
+++ b/packages/block-editor/src/components/block-list/content.scss
@@ -26,7 +26,7 @@
 /* stylelint-disable */
 _::-webkit-full-page-media, _:future, :root .block-editor-block-list__layout::selection,
 _::-webkit-full-page-media, _:future, :root .has-multi-selection .block-editor-block-list__layout::selection {
-	background-color: transparent; 
+	background-color: transparent;
 }
 /* stylelint-enable */
 
@@ -303,6 +303,31 @@ _::-webkit-full-page-media, _:future, :root .has-multi-selection .block-editor-b
 	}
 }
 
+// Indicate which blocks are editable within a page editor or a content-locked
+// pattern. Only show when user hovers over the page editor or pattern.
+.is-template-locked:hover,
+.block-editor-block-list__block:hover {
+	.block-editor-block-list__block.is-editing-disabled > .block-editor-block-list__block:not(.is-editing-disabled):not(.is-selected):not(.has-child-selected) {
+		&::after {
+			content: "";
+			border-style: dotted;
+			position: absolute;
+			pointer-events: none;
+			top: $border-width;
+			left: $border-width;
+			right: $border-width;
+			bottom: $border-width;
+			border: 1px dotted var(--wp-admin-theme-color);
+			border-radius: $radius-block-ui - $border-width;
+		}
+
+		&.is-hovered::after {
+			background: rgba(var(--wp-admin-theme-color--rgb), 0.1);
+			border: none;
+		}
+	}
+}
+
 // 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;
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
index 1498105896501..4ff3caa43a724 100644
--- a/packages/block-editor/src/components/block-list/private-block-context.js
+++ b/packages/block-editor/src/components/block-list/private-block-context.js
@@ -3,4 +3,4 @@
  */
 import { createContext } from '@wordpress/element';
 
-export const PrivateBlockContext = createContext( null );
+export const PrivateBlockContext = createContext( {} );
diff --git a/packages/block-editor/src/components/block-preview/auto.js b/packages/block-editor/src/components/block-preview/auto.js
index 8972370cac689..b4fa5e27b072e 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';
 
 /**
@@ -55,7 +55,7 @@ function ScaledBlockPreview( {
 	}, [ styles, additionalStyles ] );
 
 	// Initialize on render instead of module top level, to avoid circular dependency issues.
-	MemoizedBlockList = MemoizedBlockList || pure( BlockList );
+	MemoizedBlockList = MemoizedBlockList || memo( BlockList );
 
 	const scale = containerWidth / viewportWidth;
 	const aspectRatio = contentHeight
diff --git a/packages/block-editor/src/components/block-switcher/index.js b/packages/block-editor/src/components/block-switcher/index.js
index 8117c6f539b4f..f3f976262ea58 100644
--- a/packages/block-editor/src/components/block-switcher/index.js
+++ b/packages/block-editor/src/components/block-switcher/index.js
@@ -29,75 +29,44 @@ 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(
+	const { possibleBlockTransformations, patterns, blocks } = useSelect(
 		( select ) => {
 			const {
+				getBlocksByClientId,
 				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;
-			}
+			const _blocks = getBlocksByClientId( clientIds );
 			return {
+				blocks: _blocks,
 				possibleBlockTransformations: getBlockTransformItems(
-					blocks,
+					_blocks,
 					rootClientId
 				),
-				canRemove: canRemoveBlocks( clientIds, rootClientId ),
-				hasBlockStyles: !! styles?.length,
-				icon: _icon,
 				patterns: __experimentalGetPatternTransformItems(
-					blocks,
+					_blocks,
 					rootClientId
 				),
 			};
 		},
-		[ clientIds, blocks, blockInformation?.icon ]
+		[ 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 +75,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,18 +88,18 @@ 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 =
@@ -141,11 +108,118 @@ export const BlockSwitcherDropdownMenu = ( { clientIds, blocks } ) => {
 	const hasBlockOrBlockVariationTransforms =
 		hasPossibleBlockTransformations ||
 		hasPossibleBlockVariationTransformations;
-	const showDropdown =
+	const hasContents =
 		hasBlockStyles ||
 		hasBlockOrBlockVariationTransforms ||
 		hasPatternTransformation;
-	if ( ! showDropdown ) {
+	if ( ! hasContents ) {
+		return (
+			<p className="block-editor-block-switcher__no-transforms">
+				{ __( 'No transforms.' ) }
+			</p>
+		);
+	}
+	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 }
+				/>
+			) }
+		</div>
+	);
+}
+
+export const BlockSwitcher = ( { clientIds } ) => {
+	const blockInformation = useBlockDisplayInformation( clientIds?.[ 0 ] );
+	const {
+		canRemove,
+		hasBlockStyles,
+		icon,
+		invalidBlocks,
+		isReusable,
+		isTemplate,
+	} = useSelect(
+		( select ) => {
+			const {
+				getBlockRootClientId,
+				getBlocksByClientId,
+				canRemoveBlocks,
+			} = select( blockEditorStore );
+			const { getBlockStyles, getBlockType } = select( blocksStore );
+			const _blocks = getBlocksByClientId( clientIds );
+			if ( ! _blocks.length || _blocks.some( ( block ) => ! block ) ) {
+				return { invalidBlocks: true };
+			}
+			const rootClientId = getBlockRootClientId( clientIds );
+			const [ { name: firstBlockName } ] = _blocks;
+			const _isSingleBlockSelected = _blocks.length === 1;
+			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 {
+				canRemove: canRemoveBlocks( clientIds, rootClientId ),
+				hasBlockStyles:
+					_isSingleBlockSelected &&
+					!! getBlockStyles( firstBlockName )?.length,
+				icon: _icon,
+				isReusable:
+					_isSingleBlockSelected && isReusableBlock( _blocks[ 0 ] ),
+				isTemplate:
+					_isSingleBlockSelected && isTemplatePart( _blocks[ 0 ] ),
+			};
+		},
+		[ clientIds, blockInformation?.icon ]
+	);
+	const blockTitle = useBlockDisplayTitle( {
+		clientId: clientIds?.[ 0 ],
+		maximumLength: 35,
+	} );
+	if ( invalidBlocks ) {
+		return null;
+	}
+	const hideDropdown = ! hasBlockStyles && ! canRemove;
+	if ( hideDropdown ) {
 		return (
 			<ToolbarGroup>
 				<ToolbarButton
@@ -166,11 +240,10 @@ export const BlockSwitcherDropdownMenu = ( { clientIds, blocks } ) => {
 			</ToolbarGroup>
 		);
 	}
-
+	const isSingleBlock = clientIds.length === 1;
 	const blockSwitcherLabel = isSingleBlock
 		? blockTitle
 		: __( 'Multiple blocks selected' );
-
 	const blockSwitcherDescription = isSingleBlock
 		? __( 'Change block type or style' )
 		: sprintf(
@@ -178,11 +251,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
 		  );
-
 	return (
 		<ToolbarGroup>
 			<ToolbarItem>
@@ -215,46 +287,12 @@ export const BlockSwitcherDropdownMenu = ( { clientIds, blocks } ) => {
 						menuProps={ { orientation: 'both' } }
 					>
 						{ ( { onClose } ) => (
-							<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>
+							<BlockSwitcherDropdownMenuContents
+								onClose={ onClose }
+								clientIds={ clientIds }
+								hasBlockStyles={ hasBlockStyles }
+								canRemove={ canRemove }
+							/>
 						) }
 					</DropdownMenu>
 				) }
@@ -263,20 +301,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/style.scss b/packages/block-editor/src/components/block-switcher/style.scss
index d30c6587a520f..6a8a720b9fd2e 100644
--- a/packages/block-editor/src/components/block-switcher/style.scss
+++ b/packages/block-editor/src/components/block-switcher/style.scss
@@ -197,3 +197,9 @@
 		}
 	}
 }
+
+.block-editor-block-switcher__no-transforms {
+	color: $gray-700;
+	padding: 6px $grid-unit;
+	margin: 0;
+}
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 220815d1a6afd..0000000000000
--- 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 8882a5369ca01..ce900003e7a60 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 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 ] } /> );
+		expect(
+			screen.getByRole( 'button', {
+				name: 'Block Name',
+			} )
+		).toBeDisabled();
 	} );
 
-	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 ] } />
-			);
-
+		await waitFor( () =>
 			expect(
 				screen.getByRole( 'button', {
 					name: 'Block Name',
-					expanded: false,
+					expanded: true,
 				} )
-			).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 ] } />
-			);
-
-			expect(
-				screen.getByRole( 'button', {
-					name: 'Block Name',
-					expanded: false,
-				} )
-			).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/font-sizes/fluid-utils.js b/packages/block-editor/src/components/font-sizes/fluid-utils.js
index b26d542708c37..595011b68bafb 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 0a1092a1d8128..27b1cfe8c994a 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/global-styles/border-panel.js b/packages/block-editor/src/components/global-styles/border-panel.js
index ff1f3ddf55471..a1cbcfd9a01c6 100644
--- a/packages/block-editor/src/components/global-styles/border-panel.js
+++ b/packages/block-editor/src/components/global-styles/border-panel.js
@@ -85,8 +85,10 @@ export default function BorderPanel( {
 	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
@@ -98,25 +100,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;
@@ -124,10 +114,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 );
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 0000000000000..ab80e0e8eb43e
--- /dev/null
+++ b/packages/block-editor/src/components/iframe/get-compatibility-styles.js
@@ -0,0 +1,120 @@
+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 ( 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;
+		},
+		[]
+	);
+
+	return compatibilityStyles;
+}
diff --git a/packages/block-editor/src/components/iframe/index.js b/packages/block-editor/src/components/iframe/index.js
index 1939f75811c8c..de482c5f059dc 100644
--- a/packages/block-editor/src/components/iframe/index.js
+++ b/packages/block-editor/src/components/iframe/index.js
@@ -28,7 +28,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 ) {
@@ -121,7 +121,6 @@ function Iframe( {
 	const { styles = '', scripts = '' } = resolvedAssets;
 	const [ iframeDocument, setIframeDocument ] = useState();
 	const [ bodyClasses, setBodyClasses ] = useState( [] );
-	const compatStyles = useCompatibilityStyles();
 	const clearerRef = useBlockSelectionClearer();
 	const [ before, writingFlowRef, after ] = useWritingFlow();
 	const [ contentResizeListener, { height: contentHeight } ] =
@@ -156,7 +155,7 @@ function Iframe( {
 
 			contentDocument.dir = ownerDocument.dir;
 
-			for ( const compatStyle of compatStyles ) {
+			for ( const compatStyle of getCompatibilityStyles() ) {
 				if ( contentDocument.getElementById( compatStyle.id ) ) {
 					continue;
 				}
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 eb738c7ebefdf..0000000000000
--- 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/provider/index.js b/packages/block-editor/src/components/provider/index.js
index c3a87dfb5ff00..b140a2af8c095 100644
--- a/packages/block-editor/src/components/provider/index.js
+++ b/packages/block-editor/src/components/provider/index.js
@@ -46,7 +46,9 @@ export const ExperimentalBlockEditorProvider = withRegistryProvider(
 
 		return (
 			<SlotFillProvider passthrough>
-				<KeyboardShortcuts.Register />
+				{ ! settings.__unstableIsPreviewMode && (
+					<KeyboardShortcuts.Register />
+				) }
 				<BlockRefsProvider>{ children }</BlockRefsProvider>
 			</SlotFillProvider>
 		);
diff --git a/packages/block-editor/src/hooks/block-hooks.js b/packages/block-editor/src/hooks/block-hooks.js
index a1640c72f4b2b..f9d7026e48545 100644
--- a/packages/block-editor/src/hooks/block-hooks.js
+++ b/packages/block-editor/src/hooks/block-hooks.js
@@ -83,7 +83,7 @@ function BlockHooksControlPure( { name, clientId } ) {
 					}
 
 					const hookedBlock = candidates?.find(
-						( candidate ) => name === candidate.name
+						( candidate ) => candidate.name === block.name
 					);
 
 					// If the block exists in the designated location, we consider it hooked
diff --git a/packages/block-editor/src/hooks/typography.native.js b/packages/block-editor/src/hooks/typography.native.js
index d8cbf71d84e13..f0e9c9c10913d 100644
--- a/packages/block-editor/src/hooks/typography.native.js
+++ b/packages/block-editor/src/hooks/typography.native.js
@@ -2,7 +2,7 @@
  * WordPress dependencies
  */
 import { useSelect } from '@wordpress/data';
-import { pure } from '@wordpress/compose';
+import { memo } from '@wordpress/element';
 import { PanelBody } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
 
@@ -57,4 +57,4 @@ function TypographyPanelPure( { clientId, setAttributes, settings } ) {
 // 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 = pure( TypographyPanelPure );
+export const TypographyPanel = memo( TypographyPanelPure );
diff --git a/packages/block-editor/src/hooks/utils.js b/packages/block-editor/src/hooks/utils.js
index cd660c85826c2..e63029e4e34e8 100644
--- a/packages/block-editor/src/hooks/utils.js
+++ b/packages/block-editor/src/hooks/utils.js
@@ -2,9 +2,9 @@
  * WordPress dependencies
  */
 import { getBlockSupport } from '@wordpress/blocks';
-import { useMemo, useEffect, useId, useState } from '@wordpress/element';
+import { memo, useMemo, useEffect, useId, useState } from '@wordpress/element';
 import { useDispatch } from '@wordpress/data';
-import { createHigherOrderComponent, pure } from '@wordpress/compose';
+import { createHigherOrderComponent } from '@wordpress/compose';
 import { addFilter } from '@wordpress/hooks';
 
 /**
@@ -402,10 +402,10 @@ export function useBlockSettings( name, parentLayout ) {
 
 export function createBlockEditFilter( features ) {
 	// 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
+	// `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: pure( settings.edit ) };
+		return { ...settings, Edit: memo( settings.edit ) };
 	} );
 	const withBlockEditHooks = createHigherOrderComponent(
 		( OriginalBlockEdit ) => ( props ) => {
@@ -488,7 +488,7 @@ function BlockProps( { index, useBlockProps, setAllWrapperProps, ...props } ) {
 	return null;
 }
 
-const BlockPropsPure = pure( BlockProps );
+const BlockPropsPure = memo( BlockProps );
 
 export function createBlockListBlockFilter( features ) {
 	const withBlockListBlockHooks = createHigherOrderComponent(
diff --git a/packages/block-editor/src/store/private-selectors.js b/packages/block-editor/src/store/private-selectors.js
index d31a710fd94fe..e8230eea89daa 100644
--- a/packages/block-editor/src/store/private-selectors.js
+++ b/packages/block-editor/src/store/private-selectors.js
@@ -15,7 +15,7 @@ import {
 	canInsertBlockType,
 	__experimentalGetAllowedPatterns,
 } from './selectors';
-import { getUserPatterns, checkAllowListRecursive } from './utils';
+import { getAllPatterns, checkAllowListRecursive } from './utils';
 
 /**
  * Returns true if the block interface is hidden, or false otherwise.
@@ -253,26 +253,20 @@ export const getInserterMediaCategories = createSelector(
  */
 export const hasAllowedPatterns = createSelector(
 	( state, rootClientId = null ) => {
-		const patterns = state.settings.__experimentalBlockPatterns;
-		const userPatterns = getUserPatterns( state );
+		const patterns = getAllPatterns( state );
 		const { allowedBlockTypes } = getSettings( state );
-		return [ ...userPatterns, ...patterns ].some(
-			( { name, inserter = true } ) => {
-				if ( ! inserter ) {
-					return false;
-				}
-				const { blocks } = __experimentalGetParsedPattern(
-					state,
-					name
-				);
-				return (
-					checkAllowListRecursive( blocks, allowedBlockTypes ) &&
-					blocks.every( ( { name: blockName } ) =>
-						canInsertBlockType( state, blockName, rootClientId )
-					)
-				);
+		return patterns.some( ( { name, inserter = true } ) => {
+			if ( ! inserter ) {
+				return false;
 			}
-		);
+			const { blocks } = __experimentalGetParsedPattern( state, name );
+			return (
+				checkAllowListRecursive( blocks, allowedBlockTypes ) &&
+				blocks.every( ( { name: blockName } ) =>
+					canInsertBlockType( state, blockName, rootClientId )
+				)
+			);
+		} );
 	},
 	( state, rootClientId ) => [
 		...__experimentalGetAllowedPatterns.getDependants(
diff --git a/packages/block-editor/src/store/selectors.js b/packages/block-editor/src/store/selectors.js
index 1cf3705454f9b..5e47e966ef334 100644
--- a/packages/block-editor/src/store/selectors.js
+++ b/packages/block-editor/src/store/selectors.js
@@ -27,7 +27,7 @@ import { createRegistrySelector } from '@wordpress/data';
  * Internal dependencies
  */
 import {
-	getUserPatterns,
+	getAllPatterns,
 	checkAllowListRecursive,
 	checkAllowList,
 } from './utils';
@@ -2015,7 +2015,7 @@ export const getInserterItems = createSelector(
 	},
 	( state, rootClientId ) => [
 		state.blockListSettings[ rootClientId ],
-		state.blocks.byClientId,
+		state.blocks.byClientId.get( rootClientId ),
 		state.blocks.order,
 		state.preferences.insertUsage,
 		state.settings.allowedBlockTypes,
@@ -2086,7 +2086,7 @@ export const getBlockTransformItems = createSelector(
 	},
 	( state, blocks, rootClientId ) => [
 		state.blockListSettings[ rootClientId ],
-		state.blocks.byClientId,
+		state.blocks.byClientId.get( rootClientId ),
 		state.preferences.insertUsage,
 		state.settings.allowedBlockTypes,
 		state.settings.templateLock,
@@ -2118,7 +2118,7 @@ export const hasInserterItems = createSelector(
 	},
 	( state, rootClientId ) => [
 		state.blockListSettings[ rootClientId ],
-		state.blocks.byClientId,
+		state.blocks.byClientId.get( rootClientId ),
 		state.settings.allowedBlockTypes,
 		state.settings.templateLock,
 		getReusableBlocks( state ),
@@ -2143,18 +2143,20 @@ export const getAllowedBlocks = createSelector(
 		const blockTypes = getBlockTypes().filter( ( blockType ) =>
 			canIncludeBlockTypeInInserter( state, blockType, rootClientId )
 		);
+
 		const hasReusableBlock =
 			canInsertBlockTypeUnmemoized( state, 'core/block', rootClientId ) &&
 			getReusableBlocks( state ).length > 0;
 
-		return [
-			...blockTypes,
-			...( hasReusableBlock ? [ 'core/block' ] : [] ),
-		];
+		if ( hasReusableBlock ) {
+			blockTypes.push( 'core/block' );
+		}
+
+		return blockTypes;
 	},
 	( state, rootClientId ) => [
 		state.blockListSettings[ rootClientId ],
-		state.blocks.byClientId,
+		state.blocks.byClientId.get( rootClientId ),
 		state.settings.allowedBlockTypes,
 		state.settings.templateLock,
 		getReusableBlocks( state ),
@@ -2237,21 +2239,10 @@ export const __experimentalGetDirectInsertBlock = createSelector(
 	]
 );
 
-export const __experimentalUserPatternCategories = createSelector(
-	( state ) => {
-		return state?.settings?.__experimentalUserPatternCategories;
-	},
-	( state ) => [ state.settings.__experimentalUserPatternCategories ]
-);
-
 export const __experimentalGetParsedPattern = createSelector(
 	( state, patternName ) => {
-		const patterns = state.settings.__experimentalBlockPatterns;
-		const userPatterns = getUserPatterns( state );
-
-		const pattern = [ ...patterns, ...userPatterns ].find(
-			( { name } ) => name === patternName
-		);
+		const patterns = getAllPatterns( state );
+		const pattern = patterns.find( ( { name } ) => name === patternName );
 		if ( ! pattern ) {
 			return null;
 		}
@@ -2262,21 +2253,15 @@ export const __experimentalGetParsedPattern = createSelector(
 			} ),
 		};
 	},
-	( state ) => [
-		state.settings.__experimentalBlockPatterns,
-		state.settings.__experimentalReusableBlocks,
-		state?.settings?.__experimentalUserPatternCategories,
-	]
+	( state ) => [ getAllPatterns( state ) ]
 );
 
 const getAllAllowedPatterns = createSelector(
 	( state ) => {
-		const patterns = state.settings.__experimentalBlockPatterns;
-		const userPatterns = getUserPatterns( state );
-
+		const patterns = getAllPatterns( state );
 		const { allowedBlockTypes } = getSettings( state );
 
-		const parsedPatterns = [ ...userPatterns, ...patterns ]
+		const parsedPatterns = patterns
 			.filter( ( { inserter = true } ) => !! inserter )
 			.map( ( { name } ) =>
 				__experimentalGetParsedPattern( state, name )
@@ -2286,12 +2271,7 @@ const getAllAllowedPatterns = createSelector(
 		);
 		return allowedPatterns;
 	},
-	( state ) => [
-		state.settings.__experimentalBlockPatterns,
-		state.settings.__experimentalReusableBlocks,
-		state.settings.allowedBlockTypes,
-		state?.settings?.__experimentalUserPatternCategories,
-	]
+	( state ) => [ getAllPatterns( state ), state.settings.allowedBlockTypes ]
 );
 
 /**
@@ -2315,9 +2295,7 @@ export const __experimentalGetAllowedPatterns = createSelector(
 		return patternsAllowed;
 	},
 	( state, rootClientId ) => [
-		state.settings.__experimentalBlockPatterns,
-		state.settings.__experimentalReusableBlocks,
-		state.settings.allowedBlockTypes,
+		getAllAllowedPatterns( state ),
 		state.settings.templateLock,
 		state.blockListSettings[ rootClientId ],
 		state.blocks.byClientId.get( rootClientId ),
@@ -2566,7 +2544,7 @@ export function __experimentalGetLastBlockAttributeChanges( state ) {
  * @return {Array} Reusable blocks
  */
 function getReusableBlocks( state ) {
-	return state?.settings?.__experimentalReusableBlocks ?? EMPTY_ARRAY;
+	return state.settings.__experimentalReusableBlocks ?? EMPTY_ARRAY;
 }
 
 /**
diff --git a/packages/block-editor/src/store/utils.js b/packages/block-editor/src/store/utils.js
index 99281f55fcd09..7587dcdf56fd7 100644
--- a/packages/block-editor/src/store/utils.js
+++ b/packages/block-editor/src/store/utils.js
@@ -1,35 +1,52 @@
+/**
+ * External dependencies
+ */
+import createSelector from 'rememo';
+
 /**
  * Internal dependencies
  */
 import { INSERTER_PATTERN_TYPES } from '../components/inserter/block-patterns-tab/utils';
 
-const EMPTY_ARRAY = [];
+export const getUserPatterns = createSelector(
+	( state ) => {
+		const userPatterns = state.settings.__experimentalReusableBlocks ?? [];
+		const userPatternCategories =
+			state.settings.__experimentalUserPatternCategories ?? [];
+		return userPatterns.map( ( userPattern ) => {
+			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 = userPatternCategories.find(
+						( { id } ) => id === catId
+					);
+					return category ? category.slug : catId;
+				} ),
+				content: userPattern.content.raw,
+				syncStatus: userPattern.wp_pattern_sync_status,
+			};
+		} );
+	},
+	( state ) => [
+		state.settings.__experimentalReusableBlocks,
+		state.settings.__experimentalUserPatternCategories,
+	]
+);
 
-export 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 )
-	);
-	return userPatterns.map( ( userPattern ) => {
-		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 ) =>
-				categories && categories.get( catId )
-					? categories.get( catId ).slug
-					: catId
-			),
-			content: userPattern.content.raw,
-			syncStatus: userPattern.wp_pattern_sync_status,
-		};
-	} );
-}
+export const getAllPatterns = createSelector(
+	( state ) => {
+		const patterns = state.settings.__experimentalBlockPatterns;
+		const userPatterns = getUserPatterns( state );
+		return [ ...userPatterns, ...patterns ];
+	},
+	( state ) => [
+		state.settings.__experimentalBlockPatterns,
+		getUserPatterns( state ),
+	]
+);
 
 export const checkAllowList = ( list, item, defaultResult = null ) => {
 	if ( typeof list === 'boolean' ) {
diff --git a/packages/block-editor/src/utils/transform-styles/index.js b/packages/block-editor/src/utils/transform-styles/index.js
index 742e3a9becaef..808566776f6ea 100644
--- a/packages/block-editor/src/utils/transform-styles/index.js
+++ b/packages/block-editor/src/utils/transform-styles/index.js
@@ -5,6 +5,52 @@ import postcss, { CssSyntaxError } from 'postcss';
 import wrap from 'postcss-prefixwrap';
 import rebaseUrl from 'postcss-urlrebase';
 
+const transformStylesCache = new WeakMap();
+
+function transformStyle(
+	{ css, ignoredSelectors = [], baseURL },
+	wrapperSelector = ''
+) {
+	// 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;
+	}
+
+	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;
+	}
+}
+
 /**
  * Applies a series of CSS rule transforms to wrap selectors inside a given class and/or rewrite URLs depending on the parameters passed.
  *
@@ -18,45 +64,14 @@ import rebaseUrl from 'postcss-urlrebase';
  * @return {Array} converted rules.
  */
 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;
+	return styles.map( ( style ) => {
+		if ( transformStylesCache.has( style ) ) {
+			return transformStylesCache.get( style );
 		}
 
-		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;
-		}
+		const transformedStyle = transformStyle( style, wrapperSelector );
+		transformStylesCache.set( style, transformedStyle );
+		return transformedStyle;
 	} );
 };
 
diff --git a/packages/block-library/CHANGELOG.md b/packages/block-library/CHANGELOG.md
index d5079fbbb4ac2..d17ee65991c0a 100644
--- a/packages/block-library/CHANGELOG.md
+++ b/packages/block-library/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 8.26.0 (2024-01-10)
+
 ## 8.25.0 (2023-12-13)
 
 ## 8.24.0 (2023-11-29)
diff --git a/packages/block-library/package.json b/packages/block-library/package.json
index 30e341d08923a..12f4e23d9da4d 100644
--- a/packages/block-library/package.json
+++ b/packages/block-library/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/block-library",
-	"version": "8.25.0",
+	"version": "8.26.0",
 	"description": "Block library for the WordPress editor.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -53,6 +53,7 @@
 		"@wordpress/interactivity": "file:../interactivity",
 		"@wordpress/keycodes": "file:../keycodes",
 		"@wordpress/notices": "file:../notices",
+		"@wordpress/patterns": "file:../patterns",
 		"@wordpress/primitives": "file:../primitives",
 		"@wordpress/private-apis": "file:../private-apis",
 		"@wordpress/reusable-blocks": "file:../reusable-blocks",
diff --git a/packages/block-library/src/block/edit.js b/packages/block-library/src/block/edit.js
index 6331d33c27a7b..c53f52bfb703e 100644
--- a/packages/block-library/src/block/edit.js
+++ b/packages/block-library/src/block/edit.js
@@ -27,6 +27,7 @@ import {
 	store as blockEditorStore,
 	BlockControls,
 } from '@wordpress/block-editor';
+import { privateApis as patternsPrivateApis } from '@wordpress/patterns';
 import { parse, cloneBlock } from '@wordpress/blocks';
 
 /**
@@ -35,10 +36,13 @@ import { parse, cloneBlock } from '@wordpress/blocks';
 import { unlock } from '../lock-unlock';
 
 const { useLayoutClasses } = unlock( blockEditorPrivateApis );
+const { PARTIAL_SYNCING_SUPPORTED_BLOCKS } = unlock( patternsPrivateApis );
 
 function isPartiallySynced( block ) {
 	return (
-		'core/paragraph' === block.name &&
+		Object.keys( PARTIAL_SYNCING_SUPPORTED_BLOCKS ).includes(
+			block.name
+		) &&
 		!! block.attributes.metadata?.bindings &&
 		Object.values( block.attributes.metadata.bindings ).some(
 			( binding ) => binding.source.name === 'pattern_attributes'
@@ -100,7 +104,7 @@ function applyInitialOverrides( blocks, overrides = {}, defaultValues ) {
 			defaultValues[ blockId ] ??= {};
 			defaultValues[ blockId ][ attributeKey ] =
 				block.attributes[ attributeKey ];
-			if ( overrides[ blockId ] ) {
+			if ( overrides[ blockId ]?.[ attributeKey ] !== undefined ) {
 				newAttributes[ attributeKey ] =
 					overrides[ blockId ][ attributeKey ];
 			}
@@ -130,6 +134,8 @@ function getOverridesFromBlocks( blocks, defaultValues ) {
 				defaultValues[ blockId ][ attributeKey ]
 			) {
 				overrides[ blockId ] ??= {};
+				// TODO: We need a way to represent `undefined` in the serialized overrides.
+				// Also see: https://github.com/WordPress/gutenberg/pull/57249#discussion_r1452987871
 				overrides[ blockId ][ attributeKey ] =
 					block.attributes[ attributeKey ];
 			}
@@ -147,6 +153,13 @@ function setBlockEditMode( setEditMode, blocks, mode ) {
 	} );
 }
 
+function getHasOverridableBlocks( blocks ) {
+	return blocks.some( ( block ) => {
+		if ( isPartiallySynced( block ) ) return true;
+		return getHasOverridableBlocks( block.innerBlocks );
+	} );
+}
+
 export default function ReusableBlockEdit( {
 	name,
 	attributes: { ref, overrides },
@@ -208,15 +221,23 @@ export default function ReusableBlockEdit( {
 		[ innerBlocks, setBlockEditingMode ]
 	);
 
-	// Apply the initial overrides from the pattern block to the inner blocks.
-	useEffect( () => {
-		const initialBlocks =
+	const hasOverridableBlocks = useMemo(
+		() => getHasOverridableBlocks( innerBlocks ),
+		[ innerBlocks ]
+	);
+
+	const initialBlocks = useMemo(
+		() =>
 			// Clone the blocks to generate new client IDs.
 			editedRecord.blocks?.map( ( block ) => cloneBlock( block ) ) ??
 			( editedRecord.content && typeof editedRecord.content !== 'function'
 				? parse( editedRecord.content )
-				: [] );
+				: [] ),
+		[ editedRecord.blocks, editedRecord.content ]
+	);
 
+	// Apply the initial overrides from the pattern block to the inner blocks.
+	useEffect( () => {
 		defaultValuesRef.current = {};
 		const editingMode = getBlockEditingMode( patternClientId );
 		// Replace the contents of the blocks with the overrides.
@@ -237,7 +258,7 @@ export default function ReusableBlockEdit( {
 	}, [
 		__unstableMarkNextChangeAsNotPersistent,
 		patternClientId,
-		editedRecord,
+		initialBlocks,
 		replaceInnerBlocks,
 		registry,
 		getBlockEditingMode,
@@ -293,6 +314,12 @@ export default function ReusableBlockEdit( {
 		editOriginalProps.onClick( event );
 	};
 
+	const resetOverrides = () => {
+		if ( overrides ) {
+			replaceInnerBlocks( patternClientId, initialBlocks );
+		}
+	};
+
 	let children = null;
 
 	if ( hasAlreadyRendered ) {
@@ -333,6 +360,21 @@ export default function ReusableBlockEdit( {
 					</ToolbarGroup>
 				</BlockControls>
 			) }
+
+			{ hasOverridableBlocks && (
+				<BlockControls>
+					<ToolbarGroup>
+						<ToolbarButton
+							onClick={ resetOverrides }
+							disabled={ ! overrides }
+							__experimentalIsFocusable
+						>
+							{ __( 'Reset to original' ) }
+						</ToolbarButton>
+					</ToolbarGroup>
+				</BlockControls>
+			) }
+
 			{ children === null ? (
 				<div { ...innerBlocksProps } />
 			) : (
diff --git a/packages/block-library/src/button/edit.js b/packages/block-library/src/button/edit.js
index d41d917d5b8fe..b46e145d760ad 100644
--- a/packages/block-library/src/button/edit.js
+++ b/packages/block-library/src/button/edit.js
@@ -35,6 +35,7 @@ import {
 	__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';
@@ -189,6 +190,7 @@ function ButtonEdit( props ) {
 		ref: useMergeRefs( [ setPopoverAnchor, ref ] ),
 		onKeyDown,
 	} );
+	const blockEditingMode = useBlockEditingMode();
 
 	const [ isEditingURL, setIsEditingURL ] = useState( false );
 	const isURLSet = !! url;
@@ -277,12 +279,14 @@ function ButtonEdit( props ) {
 				/>
 			</div>
 			<BlockControls group="block">
-				<AlignmentControl
-					value={ textAlign }
-					onChange={ ( nextAlign ) => {
-						setAttributes( { textAlign: nextAlign } );
-					} }
-				/>
+				{ blockEditingMode === 'default' && (
+					<AlignmentControl
+						value={ textAlign }
+						onChange={ ( nextAlign ) => {
+							setAttributes( { textAlign: nextAlign } );
+						} }
+					/>
+				) }
 				{ ! isURLSet && isLinkTag && (
 					<ToolbarButton
 						name="link"
diff --git a/packages/block-library/src/heading/edit.js b/packages/block-library/src/heading/edit.js
index b7d1d17426443..e0e36a831429b 100644
--- a/packages/block-library/src/heading/edit.js
+++ b/packages/block-library/src/heading/edit.js
@@ -17,6 +17,7 @@ import {
 	useBlockProps,
 	store as blockEditorStore,
 	HeadingLevelDropdown,
+	useBlockEditingMode,
 } from '@wordpress/block-editor';
 
 /**
@@ -40,6 +41,7 @@ function HeadingEdit( {
 		} ),
 		style,
 	} );
+	const blockEditingMode = useBlockEditingMode();
 
 	const { canGenerateAnchors } = useSelect( ( select ) => {
 		const { getGlobalBlockCount, getSettings } = select( blockEditorStore );
@@ -90,20 +92,22 @@ 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 }
+						onChange={ ( newLevel ) =>
+							setAttributes( { level: newLevel } )
+						}
+					/>
+					<AlignmentControl
+						value={ textAlign }
+						onChange={ ( nextAlign ) => {
+							setAttributes( { textAlign: nextAlign } );
+						} }
+					/>
+				</BlockControls>
+			) }
 			<RichText
 				identifier="content"
 				tagName={ tagName }
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 0000000000000..b7d1d17426443
--- /dev/null
+++ b/packages/block-library/src/heading/edit.native.js
@@ -0,0 +1,144 @@
+/**
+ * External dependencies
+ */
+import classnames from 'classnames';
+
+/**
+ * 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: classnames( {
+			[ `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/image/index.js b/packages/block-library/src/image/index.js
index 1477fa99c702c..68625bd77cc87 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/navigation-link/index.php b/packages/block-library/src/navigation-link/index.php
index f7c26afd1f88d..1dcb2996a8e15 100644
--- a/packages/block-library/src/navigation-link/index.php
+++ b/packages/block-library/src/navigation-link/index.php
@@ -368,11 +368,11 @@ function block_core_navigation_link_unregister_variation( $name ) {
 
 /**
  * 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.
+ * @return array
  */
-function register_block_core_navigation_link() {
+function build_navigation_link_block_variations() {
 	// 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.
@@ -407,11 +407,21 @@ function register_block_core_navigation_link() {
 		}
 	}
 
+	return array_merge( $built_ins, $variations );
+}
+
+/**
+ * Register the navigation link block.
+ *
+ * @uses render_block_core_navigation()
+ * @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 ),
+			'render_callback'    => 'render_block_core_navigation_link',
+			'variation_callback' => 'build_navigation_link_block_variations',
 		)
 	);
 }
diff --git a/packages/block-library/src/paragraph/edit.js b/packages/block-library/src/paragraph/edit.js
index ac766f69dd846..cecfdce474c51 100644
--- a/packages/block-library/src/paragraph/edit.js
+++ b/packages/block-library/src/paragraph/edit.js
@@ -19,6 +19,7 @@ import {
 	RichText,
 	useBlockProps,
 	useSettings,
+	useBlockEditingMode,
 } from '@wordpress/block-editor';
 import { createBlock } from '@wordpress/blocks';
 import { formatLtr } from '@wordpress/icons';
@@ -108,28 +109,31 @@ function ParagraphBlock( {
 		} ),
 		style: { direction },
 	} );
+	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>
+			{ 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 } )
+						}
+					/>
+				</BlockControls>
+			) }
 			<InspectorControls group="typography">
 				<DropCapControl
 					clientId={ clientId }
diff --git a/packages/block-library/src/post-date/edit.js b/packages/block-library/src/post-date/edit.js
index f8cd268358d49..0a70758ac32f0 100644
--- a/packages/block-library/src/post-date/edit.js
+++ b/packages/block-library/src/post-date/edit.js
@@ -108,40 +108,45 @@ 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 }
 									/>
-								);
-							} }
-						/>
-					</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-terms/index.php b/packages/block-library/src/post-terms/index.php
index c97155b81e3a9..44291038383d4 100644
--- a/packages/block-library/src/post-terms/index.php
+++ b/packages/block-library/src/post-terms/index.php
@@ -59,9 +59,11 @@ function render_block_core_post_terms( $attributes, $content, $block ) {
 }
 
 /**
- * Registers the `core/post-terms` block on the server.
+ * Returns the available variations for the `core/post-terms` block.
+ *
+ * @return array The available variations for the block.
  */
-function register_block_core_post_terms() {
+function build_post_term_block_variations() {
 	$taxonomies = get_taxonomies(
 		array(
 			'publicly_queryable' => true,
@@ -103,11 +105,18 @@ function register_block_core_post_terms() {
 		}
 	}
 
+	return array_merge( $built_ins, $custom_variations );
+}
+
+/**
+ * Registers the `core/post-terms` block on the server.
+ */
+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' => 'build_post_term_block_variations',
 		)
 	);
 }
diff --git a/packages/block-library/src/pullquote/block.json b/packages/block-library/src/pullquote/block.json
index 7fc81d5683bd1..f041d46cda8cd 100644
--- a/packages/block-library/src/pullquote/block.json
+++ b/packages/block-library/src/pullquote/block.json
@@ -35,6 +35,10 @@
 				"text": true
 			}
 		},
+		"spacing": {
+			"margin": true,
+			"padding": true
+		},
 		"typography": {
 			"fontSize": true,
 			"lineHeight": true,
diff --git a/packages/block-library/src/pullquote/style.scss b/packages/block-library/src/pullquote/style.scss
index 94d043d1cf2f5..b53dbf6561638 100644
--- a/packages/block-library/src/pullquote/style.scss
+++ b/packages/block-library/src/pullquote/style.scss
@@ -1,5 +1,5 @@
 .wp-block-pullquote {
-	padding: 3em 0;
+	padding: 4em 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;
@@ -10,6 +10,18 @@
 		color: inherit;
 	}
 
+	blockquote {
+		margin: 0;
+	}
+
+	p {
+		margin-top: 0;
+
+		&:last-child {
+			margin-bottom: 0;
+		}
+	}
+
 	&.alignleft,
 	&.alignright {
 		max-width: $content-width * 0.5;
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 398016728c499..eb5abe9c24d98 100644
--- a/packages/block-library/src/query/edit/inspector-controls/index.js
+++ b/packages/block-library/src/query/edit/inspector-controls/index.js
@@ -12,10 +12,7 @@ import {
 	__experimentalToolsPanelItem as ToolsPanelItem,
 } from '@wordpress/components';
 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';
 
@@ -138,156 +135,150 @@ export default function QueryInspectorControls( props ) {
 				<CreateNewPostLink { ...props } />
 			</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 } )
-								}
-							/>
-						) }
-						{ showPostTypeControl && (
-							<SelectControl
+				<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 } )
+							}
+						/>
+					) }
+					{ showPostTypeControl && (
+						<SelectControl
+							__nextHasNoMarginBottom
+							options={ postTypesSelectOptions }
+							value={ postType }
+							label={ __( 'Post type' ) }
+							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.'
+							) }
+						/>
+					) }
+					{ showColumnsControl && (
+						<>
+							<RangeControl
 								__nextHasNoMarginBottom
-								options={ postTypesSelectOptions }
-								value={ postType }
-								label={ __( 'Post type' ) }
-								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.'
-								) }
-							/>
-						) }
-						{ 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 }
+								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 }
+						/>
+					) }
+					{ showStickyControl && (
+						<StickyControl
+							value={ sticky }
+							onChange={ ( value ) =>
+								setQuery( { sticky: value } )
+							}
 						/>
-					</PanelBody>
-				</InspectorControls>
+					) }
+					<EnhancedPaginationControl
+						enhancedPagination={ enhancedPagination }
+						setAttributes={ setAttributes }
+						clientId={ clientId }
+					/>
+				</PanelBody>
 			) }
 			{ ! inherit && showFiltersPanel && (
-				<InspectorControls>
-					<ToolsPanel
-						className="block-library-query-toolspanel__filters"
-						label={ __( 'Filters' ) }
-						resetAll={ () => {
-							setQuery( {
-								author: '',
-								parents: [],
-								search: '',
-								taxQuery: null,
-							} );
-							setQuerySearch( '' );
-						} }
-						dropdownMenuProps={ TOOLSPANEL_DROPDOWNMENU_PROPS }
-					>
-						{ 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 }
+				<ToolsPanel
+					className="block-library-query-toolspanel__filters"
+					label={ __( 'Filters' ) }
+					resetAll={ () => {
+						setQuery( {
+							author: '',
+							parents: [],
+							search: '',
+							taxQuery: null,
+						} );
+						setQuerySearch( '' );
+					} }
+					dropdownMenuProps={ TOOLSPANEL_DROPDOWNMENU_PROPS }
+				>
+					{ 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
 								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>
+					) }
+				</ToolsPanel>
 			) }
 		</>
 	);
diff --git a/packages/block-library/src/query/edit/query-content.js b/packages/block-library/src/query/edit/query-content.js
index 4d9b8885cb15e..77f9fb211e335 100644
--- a/packages/block-library/src/query/edit/query-content.js
+++ b/packages/block-library/src/query/edit/query-content.js
@@ -112,13 +112,15 @@ 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 }
+				/>
+			</InspectorControls>
 			<BlockControls>
 				<QueryToolbar
 					name={ name }
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 8ad4b4bdbeb1d..44562c472dd4f 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,7 +69,7 @@ export function TemplatePartAdvancedControls( {
 	} ) );
 
 	return (
-		<InspectorControls group="advanced">
+		<>
 			{ isEntityAvailable && (
 				<>
 					<TextControl
@@ -124,6 +123,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 163dfa5403ce6..ec92996978bd6 100644
--- a/packages/block-library/src/template-part/edit/index.js
+++ b/packages/block-library/src/template-part/edit/index.js
@@ -9,6 +9,7 @@ import {
 	store as blockEditorStore,
 	__experimentalRecursionProvider as RecursionProvider,
 	__experimentalUseHasRecursion as useHasRecursion,
+	InspectorControls,
 } from '@wordpress/block-editor';
 import { Spinner, Modal, MenuItem } from '@wordpress/components';
 import { __, sprintf } from '@wordpress/i18n';
@@ -29,6 +30,43 @@ import {
 	useTemplatePartArea,
 } from './utils/hooks';
 
+function ReplaceButton( {
+	isEntityAvailable,
+	area,
+	clientId,
+	templatePartId,
+	isTemplatePartSelectionOpen,
+	setIsTemplatePartSelectionOpen,
+} ) {
+	const { templateParts } = useAlternativeTemplateParts(
+		area,
+		templatePartId
+	);
+	const blockPatterns = useAlternativeBlockPatterns( area, clientId );
+
+	const hasReplacements = !! templateParts.length || !! blockPatterns.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>
+	);
+}
+
 export default function TemplatePartEdit( {
 	attributes,
 	setAttributes,
@@ -81,23 +119,13 @@ export default function TemplatePartEdit( {
 		},
 		[ 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' );
-
 	// 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 (
@@ -132,14 +160,16 @@ export default function TemplatePartEdit( {
 	return (
 		<>
 			<RecursionProvider uniqueId={ templatePartId }>
-				<TemplatePartAdvancedControls
-					tagName={ tagName }
-					setAttributes={ setAttributes }
-					isEntityAvailable={ isEntityAvailable }
-					templatePartId={ templatePartId }
-					defaultWrapper={ areaObject.tagName }
-					hasInnerBlocks={ innerBlocks.length > 0 }
-				/>
+				<InspectorControls group="advanced">
+					<TemplatePartAdvancedControls
+						tagName={ tagName }
+						setAttributes={ setAttributes }
+						isEntityAvailable={ isEntityAvailable }
+						templatePartId={ templatePartId }
+						defaultWrapper={ areaObject.tagName }
+						hasInnerBlocks={ innerBlocks.length > 0 }
+					/>
+				</InspectorControls>
 				{ isPlaceholder && (
 					<TagName { ...blockProps }>
 						<TemplatePartPlaceholder
@@ -153,36 +183,33 @@ 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 (
-								<MenuItem
-									onClick={ () => {
-										setIsTemplatePartSelectionOpen( true );
-									} }
-									aria-expanded={
-										isTemplatePartSelectionOpen
-									}
-									aria-haspopup="dialog"
-								>
-									{ __( 'Replace' ) }
-								</MenuItem>
-							);
-						} }
-					</BlockSettingsMenuControls>
-				) }
+						return (
+							<ReplaceButton
+								{ ...{
+									isEntityAvailable,
+									area,
+									clientId,
+									templatePartId,
+									isTemplatePartSelectionOpen,
+									setIsTemplatePartSelectionOpen,
+								} }
+							/>
+						);
+					} }
+				</BlockSettingsMenuControls>
 				{ isEntityAvailable && (
 					<TemplatePartInnerBlocks
 						tagName={ TagName }
diff --git a/packages/block-library/src/template-part/index.php b/packages/block-library/src/template-part/index.php
index 0c97f88b98e38..86a17f33c92f3 100644
--- a/packages/block-library/src/template-part/index.php
+++ b/packages/block-library/src/template-part/index.php
@@ -281,8 +281,8 @@ 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-serialization-default-parser/CHANGELOG.md b/packages/block-serialization-default-parser/CHANGELOG.md
index 5e8e65ddea45b..b705866a04957 100644
--- a/packages/block-serialization-default-parser/CHANGELOG.md
+++ b/packages/block-serialization-default-parser/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 4.49.0 (2024-01-10)
+
 ## 4.48.0 (2023-12-13)
 
 ## 4.47.0 (2023-11-29)
diff --git a/packages/block-serialization-default-parser/package.json b/packages/block-serialization-default-parser/package.json
index 56a0c56269add..668fc92eea94b 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.48.0",
+	"version": "4.49.0",
 	"description": "Block serialization specification parser for WordPress posts.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/block-serialization-spec-parser/CHANGELOG.md b/packages/block-serialization-spec-parser/CHANGELOG.md
index 8181385569751..c6f586ce6b480 100644
--- a/packages/block-serialization-spec-parser/CHANGELOG.md
+++ b/packages/block-serialization-spec-parser/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 4.49.0 (2024-01-10)
+
 ## 4.48.0 (2023-12-13)
 
 ## 4.47.0 (2023-11-29)
diff --git a/packages/block-serialization-spec-parser/package.json b/packages/block-serialization-spec-parser/package.json
index cdd2884211afe..df841c8a506c1 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.48.0",
+	"version": "4.49.0",
 	"description": "Block serialization specification parser for WordPress posts.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/blocks/CHANGELOG.md b/packages/blocks/CHANGELOG.md
index 0cce621f5b6cd..d932b12a54531 100644
--- a/packages/blocks/CHANGELOG.md
+++ b/packages/blocks/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 12.26.0 (2024-01-10)
+
 ## 12.25.0 (2023-12-13)
 
 ## 12.24.0 (2023-11-29)
diff --git a/packages/blocks/package.json b/packages/blocks/package.json
index a2aff291dbda3..af0e076574518 100644
--- a/packages/blocks/package.json
+++ b/packages/blocks/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/blocks",
-	"version": "12.25.0",
+	"version": "12.26.0",
 	"description": "Block API for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/browserslist-config/CHANGELOG.md b/packages/browserslist-config/CHANGELOG.md
index 451716f50edb9..cf94e1caf70e5 100644
--- a/packages/browserslist-config/CHANGELOG.md
+++ b/packages/browserslist-config/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 5.32.0 (2024-01-10)
+
 ## 5.31.0 (2023-12-13)
 
 ## 5.30.0 (2023-11-29)
diff --git a/packages/browserslist-config/package.json b/packages/browserslist-config/package.json
index 815fe6eba00fe..4b2747e505e16 100644
--- a/packages/browserslist-config/package.json
+++ b/packages/browserslist-config/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/browserslist-config",
-	"version": "5.31.0",
+	"version": "5.32.0",
 	"description": "WordPress Browserslist shared configuration.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/commands/CHANGELOG.md b/packages/commands/CHANGELOG.md
index 8c697a90b20be..3b42cc552899f 100644
--- a/packages/commands/CHANGELOG.md
+++ b/packages/commands/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 0.20.0 (2024-01-10)
+
 ## Enhancements
 
 -   Support conditional commands and commands loaders using the "disabled" config.
diff --git a/packages/commands/package.json b/packages/commands/package.json
index 20fcea5c67b11..5314cf671b1ba 100644
--- a/packages/commands/package.json
+++ b/packages/commands/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/commands",
-	"version": "0.19.0",
+	"version": "0.20.0",
 	"description": "Handles the commands menu.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md
index ba0629eff7f37..92ce15dc425f6 100644
--- a/packages/components/CHANGELOG.md
+++ b/packages/components/CHANGELOG.md
@@ -2,6 +2,26 @@
 
 ## Unreleased
 
+### 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)).
+
+### Bug Fix
+
+-   `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)).
+
+### 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)).
+
+## 25.15.0 (2024-01-10)
+
 ### Bug Fix
 
 -   `NumberControl`: Make increment and decrement buttons keyboard accessible. ([#57402](https://github.com/WordPress/gutenberg/pull/57402)).
@@ -19,12 +39,10 @@
 -   `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)).
--   `ToggleGroupControl`: Improve controlled value detection ([#57770](https://github.com/WordPress/gutenberg/pull/57770)).
 -   `NavigatorProvider`: Exclude `size` value from `contain` CSS rule ([#57498](https://github.com/WordPress/gutenberg/pull/57498)).
 
 ### Enhancements
 
--   `ColorPicker`: improve the UX around HSL sliders ([#57555](https://github.com/WordPress/gutenberg/pull/57555)).
 -   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)).
@@ -34,10 +52,6 @@
 -   `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)).
--   `Tooltip`: no-op when nested inside other `Tooltip` components ([#57202](https://github.com/WordPress/gutenberg/pull/57202)).
--   `PaletteEdit`: improve unit tests ([#57645](https://github.com/WordPress/gutenberg/pull/57645)).
--   `ColorPalette` and `CircularOptionPicker`: improve unit tests ([#57809](https://github.com/WordPress/gutenberg/pull/57809)).
--   `BoxControl`, `BorderControl`, `BorderBoxControl`: Add opt-in prop for 40px default size ([#56185](https://github.com/WordPress/gutenberg/pull/56185)).
 
 ### Experimental
 
@@ -45,7 +59,6 @@
 -   `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)).
--   `BoxControl`: Update design ([#56665](https://github.com/WordPress/gutenberg/pull/56665)).
 
 ## 25.14.0 (2023-12-13)
 
diff --git a/packages/components/package.json b/packages/components/package.json
index cd440998b9323..a16778a7778b5 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/components",
-	"version": "25.14.0",
+	"version": "25.15.0",
 	"description": "UI components for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -88,4 +88,4 @@
 	"publishConfig": {
 		"access": "public"
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/components/src/button/README.md b/packages/components/src/button/README.md
index 3f577991dc44b..a8cdcf82c9665 100644
--- a/packages/components/src/button/README.md
+++ b/packages/components/src/button/README.md
@@ -135,7 +135,7 @@ 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.
 
 -   Required: No
 
diff --git a/packages/components/src/button/types.ts b/packages/components/src/button/types.ts
index b781786cc1271..e728739806af7 100644
--- a/packages/components/src/button/types.ts
+++ b/packages/components/src/button/types.ts
@@ -115,7 +115,9 @@ type BaseButtonProps = {
 	 */
 	variant?: 'primary' | 'secondary' | 'tertiary' | 'link';
 	/**
-	 * Whether this is focusable.
+	 * Whether to keep the button focusable when disabled.
+	 *
+	 * @default false
 	 */
 	__experimentalIsFocusable?: boolean;
 };
@@ -123,7 +125,8 @@ type BaseButtonProps = {
 type _ButtonProps = {
 	/**
 	 * Whether the button is disabled.
-	 * If `true`, this will force a `button` element to be rendered.
+	 *
+	 * If `true`, this will force a `button` element to be rendered, even when an `href` is given.
 	 */
 	disabled?: boolean;
 };
@@ -131,7 +134,8 @@ type _ButtonProps = {
 type AnchorProps = {
 	/**
 	 * Whether the button is disabled.
-	 * If `true`, this will force a `button` element to be rendered.
+	 *
+	 * If `true`, this will force a `button` element to be rendered, even when an `href` is given.
 	 */
 	disabled?: false;
 	/**
diff --git a/packages/components/src/custom-select-control-v2/index.tsx b/packages/components/src/custom-select-control-v2/index.tsx
index 614f52105513f..87750eaaec99e 100644
--- a/packages/components/src/custom-select-control-v2/index.tsx
+++ b/packages/components/src/custom-select-control-v2/index.tsx
@@ -49,7 +49,7 @@ export function CustomSelect( {
 	onChange,
 	size = 'default',
 	value,
-	renderSelectedValue = defaultRenderSelectedValue,
+	renderSelectedValue,
 	...props
 }: WordPressComponentProps< CustomSelectProps, 'button', false > ) {
 	const store = Ariakit.useSelectStore( {
@@ -60,6 +60,9 @@ export function CustomSelect( {
 
 	const { value: currentValue } = store.useState();
 
+	const computedRenderSelectedValue =
+		renderSelectedValue ?? defaultRenderSelectedValue;
+
 	return (
 		<>
 			<Styled.CustomSelectLabel store={ store }>
@@ -71,7 +74,7 @@ export function CustomSelect( {
 				hasCustomRenderProp={ !! renderSelectedValue }
 				store={ store }
 			>
-				{ renderSelectedValue( currentValue ) }
+				{ computedRenderSelectedValue( currentValue ) }
 				<Ariakit.SelectArrow />
 			</Styled.CustomSelectButton>
 			<Styled.CustomSelectPopover gutter={ 12 } store={ store } sameWidth>
diff --git a/packages/components/src/tooltip/index.tsx b/packages/components/src/tooltip/index.tsx
index 1e652d9a42dbb..f71182b85edb2 100644
--- a/packages/components/src/tooltip/index.tsx
+++ b/packages/components/src/tooltip/index.tsx
@@ -8,34 +8,39 @@ import * as Ariakit from '@ariakit/react';
  * WordPress dependencies
  */
 import { useInstanceId } from '@wordpress/compose';
-import { Children, cloneElement } from '@wordpress/element';
+import {
+	Children,
+	useContext,
+	createContext,
+	forwardRef,
+} from '@wordpress/element';
 import deprecated from '@wordpress/deprecated';
 
 /**
  * Internal dependencies
  */
-import type { TooltipProps, TooltipInternalContext } from './types';
+import type {
+	TooltipProps,
+	TooltipInternalContext as TooltipInternalContextType,
+} from './types';
 import Shortcut from '../shortcut';
 import { positionToPlacement } from '../popover/utils';
-import {
-	contextConnect,
-	useContextSystem,
-	ContextSystemProvider,
-} from '../context';
 import type { WordPressComponentProps } from '../context';
 
+const TooltipInternalContext = createContext< TooltipInternalContextType >( {
+	isNestedInTooltip: false,
+} );
+
 /**
  * Time over anchor to wait before showing tooltip
  */
 export const TOOLTIP_DELAY = 700;
 
 const CONTEXT_VALUE = {
-	Tooltip: {
-		isNestedInTooltip: true,
-	},
+	isNestedInTooltip: true,
 };
 
-function UnconnectedTooltip(
+function UnforwardedTooltip(
 	props: WordPressComponentProps< TooltipProps, 'div', false >,
 	ref: React.ForwardedRef< any >
 ) {
@@ -48,14 +53,10 @@ function UnconnectedTooltip(
 		shortcut,
 		text,
 
-		// From Internal Context system
-		isNestedInTooltip,
-
 		...restProps
-	} = useContextSystem< typeof props & TooltipInternalContext >(
-		props,
-		'Tooltip'
-	);
+	} = props;
+
+	const { isNestedInTooltip } = useContext( TooltipInternalContext );
 
 	const baseId = useInstanceId( Tooltip, 'tooltip' );
 	const describedById = text || shortcut ? baseId : undefined;
@@ -96,16 +97,15 @@ function UnconnectedTooltip(
 	} );
 
 	if ( isNestedInTooltip ) {
-		return isOnlyChild
-			? cloneElement( children, {
-					...restProps,
-					ref,
-			  } )
-			: children;
+		return isOnlyChild ? (
+			<Ariakit.Role { ...restProps } render={ children } />
+		) : (
+			children
+		);
 	}
 
 	return (
-		<ContextSystemProvider value={ CONTEXT_VALUE }>
+		<TooltipInternalContext.Provider value={ CONTEXT_VALUE }>
 			<Ariakit.TooltipAnchor
 				onClick={ hideOnClick ? tooltipStore.hide : undefined }
 				store={ tooltipStore }
@@ -117,6 +117,7 @@ function UnconnectedTooltip(
 			{ isOnlyChild && ( text || shortcut ) && (
 				<Ariakit.Tooltip
 					{ ...restProps }
+					className="components-tooltip"
 					unmountOnHide
 					gutter={ 4 }
 					id={ describedById }
@@ -134,10 +135,10 @@ function UnconnectedTooltip(
 					) }
 				</Ariakit.Tooltip>
 			) }
-		</ContextSystemProvider>
+		</TooltipInternalContext.Provider>
 	);
 }
 
-export const Tooltip = contextConnect( UnconnectedTooltip, 'Tooltip' );
+export const Tooltip = forwardRef( UnforwardedTooltip );
 
 export default Tooltip;
diff --git a/packages/components/src/tooltip/test/index.tsx b/packages/components/src/tooltip/test/index.tsx
index ed6f7b5f7b4a1..40038bbc5e25a 100644
--- a/packages/components/src/tooltip/test/index.tsx
+++ b/packages/components/src/tooltip/test/index.tsx
@@ -102,6 +102,17 @@ describe( 'Tooltip', () => {
 				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' );
+		} );
 	} );
 
 	describe( 'keyboard focus', () => {
diff --git a/packages/components/src/tooltip/types.ts b/packages/components/src/tooltip/types.ts
index 3d28a1a0e96c6..11268683bc2ce 100644
--- a/packages/components/src/tooltip/types.ts
+++ b/packages/components/src/tooltip/types.ts
@@ -61,5 +61,5 @@ export type TooltipProps = {
 };
 
 export type TooltipInternalContext = {
-	isNestedInTooltip?: boolean;
+	isNestedInTooltip: boolean;
 };
diff --git a/packages/compose/CHANGELOG.md b/packages/compose/CHANGELOG.md
index d6938f4f26f63..54ff6a16252e3 100644
--- a/packages/compose/CHANGELOG.md
+++ b/packages/compose/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 ## Unreleased
 
+### 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)
diff --git a/packages/compose/README.md b/packages/compose/README.md
index ce393f2b5fd18..7eb70a7300f07 100644
--- a/packages/compose/README.md
+++ b/packages/compose/README.md
@@ -141,6 +141,8 @@ _Related_
 
 ### 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
diff --git a/packages/compose/package.json b/packages/compose/package.json
index 0dec375ed2243..63ebb740de6fa 100644
--- a/packages/compose/package.json
+++ b/packages/compose/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/compose",
-	"version": "6.25.0",
+	"version": "6.26.0",
 	"description": "WordPress higher-order components (HOCs).",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -39,7 +39,7 @@
 		"@wordpress/priority-queue": "file:../priority-queue",
 		"@wordpress/undo-manager": "file:../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"
 	},
diff --git a/packages/compose/src/higher-order/pure/index.tsx b/packages/compose/src/higher-order/pure/index.tsx
index 65684738b708a..38a85a5eebe9a 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/hooks/use-copy-to-clipboard/index.js b/packages/compose/src/hooks/use-copy-to-clipboard/index.js
index 1d838a1158ecf..94ab6048a4b46 100644
--- a/packages/compose/src/hooks/use-copy-to-clipboard/index.js
+++ b/packages/compose/src/hooks/use-copy-to-clipboard/index.js
@@ -54,9 +54,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/core-commands/CHANGELOG.md b/packages/core-commands/CHANGELOG.md
index 1abb8f289e7d9..a65a04f4dbe04 100644
--- a/packages/core-commands/CHANGELOG.md
+++ b/packages/core-commands/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 0.18.0 (2024-01-10)
+
 ## 0.17.0 (2023-12-13)
 
 ## 0.16.0 (2023-11-29)
diff --git a/packages/core-commands/package.json b/packages/core-commands/package.json
index a3e42ee2c236a..076dce00569e0 100644
--- a/packages/core-commands/package.json
+++ b/packages/core-commands/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/core-commands",
-	"version": "0.17.0",
+	"version": "0.18.0",
 	"description": "WordPress core reusable commands.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/core-data/CHANGELOG.md b/packages/core-data/CHANGELOG.md
index ae8d7543f8fbd..306ee51c90eab 100644
--- a/packages/core-data/CHANGELOG.md
+++ b/packages/core-data/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 6.26.0 (2024-01-10)
+
 ## 6.25.0 (2023-12-13)
 
 ## 6.24.0 (2023-11-29)
diff --git a/packages/core-data/package.json b/packages/core-data/package.json
index dfbdc2a073765..5970b985a58d4 100644
--- a/packages/core-data/package.json
+++ b/packages/core-data/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/core-data",
-	"version": "6.25.0",
+	"version": "6.26.0",
 	"description": "Access to and manipulation of core WordPress entities.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/create-block-interactive-template/CHANGELOG.md b/packages/create-block-interactive-template/CHANGELOG.md
index 159c65e9ada19..2025feabddc63 100644
--- a/packages/create-block-interactive-template/CHANGELOG.md
+++ b/packages/create-block-interactive-template/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 1.12.0 (2024-01-10)
+
 ### Enhancement
 
 -   Update the template to use `viewModule` in block.json ([#57712](https://github.com/WordPress/gutenberg/pull/57712)).
diff --git a/packages/create-block-interactive-template/package.json b/packages/create-block-interactive-template/package.json
index 4b89f9d49ae83..e95e68fef062a 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.11.0",
+	"version": "1.12.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",
diff --git a/packages/create-block-tutorial-template/CHANGELOG.md b/packages/create-block-tutorial-template/CHANGELOG.md
index 021972a2178bb..971da45400f01 100644
--- a/packages/create-block-tutorial-template/CHANGELOG.md
+++ b/packages/create-block-tutorial-template/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 3.3.0 (2024-01-10)
+
 ## 3.2.0 (2023-12-13)
 
 ## 3.1.0 (2023-11-29)
diff --git a/packages/create-block-tutorial-template/package.json b/packages/create-block-tutorial-template/package.json
index 994294adf3a48..6a7f0b85901b0 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.2.0",
+	"version": "3.3.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",
diff --git a/packages/create-block/CHANGELOG.md b/packages/create-block/CHANGELOG.md
index a3a1b01bc09fb..9d000b18d6aae 100644
--- a/packages/create-block/CHANGELOG.md
+++ b/packages/create-block/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 4.33.0 (2024-01-10)
+
 ### New Feature
 
 -   Add support for the `viewModule` property ([#57712](https://github.com/WordPress/gutenberg/pull/57712)).
diff --git a/packages/create-block/package.json b/packages/create-block/package.json
index 32a04f4b9857e..b25dd050a1ef4 100644
--- a/packages/create-block/package.json
+++ b/packages/create-block/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/create-block",
-	"version": "4.32.0",
+	"version": "4.33.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",
diff --git a/packages/customize-widgets/CHANGELOG.md b/packages/customize-widgets/CHANGELOG.md
index 733a2e88914e8..5ebaf223d81a3 100644
--- a/packages/customize-widgets/CHANGELOG.md
+++ b/packages/customize-widgets/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 4.26.0 (2024-01-10)
+
 ## 4.25.0 (2023-12-13)
 
 ## 4.24.0 (2023-11-29)
diff --git a/packages/customize-widgets/package.json b/packages/customize-widgets/package.json
index 88b32f5a23bec..5ee1b3ddb6037 100644
--- a/packages/customize-widgets/package.json
+++ b/packages/customize-widgets/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/customize-widgets",
-	"version": "4.25.0",
+	"version": "4.26.0",
 	"description": "Widgets blocks in Customizer Module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/data-controls/CHANGELOG.md b/packages/data-controls/CHANGELOG.md
index a5be93faab004..964ab8830b1c0 100644
--- a/packages/data-controls/CHANGELOG.md
+++ b/packages/data-controls/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 3.18.0 (2024-01-10)
+
 ## 3.17.0 (2023-12-13)
 
 ## 3.16.0 (2023-11-29)
diff --git a/packages/data-controls/package.json b/packages/data-controls/package.json
index 5018027820afe..2c1fc4dc011e7 100644
--- a/packages/data-controls/package.json
+++ b/packages/data-controls/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/data-controls",
-	"version": "3.17.0",
+	"version": "3.18.0",
 	"description": "A set of common controls for the @wordpress/data api.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/data/CHANGELOG.md b/packages/data/CHANGELOG.md
index 328928d93d509..9c56bdfd15831 100644
--- a/packages/data/CHANGELOG.md
+++ b/packages/data/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 9.19.0 (2024-01-10)
+
 ## 9.18.0 (2023-12-13)
 
 ## 9.17.0 (2023-11-29)
diff --git a/packages/data/package.json b/packages/data/package.json
index 37e9d8753cda0..135e9697ad1b1 100644
--- a/packages/data/package.json
+++ b/packages/data/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/data",
-	"version": "9.18.0",
+	"version": "9.19.0",
 	"description": "Data module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/data/src/factory.js b/packages/data/src/factory.js
index a4adc4dcf4251..be4ef8cf673c5 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/redux-store/index.js b/packages/data/src/redux-store/index.js
index e839408721542..7fdc9331a2474 100644
--- a/packages/data/src/redux-store/index.js
+++ b/packages/data/src/redux-store/index.js
@@ -237,6 +237,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 );
 				};
 
diff --git a/packages/data/src/test/registry-selectors.js b/packages/data/src/test/registry-selectors.js
new file mode 100644
index 0000000000000..edcadef8356c6
--- /dev/null
+++ b/packages/data/src/test/registry-selectors.js
@@ -0,0 +1,154 @@
+/**
+ * External dependencies
+ */
+import createSelector from 'rememo';
+
+/**
+ * Internal dependencies
+ */
+import { createRegistry } from '../registry';
+import { createRegistrySelector } from '../factory';
+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/dataviews/CHANGELOG.md b/packages/dataviews/CHANGELOG.md
index bd4afefab43fe..231fa05170a08 100644
--- a/packages/dataviews/CHANGELOG.md
+++ b/packages/dataviews/CHANGELOG.md
@@ -2,4 +2,6 @@
 
 ## Unreleased
 
+## 0.3.0 (2024-01-10)
+
 ## 0.2.0 (2023-12-13)
diff --git a/packages/dataviews/package.json b/packages/dataviews/package.json
index 4dfb35948af46..ddb51cc846985 100644
--- a/packages/dataviews/package.json
+++ b/packages/dataviews/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/dataviews",
-	"version": "0.2.0",
+	"version": "0.3.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",
diff --git a/packages/dataviews/src/style.scss b/packages/dataviews/src/style.scss
index 06997fee49a05..4cd5395895c55 100644
--- a/packages/dataviews/src/style.scss
+++ b/packages/dataviews/src/style.scss
@@ -59,6 +59,10 @@
 	margin: $grid-unit-40 0 $grid-unit-20;
 }
 
+.dataviews-view-table-wrapper {
+	overflow-x: scroll;
+}
+
 .dataviews-view-table {
 	width: 100%;
 	text-indent: 0;
@@ -81,7 +85,12 @@
 	td,
 	th {
 		padding: $grid-unit-15;
-		min-width: 160px;
+		white-space: nowrap;
+
+		@include break-huge() {
+			min-width: 200px;
+		}
+
 		&[data-field-id="actions"] {
 			text-align: right;
 		}
@@ -200,6 +209,48 @@
 	.dataviews-view-table-header {
 		padding-left: $grid-unit-05;
 	}
+
+	.dataviews-view-table__actions-column {
+		width: 1%;
+	}
+}
+
+.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-900;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	overflow: hidden;
+	display: block;
+	width: 100%;
+
+	a {
+		text-decoration: none;
+		color: inherit;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+		overflow: hidden;
+		display: block;
+		width: 100%;
+
+		&:hover {
+			color: $gray-900;
+		}
+	}
+
+	button.components-button.is-link {
+		text-decoration: none;
+		color: inherit;
+		font-weight: inherit;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+		overflow: hidden;
+		display: block;
+		width: 100%;
+	}
 }
 
 .dataviews-view-grid {
@@ -216,22 +267,17 @@
 	}
 
 	.dataviews-view-grid__card {
-		.dataviews-view-grid__primary-field {
-			.dataviews-view-grid__title-field {
-				white-space: nowrap;
-				overflow: hidden;
-				text-overflow: ellipsis;
-				display: block;
-				font-size: $default-font-size;
-				width: 100%;
-			}
+		border-radius: $radius-block-ui * 2;
+		border: 1px solid $gray-200;
+		height: 100%;
+		justify-content: flex-start;
 
-			.dataviews-view-grid__title-field a,
-			button.dataviews-view-grid__title-field {
-				font-weight: 500;
-				color: $gray-900;
-				text-decoration: none;
-			}
+		.dataviews-view-grid__title-actions {
+			padding: 0 $grid-unit-05;
+		}
+
+		.dataviews-view-grid__primary-field {
+			min-height: $grid-unit-50;
 		}
 	}
 
@@ -239,11 +285,11 @@
 		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;
+		border-bottom: 1px solid $gray-200;
+		background-color: $gray-100;
 
-		> * {
+		img {
 			object-fit: cover;
 			width: 100%;
 			height: 100%;
@@ -251,7 +297,7 @@
 	}
 
 	.dataviews-view-grid__primary-field {
-		min-height: $grid-unit-30;
+		padding: $grid-unit-10;
 	}
 
 	.dataviews-view-grid__fields {
@@ -259,12 +305,14 @@
 		font-size: 12px;
 		line-height: 16px;
 
+		&:not(:empty) {
+			padding: $grid-unit-15;
+			padding-top: 0;
+		}
+
 		.dataviews-view-grid__field {
-			.dataviews-view-grid__field-header {
-				color: $gray-700;
-			}
 			.dataviews-view-grid__field-value {
-				color: $gray-900;
+				color: $gray-700;
 			}
 		}
 	}
@@ -296,6 +344,7 @@
 		&:not(.is-selected):hover {
 			color: var(--wp-admin-theme-color);
 
+			.dataviews-view-list__primary-field,
 			.dataviews-view-list__fields {
 				color: var(--wp-admin-theme-color);
 			}
@@ -308,6 +357,7 @@
 			background-color: var(--wp-admin-theme-color);
 			color: $white;
 
+			.dataviews-view-list__primary-field,
 			.dataviews-view-list__fields,
 			.components-button {
 				color: $white;
@@ -350,6 +400,7 @@
 		overflow: hidden;
 		position: relative;
 		flex-shrink: 0;
+		background-color: $gray-100;
 
 		img {
 			width: 100%;
@@ -387,6 +438,10 @@
 			&:last-child {
 				margin-right: 0;
 			}
+
+			&:empty {
+				display: none;
+			}
 		}
 	}
 
diff --git a/packages/dataviews/src/view-actions.js b/packages/dataviews/src/view-actions.js
index 65c4dff8c36f7..5c0b21ebb7828 100644
--- a/packages/dataviews/src/view-actions.js
+++ b/packages/dataviews/src/view-actions.js
@@ -7,12 +7,13 @@ import {
 } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
 import { memo } from '@wordpress/element';
+import { settings } from '@wordpress/icons';
 
 /**
  * Internal dependencies
  */
 import { unlock } from './lock-unlock';
-import { VIEW_LAYOUTS, LAYOUT_TABLE, SORTING_DIRECTIONS } from './constants';
+import { VIEW_LAYOUTS, SORTING_DIRECTIONS } from './constants';
 
 const {
 	DropdownMenuV2: DropdownMenu,
@@ -260,12 +261,7 @@ const ViewActions = memo( function ViewActions( {
 			trigger={
 				<Button
 					size="compact"
-					icon={
-						VIEW_LAYOUTS.find( ( v ) => v.type === view.type )
-							?.icon ||
-						VIEW_LAYOUTS.find( ( v ) => v.type === LAYOUT_TABLE )
-							.icon
-					}
+					icon={ settings }
 					label={ __( 'View options' ) }
 				/>
 			}
diff --git a/packages/dataviews/src/view-grid.js b/packages/dataviews/src/view-grid.js
index 7c18d31dccd19..c8cc3516e1cbb 100644
--- a/packages/dataviews/src/view-grid.js
+++ b/packages/dataviews/src/view-grid.js
@@ -2,10 +2,10 @@
  * WordPress dependencies
  */
 import {
-	FlexBlock,
 	__experimentalGrid as Grid,
 	__experimentalHStack as HStack,
 	__experimentalVStack as VStack,
+	Tooltip,
 } from '@wordpress/components';
 import { useAsyncList } from '@wordpress/compose';
 
@@ -39,14 +39,14 @@ export default function ViewGrid( {
 	const usedData = deferredRendering ? shownData : data;
 	return (
 		<Grid
-			gap={ 8 }
+			gap={ 6 }
 			columns={ 2 }
 			alignment="top"
 			className="dataviews-view-grid"
 		>
 			{ usedData.map( ( item ) => (
 				<VStack
-					spacing={ 3 }
+					spacing={ 0 }
 					key={ getItemId( item ) }
 					className="dataviews-view-grid__card"
 				>
@@ -54,12 +54,12 @@ export default function ViewGrid( {
 						{ mediaField?.render( { item } ) }
 					</div>
 					<HStack
-						className="dataviews-view-grid__primary-field"
 						justify="space-between"
+						className="dataviews-view-grid__title-actions"
 					>
-						<FlexBlock>
+						<HStack className="dataviews-view-grid__primary-field">
 							{ primaryField?.render( { item } ) }
-						</FlexBlock>
+						</HStack>
 						<ItemActions
 							item={ item }
 							actions={ actions }
@@ -83,12 +83,14 @@ export default function ViewGrid( {
 									key={ field.id }
 									spacing={ 1 }
 								>
-									<div className="dataviews-view-grid__field-header">
-										{ field.header }
-									</div>
-									<div className="dataviews-view-grid__field-value">
-										{ renderedValue }
-									</div>
+									<Tooltip
+										text={ field.header }
+										placement="left"
+									>
+										<div className="dataviews-view-grid__field-value">
+											{ renderedValue }
+										</div>
+									</Tooltip>
 								</VStack>
 							);
 						} ) }
diff --git a/packages/dataviews/src/view-list.js b/packages/dataviews/src/view-list.js
index df4297334d178..790b50f657a66 100644
--- a/packages/dataviews/src/view-list.js
+++ b/packages/dataviews/src/view-list.js
@@ -92,7 +92,9 @@ export default function ViewList( {
 										) }
 									</div>
 									<VStack spacing={ 1 }>
-										{ primaryField?.render( { item } ) }
+										<span className="dataviews-view-list__primary-field">
+											{ primaryField?.render( { item } ) }
+										</span>
 										<div className="dataviews-view-list__fields">
 											{ visibleFields.map( ( field ) => {
 												return (
diff --git a/packages/dataviews/src/view-table.js b/packages/dataviews/src/view-table.js
index 22e68b4f56331..361b4091d646f 100644
--- a/packages/dataviews/src/view-table.js
+++ b/packages/dataviews/src/view-table.js
@@ -437,7 +437,7 @@ function ViewTable( {
 	);
 
 	return (
-		<div>
+		<div className="dataviews-view-table-wrapper">
 			<table
 				className="dataviews-view-table"
 				aria-busy={ isLoading }
@@ -506,7 +506,10 @@ function ViewTable( {
 							</th>
 						) ) }
 						{ !! actions?.length && (
-							<th data-field-id="actions">
+							<th
+								data-field-id="actions"
+								className="dataviews-view-table__actions-column"
+							>
 								<span className="dataviews-view-table-header">
 									{ __( 'Actions' ) }
 								</span>
@@ -564,7 +567,16 @@ function ViewTable( {
 												field.maxWidth || undefined,
 										} }
 									>
-										<span className="dataviews-view-table__cell-content-wrapper">
+										<span
+											className={ classnames(
+												'dataviews-view-table__cell-content-wrapper',
+												{
+													'dataviews-view-table__primary-field':
+														primaryField?.id ===
+														field.id,
+												}
+											) }
+										>
 											{ field.render( {
 												item,
 											} ) }
@@ -572,7 +584,7 @@ function ViewTable( {
 									</td>
 								) ) }
 								{ !! actions?.length && (
-									<td>
+									<td className="dataviews-view-table__actions-column">
 										<ItemActions
 											item={ item }
 											actions={ actions }
diff --git a/packages/date/CHANGELOG.md b/packages/date/CHANGELOG.md
index 73ad2bc3daa06..d6158df35df7d 100644
--- a/packages/date/CHANGELOG.md
+++ b/packages/date/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 4.49.0 (2024-01-10)
+
 ## 4.48.0 (2023-12-13)
 
 ## 4.47.0 (2023-11-29)
diff --git a/packages/date/package.json b/packages/date/package.json
index 65f346132f928..1553dba858339 100644
--- a/packages/date/package.json
+++ b/packages/date/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/date",
-	"version": "4.48.0",
+	"version": "4.49.0",
 	"description": "Date module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/dependency-extraction-webpack-plugin/CHANGELOG.md b/packages/dependency-extraction-webpack-plugin/CHANGELOG.md
index 414a5229117ce..c147941c98e80 100644
--- a/packages/dependency-extraction-webpack-plugin/CHANGELOG.md
+++ b/packages/dependency-extraction-webpack-plugin/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 5.0.0 (2024-01-10)
+
 ### Breaking Changes
 
 -   Drop support for webpack 4.
diff --git a/packages/dependency-extraction-webpack-plugin/package.json b/packages/dependency-extraction-webpack-plugin/package.json
index b3a296e3f0014..06b9efd857d03 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.31.0",
+	"version": "5.0.0",
 	"description": "Extract WordPress script dependencies from webpack bundles.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/deprecated/CHANGELOG.md b/packages/deprecated/CHANGELOG.md
index f55a064fe5dcf..3c10ecf640335 100644
--- a/packages/deprecated/CHANGELOG.md
+++ b/packages/deprecated/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 3.49.0 (2024-01-10)
+
 ## 3.48.0 (2023-12-13)
 
 ## 3.47.0 (2023-11-29)
diff --git a/packages/deprecated/package.json b/packages/deprecated/package.json
index b67260df2cfe3..7dc51929550c3 100644
--- a/packages/deprecated/package.json
+++ b/packages/deprecated/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/deprecated",
-	"version": "3.48.0",
+	"version": "3.49.0",
 	"description": "Deprecation utility for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/docgen/CHANGELOG.md b/packages/docgen/CHANGELOG.md
index 9ce1823b8bb6c..8b3827a0c9e81 100644
--- a/packages/docgen/CHANGELOG.md
+++ b/packages/docgen/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 1.58.0 (2024-01-10)
+
 ## 1.57.0 (2023-12-13)
 
 ## 1.56.0 (2023-11-29)
diff --git a/packages/docgen/package.json b/packages/docgen/package.json
index 55b7675309f4c..844518cc1cbab 100644
--- a/packages/docgen/package.json
+++ b/packages/docgen/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/docgen",
-	"version": "1.57.0",
+	"version": "1.58.0",
 	"description": "Autogenerate public API documentation from exports and JSDoc comments.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/dom-ready/CHANGELOG.md b/packages/dom-ready/CHANGELOG.md
index 5def1df47ebae..05d3e7e79f07f 100644
--- a/packages/dom-ready/CHANGELOG.md
+++ b/packages/dom-ready/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 3.49.0 (2024-01-10)
+
 ## 3.48.0 (2023-12-13)
 
 ## 3.47.0 (2023-11-29)
diff --git a/packages/dom-ready/package.json b/packages/dom-ready/package.json
index f4716f6bce305..d902a14c662f7 100644
--- a/packages/dom-ready/package.json
+++ b/packages/dom-ready/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/dom-ready",
-	"version": "3.48.0",
+	"version": "3.49.0",
 	"description": "Execute callback after the DOM is loaded.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/dom/CHANGELOG.md b/packages/dom/CHANGELOG.md
index 6e76f6e1e3276..dda6f4e53b489 100644
--- a/packages/dom/CHANGELOG.md
+++ b/packages/dom/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 3.49.0 (2024-01-10)
+
 ## 3.48.0 (2023-12-13)
 
 ## 3.47.0 (2023-11-29)
diff --git a/packages/dom/package.json b/packages/dom/package.json
index 8d783a9725592..304653e4074b9 100644
--- a/packages/dom/package.json
+++ b/packages/dom/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/dom",
-	"version": "3.48.0",
+	"version": "3.49.0",
 	"description": "DOM utilities module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/e2e-test-utils-playwright/CHANGELOG.md b/packages/e2e-test-utils-playwright/CHANGELOG.md
index cd848a23461ae..8f3e85e901191 100644
--- a/packages/e2e-test-utils-playwright/CHANGELOG.md
+++ b/packages/e2e-test-utils-playwright/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 0.17.0 (2024-01-10)
+
 ## 0.16.0 (2023-12-13)
 
 ## 0.15.0 (2023-11-29)
diff --git a/packages/e2e-test-utils-playwright/package.json b/packages/e2e-test-utils-playwright/package.json
index 6f84aa51be554..89bfb6ab66ae8 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.16.0",
+	"version": "0.17.0",
 	"description": "End-To-End (E2E) test utils for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
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 0000000000000..6a21ba7d90aec
--- /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 064894793b8f3..5036f3d0e8a97 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[];
@@ -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/CHANGELOG.md b/packages/e2e-test-utils/CHANGELOG.md
index 9602fa9a33434..ef5b7f4de2f9d 100644
--- a/packages/e2e-test-utils/CHANGELOG.md
+++ b/packages/e2e-test-utils/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 10.20.0 (2024-01-10)
+
 ## 10.19.0 (2023-12-13)
 
 ## 10.18.0 (2023-11-29)
diff --git a/packages/e2e-test-utils/package.json b/packages/e2e-test-utils/package.json
index b95b6cfb58d36..6943658627510 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.19.0",
+	"version": "10.20.0",
 	"description": "End-To-End (E2E) test utils for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/e2e-tests/CHANGELOG.md b/packages/e2e-tests/CHANGELOG.md
index bf44801199780..bfd10d63c9271 100644
--- a/packages/e2e-tests/CHANGELOG.md
+++ b/packages/e2e-tests/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 7.20.0 (2024-01-10)
+
 ## 7.19.0 (2023-12-13)
 
 ## 7.18.0 (2023-11-29)
diff --git a/packages/e2e-tests/package.json b/packages/e2e-tests/package.json
index f9d8072adb915..864eba1af12ac 100644
--- a/packages/e2e-tests/package.json
+++ b/packages/e2e-tests/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/e2e-tests",
-	"version": "7.19.0",
+	"version": "7.20.0",
 	"description": "End-To-End (E2E) tests for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/e2e-tests/plugins/dataviews.php b/packages/e2e-tests/plugins/dataviews.php
deleted file mode 100644
index 60a611fcae8f1..0000000000000
--- 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/interactive-blocks/directive-on-document/block.json b/packages/e2e-tests/plugins/interactive-blocks/directive-on-document/block.json
new file mode 100644
index 0000000000000..296a9b2f04190
--- /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",
+	"viewScript": "directive-on-document-view",
+	"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 0000000000000..d04cb79ea5852
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-on-document/render.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * HTML for testing the directive `data-wp-on`.
+ *
+ * @package gutenberg-test-interactive-blocks
+ */
+
+gutenberg_enqueue_module( 'directive-on-document-view' );
+?>
+
+<div data-wp-interactive='{ "namespace": "directive-on-document" }' data-wp-context='{"isVisible":true}'>
+	<button data-wp-on--click="actions.visibilityHandler" data-testid="visibility">Switch visibility</button>
+	<div data-wp-show-mock="context.isVisible">
+		<div data-wp-on-document--keydown="callbacks.keydownHandler">
+			<p data-wp-text="state.counter" data-testid="counter">0</p>
+		</div>
+	</div>
+</div>
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 0000000000000..b3cb891e4d6cb
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-on-document/view.js
@@ -0,0 +1,34 @@
+/**
+ * WordPress dependencies
+ */
+import { store, directive, getContext } from '@wordpress/interactivity';
+
+// 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' );
+		if ( ! evaluate( entry ) ) {
+			return null;
+		}
+		return element;
+	}
+);
+
+const { state } = store( 'directive-on-document', {
+	state: {
+		counter: 0,
+	},
+	callbacks: {
+		keydownHandler: ( ) => {
+			state.counter += 1;
+		},
+	},
+	actions: {
+		visibilityHandler: () => {
+			const context = getContext();
+			context.isVisible = ! context.isVisible;
+		},
+	}
+} );
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-slots/block.json b/packages/e2e-tests/plugins/interactive-blocks/directive-on-window/block.json
similarity index 63%
rename from packages/e2e-tests/plugins/interactive-blocks/directive-slots/block.json
rename to packages/e2e-tests/plugins/interactive-blocks/directive-on-window/block.json
index 6139c4e062040..9d55395b087a6 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/directive-slots/block.json
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-on-window/block.json
@@ -1,8 +1,8 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
 	"apiVersion": 2,
-	"name": "test/directive-slots",
-	"title": "E2E Interactivity tests - directive slots",
+	"name": "test/directive-on-window",
+	"title": "E2E Interactivity tests - directive on window",
 	"category": "text",
 	"icon": "heart",
 	"description": "",
@@ -10,6 +10,6 @@
 		"interactivity": true
 	},
 	"textdomain": "e2e-interactivity",
-	"viewScript": "directive-slots-view",
+	"viewScript": "directive-on-window-view",
 	"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 0000000000000..e9c8792354e2a
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-on-window/render.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * HTML for testing the directive `data-wp-on`.
+ *
+ * @package gutenberg-test-interactive-blocks
+ */
+
+gutenberg_enqueue_module( 'directive-on-window-view' );
+?>
+
+<div data-wp-interactive='{ "namespace": "directive-on-window" }' data-wp-context='{"isVisible":true}'>
+	<button data-wp-on--click="actions.visibilityHandler" data-testid="visibility">Switch visibility</button>
+	<div data-wp-show-mock="context.isVisible">
+		<div data-wp-on-window--resize="callbacks.resizeHandler">
+			<p data-wp-text="state.counter" data-testid="counter">0</p>
+		</div>
+	</div>
+</div>
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 0000000000000..11d01b7a216d1
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-on-window/view.js
@@ -0,0 +1,34 @@
+/**
+ * WordPress dependencies
+ */
+import { store, directive, getContext } from '@wordpress/interactivity';
+
+// 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' );
+		if ( ! evaluate( entry ) ) {
+			return null;
+		}
+		return element;
+	}
+);
+
+const { state } = store( 'directive-on-window', {
+	state: {
+		counter: 0,
+	},
+	callbacks: {
+		resizeHandler: ( ) => {
+			state.counter += 1;
+		},
+	},
+	actions: {
+		visibilityHandler: () => {
+			const context = getContext();
+			context.isVisible = ! context.isVisible;
+		},
+	}
+} );
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 c9a989ccaf027..0000000000000
--- 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 a8673fea9eba9..0000000000000
--- 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-text/render.php b/packages/e2e-tests/plugins/interactive-blocks/directive-text/render.php
index 98803669c6b0b..91d03b6fb8e19 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/directive-text/render.php
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-text/render.php
@@ -34,4 +34,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.js b/packages/e2e-tests/plugins/interactive-blocks/directive-text/view.js
index 82f37f4f78f1f..12b8ca9488ea1 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,14 @@
 /**
  * WordPress dependencies
  */
-import { store, getContext } from '@wordpress/interactivity';
+import { store, getContext, createElement } from '@wordpress/interactivity';
 
 const { state } = store( 'directive-context', {
 	state: {
 		text: 'Text 1',
+		component: () => (createElement( 'div', {}, state.text )),
+		number: 1,
+		boolean: true
 	},
 	actions: {
 		toggleStateText() {
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 328b727ac6533..0000000000000
--- 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/embedding.test.js b/packages/e2e-tests/specs/editor/various/embedding.test.js
deleted file mode 100644
index 4461fc6233053..0000000000000
--- 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/edit-post/CHANGELOG.md b/packages/edit-post/CHANGELOG.md
index 34ccd0953562f..d029f33335102 100644
--- a/packages/edit-post/CHANGELOG.md
+++ b/packages/edit-post/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 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`.
diff --git a/packages/edit-post/package.json b/packages/edit-post/package.json
index 1b3b107a83413..4041630884f75 100644
--- a/packages/edit-post/package.json
+++ b/packages/edit-post/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/edit-post",
-	"version": "7.25.0",
+	"version": "7.26.0",
 	"description": "Edit Post module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/edit-post/src/store/selectors.js b/packages/edit-post/src/store/selectors.js
index b6a54dfd0de2c..1a39a516da8f5 100644
--- a/packages/edit-post/src/store/selectors.js
+++ b/packages/edit-post/src/store/selectors.js
@@ -594,12 +594,27 @@ export const getEditedPostTemplate = createRegistrySelector(
 		}
 
 		const post = select( editorStore ).getCurrentPost();
-		if ( post.link ) {
-			return select( coreStore ).__experimentalGetTemplateForLink(
-				post.link
-			);
+		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 ( post.slug ) {
+			slugToCheck =
+				post.type === 'page'
+					? `${ post.type }-${ post.slug }`
+					: `single-${ post.type }-${ post.slug }`;
+		} else {
+			slugToCheck =
+				post.type === 'page' ? 'page' : `single-${ post.type }`;
 		}
-
-		return null;
+		const defaultTemplateId = select( coreStore ).getDefaultTemplateId( {
+			slug: slugToCheck,
+		} );
+		return select( coreStore ).getEditedEntityRecord(
+			'postType',
+			'wp_template',
+			defaultTemplateId
+		);
 	}
 );
diff --git a/packages/edit-site/CHANGELOG.md b/packages/edit-site/CHANGELOG.md
index ff3e85639d1de..d61e6028c0042 100644
--- a/packages/edit-site/CHANGELOG.md
+++ b/packages/edit-site/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 5.26.0 (2024-01-10)
+
 ## 5.25.0 (2023-12-13)
 
 ## 5.24.0 (2023-11-29)
diff --git a/packages/edit-site/package.json b/packages/edit-site/package.json
index e560e5e682797..830d525ed060a 100644
--- a/packages/edit-site/package.json
+++ b/packages/edit-site/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/edit-site",
-	"version": "5.25.0",
+	"version": "5.26.0",
 	"description": "Edit Site Page module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/edit-site/src/components/layout/hooks.js b/packages/edit-site/src/components/layout/hooks.js
index a9bf1b982903a..184e1b44896c5 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 e8c45ccdb02a6..163d4fe6e938f 100644
--- a/packages/edit-site/src/components/layout/index.js
+++ b/packages/edit-site/src/components/layout/index.js
@@ -31,17 +31,14 @@ import {
 	useBlockCommands,
 	store as blockEditorStore,
 } from '@wordpress/block-editor';
-import { privateApis as routerPrivateApis } from '@wordpress/router';
 import { privateApis as coreCommandsPrivateApis } from '@wordpress/core-commands';
 
 /**
  * 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';
@@ -53,12 +50,11 @@ 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 useLayoutAreas from './router';
 
 const { useCommands } = unlock( coreCommandsPrivateApis );
 const { useCommandContext } = unlock( commandsPrivateApis );
-const { useLocation } = unlock( routerPrivateApis );
 const { useGlobalStyle } = unlock( blockEditorPrivateApis );
 
 const ANIMATION_DURATION = 0.5;
@@ -72,10 +68,7 @@ export default function Layout() {
 	useCommonCommands();
 	useBlockCommands();
 
-	const { params } = useLocation();
 	const isMobileViewport = useViewportMatch( 'medium', '<' );
-	const isListPage = getIsListPage( params, isMobileViewport );
-	const isEditorPage = ! isListPage;
 
 	const {
 		isDistractionFree,
@@ -109,26 +102,17 @@ export default function Layout() {
 				select( blockEditorStore ).getBlockSelectionStart(),
 		};
 	}, [] );
-	const isEditing = canvasMode === 'edit';
 	const navigateRegionsProps = useNavigateRegions( {
 		previous: previousShortcut,
 		next: nextShortcut,
 	} );
 	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 isEditorLoading = useIsSiteEditorLoading();
 	const [ isResizableFrameOversized, setIsResizableFrameOversized ] =
 		useState( false );
+	const { areas, widths } = useLayoutAreas();
 
 	// This determines which animation variant should apply to the header.
 	// There is also a `isDistractionFreeHovering` state that gets priority
@@ -154,7 +138,7 @@ export default function Layout() {
 	// Sets the right context for the command palette
 	let commandContext = 'site-editor';
 
-	if ( canvasMode === 'edit' && isEditorPage ) {
+	if ( canvasMode === 'edit' ) {
 		commandContext = 'site-editor-edit';
 	}
 	if ( hasBlockSelected ) {
@@ -185,9 +169,9 @@ export default function Layout() {
 					'edit-site-layout',
 					navigateRegionsProps.className,
 					{
-						'is-distraction-free': isDistractionFree && isEditing,
-						'is-full-canvas': isFullCanvas,
-						'is-edit-mode': isEditing,
+						'is-distraction-free':
+							isDistractionFree && canvasMode === 'edit',
+						'is-full-canvas': canvasMode === 'edit',
 						'has-fixed-toolbar': hasFixedToolbar,
 						'is-block-toolbar-visible': hasBlockSelected,
 					}
@@ -228,7 +212,7 @@ export default function Layout() {
 					/>
 
 					<AnimatePresence initial={ false }>
-						{ isEditorPage && isEditing && (
+						{ canvasMode === 'edit' && (
 							<NavigableRegion
 								key="header"
 								className="edit-site-layout__header"
@@ -272,7 +256,7 @@ export default function Layout() {
 						className="edit-site-layout__sidebar-region"
 					>
 						<AnimatePresence>
-							{ showSidebar && (
+							{ canvasMode === 'view' && (
 								<motion.div
 									initial={ { opacity: 0 } }
 									animate={ { opacity: 1 } }
@@ -296,82 +280,82 @@ export default function Layout() {
 
 					<SavePanel />
 
-					{ showCanvas && (
-						<>
-							{ isListPage && <PageMain /> }
-							{ isEditorPage && (
-								<div className="edit-site-layout__canvas-container">
-									{ canvasResizer }
-									{ !! canvasSize.width && (
-										<motion.div
-											whileHover={
-												isEditorPage &&
-												canvasMode === 'view'
-													? {
-															scale: 1.005,
-															transition: {
-																duration:
-																	disableMotion
-																		? 0
-																		: 0.5,
-																ease: 'easeOut',
-															},
-													  }
-													: {}
+					{ areas.content && canvasMode !== 'edit' && (
+						<div
+							className="edit-site-layout__area"
+							style={ {
+								maxWidth: widths?.content,
+							} }
+						>
+							{ areas.content }
+						</div>
+					) }
+
+					{ areas.preview && (
+						<div className="edit-site-layout__canvas-container">
+							{ canvasResizer }
+							{ !! canvasSize.width && (
+								<motion.div
+									whileHover={
+										canvasMode === 'view'
+											? {
+													scale: 1.005,
+													transition: {
+														duration: disableMotion
+															? 0
+															: 0.5,
+														ease: 'easeOut',
+													},
+											  }
+											: {}
+									}
+									initial={ false }
+									layout="position"
+									className={ classnames(
+										'edit-site-layout__canvas',
+										{
+											'is-right-aligned':
+												isResizableFrameOversized,
+										}
+									) }
+									transition={ {
+										type: 'tween',
+										duration: disableMotion
+											? 0
+											: ANIMATION_DURATION,
+										ease: 'easeOut',
+									} }
+								>
+									<ErrorBoundary>
+										<ResizableFrame
+											isReady={ ! isEditorLoading }
+											isFullWidth={
+												canvasMode === 'edit'
 											}
-											initial={ false }
-											layout="position"
-											className={ classnames(
-												'edit-site-layout__canvas',
-												{
-													'is-right-aligned':
-														isResizableFrameOversized,
-												}
-											) }
-											transition={ {
-												type: 'tween',
-												duration: disableMotion
-													? 0
-													: ANIMATION_DURATION,
-												ease: 'easeOut',
+											defaultSize={ {
+												width:
+													canvasSize.width -
+													24 /* $canvas-padding */,
+												height: canvasSize.height,
+											} }
+											isOversized={
+												isResizableFrameOversized
+											}
+											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
-														isLoading={
-															isEditorLoading
-														}
-													/>
-												</ResizableFrame>
-											</ErrorBoundary>
-										</motion.div>
-									) }
-								</div>
+											{ areas.preview }
+										</ResizableFrame>
+									</ErrorBoundary>
+								</motion.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 0000000000000..3f9a8be7f82de
--- /dev/null
+++ b/packages/edit-site/src/components/layout/router.js
@@ -0,0 +1,103 @@
+/**
+ * WordPress dependencies
+ */
+import { privateApis as routerPrivateApis } from '@wordpress/router';
+
+/**
+ * Internal dependencies
+ */
+import { unlock } from '../../lock-unlock';
+import { useIsSiteEditorLoading } from './hooks';
+import Editor from '../editor';
+import DataviewsPatterns from '../page-patterns/dataviews-patterns';
+import PagePages from '../page-pages';
+import PagePatterns from '../page-patterns';
+import PageTemplateParts from '../page-template-parts';
+import PageTemplates from '../page-templates';
+
+const { useLocation } = unlock( routerPrivateApis );
+
+export default function useLayoutAreas() {
+	const isSiteEditorLoading = useIsSiteEditorLoading();
+	const { params } = useLocation();
+	const { postType, postId, path, layout, isCustom } = params ?? {};
+
+	// Regular page
+	if ( path === '/page' ) {
+		const isListLayout =
+			isCustom !== 'true' && ( ! layout || layout === 'list' );
+		return {
+			areas: {
+				content: window.__experimentalAdminViews ? (
+					<PagePages />
+				) : undefined,
+				preview: ( isListLayout ||
+					! window.__experimentalAdminViews ) && (
+					<Editor isLoading={ isSiteEditorLoading } />
+				),
+			},
+			widths: {
+				content:
+					window.__experimentalAdminViews && isListLayout
+						? 380
+						: undefined,
+			},
+		};
+	}
+
+	// Regular other post types
+	if ( postType && postId ) {
+		return {
+			areas: {
+				preview: <Editor isLoading={ isSiteEditorLoading } />,
+			},
+		};
+	}
+
+	// Templates
+	if (
+		path === '/wp_template/all' ||
+		( path === '/wp_template' && window?.__experimentalAdminViews )
+	) {
+		const isListLayout =
+			isCustom !== 'true' && ( ! layout || layout === 'list' );
+		return {
+			areas: {
+				content: <PageTemplates />,
+				preview: isListLayout && (
+					<Editor isLoading={ isSiteEditorLoading } />
+				),
+			},
+			widths: {
+				content: isListLayout ? 380 : undefined,
+			},
+		};
+	}
+
+	// Template parts
+	if ( path === '/wp_template_part/all' ) {
+		return {
+			areas: {
+				content: <PageTemplateParts />,
+			},
+		};
+	}
+
+	// Patterns
+	if ( path === '/patterns' ) {
+		return {
+			areas: {
+				content: window?.__experimentalAdminViews ? (
+					<DataviewsPatterns />
+				) : (
+					<PagePatterns />
+				),
+			},
+		};
+	}
+
+	// Fallback shows the home page preview
+	return {
+		areas: { preview: <Editor isLoading={ isSiteEditorLoading } /> },
+	};
+}
diff --git a/packages/edit-site/src/components/layout/style.scss b/packages/edit-site/src/components/layout/style.scss
index 53d3ed82a88bc..c14d4c2f68274 100644
--- a/packages/edit-site/src/components/layout/style.scss
+++ b/packages/edit-site/src/components/layout/style.scss
@@ -14,11 +14,6 @@
 	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} - #{$grid-unit-30});
 	}
@@ -30,7 +25,7 @@
 		box-shadow: none;
 
 		@include break-medium {
-			width: auto;
+			width: $header-height;
 			padding-right: 0;
 		}
 	}
@@ -156,20 +151,13 @@
 	}
 }
 
-.edit-site-template-pages-list-view,
-.edit-site-page-pages-list-view {
-	max-width: $nav-sidebar-width;
-}
-
 // This shouldn't be necessary (we should have a way to say that a skeletton is relative
 .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%;
 }
@@ -187,7 +175,7 @@
 	justify-content: center;
 	border-bottom: 1px solid transparent;
 
-	.edit-site-layout.is-full-canvas.is-edit-mode & {
+	.edit-site-layout.is-full-canvas & {
 		border-bottom-color: $gray-200;
 		transition: border-bottom-color 0.15s 0.4s ease-out;
 	}
@@ -261,8 +249,7 @@
 	}
 }
 
-.is-edit-mode.is-distraction-free {
-
+.edit-site-layout.is-distraction-free {
 	.edit-site-layout__header-container {
 		height: $header-height;
 		position: absolute;
@@ -300,3 +287,16 @@
 	}
 
 }
+
+.edit-site-layout__area {
+	color: $gray-800;
+	background: $white;
+	flex-grow: 1;
+	overflow: auto;
+	margin: 0;
+	margin-top: $header-height;
+	@include break-medium() {
+		border-radius: 8px;
+		margin: $canvas-padding $canvas-padding $canvas-padding 0;
+	}
+}
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 7cc2025ac2c94..0000000000000
--- 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 DataviewsPatterns from '../page-patterns/dataviews-patterns';
-import PageTemplateParts from '../page-template-parts';
-import PageTemplates from '../page-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 <PageTemplates />;
-	} else if ( path === '/wp_template_part/all' ) {
-		return <PageTemplateParts />;
-	} else if ( path === '/patterns' ) {
-		return window?.__experimentalAdminViews ? (
-			<DataviewsPatterns />
-		) : (
-			<PagePatterns />
-		);
-	} else if ( window?.__experimentalAdminViews && path === '/page' ) {
-		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
index 45368c11833f3..048821b048f6a 100644
--- a/packages/edit-site/src/components/page-pages/index.js
+++ b/packages/edit-site/src/components/page-pages/index.js
@@ -1,11 +1,7 @@
 /**
  * WordPress dependencies
  */
-import {
-	__experimentalView as View,
-	__experimentalVStack as VStack,
-	Button,
-} from '@wordpress/components';
+import { Button } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
 import { useEntityRecords, store as coreStore } from '@wordpress/core-data';
 import { decodeEntities } from '@wordpress/html-entities';
@@ -14,7 +10,6 @@ import { dateI18n, getDate, getSettings } from '@wordpress/date';
 import { privateApis as routerPrivateApis } from '@wordpress/router';
 import { useSelect, useDispatch } from '@wordpress/data';
 import { DataViews } from '@wordpress/dataviews';
-import { ENTER, SPACE } from '@wordpress/keycodes';
 
 /**
  * Internal dependencies
@@ -42,7 +37,6 @@ import {
 	viewPostAction,
 	useEditPostAction,
 } from '../actions';
-import PostPreview from '../post-preview';
 import AddNewPageModal from '../add-new-page';
 import Media from '../media';
 import { unlock } from '../../lock-unlock';
@@ -50,13 +44,24 @@ const { useLocation, useHistory } = unlock( routerPrivateApis );
 
 const EMPTY_ARRAY = [];
 
-function useView( type ) {
-	const {
-		params: { activeView = 'all', isCustom = 'false' },
-	} = useLocation();
-	const selectedDefaultView =
-		isCustom === 'false' &&
-		DEFAULT_VIEWS[ type ].find( ( { slug } ) => slug === activeView )?.view;
+function useView( postType ) {
+	const { params } = useLocation();
+	const { activeView = 'all', isCustom = 'false', layout } = params;
+	const history = useHistory();
+	const selectedDefaultView = useMemo( () => {
+		const defaultView =
+			isCustom === 'false' &&
+			DEFAULT_VIEWS[ postType ].find(
+				( { slug } ) => slug === activeView
+			)?.view;
+		if ( isCustom === 'false' && layout ) {
+			return {
+				...defaultView,
+				type: layout,
+			};
+		}
+		return defaultView;
+	}, [ isCustom, activeView, layout, postType ] );
 	const [ view, setView ] = useState( selectedDefaultView );
 
 	useEffect( () => {
@@ -82,10 +87,21 @@ function useView( type ) {
 	const { editEntityRecord } = useDispatch( coreStore );
 
 	const customView = useMemo( () => {
-		return (
-			editedViewRecord?.content && JSON.parse( editedViewRecord?.content )
-		);
+		const storedView =
+			editedViewRecord?.content &&
+			JSON.parse( editedViewRecord?.content );
+		if ( ! storedView ) {
+			return storedView;
+		}
+
+		return {
+			...storedView,
+			layout: {
+				...( DEFAULT_CONFIG_PER_VIEW_TYPE[ storedView?.type ] || {} ),
+			},
+		};
 	}, [ editedViewRecord?.content ] );
+
 	const setCustomView = useCallback(
 		( viewToSet ) => {
 			editEntityRecord(
@@ -100,13 +116,26 @@ function useView( type ) {
 		[ editEntityRecord, editedViewRecord?.id ]
 	);
 
+	const setDefaultViewAndUpdateUrl = useCallback(
+		( viewToSet ) => {
+			if ( viewToSet.type !== view?.type ) {
+				history.push( {
+					...params,
+					layout: viewToSet.type,
+				} );
+			}
+			setView( viewToSet );
+		},
+		[ params, view?.type, history ]
+	);
+
 	if ( isCustom === 'false' ) {
-		return [ view, setView ];
+		return [ view, setDefaultViewAndUpdateUrl ];
 	} 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 ];
+	return [ DEFAULT_VIEWS[ postType ][ 0 ].view, setDefaultViewAndUpdateUrl ];
 }
 
 // See https://github.com/WordPress/gutenberg/issues/55886
@@ -124,12 +153,20 @@ const DEFAULT_STATUSES = 'draft,future,pending,private,publish'; // All but 'tra
 export default function PagePages() {
 	const postType = 'page';
 	const [ view, setView ] = useView( postType );
-	const [ pageId, setPageId ] = useState( null );
 	const history = useHistory();
+	const { params } = useLocation();
+	const { isCustom = 'false' } = params;
 
 	const onSelectionChange = useCallback(
-		( items ) => setPageId( items?.length === 1 ? items[ 0 ].id : null ),
-		[ setPageId ]
+		( items ) => {
+			if ( isCustom === 'false' && view?.type === LAYOUT_LIST ) {
+				history.push( {
+					...params,
+					postId: items.length === 1 ? items[ 0 ].id : undefined,
+				} );
+			}
+		},
+		[ history, params, view?.type, isCustom ]
 	);
 
 	const onDetailsChange = useCallback(
@@ -205,18 +242,37 @@ export default function PagePages() {
 				id: 'featured-image',
 				header: __( 'Featured Image' ),
 				getValue: ( { item } ) => item.featured_media,
-				render: ( { item } ) =>
-					!! item.featured_media ? (
-						<Media
-							className="edit-site-page-pages__featured-image"
-							id={ item.featured_media }
-							size={
-								view.type === LAYOUT_GRID
-									? [ 'large', 'full', 'medium', 'thumbnail' ]
-									: [ 'thumbnail', 'medium', 'large', 'full' ]
-							}
-						/>
-					) : null,
+				render: ( { item } ) => (
+					<span
+						className={
+							view.type === LAYOUT_TABLE
+								? 'edit-site-page-pages__media-wrapper'
+								: ''
+						}
+					>
+						{ !! item.featured_media ? (
+							<Media
+								className="edit-site-page-pages__featured-image"
+								id={ item.featured_media }
+								size={
+									view.type === LAYOUT_GRID
+										? [
+												'large',
+												'full',
+												'medium',
+												'thumbnail',
+										  ]
+										: [
+												'thumbnail',
+												'medium',
+												'large',
+												'full',
+										  ]
+								}
+							/>
+						) : null }
+					</span>
+				),
 				enableSorting: false,
 			},
 			{
@@ -224,32 +280,22 @@ export default function PagePages() {
 				id: 'title',
 				getValue: ( { item } ) => item.title?.rendered,
 				render: ( { item } ) => {
-					return (
-						<VStack spacing={ 1 }>
-							<View
-								as="span"
-								className="dataviews-view-grid__title-field"
-							>
-								{ [ LAYOUT_TABLE, LAYOUT_GRID ].includes(
-									view.type
-								) ? (
-									<Link
-										params={ {
-											postId: item.id,
-											postType: item.type,
-											canvas: 'edit',
-										} }
-									>
-										{ decodeEntities(
-											item.title?.rendered
-										) || __( '(no title)' ) }
-									</Link>
-								) : (
-									decodeEntities( item.title?.rendered ) ||
-									__( '(no title)' )
-								) }
-							</View>
-						</VStack>
+					return [ LAYOUT_TABLE, LAYOUT_GRID ].includes(
+						view.type
+					) ? (
+						<Link
+							params={ {
+								postId: item.id,
+								postType: item.type,
+								canvas: 'edit',
+							} }
+						>
+							{ decodeEntities( item.title?.rendered ) ||
+								__( '(no title)' ) }
+						</Link>
+					) : (
+						decodeEntities( item.title?.rendered ) ||
+							__( '(no title)' )
 					);
 				},
 				maxWidth: 400,
@@ -350,85 +396,33 @@ export default function PagePages() {
 
 	// TODO: we need to handle properly `data={ data || EMPTY_ARRAY }` for when `isLoading`.
 	return (
-		<>
-			<Page
-				className={
-					view.type === LAYOUT_LIST
-						? 'edit-site-page-pages-list-view'
-						: null
-				}
-				title={ __( 'Pages' ) }
-				actions={
-					<>
-						<Button variant="primary" onClick={ openModal }>
-							{ __( 'Add new page' ) }
-						</Button>
-						{ showAddPageModal && (
-							<AddNewPageModal
-								onSave={ handleNewPage }
-								onClose={ closeModal }
-							/>
-						) }
-					</>
-				}
-			>
-				<DataViews
-					paginationInfo={ paginationInfo }
-					fields={ fields }
-					actions={ actions }
-					data={ pages || EMPTY_ARRAY }
-					isLoading={ isLoadingPages || isLoadingAuthors }
-					view={ view }
-					onChangeView={ onChangeView }
-					onSelectionChange={ onSelectionChange }
-					onDetailsChange={ onDetailsChange }
-				/>
-			</Page>
-			{ view.type === LAYOUT_LIST && (
-				<Page>
-					<div
-						className="edit-site-page-pages-preview"
-						tabIndex={ 0 }
-						role="button"
-						onKeyDown={ ( event ) => {
-							const { keyCode } = event;
-							if ( keyCode === ENTER || keyCode === SPACE ) {
-								history.push( {
-									postId: pageId,
-									postType,
-									canvas: 'edit',
-								} );
-							}
-						} }
-						onClick={ () =>
-							history.push( {
-								postId: pageId,
-								postType,
-								canvas: 'edit',
-							} )
-						}
-					>
-						{ pageId !== null ? (
-							<PostPreview
-								postId={ pageId }
-								postType={ postType }
-							/>
-						) : (
-							<div
-								style={ {
-									display: 'flex',
-									flexDirection: 'column',
-									justifyContent: 'center',
-									textAlign: 'center',
-									height: '100%',
-								} }
-							>
-								<p>{ __( 'Select a page to preview' ) }</p>
-							</div>
-						) }
-					</div>
-				</Page>
-			) }
-		</>
+		<Page
+			title={ __( 'Pages' ) }
+			actions={
+				<>
+					<Button variant="primary" onClick={ openModal }>
+						{ __( 'Add new page' ) }
+					</Button>
+					{ showAddPageModal && (
+						<AddNewPageModal
+							onSave={ handleNewPage }
+							onClose={ closeModal }
+						/>
+					) }
+				</>
+			}
+		>
+			<DataViews
+				paginationInfo={ paginationInfo }
+				fields={ fields }
+				actions={ actions }
+				data={ pages || EMPTY_ARRAY }
+				isLoading={ isLoadingPages || isLoadingAuthors }
+				view={ view }
+				onChangeView={ onChangeView }
+				onSelectionChange={ onSelectionChange }
+				onDetailsChange={ onDetailsChange }
+			/>
+		</Page>
 	);
 }
diff --git a/packages/edit-site/src/components/page-pages/style.scss b/packages/edit-site/src/components/page-pages/style.scss
index c2d2cc25529c4..c9169daa58979 100644
--- a/packages/edit-site/src/components/page-pages/style.scss
+++ b/packages/edit-site/src/components/page-pages/style.scss
@@ -1,6 +1,26 @@
-.edit-site-page-pages__featured-image {
-	border-radius: $grid-unit-05;
+.edit-site-page-pages__media-wrapper {
 	width: $grid-unit-50;
 	height: $grid-unit-50;
 	display: block;
+	border-radius: $grid-unit-05;
+	position: relative;
+	background-color: $gray-100;
+	overflow: hidden;
+
+	.edit-site-page-pages__featured-image {
+		height: 100%;
+		object-fit: cover;
+		width: 100%;
+	}
+
+	&::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%;
+	}
 }
diff --git a/packages/edit-site/src/components/page-patterns/dataviews-patterns.js b/packages/edit-site/src/components/page-patterns/dataviews-patterns.js
index ad474d882cfcf..19b9b6381ec3b 100644
--- a/packages/edit-site/src/components/page-patterns/dataviews-patterns.js
+++ b/packages/edit-site/src/components/page-patterns/dataviews-patterns.js
@@ -4,7 +4,6 @@
 import {
 	__experimentalHStack as HStack,
 	Button,
-	__experimentalHeading as Heading,
 	Tooltip,
 	Flex,
 } from '@wordpress/components';
@@ -197,24 +196,24 @@ function Title( { item, categoryId } ) {
 					/>
 				</Tooltip>
 			) }
-			<Flex as="span" gap={ 0 } justify="left">
+			<Flex
+				as="div"
+				gap={ 0 }
+				justify="left"
+				className="edit-site-patterns__pattern-title"
+			>
 				{ item.type === PATTERN_TYPES.theme ? (
-					<span className="dataviews-view-grid__title-field">
-						{ item.title }
-					</span>
+					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"
-							className="dataviews-view-grid__title-field"
-						>
-							{ item.title || item.name }
-						</Button>
-					</Heading>
+					<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>
 				) }
 			</Flex>
 		</HStack>
diff --git a/packages/edit-site/src/components/page-patterns/style.scss b/packages/edit-site/src/components/page-patterns/style.scss
index dd3c52ef08c1a..b5d092f438e8e 100644
--- a/packages/edit-site/src/components/page-patterns/style.scss
+++ b/packages/edit-site/src/components/page-patterns/style.scss
@@ -1,10 +1,11 @@
 .edit-site-patterns {
+	background: #1e1e1e;
 	border-left: 1px solid $gray-800;
-	background: none;
 	margin: $header-height 0 0;
 	border-radius: 0;
 	padding: 0;
 	overflow-x: auto;
+	min-height: 100%;
 
 	.components-base-control {
 		width: 100%;
@@ -254,6 +255,15 @@
 		top: 0;
 		z-index: 2;
 	}
+
+	.edit-site-patterns__pattern-title {
+		display: block;
+		width: 100%;
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		color: inherit;
+	}
 }
 
 .dataviews-action-modal__duplicate-pattern {
diff --git a/packages/edit-site/src/components/page-templates/index.js b/packages/edit-site/src/components/page-templates/index.js
index ddc48542ee1b7..7deec674f9b41 100644
--- a/packages/edit-site/src/components/page-templates/index.js
+++ b/packages/edit-site/src/components/page-templates/index.js
@@ -8,17 +8,14 @@ import removeAccents from 'remove-accents';
  */
 import {
 	Icon,
-	__experimentalView as View,
 	__experimentalText as Text,
 	__experimentalHStack as HStack,
-	__experimentalVStack as VStack,
 	VisuallyHidden,
 } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
 import { useState, useMemo, useCallback } from '@wordpress/element';
 import { useEntityRecords } from '@wordpress/core-data';
 import { decodeEntities } from '@wordpress/html-entities';
-import { ENTER, SPACE } from '@wordpress/keycodes';
 import { parse } from '@wordpress/blocks';
 import {
 	BlockPreview,
@@ -55,12 +52,11 @@ import {
 import { postRevisionsAction } from '../actions';
 import usePatternSettings from '../page-patterns/use-pattern-settings';
 import { unlock } from '../../lock-unlock';
-import PostPreview from '../post-preview';
 
 const { ExperimentalBlockEditorProvider, useGlobalStyle } = unlock(
 	blockEditorPrivateApis
 );
-const { useHistory } = unlock( routerPrivateApis );
+const { useHistory, useLocation } = unlock( routerPrivateApis );
 
 const EMPTY_ARRAY = [];
 
@@ -79,7 +75,7 @@ const defaultConfigPerViewType = {
 };
 
 const DEFAULT_VIEW = {
-	type: LAYOUT_TABLE,
+	type: window?.__experimentalAdminViews ? LAYOUT_LIST : LAYOUT_TABLE,
 	search: '',
 	page: 1,
 	perPage: 20,
@@ -96,28 +92,19 @@ function normalizeSearchInput( input = '' ) {
 
 function TemplateTitle( { item, viewType } ) {
 	if ( viewType === LAYOUT_LIST ) {
-		return (
-			<>
-				{ decodeEntities( item.title?.rendered ) || __( '(no title)' ) }
-			</>
-		);
+		return decodeEntities( item.title?.rendered ) || __( '(no title)' );
 	}
 
 	return (
-		<VStack spacing={ 1 }>
-			<View as="span" className="dataviews-view-grid__title-field">
-				<Link
-					params={ {
-						postId: item.id,
-						postType: item.type,
-						canvas: 'edit',
-					} }
-				>
-					{ decodeEntities( item.title?.rendered ) ||
-						__( '(no title)' ) }
-				</Link>
-			</View>
-		</VStack>
+		<Link
+			params={ {
+				postId: item.id,
+				postType: item.type,
+				canvas: 'edit',
+			} }
+		>
+			{ decodeEntities( item.title?.rendered ) || __( '(no title)' ) }
+		</Link>
 	);
 }
 
@@ -167,18 +154,42 @@ function TemplatePreview( { content, viewType } ) {
 }
 
 export default function DataviewsTemplates() {
-	const [ templateId, setTemplateId ] = useState( null );
-	const [ view, setView ] = useState( DEFAULT_VIEW );
+	const { params } = useLocation();
+	const { layout } = params;
+	const defaultView = useMemo( () => {
+		return {
+			...DEFAULT_VIEW,
+			type: layout ?? DEFAULT_VIEW.type,
+		};
+	}, [ layout ] );
+	const [ view, setView ] = useState( defaultView );
 	const { records: allTemplates, isResolving: isLoadingData } =
 		useEntityRecords( 'postType', TEMPLATE_POST_TYPE, {
 			per_page: -1,
 		} );
 	const history = useHistory();
-
 	const onSelectionChange = useCallback(
-		( items ) =>
-			setTemplateId( items?.length === 1 ? items[ 0 ].id : null ),
-		[ setTemplateId ]
+		( items ) => {
+			if ( view?.type === LAYOUT_LIST ) {
+				history.push( {
+					...params,
+					postId: items.length === 1 ? items[ 0 ].id : undefined,
+				} );
+			}
+		},
+		[ history, params, view?.type ]
+	);
+
+	const onDetailsChange = useCallback(
+		( items ) => {
+			if ( items?.length === 1 ) {
+				history.push( {
+					postId: items[ 0 ].id,
+					postType: TEMPLATE_POST_TYPE,
+				} );
+			}
+		},
+		[ history ]
 	);
 
 	const authors = useMemo( () => {
@@ -228,19 +239,24 @@ export default function DataviewsTemplates() {
 				getValue: ( { item } ) => item.description,
 				render: ( { item } ) => {
 					return item.description ? (
-						decodeEntities( item.description )
+						<span className="page-templates-description">
+							{ decodeEntities( item.description ) }
+						</span>
 					) : (
-						<>
-							<Text variant="muted" aria-hidden="true">
-								&#8212;
-							</Text>
-							<VisuallyHidden>
-								{ __( 'No description.' ) }
-							</VisuallyHidden>
-						</>
+						view.type === LAYOUT_TABLE && (
+							<>
+								<Text variant="muted" aria-hidden="true">
+									&#8212;
+								</Text>
+								<VisuallyHidden>
+									{ __( 'No description.' ) }
+								</VisuallyHidden>
+							</>
+						)
 					);
 				},
-				maxWidth: 200,
+				maxWidth: 400,
+				minWidth: 320,
 				enableSorting: false,
 			},
 			{
@@ -253,6 +269,7 @@ export default function DataviewsTemplates() {
 				enableHiding: false,
 				type: ENUMERATION_TYPE,
 				elements: authors,
+				width: '1%',
 			},
 		],
 		[ authors, view.type ]
@@ -341,89 +358,41 @@ export default function DataviewsTemplates() {
 						...defaultConfigPerViewType[ newView.type ],
 					},
 				};
+
+				history.push( {
+					...params,
+					layout: newView.type,
+				} );
 			}
 
 			setView( newView );
 		},
-		[ view.type, setView ]
+		[ view.type, setView, history, params ]
 	);
 
 	return (
-		<>
-			<Page
-				className={
-					view.type === LAYOUT_LIST
-						? 'edit-site-template-pages-list-view'
-						: null
-				}
-				title={ __( 'Templates' ) }
-				actions={
-					<AddNewTemplate
-						templateType={ TEMPLATE_POST_TYPE }
-						showIcon={ false }
-						toggleProps={ { variant: 'primary' } }
-					/>
-				}
-			>
-				<DataViews
-					paginationInfo={ paginationInfo }
-					fields={ fields }
-					actions={ actions }
-					data={ data }
-					isLoading={ isLoadingData }
-					view={ view }
-					onChangeView={ onChangeView }
-					onSelectionChange={ onSelectionChange }
-					deferredRendering={
-						! view.hiddenFields?.includes( 'preview' )
-					}
+		<Page
+			title={ __( 'Templates' ) }
+			actions={
+				<AddNewTemplate
+					templateType={ TEMPLATE_POST_TYPE }
+					showIcon={ false }
+					toggleProps={ { variant: 'primary' } }
 				/>
-			</Page>
-			{ view.type === LAYOUT_LIST && (
-				<Page>
-					<div
-						className="edit-site-template-pages-preview"
-						tabIndex={ 0 }
-						role="button"
-						onKeyDown={ ( event ) => {
-							const { keyCode } = event;
-							if ( keyCode === ENTER || keyCode === SPACE ) {
-								history.push( {
-									postId: templateId,
-									postType: TEMPLATE_POST_TYPE,
-									canvas: 'edit',
-								} );
-							}
-						} }
-						onClick={ () =>
-							history.push( {
-								postId: templateId,
-								postType: TEMPLATE_POST_TYPE,
-								canvas: 'edit',
-							} )
-						}
-					>
-						{ templateId !== null ? (
-							<PostPreview
-								postId={ templateId }
-								postType={ TEMPLATE_POST_TYPE }
-							/>
-						) : (
-							<div
-								style={ {
-									display: 'flex',
-									flexDirection: 'column',
-									justifyContent: 'center',
-									textAlign: 'center',
-									height: '100%',
-								} }
-							>
-								<p>{ __( 'Select a template to preview' ) }</p>
-							</div>
-						) }
-					</div>
-				</Page>
-			) }
-		</>
+			}
+		>
+			<DataViews
+				paginationInfo={ paginationInfo }
+				fields={ fields }
+				actions={ actions }
+				data={ data }
+				isLoading={ isLoadingData }
+				view={ view }
+				onChangeView={ onChangeView }
+				onSelectionChange={ onSelectionChange }
+				onDetailsChange={ onDetailsChange }
+				deferredRendering={ ! view.hiddenFields?.includes( 'preview' ) }
+			/>
+		</Page>
 	);
 }
diff --git a/packages/edit-site/src/components/page-templates/style.scss b/packages/edit-site/src/components/page-templates/style.scss
index ed4484550b48d..9fdca6d15d560 100644
--- a/packages/edit-site/src/components/page-templates/style.scss
+++ b/packages/edit-site/src/components/page-templates/style.scss
@@ -11,3 +11,7 @@
 		}
 	}
 }
+
+.page-templates-description {
+	white-space: normal;
+}
diff --git a/packages/edit-site/src/components/post-preview/index.js b/packages/edit-site/src/components/post-preview/index.js
deleted file mode 100644
index 8f325c2627594..0000000000000
--- a/packages/edit-site/src/components/post-preview/index.js
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * Internal dependencies
- */
-import Editor from '../editor';
-import { useInitEditedEntity } from '../sync-state-with-url/use-init-edited-entity-from-url';
-import { useIsSiteEditorLoading } from '../layout/hooks';
-
-export default function PostPreview( { postType, postId } ) {
-	useInitEditedEntity( {
-		postId,
-		postType,
-	} );
-	const isEditorLoading = useIsSiteEditorLoading();
-
-	return <Editor isLoading={ isEditorLoading } />;
-}
diff --git a/packages/edit-site/src/components/save-button/index.js b/packages/edit-site/src/components/save-button/index.js
index e7eac94de5f31..461264bd5a563 100644
--- a/packages/edit-site/src/components/save-button/index.js
+++ b/packages/edit-site/src/components/save-button/index.js
@@ -34,9 +34,7 @@ export default function SaveButton( {
 			const dirtyEntityRecords = __experimentalGetDirtyEntityRecords();
 			const { isSaveViewOpened } = select( editSiteStore );
 			const isActivatingTheme = isResolving( 'activateTheme' );
-			const previewingTheme = select( coreStore ).getTheme(
-				currentlyPreviewingTheme()
-			);
+			const currentlyPreviewingThemeId = currentlyPreviewingTheme();
 
 			return {
 				isDirty: dirtyEntityRecords.length > 0,
@@ -49,7 +47,12 @@ 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 );
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 fe9f046f31972..329103bd2b97d 100644
--- a/packages/edit-site/src/components/sidebar-dataviews/default-views.js
+++ b/packages/edit-site/src/components/sidebar-dataviews/default-views.js
@@ -15,7 +15,9 @@ import {
 } from '../../utils/constants';
 
 export const DEFAULT_CONFIG_PER_VIEW_TYPE = {
-	[ LAYOUT_TABLE ]: {},
+	[ LAYOUT_TABLE ]: {
+		primaryField: 'title',
+	},
 	[ LAYOUT_GRID ]: {
 		mediaField: 'featured-image',
 		primaryField: 'title',
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 9ab6f58c81b21..becefe8841fa6 100644
--- a/packages/edit-site/src/components/sidebar-navigation-screen/index.js
+++ b/packages/edit-site/src/components/sidebar-navigation-screen/index.js
@@ -41,17 +41,26 @@ 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 icon = isRTL() ? chevronRight : chevronLeft;
 
 	return (
@@ -108,7 +117,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/index.js b/packages/edit-site/src/components/sidebar/index.js
index 73c6aea7e328c..1d0be62982e87 100644
--- a/packages/edit-site/src/components/sidebar/index.js
+++ b/packages/edit-site/src/components/sidebar/index.js
@@ -76,7 +76,11 @@ function SidebarScreens() {
 				<SidebarNavigationScreenPage />
 			</SidebarScreenWrapper>
 			<SidebarScreenWrapper path="/:postType(wp_template)">
-				<SidebarNavigationScreenTemplates />
+				{ window?.__experimentalAdminViews ? (
+					<SidebarNavigationScreenTemplatesBrowse />
+				) : (
+					<SidebarNavigationScreenTemplates />
+				) }
 			</SidebarScreenWrapper>
 			<SidebarScreenWrapper path="/patterns">
 				<SidebarNavigationScreenPatterns />
diff --git a/packages/edit-site/src/components/site-hub/index.js b/packages/edit-site/src/components/site-hub/index.js
index 7af0d53090c57..f79df2df36709 100644
--- a/packages/edit-site/src/components/site-hub/index.js
+++ b/packages/edit-site/src/components/site-hub/index.js
@@ -180,7 +180,10 @@ const SiteHub = memo( ( { isTransparent, className } ) => {
 								'View site (opens in a new tab)'
 							) }
 							icon={ external }
-							className="edit-site-site-hub__site-view-link"
+							className={ classnames(
+								'edit-site-site-hub__site-view-link',
+								{ 'is-transparent': isTransparent }
+							) }
 						/>
 					) }
 				</HStack>
diff --git a/packages/edit-site/src/components/site-hub/style.scss b/packages/edit-site/src/components/site-hub/style.scss
index 0fda40c2e8a9a..ef063c39841fc 100644
--- a/packages/edit-site/src/components/site-hub/style.scss
+++ b/packages/edit-site/src/components/site-hub/style.scss
@@ -9,6 +9,7 @@
 	}
 
 	.edit-site-site-hub__site-title,
+	.edit-site-site-hub__site-view-link,
 	.edit-site-site-hub_toggle-command-center {
 		transition: opacity ease 0.1s;
 
@@ -20,22 +21,10 @@
 	.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;
-		}
-	}
 }
 
 .edit-site-site-hub__post-type {
diff --git a/packages/edit-site/src/components/site-icon/style.scss b/packages/edit-site/src/components/site-icon/style.scss
index ac16279c9fe18..fc680166bf269 100644
--- a/packages/edit-site/src/components/site-icon/style.scss
+++ b/packages/edit-site/src/components/site-icon/style.scss
@@ -9,7 +9,7 @@
 	object-fit: cover;
 	background: #333;
 
-	.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/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 7b1321fdf4b8a..11c065cf862db 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
@@ -27,7 +27,7 @@ const postTypesWithoutParentTemplate = [
 	PATTERN_TYPES.user,
 ];
 
-function useResolveEditedEntityAndContext( { postId, postType } ) {
+function useResolveEditedEntityAndContext( { path, postId, postType } ) {
 	const { hasLoadedAllDependencies, homepageId, url, frontPageTemplateId } =
 		useSelect( ( select ) => {
 			const { getSite, getUnstableBase, getEntityRecords } =
@@ -128,10 +128,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,
 				} );
 			}
 
@@ -144,6 +159,11 @@ function useResolveEditedEntityAndContext( { postId, postType } ) {
 				return resolveTemplateForPostTypeAndId( postType, postId );
 			}
 
+			// Some URLs in list views are different
+			if ( path === '/page' && postId ) {
+				return resolveTemplateForPostTypeAndId( 'page', postId );
+			}
+
 			// If we're rendering the home page, and we have a static home page, resolve its template.
 			if ( homepageId ) {
 				return resolveTemplateForPostTypeAndId( 'page', homepageId );
@@ -161,6 +181,7 @@ function useResolveEditedEntityAndContext( { postId, postType } ) {
 			url,
 			postId,
 			postType,
+			path,
 			frontPageTemplateId,
 		]
 	);
@@ -174,12 +195,25 @@ function useResolveEditedEntityAndContext( { postId, postType } ) {
 			return { postType, postId };
 		}
 
+		// Some URLs in list views are different
+		if ( path === '/page' && postId ) {
+			return { postType: 'page', postId };
+		}
+
 		if ( homepageId ) {
 			return { postType: 'page', postId: homepageId };
 		}
 
 		return {};
-	}, [ homepageId, postType, postId ] );
+	}, [ homepageId, postType, postId, path ] );
+
+	if (
+		( path === '/wp_template/all' ||
+			( path === '/wp_template' && window?.__experimentalAdminViews ) ) &&
+		postId
+	) {
+		return { isReady: true, postType: 'wp_template', postId, context };
+	}
 
 	if ( postTypesWithoutParentTemplate.includes( postType ) ) {
 		return { isReady: true, postType, postId, context };
@@ -197,7 +231,8 @@ 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 );
 
@@ -209,8 +244,3 @@ export function useInitEditedEntity( params ) {
 		}
 	}, [ isReady, postType, postId, context, setEditedEntity ] );
 }
-
-export default function useInitEditedEntityFromURL() {
-	const { params = {} } = useLocation();
-	return useInitEditedEntity( params );
-}
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
index 5f176dff8198d..3eb6d6e6f4fad 100644
--- 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
@@ -82,6 +82,7 @@ export default function useSyncPathWithURL() {
 					postType: navigatorParams?.postType,
 					postId: navigatorParams?.postId,
 					path: undefined,
+					layout: undefined,
 				} );
 			} else if (
 				navigatorLocation.path.startsWith( '/page/' ) &&
@@ -91,6 +92,7 @@ export default function useSyncPathWithURL() {
 					postType: 'page',
 					postId: navigatorParams?.postId,
 					path: undefined,
+					layout: undefined,
 				} );
 			} else if ( navigatorLocation.path === '/patterns' ) {
 				updateUrlParams( {
@@ -99,12 +101,29 @@ export default function useSyncPathWithURL() {
 					canvas: undefined,
 					path: navigatorLocation.path,
 				} );
+			} else if (
+				// These sidebar paths are special in the sense that the url in these pages may or may not have a postId and we need to retain it if it has.
+				// The "type" property should be kept as well.
+				( navigatorLocation.path === '/page' &&
+					window?.__experimentalAdminViews ) ||
+				( navigatorLocation.path === '/wp_template' &&
+					window?.__experimentalAdminViews ) ||
+				( navigatorLocation.path === '/wp_template/all' &&
+					! window?.__experimentalAdminViews )
+			) {
+				updateUrlParams( {
+					postType: undefined,
+					categoryType: undefined,
+					categoryId: undefined,
+					path: navigatorLocation.path,
+				} );
 			} else {
 				updateUrlParams( {
 					postType: undefined,
 					postId: undefined,
 					categoryType: undefined,
 					categoryId: undefined,
+					layout: undefined,
 					path:
 						navigatorLocation.path === '/'
 							? undefined
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 0407b85c4e8bc..4844ec6d03eb5 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
@@ -389,30 +389,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 { ...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
index e60b7945448e7..1c5c47a68fbfb 100644
--- a/packages/edit-site/src/hooks/template-part-edit.js
+++ b/packages/edit-site/src/hooks/template-part-edit.js
@@ -52,16 +52,14 @@ function EditTemplatePartMenuItem( { attributes } ) {
 	}
 
 	return (
-		<BlockControls group="other">
-			<ToolbarButton
-				{ ...linkProps }
-				onClick={ ( event ) => {
-					linkProps.onClick( event );
-				} }
-			>
-				{ __( 'Edit' ) }
-			</ToolbarButton>
-		</BlockControls>
+		<ToolbarButton
+			{ ...linkProps }
+			onClick={ ( event ) => {
+				linkProps.onClick( event );
+			} }
+		>
+			{ __( 'Edit' ) }
+		</ToolbarButton>
 	);
 }
 
@@ -72,9 +70,11 @@ export const withEditBlockControls = createHigherOrderComponent(
 
 		return (
 			<>
-				<BlockEdit { ...props } />
+				<BlockEdit key="edit" { ...props } />
 				{ isDisplayed && (
-					<EditTemplatePartMenuItem attributes={ attributes } />
+					<BlockControls group="other">
+						<EditTemplatePartMenuItem attributes={ attributes } />
+					</BlockControls>
 				) }
 			</>
 		);
diff --git a/packages/edit-site/src/utils/get-is-list-page.js b/packages/edit-site/src/utils/get-is-list-page.js
index 9530cd85bf04b..3028b0e65d786 100644
--- a/packages/edit-site/src/utils/get-is-list-page.js
+++ b/packages/edit-site/src/utils/get-is-list-page.js
@@ -16,6 +16,7 @@ export default function getIsListPage(
 	return (
 		[ '/wp_template/all', '/wp_template_part/all' ].includes( path ) ||
 		( path === '/page' && window?.__experimentalAdminViews ) ||
+		( path === '/wp_template' && window?.__experimentalAdminViews ) ||
 		( path === '/patterns' &&
 			// Don't treat "/patterns" without categoryType and categoryId as a
 			// list page in mobile because the sidebar covers the whole page.
diff --git a/packages/edit-widgets/CHANGELOG.md b/packages/edit-widgets/CHANGELOG.md
index 34fb6a54d8c25..efef3dd674b80 100644
--- a/packages/edit-widgets/CHANGELOG.md
+++ b/packages/edit-widgets/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 5.26.0 (2024-01-10)
+
 ## 5.25.0 (2023-12-13)
 
 ## 5.24.0 (2023-11-29)
diff --git a/packages/edit-widgets/package.json b/packages/edit-widgets/package.json
index 974a0ba02905f..8861148d173ca 100644
--- a/packages/edit-widgets/package.json
+++ b/packages/edit-widgets/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/edit-widgets",
-	"version": "5.25.0",
+	"version": "5.26.0",
 	"description": "Widgets Page module for WordPress..",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/editor/CHANGELOG.md b/packages/editor/CHANGELOG.md
index dc8fffd379798..4484201d28fcc 100644
--- a/packages/editor/CHANGELOG.md
+++ b/packages/editor/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 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`.
diff --git a/packages/editor/package.json b/packages/editor/package.json
index 63656899e587c..b974c7443851f 100644
--- a/packages/editor/package.json
+++ b/packages/editor/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/editor",
-	"version": "13.25.0",
+	"version": "13.26.0",
 	"description": "Enhanced block editor for WordPress posts.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/editor/src/components/editor-canvas/index.js b/packages/editor/src/components/editor-canvas/index.js
index e5e663f821a64..d6084ef922805 100644
--- a/packages/editor/src/components/editor-canvas/index.js
+++ b/packages/editor/src/components/editor-canvas/index.js
@@ -364,7 +364,8 @@ function EditorCanvas( {
 						'is-' + deviceType.toLowerCase() + '-preview',
 						renderingMode !== 'post-only'
 							? 'wp-site-blocks'
-							: `${ blockListLayoutClass } wp-block-post-content` // Ensure root level blocks receive default/flow blockGap styling rules.
+							: `${ blockListLayoutClass } wp-block-post-content`, // Ensure root level blocks receive default/flow blockGap styling rules.
+						renderingMode !== 'all' && 'is-' + renderingMode
 					) }
 					layout={ blockListLayout }
 					dropZoneElement={
diff --git a/packages/element/CHANGELOG.md b/packages/element/CHANGELOG.md
index 89c422ad27a0b..e57fc1e022e45 100644
--- a/packages/element/CHANGELOG.md
+++ b/packages/element/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 5.26.0 (2024-01-10)
+
 ## 5.25.0 (2023-12-13)
 
 ## 5.24.0 (2023-11-29)
diff --git a/packages/element/package.json b/packages/element/package.json
index 6ce4714c25f0b..9f075bdfff56d 100644
--- a/packages/element/package.json
+++ b/packages/element/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/element",
-	"version": "5.25.0",
+	"version": "5.26.0",
 	"description": "Element React module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/env/CHANGELOG.md b/packages/env/CHANGELOG.md
index 6605add780096..154e8d36b3b44 100644
--- a/packages/env/CHANGELOG.md
+++ b/packages/env/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 9.1.0 (2024-01-10)
+
 ## 9.0.0 (2023-12-13)
 
 ### Breaking Change
diff --git a/packages/env/package.json b/packages/env/package.json
index cd3fd075568e2..5036479faa532 100644
--- a/packages/env/package.json
+++ b/packages/env/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/env",
-	"version": "9.0.0",
+	"version": "9.1.0",
 	"description": "A zero-config, self contained local WordPress environment for development and testing.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/escape-html/CHANGELOG.md b/packages/escape-html/CHANGELOG.md
index 7b5f651626528..8cb9c60a82c57 100644
--- a/packages/escape-html/CHANGELOG.md
+++ b/packages/escape-html/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 2.49.0 (2024-01-10)
+
 ## 2.48.0 (2023-12-13)
 
 ## 2.47.0 (2023-11-29)
diff --git a/packages/escape-html/package.json b/packages/escape-html/package.json
index 2618d5818400c..cfeabcb8c06e9 100644
--- a/packages/escape-html/package.json
+++ b/packages/escape-html/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/escape-html",
-	"version": "2.48.0",
+	"version": "2.49.0",
 	"description": "Escape HTML utils.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/eslint-plugin/CHANGELOG.md b/packages/eslint-plugin/CHANGELOG.md
index 533c5e7788c66..10e82685d7b74 100644
--- a/packages/eslint-plugin/CHANGELOG.md
+++ b/packages/eslint-plugin/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 17.6.0 (2024-01-10)
+
 ## 17.5.0 (2023-12-13)
 
 ## 17.4.0 (2023-11-29)
diff --git a/packages/eslint-plugin/package.json b/packages/eslint-plugin/package.json
index ef0931dfb2c6c..b56a61ab16044 100644
--- a/packages/eslint-plugin/package.json
+++ b/packages/eslint-plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/eslint-plugin",
-	"version": "17.5.0",
+	"version": "17.6.0",
 	"description": "ESLint plugin for WordPress development.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/format-library/CHANGELOG.md b/packages/format-library/CHANGELOG.md
index 8b3d314e9a0f2..1ea92da62e1a4 100644
--- a/packages/format-library/CHANGELOG.md
+++ b/packages/format-library/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 4.26.0 (2024-01-10)
+
 ## 4.25.0 (2023-12-13)
 
 ## 4.24.0 (2023-11-29)
diff --git a/packages/format-library/package.json b/packages/format-library/package.json
index b71addc176e7c..280fd5d8c2042 100644
--- a/packages/format-library/package.json
+++ b/packages/format-library/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/format-library",
-	"version": "4.25.0",
+	"version": "4.26.0",
 	"description": "Format library for the WordPress editor.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/hooks/CHANGELOG.md b/packages/hooks/CHANGELOG.md
index c428f26ed17f1..7b71f8d382f01 100644
--- a/packages/hooks/CHANGELOG.md
+++ b/packages/hooks/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 3.49.0 (2024-01-10)
+
 ## 3.48.0 (2023-12-13)
 
 ## 3.47.0 (2023-11-29)
diff --git a/packages/hooks/package.json b/packages/hooks/package.json
index 0c29dacb17895..08fa1eb54819c 100644
--- a/packages/hooks/package.json
+++ b/packages/hooks/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/hooks",
-	"version": "3.48.0",
+	"version": "3.49.0",
 	"description": "WordPress hooks library.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/html-entities/CHANGELOG.md b/packages/html-entities/CHANGELOG.md
index d7c1b049e3790..ba88048d21a5a 100644
--- a/packages/html-entities/CHANGELOG.md
+++ b/packages/html-entities/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 3.49.0 (2024-01-10)
+
 ## 3.48.0 (2023-12-13)
 
 ## 3.47.0 (2023-11-29)
diff --git a/packages/html-entities/package.json b/packages/html-entities/package.json
index 92e85598707b9..10965eaf51fab 100644
--- a/packages/html-entities/package.json
+++ b/packages/html-entities/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/html-entities",
-	"version": "3.48.0",
+	"version": "3.49.0",
 	"description": "HTML entity utilities for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/i18n/CHANGELOG.md b/packages/i18n/CHANGELOG.md
index f227f81571087..cca18773c660e 100644
--- a/packages/i18n/CHANGELOG.md
+++ b/packages/i18n/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 4.49.0 (2024-01-10)
+
 ## 4.48.0 (2023-12-13)
 
 ## 4.47.0 (2023-11-29)
diff --git a/packages/i18n/package.json b/packages/i18n/package.json
index 7346330946e19..a2b2ed907cf96 100644
--- a/packages/i18n/package.json
+++ b/packages/i18n/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/i18n",
-	"version": "4.48.0",
+	"version": "4.49.0",
 	"description": "WordPress internationalization (i18n) library.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/icons/CHANGELOG.md b/packages/icons/CHANGELOG.md
index df0e3e43b1d81..a5ca30a014f1d 100644
--- a/packages/icons/CHANGELOG.md
+++ b/packages/icons/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 9.40.0 (2024-01-10)
+
 ## 9.39.0 (2023-12-13)
 
 ## 9.38.0 (2023-11-29)
diff --git a/packages/icons/package.json b/packages/icons/package.json
index 31ebc3c57d129..b94cb445b5760 100644
--- a/packages/icons/package.json
+++ b/packages/icons/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/icons",
-	"version": "9.39.0",
+	"version": "9.40.0",
 	"description": "WordPress Icons package, based on dashicon.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/interactivity/CHANGELOG.md b/packages/interactivity/CHANGELOG.md
index ff0c4942abb3f..d660032cbc038 100644
--- a/packages/interactivity/CHANGELOG.md
+++ b/packages/interactivity/CHANGELOG.md
@@ -2,9 +2,27 @@
 
 ## Unreleased
 
+### 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))
+
 ### 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))
+
+### 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))
+
+### Bug Fix
+
+-   Prevent `wp-data-on=""` from creating `onDefault` handlers. ([#57925](https://github.com/WordPress/gutenberg/pull/57925))
+
+## 3.2.0 (2024-01-10)
 
 ### Bug Fix
 
diff --git a/packages/interactivity/docs/2-api-reference.md b/packages/interactivity/docs/2-api-reference.md
index 7980c31b984f8..922662c10a8e2 100644
--- a/packages/interactivity/docs/2-api-reference.md
+++ b/packages/interactivity/docs/2-api-reference.md
@@ -20,6 +20,8 @@ DOM elements are connected to data stored in the state and context through direc
     - [`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-on-window`](#wp-on-window) ![](https://img.shields.io/badge/EVENT_HANDLERS-afd2e3.svg)
+    - [`wp-on-document`](#wp-on-document) ![](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-run`](#wp-run) ![](https://img.shields.io/badge/SIDE_EFFECTS-afd2e3.svg)
@@ -55,7 +57,7 @@ _Example of directives used in the HTML markup_
   >
     Toggle
   </button>
- 
+
   <p id="p-1" data-bind--hidden="!context.isOpen">
     This element is now visible!
   </p>
@@ -68,13 +70,13 @@ Directives can also be injected dynamically using the [HTML Tag Processor](https
 
 With directives, we can directly manage behavior related to things such as side effects, state, event handlers, attributes or content.
 
-#### `wp-interactive` 
+#### `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 
+<div
   data-wp-interactive='{ "namespace": "myPlugin" }'
   data-wp-context='{ "myColor" : "red", "myBgColor": "yellow" }'
 >
@@ -88,13 +90,13 @@ The `wp-interactive` directive "activates" the interactivity for the DOM element
 > **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` 
+#### `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_ 
+_Example of `wp-context` directive_
 
 ```php
 //render.php
@@ -139,13 +141,13 @@ Different contexts can be defined at different levels, and deeper levels will me
 </div>
 ```
 
-#### `wp-bind` 
+#### `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_ 
+_Example of `wp-bind` directive_
 
 ```html
 <li data-wp-context='{ "isMenuOpen": false }'>
@@ -183,10 +185,10 @@ store( "myPlugin", {
 
 The `wp-bind` directive is executed:
 
-- When the element is created. 
+- 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: 
+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.
@@ -198,24 +200,24 @@ The `wp-bind` will do different things over the DOM element is applied, dependin
   - 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` 
+#### `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_ 
+_Example of `wp-class` directive_
 
 ```html
 <div>
-  <li 
+  <li
     data-wp-context='{ "isSelected": false }'
     data-wp-on--click="actions.toggleSelection"
     data-wp-class--selected="context.isSelected"
   >
     Option 1
   </li>
-  <li 
+  <li
     data-wp-context='{ "isSelected": false }'
     data-wp-on--click="actions.toggleSelection"
     data-wp-class--selected="context.isSelected"
@@ -251,13 +253,13 @@ When `wp-class` directive references a callback to get its final boolean value,
 
 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` 
+#### `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_ 
+_Example of `wp-style` directive_
 
 ```html
 <div data-wp-context='{ "color": "red" }' >
@@ -296,7 +298,7 @@ The value received by the directive is used to add or remove the style attribute
 - 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` 
+#### `wp-text`
 
 It sets the inner text of an HTML element.
 
@@ -333,13 +335,13 @@ The `wp-text` directive is executed:
 
 The returned value is used to change the inner content of the element: `<div>value</div>`.
 
-#### `wp-on` 
+#### `wp-on`
 
-It runs code on dispatched DOM events like `click` or `keyup`. 
+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_ 
+_Example of `wp-on` directive_
 
 ```php
 <button data-wp-on--click="actions.logTime" >
@@ -363,20 +365,86 @@ store( "myPlugin", {
 </details>
 <br/>
 
-The `wp-on` directive is executed each time the associated event is triggered. 
+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` 
+#### `wp-on-window`
+
+It allows to attach global window events like `resize`, `copy`, `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`).
+
+_Example of `wp-on-window` directive_
+
+```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>
+<br/>
+
+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-document`
+
+It allows to attach global document events like `scroll`, `mousemove`, `keydown` and then execute a defined callback when those happen.
 
-It runs a callback **when the node is created and runs it again when the state or context changes**. 
+[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`).
+
+_Example of `wp-on-document` directive_
+
+```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>
+<br/>
+
+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-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 
+<div
   data-wp-context='{ "counter": 0 }'
   data-wp-watch="callbacks.logCounter"
 >
@@ -396,14 +464,14 @@ store( "myPlugin", {
       const context = getContext();
       context.counter++;
     },
-    decreaseCounter: () => {	
+    decreaseCounter: () => {
       const context = getContext();
       context.counter--;
     },
   },
   callbacks: {
     logCounter: () => {
-      const { counter } = getContext(); 
+      const { counter } = getContext();
       console.log("Counter is " + counter + " at " + new Date() );
     },
   },
@@ -427,13 +495,13 @@ As a reference, some use cases for this directive may be:
 - Setting the focus on an element with `.focus()`.
 - Changing the state or context when certain conditions are met.
 
-#### `wp-init` 
+#### `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_ 
+_Example of `data-wp-init` directive_
 
 ```html
 <div data-wp-init="callbacks.logTimeInit">
@@ -444,8 +512,8 @@ _Example of `data-wp-init` directive_
 _Example of several `wp-init` directives on the same DOM element_
 
 ```html
-<form 
-  data-wp-init--log="callbacks.logTimeInit" 
+<form
+  data-wp-init--log="callbacks.logTimeInit"
   data-wp-init--focus="callbacks.focusFirstElement"
 >
   <input type="text">
@@ -472,7 +540,7 @@ store( "myPlugin", {
 
 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` 
+#### `wp-run`
 
 It runs the passed callback **during node's render execution**.
 
@@ -480,7 +548,7 @@ You can use and compose hooks like `useState`, `useWatch` or `useEffect` inside
 
 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 than the other unique ids of the `wp-run` directives of that DOM element._
 
-_Example of `data-wp-run` directive_ 
+_Example of `data-wp-run` directive_
 
 ```html
 <div data-wp-run="callbacks.logInView">
@@ -528,7 +596,7 @@ store( 'myPlugin', {
 </details>
 <br/>
 
-#### `wp-key` 
+#### `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.
 
@@ -536,18 +604,18 @@ The key should be a string that uniquely identifies the element among its siblin
 
 ```html
 <ul>
-  <li data-wp-key="unique-id-1">Item 1</li> 
+  <li data-wp-key="unique-id-1">Item 1</li>
   <li data-wp-key="unique-id-2">Item 2</li>
-</ul>  
+</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="previous-page" ...>Previous page</a>
   <a data-wp-key="next-page" ...>Next page</a>
-</div>  
+</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.
@@ -564,7 +632,7 @@ const { state } = store( "myPlugin", {
     currentVideo: '',
     get isPlaying() {
       return state.currentVideo !== '';
-    } 
+    }
   },
 } );
 ```
@@ -599,13 +667,13 @@ The store is used to create the logic (actions, side effects…) linked to the d
 
 ### Elements of the store
 
-#### State 
+#### 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!" }'>
 
@@ -634,11 +702,11 @@ const { state } = store( "myPlugin", {
 } )
 ```
 
-#### Actions 
+#### Actions
 
 Usually triggered by the `data-wp-on` directive (using event listeners) or other actions.
 
-#### Side Effects 
+#### Side Effects
 
 Automatically react to state changes. Usually triggered by `data-wp-watch` or `data-wp-init` directives.
 
@@ -647,7 +715,7 @@ Automatically react to state changes. Usually triggered by `data-wp-watch` or `d
 They return a computed version of the state. They can access both `state` and `context`.
 
 ```js
-// view.js  
+// view.js
 const { state } = store( "myPlugin", {
   state: {
     amount: 34,
@@ -698,7 +766,7 @@ const { state } = store( "myPlugin", {
 > **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 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
@@ -740,7 +808,7 @@ This approach enables some functionalities that make directives flexible and pow
 
 *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`.  
+The `store` method used to set the store in javascript can be imported from `@wordpress/interactivity`.
 
 ```js
 // store
@@ -768,11 +836,11 @@ store( "myPlugin", {
 > **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 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. 
+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 }`_
 
diff --git a/packages/interactivity/package.json b/packages/interactivity/package.json
index c856628c5d79e..35c8dd2d85bd8 100644
--- a/packages/interactivity/package.json
+++ b/packages/interactivity/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/interactivity",
-	"version": "3.1.0",
+	"version": "3.2.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",
@@ -26,9 +26,9 @@
 	"react-native": "src/index",
 	"types": "build-types",
 	"dependencies": {
-		"@preact/signals": "^1.1.3",
-		"deepsignal": "^1.3.6",
-		"preact": "^10.13.2"
+		"@preact/signals": "^1.2.2",
+		"deepsignal": "^1.4.0",
+		"preact": "^10.19.3"
 	},
 	"publishConfig": {
 		"access": "public"
diff --git a/packages/interactivity/src/directives.js b/packages/interactivity/src/directives.js
index e9cc66fa50a6f..25ba92808614d 100644
--- a/packages/interactivity/src/directives.js
+++ b/packages/interactivity/src/directives.js
@@ -1,13 +1,7 @@
 /**
  * External dependencies
  */
-import {
-	useContext,
-	useMemo,
-	useEffect,
-	useRef,
-	useLayoutEffect,
-} from 'preact/hooks';
+import { useContext, useMemo, useRef } from 'preact/hooks';
 import { deepSignal, peek } from 'deepsignal';
 
 /**
@@ -16,8 +10,6 @@ import { deepSignal, peek } from 'deepsignal';
 import { createPortal } from './portals';
 import { useWatch, useInit } 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 );
@@ -36,6 +28,64 @@ const mergeDeepSignals = ( target, source, overwrite ) => {
 	}
 };
 
+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 ];
+};
+
+/**
+ * Creates a directive that adds an event listener to the global window or
+ * document object.
+ *
+ * @param {string} type 'window' or 'document'
+ * @return {void}
+ */
+const getGlobalEventDirective =
+	( type ) =>
+	( { directives, evaluate } ) => {
+		directives[ `on-${ type }` ]
+			.filter( ( { suffix } ) => suffix !== 'default' )
+			.forEach( ( entry ) => {
+				useInit( () => {
+					const cb = ( event ) => evaluate( entry, event );
+					const globalVar = type === 'window' ? window : document;
+					globalVar.addEventListener( entry.suffix, cb );
+					return () =>
+						globalVar.removeEventListener( entry.suffix, cb );
+				}, [] );
+			} );
+	};
+
 export default () => {
 	// data-wp-context
 	directive(
@@ -88,13 +138,20 @@ export default () => {
 
 	// data-wp-on--[event]
 	directive( 'on', ( { directives: { on }, element, evaluate } ) => {
-		on.forEach( ( entry ) => {
-			element.props[ `on${ entry.suffix }` ] = ( event ) => {
-				evaluate( entry, event );
-			};
-		} );
+		on.filter( ( { suffix } ) => suffix !== 'default' ).forEach(
+			( entry ) => {
+				element.props[ `on${ entry.suffix }` ] = ( event ) => {
+					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-class--[classname]
 	directive(
 		'class',
@@ -132,41 +189,6 @@ export default () => {
 		}
 	);
 
-	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
@@ -202,17 +224,6 @@ export default () => {
 				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
@@ -265,48 +276,6 @@ export default () => {
 		);
 	} );
 
-	// 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',
@@ -330,67 +299,15 @@ export default () => {
 	// data-wp-text
 	directive( 'text', ( { directives: { text }, element, evaluate } ) => {
 		const entry = text.find( ( { suffix } ) => suffix === 'default' );
-		element.props.children = evaluate( entry );
+		try {
+			const result = evaluate( entry );
+			element.props.children =
+				typeof result === 'object' ? null : result.toString();
+		} catch ( e ) {
+			element.props.children = null;
+		}
 	} );
 
-	// 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 }
-	);
-
 	// data-wp-run
 	directive( 'run', ( { directives: { run }, evaluate } ) => {
 		run.forEach( ( entry ) => evaluate( entry ) );
diff --git a/packages/interactivity/src/hooks.tsx b/packages/interactivity/src/hooks.tsx
index 14f0dc6683b46..0f3bb145b6559 100644
--- a/packages/interactivity/src/hooks.tsx
+++ b/packages/interactivity/src/hooks.tsx
@@ -3,7 +3,6 @@
  */
 import { h, options, createContext, cloneElement } from 'preact';
 import { useRef, useCallback, useContext } from 'preact/hooks';
-import { deepSignal } from 'deepsignal';
 import type { VNode, Context, RefObject } from 'preact';
 
 /**
@@ -60,8 +59,7 @@ interface Scope {
 	evaluate: Evaluate;
 	context: Context< any >;
 	ref: RefObject< HTMLElement >;
-	state: any;
-	props: any;
+	attributes: h.JSX.HTMLAttributes;
 }
 
 interface Evaluate {
@@ -142,11 +140,10 @@ export const getElement = () => {
 			'Cannot call `getElement()` outside getters and actions used by directives.'
 		);
 	}
-	const { ref, state, props } = getScope();
+	const { ref, attributes } = getScope();
 	return Object.freeze( {
 		ref: ref.current,
-		state,
-		props: deepImmutable( props ),
+		attributes: deepImmutable( attributes ),
 	} );
 };
 
@@ -313,12 +310,12 @@ const Directives = ( {
 	scope.context = useContext( context );
 	/* 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 =
diff --git a/packages/interactivity/src/slots.js b/packages/interactivity/src/slots.js
deleted file mode 100644
index e8bc6ddfa368f..0000000000000
--- 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/interface/CHANGELOG.md b/packages/interface/CHANGELOG.md
index 90e0326e02a47..a684dc5a6a4ef 100644
--- a/packages/interface/CHANGELOG.md
+++ b/packages/interface/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 5.26.0 (2024-01-10)
+
 ## 5.25.0 (2023-12-13)
 
 ## 5.24.0 (2023-11-29)
diff --git a/packages/interface/package.json b/packages/interface/package.json
index 7356a7b52d1d4..feebc542d3a78 100644
--- a/packages/interface/package.json
+++ b/packages/interface/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/interface",
-	"version": "5.25.0",
+	"version": "5.26.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",
diff --git a/packages/interface/src/components/interface-skeleton/index.js b/packages/interface/src/components/interface-skeleton/index.js
index baf98d153ed87..8d6a060259a29 100644
--- a/packages/interface/src/components/interface-skeleton/index.js
+++ b/packages/interface/src/components/interface-skeleton/index.js
@@ -11,7 +11,7 @@ import {
 	__unstableUseNavigateRegions as useNavigateRegions,
 	__unstableMotion as motion,
 } from '@wordpress/components';
-import { __ } from '@wordpress/i18n';
+import { __, _x } from '@wordpress/i18n';
 import { useMergeRefs } from '@wordpress/compose';
 
 /**
@@ -68,7 +68,7 @@ function InterfaceSkeleton(
 
 	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. */
diff --git a/packages/is-shallow-equal/CHANGELOG.md b/packages/is-shallow-equal/CHANGELOG.md
index 46ad3508ad041..d7d7028dd5e40 100644
--- a/packages/is-shallow-equal/CHANGELOG.md
+++ b/packages/is-shallow-equal/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 4.49.0 (2024-01-10)
+
 ## 4.48.0 (2023-12-13)
 
 ## 4.47.0 (2023-11-29)
diff --git a/packages/is-shallow-equal/package.json b/packages/is-shallow-equal/package.json
index 6969d6a2fe8a0..f2600696d54d6 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.48.0",
+	"version": "4.49.0",
 	"description": "Test for shallow equality between two objects or arrays.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/jest-console/CHANGELOG.md b/packages/jest-console/CHANGELOG.md
index bf9aba56a98e1..f82d95dc08cd4 100644
--- a/packages/jest-console/CHANGELOG.md
+++ b/packages/jest-console/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 7.20.0 (2024-01-10)
+
 ## 7.19.0 (2023-12-13)
 
 ## 7.18.0 (2023-11-29)
diff --git a/packages/jest-console/package.json b/packages/jest-console/package.json
index 4a6f249a104d2..4dfdea8d61175 100644
--- a/packages/jest-console/package.json
+++ b/packages/jest-console/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/jest-console",
-	"version": "7.19.0",
+	"version": "7.20.0",
 	"description": "Custom Jest matchers for the Console object.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/jest-preset-default/CHANGELOG.md b/packages/jest-preset-default/CHANGELOG.md
index 5b94554550781..d0525fe187ad5 100644
--- a/packages/jest-preset-default/CHANGELOG.md
+++ b/packages/jest-preset-default/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 11.20.0 (2024-01-10)
+
 ## 11.19.0 (2023-12-13)
 
 ## 11.18.0 (2023-11-29)
diff --git a/packages/jest-preset-default/package.json b/packages/jest-preset-default/package.json
index 7bda9f2e279f2..aa787861ed89d 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.19.0",
+	"version": "11.20.0",
 	"description": "Default Jest preset for WordPress development.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/jest-puppeteer-axe/CHANGELOG.md b/packages/jest-puppeteer-axe/CHANGELOG.md
index 9114f0e043772..89acfcecff4da 100644
--- a/packages/jest-puppeteer-axe/CHANGELOG.md
+++ b/packages/jest-puppeteer-axe/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 6.20.0 (2024-01-10)
+
 ## 6.19.0 (2023-12-13)
 
 ## 6.18.0 (2023-11-29)
diff --git a/packages/jest-puppeteer-axe/package.json b/packages/jest-puppeteer-axe/package.json
index cdd09f7b79165..d30e2ea781286 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.19.0",
+	"version": "6.20.0",
 	"description": "Axe API integration with Jest and Puppeteer.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/keyboard-shortcuts/CHANGELOG.md b/packages/keyboard-shortcuts/CHANGELOG.md
index 32175acb451f5..2af0ab1eb2905 100644
--- a/packages/keyboard-shortcuts/CHANGELOG.md
+++ b/packages/keyboard-shortcuts/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 4.26.0 (2024-01-10)
+
 ## 4.25.0 (2023-12-13)
 
 ## 4.24.0 (2023-11-29)
diff --git a/packages/keyboard-shortcuts/package.json b/packages/keyboard-shortcuts/package.json
index af36a49371a0b..7f336adb52510 100644
--- a/packages/keyboard-shortcuts/package.json
+++ b/packages/keyboard-shortcuts/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/keyboard-shortcuts",
-	"version": "4.25.0",
+	"version": "4.26.0",
 	"description": "Handling keyboard shortcuts.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/keycodes/CHANGELOG.md b/packages/keycodes/CHANGELOG.md
index b65e8f808d595..6fda0148feaa8 100644
--- a/packages/keycodes/CHANGELOG.md
+++ b/packages/keycodes/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 3.49.0 (2024-01-10)
+
 ## 3.48.0 (2023-12-13)
 
 ## 3.47.0 (2023-11-29)
diff --git a/packages/keycodes/package.json b/packages/keycodes/package.json
index ecebbb58eb99f..c5ce48ea8c2c3 100644
--- a/packages/keycodes/package.json
+++ b/packages/keycodes/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/keycodes",
-	"version": "3.48.0",
+	"version": "3.49.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",
diff --git a/packages/lazy-import/CHANGELOG.md b/packages/lazy-import/CHANGELOG.md
index 87ebbe936eaa4..214141e0d476d 100644
--- a/packages/lazy-import/CHANGELOG.md
+++ b/packages/lazy-import/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 1.36.0 (2024-01-10)
+
 ## 1.35.0 (2023-12-13)
 
 ## 1.34.0 (2023-11-29)
diff --git a/packages/lazy-import/package.json b/packages/lazy-import/package.json
index b1967c0d4bedb..8ad948e62408a 100644
--- a/packages/lazy-import/package.json
+++ b/packages/lazy-import/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/lazy-import",
-	"version": "1.35.0",
+	"version": "1.36.0",
 	"description": "Lazily import a module, installing it automatically if missing.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/list-reusable-blocks/CHANGELOG.md b/packages/list-reusable-blocks/CHANGELOG.md
index d1dd89a70ad63..4c153c4539b35 100644
--- a/packages/list-reusable-blocks/CHANGELOG.md
+++ b/packages/list-reusable-blocks/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 4.26.0 (2024-01-10)
+
 ## 4.25.0 (2023-12-13)
 
 ## 4.24.0 (2023-11-29)
diff --git a/packages/list-reusable-blocks/package.json b/packages/list-reusable-blocks/package.json
index bba7e2a7680e5..403809ae7d72a 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.25.0",
+	"version": "4.26.0",
 	"description": "Adding Export/Import support to the reusable blocks listing.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/media-utils/CHANGELOG.md b/packages/media-utils/CHANGELOG.md
index 8d8a13b4ae6ab..d7a8c61e149bf 100644
--- a/packages/media-utils/CHANGELOG.md
+++ b/packages/media-utils/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 4.40.0 (2024-01-10)
+
 ## 4.39.0 (2023-12-13)
 
 ## 4.38.0 (2023-11-29)
diff --git a/packages/media-utils/package.json b/packages/media-utils/package.json
index 1086a79722cb0..b01403efff06e 100644
--- a/packages/media-utils/package.json
+++ b/packages/media-utils/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/media-utils",
-	"version": "4.39.0",
+	"version": "4.40.0",
 	"description": "WordPress Media Upload Utils.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/notices/CHANGELOG.md b/packages/notices/CHANGELOG.md
index 0b4c95da74005..03f5931c9899b 100644
--- a/packages/notices/CHANGELOG.md
+++ b/packages/notices/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 4.17.0 (2024-01-10)
+
 ## 4.16.0 (2023-12-13)
 
 ## 4.15.0 (2023-11-29)
diff --git a/packages/notices/package.json b/packages/notices/package.json
index 7c40413adea51..4f763cb6ed576 100644
--- a/packages/notices/package.json
+++ b/packages/notices/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/notices",
-	"version": "4.16.0",
+	"version": "4.17.0",
 	"description": "State management for notices.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/npm-package-json-lint-config/CHANGELOG.md b/packages/npm-package-json-lint-config/CHANGELOG.md
index 2eaaf4c0df1e9..3978d24103d0c 100644
--- a/packages/npm-package-json-lint-config/CHANGELOG.md
+++ b/packages/npm-package-json-lint-config/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 4.34.0 (2024-01-10)
+
 ## 4.33.0 (2023-12-13)
 
 ## 4.32.0 (2023-11-29)
diff --git a/packages/npm-package-json-lint-config/package.json b/packages/npm-package-json-lint-config/package.json
index 3bbc4c6c2e47f..a05901155c0ad 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.33.0",
+	"version": "4.34.0",
 	"description": "WordPress npm-package-json-lint shareable configuration.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/nux/CHANGELOG.md b/packages/nux/CHANGELOG.md
index 9980b2d629d0b..e20bca5073fb2 100644
--- a/packages/nux/CHANGELOG.md
+++ b/packages/nux/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 8.11.0 (2024-01-10)
+
 ## 8.10.0 (2023-12-13)
 
 ## 8.9.0 (2023-11-29)
diff --git a/packages/nux/package.json b/packages/nux/package.json
index 64511b2fa42d0..e59b11cf9b951 100644
--- a/packages/nux/package.json
+++ b/packages/nux/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/nux",
-	"version": "8.10.0",
+	"version": "8.11.0",
 	"description": "NUX (New User eXperience) module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/patterns/CHANGELOG.md b/packages/patterns/CHANGELOG.md
index 566bd024cf380..10fd61c03f939 100644
--- a/packages/patterns/CHANGELOG.md
+++ b/packages/patterns/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 1.10.0 (2024-01-10)
+
 ## 1.9.0 (2023-12-13)
 
 ## 1.8.0 (2023-11-29)
diff --git a/packages/patterns/package.json b/packages/patterns/package.json
index 54ec5178d640d..bb130b52f8a98 100644
--- a/packages/patterns/package.json
+++ b/packages/patterns/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/patterns",
-	"version": "1.9.0",
+	"version": "1.10.0",
 	"description": "Management of user pattern editing.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/patterns/src/constants.js b/packages/patterns/src/constants.js
index 3e533d834fd75..5fa9ec44f4e3a 100644
--- a/packages/patterns/src/constants.js
+++ b/packages/patterns/src/constants.js
@@ -23,4 +23,14 @@ 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/heading': { content: __( 'Content' ) },
+	'core/button': {
+		text: __( 'Text' ),
+		url: __( 'URL' ),
+	},
+	'core/image': {
+		url: __( 'URL' ),
+		title: __( 'Title' ),
+		alt: __( 'Alt Text' ),
+	},
 };
diff --git a/packages/plugins/CHANGELOG.md b/packages/plugins/CHANGELOG.md
index b41c2e9f112bd..4fc131ebbcbd4 100644
--- a/packages/plugins/CHANGELOG.md
+++ b/packages/plugins/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 6.17.0 (2024-01-10)
+
 ## 6.16.0 (2023-12-13)
 
 ## 6.15.0 (2023-11-29)
diff --git a/packages/plugins/package.json b/packages/plugins/package.json
index b8b63a3c381d7..9341fc509e6a8 100644
--- a/packages/plugins/package.json
+++ b/packages/plugins/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/plugins",
-	"version": "6.16.0",
+	"version": "6.17.0",
 	"description": "Plugins module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/postcss-plugins-preset/CHANGELOG.md b/packages/postcss-plugins-preset/CHANGELOG.md
index 00e7fb9a8c6c4..0599f401fe8e5 100644
--- a/packages/postcss-plugins-preset/CHANGELOG.md
+++ b/packages/postcss-plugins-preset/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 4.33.0 (2024-01-10)
+
 ## 4.32.0 (2023-12-13)
 
 ## 4.31.0 (2023-11-29)
diff --git a/packages/postcss-plugins-preset/package.json b/packages/postcss-plugins-preset/package.json
index 078c6b87a2ec1..0fce1ad734cb9 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.32.0",
+	"version": "4.33.0",
 	"description": "PostCSS sharable plugins preset for WordPress development.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/postcss-themes/CHANGELOG.md b/packages/postcss-themes/CHANGELOG.md
index 7c696adb50733..7cb02c0f86cef 100644
--- a/packages/postcss-themes/CHANGELOG.md
+++ b/packages/postcss-themes/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 5.32.0 (2024-01-10)
+
 ## 5.31.0 (2023-12-13)
 
 ## 5.30.0 (2023-11-29)
diff --git a/packages/postcss-themes/package.json b/packages/postcss-themes/package.json
index 845911ad918e5..9eb9b4c37a647 100644
--- a/packages/postcss-themes/package.json
+++ b/packages/postcss-themes/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/postcss-themes",
-	"version": "5.31.0",
+	"version": "5.32.0",
 	"description": "PostCSS plugin to generate theme colors.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/preferences-persistence/CHANGELOG.md b/packages/preferences-persistence/CHANGELOG.md
index b227aa5ad2373..7eb846236d15b 100644
--- a/packages/preferences-persistence/CHANGELOG.md
+++ b/packages/preferences-persistence/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 1.41.0 (2024-01-10)
+
 ## 1.40.0 (2023-12-13)
 
 ## 1.39.0 (2023-11-29)
diff --git a/packages/preferences-persistence/package.json b/packages/preferences-persistence/package.json
index e17080383749e..1c40eeb80d3ba 100644
--- a/packages/preferences-persistence/package.json
+++ b/packages/preferences-persistence/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/preferences-persistence",
-	"version": "1.40.0",
+	"version": "1.41.0",
 	"description": "Persistence utilities for `wordpress/preferences`.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/preferences/CHANGELOG.md b/packages/preferences/CHANGELOG.md
index 363f62c70b3d9..6d5b2a7c62c3c 100644
--- a/packages/preferences/CHANGELOG.md
+++ b/packages/preferences/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 3.26.0 (2024-01-10)
+
 ## 3.25.0 (2023-12-13)
 
 ## 3.24.0 (2023-11-29)
diff --git a/packages/preferences/package.json b/packages/preferences/package.json
index e1164a7a1306c..7cab99bfab032 100644
--- a/packages/preferences/package.json
+++ b/packages/preferences/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/preferences",
-	"version": "3.25.0",
+	"version": "3.26.0",
 	"description": "Utilities for managing WordPress preferences.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -33,6 +33,7 @@
 		"@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",
diff --git a/packages/preferences/src/store/selectors.js b/packages/preferences/src/store/selectors.js
index 58b4d18bc362a..e249acf7bbdd3 100644
--- a/packages/preferences/src/store/selectors.js
+++ b/packages/preferences/src/store/selectors.js
@@ -1,3 +1,43 @@
+/**
+ * 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',
+	];
+
+	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 +48,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/prettier-config/CHANGELOG.md b/packages/prettier-config/CHANGELOG.md
index be847570c06f7..4b05f17c43abf 100644
--- a/packages/prettier-config/CHANGELOG.md
+++ b/packages/prettier-config/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 3.6.0 (2024-01-10)
+
 ## 3.5.0 (2023-12-13)
 
 ## 3.4.0 (2023-11-29)
diff --git a/packages/prettier-config/package.json b/packages/prettier-config/package.json
index 047963ddde99b..3dc8c49a3b1f0 100644
--- a/packages/prettier-config/package.json
+++ b/packages/prettier-config/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/prettier-config",
-	"version": "3.5.0",
+	"version": "3.6.0",
 	"description": "WordPress Prettier shared configuration.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/primitives/CHANGELOG.md b/packages/primitives/CHANGELOG.md
index bbea3951de7c9..0effaef62c372 100644
--- a/packages/primitives/CHANGELOG.md
+++ b/packages/primitives/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 3.47.0 (2024-01-10)
+
 ## 3.46.0 (2023-12-13)
 
 ## 3.45.0 (2023-11-29)
diff --git a/packages/primitives/package.json b/packages/primitives/package.json
index 614e586c7efe2..3aa66baee21da 100644
--- a/packages/primitives/package.json
+++ b/packages/primitives/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/primitives",
-	"version": "3.46.0",
+	"version": "3.47.0",
 	"description": "WordPress cross-platform primitives.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/priority-queue/CHANGELOG.md b/packages/priority-queue/CHANGELOG.md
index dc82da748d2eb..ccb782a2fb156 100644
--- a/packages/priority-queue/CHANGELOG.md
+++ b/packages/priority-queue/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 2.49.0 (2024-01-10)
+
 ## 2.48.0 (2023-12-13)
 
 ## 2.47.0 (2023-11-29)
diff --git a/packages/priority-queue/package.json b/packages/priority-queue/package.json
index 4bfbb09da8d57..c06d29acf5585 100644
--- a/packages/priority-queue/package.json
+++ b/packages/priority-queue/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/priority-queue",
-	"version": "2.48.0",
+	"version": "2.49.0",
 	"description": "Generic browser priority queue.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/private-apis/CHANGELOG.md b/packages/private-apis/CHANGELOG.md
index 4951a8b29a7dc..3c2ce0530b5cf 100644
--- a/packages/private-apis/CHANGELOG.md
+++ b/packages/private-apis/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 0.31.0 (2024-01-10)
+
 ## 0.30.0 (2023-12-13)
 
 ## 0.29.0 (2023-11-29)
diff --git a/packages/private-apis/package.json b/packages/private-apis/package.json
index 654c53a02210e..8bf5a27dbd8bb 100644
--- a/packages/private-apis/package.json
+++ b/packages/private-apis/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/private-apis",
-	"version": "0.30.0",
+	"version": "0.31.0",
 	"description": "Internal experimental APIs for WordPress core.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/project-management-automation/CHANGELOG.md b/packages/project-management-automation/CHANGELOG.md
index 09247de37995d..69fc6f7498ca8 100644
--- a/packages/project-management-automation/CHANGELOG.md
+++ b/packages/project-management-automation/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 1.48.0 (2024-01-10)
+
 ## 1.47.0 (2023-12-13)
 
 ## 1.46.0 (2023-11-29)
diff --git a/packages/project-management-automation/package.json b/packages/project-management-automation/package.json
index 5e3d1f85314e2..46fe20bf9e727 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.47.0",
+	"version": "1.48.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",
diff --git a/packages/react-i18n/CHANGELOG.md b/packages/react-i18n/CHANGELOG.md
index 4e15abf8fadfb..893d433ed76c4 100644
--- a/packages/react-i18n/CHANGELOG.md
+++ b/packages/react-i18n/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 3.47.0 (2024-01-10)
+
 ## 3.46.0 (2023-12-13)
 
 ## 3.45.0 (2023-11-29)
diff --git a/packages/react-i18n/package.json b/packages/react-i18n/package.json
index 753f5138a2a0f..b7798f268c13d 100644
--- a/packages/react-i18n/package.json
+++ b/packages/react-i18n/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/react-i18n",
-	"version": "3.46.0",
+	"version": "3.47.0",
 	"description": "React bindings for @wordpress/i18n.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/react-native-aztec/android/build.gradle b/packages/react-native-aztec/android/build.gradle
index 18093ff1c2c13..6c1f4e5b02cce 100644
--- a/packages/react-native-aztec/android/build.gradle
+++ b/packages/react-native-aztec/android/build.gradle
@@ -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
@@ -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/package.json b/packages/react-native-aztec/package.json
index f91b214758b49..d3fdc4a71709a 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.110.0",
+	"version": "1.111.0",
 	"description": "Aztec view for react-native.",
 	"private": true,
 	"author": "The WordPress Contributors",
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 7800be076c842..c54e73b9a4b6a 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'
 
@@ -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 = "v4"
+    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/package.json b/packages/react-native-bridge/package.json
index 276e536dbf929..9068d83e1dec2 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.110.0",
+	"version": "1.111.0",
 	"description": "Native bridge library used to integrate the block editor into a native App.",
 	"private": true,
 	"author": "The WordPress Contributors",
diff --git a/packages/react-native-editor/CHANGELOG.md b/packages/react-native-editor/CHANGELOG.md
index 7a1f6997d2a13..c5973ddace958 100644
--- a/packages/react-native-editor/CHANGELOG.md
+++ b/packages/react-native-editor/CHANGELOG.md
@@ -10,6 +10,8 @@ For each user feature we should also add a importance categorization label  to i
 -->
 
 ## Unreleased
+
+## 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]
diff --git a/packages/react-native-editor/__device-tests__/helpers/utils.js b/packages/react-native-editor/__device-tests__/helpers/utils.js
index 8af4a0b1a60d7..5af85b9e6847d 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 ) => {
@@ -717,6 +736,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 b00be20458e80..fe3f410601a8d 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';
@@ -105,6 +107,47 @@ class EditorPage {
 		await typeString( this.driver, block, text, clear );
 	}
 
+	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.
diff --git a/packages/react-native-editor/android/app/build.gradle b/packages/react-native-editor/android/app/build.gradle
index ecb63589bcf1c..514c645354232 100644
--- a/packages/react-native-editor/android/app/build.gradle
+++ b/packages/react-native-editor/android/app/build.gradle
@@ -132,7 +132,7 @@ 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"
     // The version of react-native is set by the React Native Gradle Plugin
@@ -145,8 +145,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 = "v4"
+    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')}"
diff --git a/packages/react-native-editor/android/build.gradle b/packages/react-native-editor/android/build.gradle
index 7baee554d330c..f08019a79c900 100644
--- a/packages/react-native-editor/android/build.gradle
+++ b/packages/react-native-editor/android/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         compileSdkVersion = 34
         targetSdkVersion = 33
         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"
     }
@@ -30,8 +30,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' }
diff --git a/packages/react-native-editor/ios/Podfile.lock b/packages/react-native-editor/ios/Podfile.lock
index cf40d621834bd..8e0ec890f1b07 100644
--- a/packages/react-native-editor/ios/Podfile.lock
+++ b/packages/react-native-editor/ios/Podfile.lock
@@ -13,7 +13,7 @@ PODS:
     - ReactCommon/turbomodule/core (= 0.71.11)
   - fmt (6.2.1)
   - glog (0.3.5)
-  - Gutenberg (1.110.0):
+  - Gutenberg (1.111.0):
     - React-Core (= 0.71.11)
     - React-CoreModules (= 0.71.11)
     - React-RCTImage (= 0.71.11)
@@ -429,7 +429,7 @@ PODS:
     - React-RCTImage
   - RNSVG (13.9.0):
     - React-Core
-  - RNTAztecView (1.110.0):
+  - RNTAztecView (1.111.0):
     - React-Core
     - WordPress-Aztec-iOS (= 1.19.9)
   - SDWebImage (5.11.1):
@@ -610,14 +610,14 @@ EXTERNAL SOURCES:
     :path: "../../../node_modules/react-native/ReactCommon/yoga"
 
 SPEC CHECKSUMS:
-  boost: 57d2868c099736d80fcd648bf211b4431e51a558
+  boost: 7dcd2de282d72e344012f7d6564d024930a6a440
   BVLinearGradient: fbe308a1d19a8133f69e033abc85d8008644f5e3
   DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
   FBLazyVector: c511d4cd0210f416cb5c289bd5ae6b36d909b048
   FBReactNativeSpec: f07662560742d82a5b73cee116c70b0b49bcc220
   fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
   glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b
-  Gutenberg: 758124df95be2159a16909fcf00e289b9299fa39
+  Gutenberg: 904e4e1fe0069106402b3c619fe755ddd6930e48
   hermes-engine: 34c863b446d0135b85a6536fa5fd89f48196f848
   libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
   libwebp: 60305b2e989864154bd9be3d772730f08fc6a59c
@@ -662,7 +662,7 @@ SPEC CHECKSUMS:
   RNReanimated: d4f363f4987ae0ade3e36ff81c94e68261bf4b8d
   RNScreens: 68fd1060f57dd1023880bf4c05d74784b5392789
   RNSVG: 53c661b76829783cdaf9b7a57258f3d3b4c28315
-  RNTAztecView: 75ea6f071cbdd0f0afe83de7b93c0691a2bebd21
+  RNTAztecView: 1985084da164a50b19ce73e3b82395f89bbac7a6
   SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d
   SDWebImageWebPCoder: 908b83b6adda48effe7667cd2b7f78c897e5111d
   WordPress-Aztec-iOS: fbebd569c61baa252b3f5058c0a2a9a6ada686bb
diff --git a/packages/react-native-editor/package.json b/packages/react-native-editor/package.json
index 0a8ceed231ae4..dc559b60332b7 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.110.0",
+	"version": "1.111.0",
 	"description": "Mobile WordPress gutenberg editor.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/readable-js-assets-webpack-plugin/CHANGELOG.md b/packages/readable-js-assets-webpack-plugin/CHANGELOG.md
index 3a5dad2c51852..fccabbc78e0cd 100644
--- a/packages/readable-js-assets-webpack-plugin/CHANGELOG.md
+++ b/packages/readable-js-assets-webpack-plugin/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 2.32.0 (2024-01-10)
+
 ## 2.31.0 (2023-12-13)
 
 ## 2.30.0 (2023-11-29)
diff --git a/packages/readable-js-assets-webpack-plugin/package.json b/packages/readable-js-assets-webpack-plugin/package.json
index d27c530ca1510..da6750fd93136 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.31.0",
+	"version": "2.32.0",
 	"description": "Generate a readable JS file for each JS asset.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/redux-routine/CHANGELOG.md b/packages/redux-routine/CHANGELOG.md
index 9559858c133e4..e79717f26f4d9 100644
--- a/packages/redux-routine/CHANGELOG.md
+++ b/packages/redux-routine/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 4.49.0 (2024-01-10)
+
 ## 4.48.0 (2023-12-13)
 
 ## 4.47.0 (2023-11-29)
diff --git a/packages/redux-routine/package.json b/packages/redux-routine/package.json
index 2bdfb5fe8bffd..347fa98b63510 100644
--- a/packages/redux-routine/package.json
+++ b/packages/redux-routine/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/redux-routine",
-	"version": "4.48.0",
+	"version": "4.49.0",
 	"description": "Redux middleware for generator coroutines.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/reusable-blocks/CHANGELOG.md b/packages/reusable-blocks/CHANGELOG.md
index 989f649f161f2..6b53ab6270411 100644
--- a/packages/reusable-blocks/CHANGELOG.md
+++ b/packages/reusable-blocks/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 4.26.0 (2024-01-10)
+
 ## 4.25.0 (2023-12-13)
 
 ## 4.24.0 (2023-11-29)
diff --git a/packages/reusable-blocks/package.json b/packages/reusable-blocks/package.json
index c6e6df921270a..947d85834784b 100644
--- a/packages/reusable-blocks/package.json
+++ b/packages/reusable-blocks/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/reusable-blocks",
-	"version": "4.25.0",
+	"version": "4.26.0",
 	"description": "Reusable blocks utilities.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/rich-text/CHANGELOG.md b/packages/rich-text/CHANGELOG.md
index ebc6157a84c1b..18e1f53183021 100644
--- a/packages/rich-text/CHANGELOG.md
+++ b/packages/rich-text/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 6.26.0 (2024-01-10)
+
 ## 6.25.0 (2023-12-13)
 
 ## 6.24.0 (2023-11-29)
diff --git a/packages/rich-text/package.json b/packages/rich-text/package.json
index 645beb47bfa2a..ef935eea5686f 100644
--- a/packages/rich-text/package.json
+++ b/packages/rich-text/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/rich-text",
-	"version": "6.25.0",
+	"version": "6.26.0",
 	"description": "Rich text value and manipulation API.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/router/CHANGELOG.md b/packages/router/CHANGELOG.md
index 90f93aa1f9700..5a931c8c945db 100644
--- a/packages/router/CHANGELOG.md
+++ b/packages/router/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 0.18.0 (2024-01-10)
+
 ## 0.17.0 (2023-12-13)
 
 ## 0.16.0 (2023-11-29)
diff --git a/packages/router/package.json b/packages/router/package.json
index d9d640a9fe75c..4d882bdc5cd9d 100644
--- a/packages/router/package.json
+++ b/packages/router/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/router",
-	"version": "0.17.0",
+	"version": "0.18.0",
 	"description": "Router API for WordPress pages.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/scripts/CHANGELOG.md b/packages/scripts/CHANGELOG.md
index a917cd119c17a..34c2f6049a3da 100644
--- a/packages/scripts/CHANGELOG.md
+++ b/packages/scripts/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 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)).
diff --git a/packages/scripts/package.json b/packages/scripts/package.json
index f97ab389a527b..b270cac5ea7bf 100644
--- a/packages/scripts/package.json
+++ b/packages/scripts/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/scripts",
-	"version": "26.19.0",
+	"version": "27.0.0",
 	"description": "Collection of reusable scripts for WordPress development.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/server-side-render/CHANGELOG.md b/packages/server-side-render/CHANGELOG.md
index 89f9150ade561..245c503e45bb2 100644
--- a/packages/server-side-render/CHANGELOG.md
+++ b/packages/server-side-render/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 4.26.0 (2024-01-10)
+
 ## 4.25.0 (2023-12-13)
 
 ## 4.24.0 (2023-11-29)
diff --git a/packages/server-side-render/package.json b/packages/server-side-render/package.json
index c3e3bb66680e7..221c36cb20072 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.25.0",
+	"version": "4.26.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",
diff --git a/packages/shortcode/CHANGELOG.md b/packages/shortcode/CHANGELOG.md
index 6d4bb284be7d4..05eb9e9e24526 100644
--- a/packages/shortcode/CHANGELOG.md
+++ b/packages/shortcode/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 3.49.0 (2024-01-10)
+
 ## 3.48.0 (2023-12-13)
 
 ## 3.47.0 (2023-11-29)
diff --git a/packages/shortcode/package.json b/packages/shortcode/package.json
index 1e29a5e03343c..3088836074b9d 100644
--- a/packages/shortcode/package.json
+++ b/packages/shortcode/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/shortcode",
-	"version": "3.48.0",
+	"version": "3.49.0",
 	"description": "Shortcode module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/style-engine/CHANGELOG.md b/packages/style-engine/CHANGELOG.md
index 35331cb4fe9a4..2c3a6970e3171 100644
--- a/packages/style-engine/CHANGELOG.md
+++ b/packages/style-engine/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 1.32.0 (2024-01-10)
+
 ## 1.31.0 (2023-12-13)
 
 ## 1.30.0 (2023-11-29)
diff --git a/packages/style-engine/package.json b/packages/style-engine/package.json
index d11bc37c122bc..4c318049e4fe5 100644
--- a/packages/style-engine/package.json
+++ b/packages/style-engine/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/style-engine",
-	"version": "1.31.0",
+	"version": "1.32.0",
 	"description": "A suite of parsers and compilers for WordPress styles.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/stylelint-config/CHANGELOG.md b/packages/stylelint-config/CHANGELOG.md
index b7b6cb712ff75..eb82f9f916d4e 100644
--- a/packages/stylelint-config/CHANGELOG.md
+++ b/packages/stylelint-config/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 21.32.0 (2024-01-10)
+
 ## 21.31.0 (2023-12-13)
 
 ## 21.30.0 (2023-11-29)
diff --git a/packages/stylelint-config/package.json b/packages/stylelint-config/package.json
index ff3ed08296c5e..40bc6becf03fb 100644
--- a/packages/stylelint-config/package.json
+++ b/packages/stylelint-config/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/stylelint-config",
-	"version": "21.31.0",
+	"version": "21.32.0",
 	"description": "stylelint config for WordPress development.",
 	"author": "The WordPress Contributors",
 	"license": "MIT",
diff --git a/packages/sync/CHANGELOG.md b/packages/sync/CHANGELOG.md
index 206d4957a1287..353e3dec2c583 100644
--- a/packages/sync/CHANGELOG.md
+++ b/packages/sync/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 0.11.0 (2024-01-10)
+
 ## 0.10.0 (2023-12-13)
 
 ## 0.9.0 (2023-11-29)
diff --git a/packages/sync/package.json b/packages/sync/package.json
index 7f3e20f6bd75a..e0e07f11a121b 100644
--- a/packages/sync/package.json
+++ b/packages/sync/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/sync",
-	"version": "0.10.0",
+	"version": "0.11.0",
 	"description": "Sync Data.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/token-list/CHANGELOG.md b/packages/token-list/CHANGELOG.md
index 7488e836b0c13..b9f1006ecbb3a 100644
--- a/packages/token-list/CHANGELOG.md
+++ b/packages/token-list/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 2.49.0 (2024-01-10)
+
 ## 2.48.0 (2023-12-13)
 
 ## 2.47.0 (2023-11-29)
diff --git a/packages/token-list/package.json b/packages/token-list/package.json
index 3a877f9365d75..6e47980844ca2 100644
--- a/packages/token-list/package.json
+++ b/packages/token-list/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/token-list",
-	"version": "2.48.0",
+	"version": "2.49.0",
 	"description": "Constructable, plain JavaScript DOMTokenList implementation, supporting non-browser runtimes.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/undo-manager/CHANGELOG.md b/packages/undo-manager/CHANGELOG.md
index 2ff22f8020a32..0a3f1ffa8ba57 100644
--- a/packages/undo-manager/CHANGELOG.md
+++ b/packages/undo-manager/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 0.9.0 (2024-01-10)
+
 ## 0.8.0 (2023-12-13)
 
 ## 0.7.0 (2023-11-29)
diff --git a/packages/undo-manager/package.json b/packages/undo-manager/package.json
index f1d47b82de47d..fde1fcf604cbc 100644
--- a/packages/undo-manager/package.json
+++ b/packages/undo-manager/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/undo-manager",
-	"version": "0.8.0",
+	"version": "0.9.0",
 	"description": "A small package to manage undo/redo.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/url/CHANGELOG.md b/packages/url/CHANGELOG.md
index 29ca8923380d9..f6befc2b0a8b0 100644
--- a/packages/url/CHANGELOG.md
+++ b/packages/url/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 3.50.0 (2024-01-10)
+
 ## 3.49.0 (2023-12-13)
 
 ## 3.48.0 (2023-11-29)
diff --git a/packages/url/package.json b/packages/url/package.json
index 62cb1727928b4..0c2d9993f49e9 100644
--- a/packages/url/package.json
+++ b/packages/url/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/url",
-	"version": "3.49.0",
+	"version": "3.50.0",
 	"description": "WordPress URL utilities.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/viewport/CHANGELOG.md b/packages/viewport/CHANGELOG.md
index 4d03197988aec..170371171003c 100644
--- a/packages/viewport/CHANGELOG.md
+++ b/packages/viewport/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 5.26.0 (2024-01-10)
+
 ## 5.25.0 (2023-12-13)
 
 ## 5.24.0 (2023-11-29)
diff --git a/packages/viewport/package.json b/packages/viewport/package.json
index 9251dabe8752d..dd11ff8db2ba6 100644
--- a/packages/viewport/package.json
+++ b/packages/viewport/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/viewport",
-	"version": "5.25.0",
+	"version": "5.26.0",
 	"description": "Viewport module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/warning/CHANGELOG.md b/packages/warning/CHANGELOG.md
index 629291f88171b..20cae1aa42dc3 100644
--- a/packages/warning/CHANGELOG.md
+++ b/packages/warning/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 2.49.0 (2024-01-10)
+
 ## 2.48.0 (2023-12-13)
 
 ## 2.47.0 (2023-11-29)
diff --git a/packages/warning/package.json b/packages/warning/package.json
index 7a7e3958a922e..134d58c060d08 100644
--- a/packages/warning/package.json
+++ b/packages/warning/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/warning",
-	"version": "2.48.0",
+	"version": "2.49.0",
 	"description": "Warning utility for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/widgets/CHANGELOG.md b/packages/widgets/CHANGELOG.md
index a24187330ba58..3e79836af4d93 100644
--- a/packages/widgets/CHANGELOG.md
+++ b/packages/widgets/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 3.26.0 (2024-01-10)
+
 ## 3.25.0 (2023-12-13)
 
 ## 3.24.0 (2023-11-29)
diff --git a/packages/widgets/package.json b/packages/widgets/package.json
index 60d7c7c5c4696..8f04224c63fb2 100644
--- a/packages/widgets/package.json
+++ b/packages/widgets/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/widgets",
-	"version": "3.25.0",
+	"version": "3.26.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",
diff --git a/packages/wordcount/CHANGELOG.md b/packages/wordcount/CHANGELOG.md
index 9fab4788c9f41..3b1ee558fbfe7 100644
--- a/packages/wordcount/CHANGELOG.md
+++ b/packages/wordcount/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 3.49.0 (2024-01-10)
+
 ## 3.48.0 (2023-12-13)
 
 ## 3.47.0 (2023-11-29)
diff --git a/packages/wordcount/package.json b/packages/wordcount/package.json
index 5e76d6ed042c6..b8834399c8f28 100644
--- a/packages/wordcount/package.json
+++ b/packages/wordcount/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/wordcount",
-	"version": "3.48.0",
+	"version": "3.49.0",
 	"description": "WordPress word count utility.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
index 21f3fcb8baee1..a603ab142729c 100644
--- a/phpcs.xml.dist
+++ b/phpcs.xml.dist
@@ -58,6 +58,11 @@
 	<exclude-pattern>./vendor/*</exclude-pattern>
 	<exclude-pattern>./test/php/gutenberg-coding-standards/*</exclude-pattern>
 
+	<!-- 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>
@@ -115,6 +120,8 @@
 				<element value="apply_block_core_search_border_style"/>
 				<element value="apply_block_core_search_border_styles"/>
 				<element value="build_dropdown_script_block_core_categories"/>
+				<element value="build_navigation_link_block_variations"/>
+				<element value="build_post_term_block_variations"/>
 				<element value="build_template_part_block_area_variations"/>
 				<element value="build_template_part_block_instance_variations"/>
 				<element value="build_template_part_block_variations"/>
diff --git a/phpunit/block-supports/typography-test.php b/phpunit/block-supports/typography-test.php
index f6d5344222678..ec7df51317a3f 100644
--- a/phpunit/block-supports/typography-test.php
+++ b/phpunit/block-supports/typography-test.php
@@ -933,6 +933,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/schemas/json/font-collection.json b/schemas/json/font-collection.json
index a6ca2b1412e6d..4973c71312b60 100644
--- a/schemas/json/font-collection.json
+++ b/schemas/json/font-collection.json
@@ -7,11 +7,6 @@
 			"description": "JSON schema URI for font-collection.json.",
 			"type": "string"
 		},
-		"version": {
-			"description": "Version of font-collection.json schema to use.",
-			"type": "integer",
-			"enum": [ 1 ]
-		},
 		"font_families": {
 			"type": "array",
 			"description": "Array of font families ready to be installed",
@@ -55,5 +50,5 @@
 		}
 	},
 	"additionalProperties": false,
-	"required": [ "$schema", "version", "font_families" ]
+	"required": [ "$schema", "font_families" ]
 }
diff --git a/test/e2e/specs/editor/various/block-switcher.spec.js b/test/e2e/specs/editor/various/block-switcher.spec.js
index e68844ac4a9f6..8ddbcaa906f6d 100644
--- a/test/e2e/specs/editor/various/block-switcher.spec.js
+++ b/test/e2e/specs/editor/various/block-switcher.spec.js
@@ -77,7 +77,7 @@ test.describe( 'Block Switcher', () => {
 		).toHaveText( [ 'Paragraph', 'Heading', 'Columns', 'Group' ] );
 	} );
 
-	test( 'Should not show the block switcher if all the blocks the list block transforms into are removed', async ( {
+	test( 'Should not show the block switcher if the block has no styles and cannot be removed', async ( {
 		editor,
 		page,
 		pageUtils,
@@ -86,36 +86,38 @@ test.describe( 'Block Switcher', () => {
 		await editor.canvas
 			.getByRole( 'button', { name: 'Add default block' } )
 			.click();
-		await page.keyboard.type( '- List content' );
+		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();
 
-		// Remove blocks.
-		await page.waitForFunction( () => {
-			try {
-				window.wp.data
-					.dispatch( 'core/blocks' )
-					.removeBlockTypes( [
-						'core/quote',
-						'core/pullquote',
-						'core/paragraph',
-						'core/group',
-						'core/heading',
-						'core/columns',
-					] );
-				return true;
-			} catch {
-				return false;
-			}
-		} );
+		await editor.clickBlockOptionsMenuItem( 'Lock' );
+		await page.click( 'role=checkbox[name="Prevent removal"]' );
+		await page.click( 'role=button[name="Apply"]' );
 
-		await page.keyboard.press( 'ArrowUp' );
+		// 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' );
 
-		// Verify the block switcher isn't enabled.
-		await expect(
-			page
-				.getByRole( 'toolbar', { name: 'Block tools' } )
-				.getByRole( 'button', { name: 'List' } )
-		).toBeDisabled();
+		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 ( {
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 0000000000000..2fa963f66685d
--- /dev/null
+++ b/test/e2e/specs/editor/various/embedding.spec.js
@@ -0,0 +1,310 @@
+/**
+ * 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' );
+
+		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.locator( 'figure' ),
+			'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.locator( 'figure' ),
+			'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' );
+	} );
+
+	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.skip( '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_CANT_EMBED_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/pattern-overrides.spec.js b/test/e2e/specs/editor/various/pattern-overrides.spec.js
new file mode 100644
index 0000000000000..818a05881f53e
--- /dev/null
+++ b/test/e2e/specs/editor/various/pattern-overrides.spec.js
@@ -0,0 +1,219 @@
+/**
+ * WordPress dependencies
+ */
+const { test, expect } = require( '@wordpress/e2e-test-utils-playwright' );
+
+test.describe( 'Pattern Overrides', () => {
+	test.beforeAll( async ( { requestUtils } ) => {
+		await Promise.all( [
+			requestUtils.activateTheme( 'emptytheme' ),
+			requestUtils.setGutenbergExperiments( [
+				'gutenberg-pattern-partial-syncing',
+			] ),
+			requestUtils.deleteAllBlocks(),
+		] );
+	} );
+
+	test.afterEach( async ( { requestUtils } ) => {
+		await requestUtils.deleteAllBlocks();
+	} );
+
+	test.afterAll( async ( { requestUtils } ) => {
+		await Promise.all( [
+			requestUtils.setGutenbergExperiments( [] ),
+			requestUtils.activateTheme( 'twentytwentyone' ),
+		] );
+	} );
+
+	test( 'Create a pattern with overrides', async ( {
+		page,
+		admin,
+		editor,
+	} ) => {
+		let patternId;
+		let editableParagraphId;
+
+		await test.step( 'Create a synced pattern and assign blocks to allow overrides', async () => {
+			await admin.visitSiteEditor( { path: '/patterns' } );
+
+			await page
+				.getByRole( 'region', { name: 'Navigation' } )
+				.getByRole( 'button', { name: 'Create pattern' } )
+				.click();
+
+			await page
+				.getByRole( 'menu', { name: 'Create pattern' } )
+				.getByRole( 'menuitem', { name: 'Create pattern' } )
+				.click();
+
+			const createPatternDialog = page.getByRole( 'dialog', {
+				name: 'Create pattern',
+			} );
+			await createPatternDialog
+				.getByRole( 'textbox', { name: 'Name' } )
+				.fill( 'Pattern with overrides' );
+			await createPatternDialog
+				.getByRole( 'checkbox', { name: 'Synced' } )
+				.setChecked( true );
+			await createPatternDialog
+				.getByRole( 'button', { name: 'Create' } )
+				.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.openDocumentSettingsSidebar();
+			const editorSettings = page.getByRole( 'region', {
+				name: 'Editor settings',
+			} );
+			const advancedPanel = editorSettings.getByRole( 'button', {
+				name: 'Advanced',
+			} );
+			if (
+				( await advancedPanel.getAttribute( 'aria-expanded' ) ) ===
+				'false'
+			) {
+				await advancedPanel.click();
+			}
+			await editorSettings
+				.getByRole( 'checkbox', { name: 'Allow instance overrides' } )
+				.setChecked( true );
+
+			await expect.poll( editor.getBlocks ).toMatchObject( [
+				{
+					name: 'core/paragraph',
+					attributes: {
+						content: 'This paragraph can be edited',
+						metadata: {
+							id: expect.any( String ),
+							bindings: {
+								content: {
+									source: { name: 'pattern_attributes' },
+								},
+							},
+						},
+					},
+				},
+				{
+					name: 'core/paragraph',
+					attributes: { content: "This one can't" },
+				},
+			] );
+
+			await page
+				.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' } )
+			).toBeVisible();
+
+			patternId = new URL( page.url() ).searchParams.get( 'postId' );
+			const blocks = await editor.getBlocks();
+			editableParagraphId = blocks[ 0 ].attributes.metadata.id;
+		} );
+
+		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',
+			} );
+			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' );
+
+			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,
+						overrides: {
+							[ editableParagraphId ]: {
+								content: 'I would word it this way',
+							},
+						},
+					},
+				},
+				{
+					name: 'core/block',
+					attributes: {
+						ref: patternId,
+						overrides: {
+							[ editableParagraphId ]: {
+								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',
+			] );
+		} );
+	} );
+} );
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 021199cc09495..6d6a36eab9b1d 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
@@ -70,6 +70,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,
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 70509348983e6..2dc1e7c6b5051 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/interactivity/directives-body.spec.ts b/test/e2e/specs/interactivity/directive-body.spec.ts
similarity index 100%
rename from test/e2e/specs/interactivity/directives-body.spec.ts
rename to test/e2e/specs/interactivity/directive-body.spec.ts
diff --git a/test/e2e/specs/interactivity/directives-class.spec.ts b/test/e2e/specs/interactivity/directive-class.spec.ts
similarity index 100%
rename from test/e2e/specs/interactivity/directives-class.spec.ts
rename to test/e2e/specs/interactivity/directive-class.spec.ts
diff --git a/test/e2e/specs/interactivity/directives-context.spec.ts b/test/e2e/specs/interactivity/directive-context.spec.ts
similarity index 100%
rename from test/e2e/specs/interactivity/directives-context.spec.ts
rename to test/e2e/specs/interactivity/directive-context.spec.ts
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 0000000000000..824e217f08714
--- /dev/null
+++ b/test/e2e/specs/interactivity/directive-on-document.spec.ts
@@ -0,0 +1,47 @@
+/**
+ * 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( 'callbacks should run whenever the specified event is dispatched', async ( {
+		page,
+	} ) => {
+		const counter = page.getByTestId( 'counter' );
+		await expect( counter ).toHaveText( '0' );
+		await page.keyboard.press( 'ArrowDown' );
+		await expect( counter ).toHaveText( '1' );
+	} );
+	test( 'the event listener is removed when the element is removed', async ( {
+		page,
+	} ) => {
+		const counter = page.getByTestId( 'counter' );
+		const visibilityButton = page.getByTestId( 'visibility' );
+		await expect( counter ).toHaveText( '0' );
+		await page.keyboard.press( 'ArrowDown' );
+		await expect( counter ).toHaveText( '1' );
+		// Remove the element.
+		await visibilityButton.click();
+		// This keyboard press should not increase the counter.
+		await page.keyboard.press( 'ArrowDown' );
+		// Add the element back.
+		await visibilityButton.click();
+		await expect( counter ).toHaveText( '1' );
+		await page.keyboard.press( 'ArrowDown' );
+		await expect( counter ).toHaveText( '2' );
+	} );
+} );
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 0000000000000..e1d59e09cd35f
--- /dev/null
+++ b/test/e2e/specs/interactivity/directive-on-window.spec.ts
@@ -0,0 +1,45 @@
+/**
+ * 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( 'callbacks should run whenever the specified event is dispatched', async ( {
+		page,
+	} ) => {
+		await page.setViewportSize( { width: 600, height: 600 } );
+		const counter = page.getByTestId( 'counter' );
+		await expect( counter ).toHaveText( '1' );
+	} );
+	test( 'the event listener is removed when the element is removed', async ( {
+		page,
+	} ) => {
+		const counter = page.getByTestId( 'counter' );
+		const visibilityButton = page.getByTestId( 'visibility' );
+		await page.setViewportSize( { width: 600, height: 600 } );
+		await expect( counter ).toHaveText( '1' );
+		// Remove the element.
+		await visibilityButton.click();
+		// This resize should not increase the counter.
+		await page.setViewportSize( { width: 300, height: 600 } );
+		// Add the element back.
+		await visibilityButton.click();
+		await expect( counter ).toHaveText( '1' );
+		await page.setViewportSize( { width: 200, height: 600 } );
+		await expect( counter ).toHaveText( '2' );
+	} );
+} );
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 195af52fdb1bd..0000000000000
--- 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/directives-text.spec.ts b/test/e2e/specs/interactivity/directive-text.spec.ts
similarity index 77%
rename from test/e2e/specs/interactivity/directives-text.spec.ts
rename to test/e2e/specs/interactivity/directive-text.spec.ts
index 8e83be26de15c..3670c5931e15d 100644
--- a/test/e2e/specs/interactivity/directives-text.spec.ts
+++ b/test/e2e/specs/interactivity/directive-text.spec.ts
@@ -33,4 +33,13 @@ test.describe( 'data-wp-text', () => {
 		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/site-editor/new-templates-list.spec.js b/test/e2e/specs/site-editor/new-templates-list.spec.js
index df7f88b600442..272a3ffff80bf 100644
--- a/test/e2e/specs/site-editor/new-templates-list.spec.js
+++ b/test/e2e/specs/site-editor/new-templates-list.spec.js
@@ -7,18 +7,22 @@ test.describe( 'Templates', () => {
 	test.beforeAll( async ( { requestUtils } ) => {
 		await Promise.all( [
 			requestUtils.activateTheme( 'emptytheme' ),
-			requestUtils.activatePlugin( 'gutenberg-test-dataviews' ),
+			requestUtils.setGutenbergExperiments( [ 'gutenberg-dataviews' ] ),
 		] );
 	} );
 	test.afterAll( async ( { requestUtils } ) => {
 		await Promise.all( [
 			requestUtils.activateTheme( 'twentytwentyone' ),
-			requestUtils.deactivatePlugin( 'gutenberg-test-dataviews' ),
 			requestUtils.deleteAllTemplates( 'wp_template' ),
+			requestUtils.setGutenbergExperiments( [] ),
 		] );
 	} );
 	test( 'Sorting', async ( { admin, page } ) => {
-		await admin.visitSiteEditor( { path: '/wp_template/all' } );
+		await admin.visitSiteEditor( { path: '/wp_template' } );
+		// Switch to table layout.
+		await page.getByLabel( 'View options' ).click();
+		await page.getByRole( 'menuitem', { name: 'Layout' } ).click();
+		await page.getByRole( 'menuitemradio', { name: 'Table' } ).click();
 		// Descending by title.
 		await page
 			.getByRole( 'button', { name: 'Template', exact: true } )
@@ -48,7 +52,13 @@ test.describe( 'Templates', () => {
 			title: 'Date Archives',
 			content: 'hi',
 		} );
-		await admin.visitSiteEditor( { path: '/wp_template/all' } );
+		await admin.visitSiteEditor( { path: '/wp_template' } );
+
+		// Switch to table layout.
+		await page.getByLabel( 'View options' ).click();
+		await page.getByRole( 'menuitem', { name: 'Layout' } ).click();
+		await page.getByRole( 'menuitemradio', { name: 'Table' } ).click();
+
 		// Global search.
 		await page.getByRole( 'searchbox', { name: 'Filter list' } ).click();
 		await page.keyboard.type( 'tag' );
@@ -84,7 +94,13 @@ test.describe( 'Templates', () => {
 		await expect( titles ).toHaveCount( 2 );
 	} );
 	test( 'Field visibility', async ( { admin, page } ) => {
-		await admin.visitSiteEditor( { path: '/wp_template/all' } );
+		await admin.visitSiteEditor( { path: '/wp_template' } );
+
+		// Switch to table layout.
+		await page.getByLabel( 'View options' ).click();
+		await page.getByRole( 'menuitem', { name: 'Layout' } ).click();
+		await page.getByRole( 'menuitemradio', { name: 'Table' } ).click();
+
 		await page.getByRole( 'button', { name: 'Description' } ).click();
 		await page.getByRole( 'menuitem', { name: 'Hide' } ).click();
 		await expect(