diff --git a/package-lock.json b/package-lock.json
index 7c7774a55816b..064ede8cfde96 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14,9 +14,9 @@
 				"@wordpress/api-fetch": "7.0.1",
 				"@wordpress/autop": "4.0.1",
 				"@wordpress/blob": "4.0.1",
-				"@wordpress/block-directory": "5.0.2",
+				"@wordpress/block-directory": "5.0.3",
 				"@wordpress/block-editor": "13.0.2",
-				"@wordpress/block-library": "9.0.2",
+				"@wordpress/block-library": "9.0.3",
 				"@wordpress/block-serialization-default-parser": "5.0.1",
 				"@wordpress/blocks": "13.0.2",
 				"@wordpress/commands": "1.0.2",
@@ -24,7 +24,7 @@
 				"@wordpress/compose": "7.0.1",
 				"@wordpress/core-commands": "1.0.2",
 				"@wordpress/core-data": "7.0.2",
-				"@wordpress/customize-widgets": "5.0.2",
+				"@wordpress/customize-widgets": "5.0.3",
 				"@wordpress/data": "10.0.2",
 				"@wordpress/data-controls": "4.0.2",
 				"@wordpress/dataviews": "2.0.2",
@@ -32,9 +32,9 @@
 				"@wordpress/deprecated": "4.0.1",
 				"@wordpress/dom": "4.0.1",
 				"@wordpress/dom-ready": "4.0.1",
-				"@wordpress/edit-post": "8.0.2",
-				"@wordpress/edit-site": "6.0.2",
-				"@wordpress/edit-widgets": "6.0.2",
+				"@wordpress/edit-post": "8.0.3",
+				"@wordpress/edit-site": "6.0.3",
+				"@wordpress/edit-widgets": "6.0.3",
 				"@wordpress/editor": "14.0.2",
 				"@wordpress/element": "6.0.1",
 				"@wordpress/escape-html": "3.0.1",
@@ -6166,9 +6166,9 @@
 			}
 		},
 		"node_modules/@wordpress/block-directory": {
-			"version": "5.0.2",
-			"resolved": "https://registry.npmjs.org/@wordpress/block-directory/-/block-directory-5.0.2.tgz",
-			"integrity": "sha512-zTaAeNlAPFwvRsd64jvzIx2hn26KxsohUc6RbU/2sHmW1DkL9Vnl70gqy1zNqGnPK/yE4uu9tO3+afWKOeorbQ==",
+			"version": "5.0.3",
+			"resolved": "https://registry.npmjs.org/@wordpress/block-directory/-/block-directory-5.0.3.tgz",
+			"integrity": "sha512-0HQPBrrV1ns5+7iPluoGiK8lKZjefPffIr8W/KbkJCIkweQWQ0J1CYEpG7f7EGwnZ2PuEIyyChsy3Y/WH6FTOg==",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
 				"@wordpress/a11y": "^4.0.1",
@@ -6179,7 +6179,7 @@
 				"@wordpress/compose": "^7.0.1",
 				"@wordpress/core-data": "^7.0.2",
 				"@wordpress/data": "^10.0.2",
-				"@wordpress/edit-post": "^8.0.2",
+				"@wordpress/edit-post": "^8.0.3",
 				"@wordpress/editor": "^14.0.2",
 				"@wordpress/element": "^6.0.1",
 				"@wordpress/hooks": "^4.0.1",
@@ -6263,9 +6263,9 @@
 			}
 		},
 		"node_modules/@wordpress/block-library": {
-			"version": "9.0.2",
-			"resolved": "https://registry.npmjs.org/@wordpress/block-library/-/block-library-9.0.2.tgz",
-			"integrity": "sha512-vOtZyo0FcuJMAbXhxGjGGg0XPSrJrxrPnIVNjtC6EW99aeMSeFGgubvSUuAGYPsIfDbWkd+8sQZrY8/n9LI6Wg==",
+			"version": "9.0.3",
+			"resolved": "https://registry.npmjs.org/@wordpress/block-library/-/block-library-9.0.3.tgz",
+			"integrity": "sha512-SUn0RRUnZUaGnPyz3SzFTj5CsCDN2iJikHX46LB1AU78vw0ZBI8BplgZV/l7sAPJlx+hfSmWry97iDqo6bl1lw==",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
 				"@wordpress/a11y": "^4.0.1",
@@ -6560,13 +6560,13 @@
 			}
 		},
 		"node_modules/@wordpress/customize-widgets": {
-			"version": "5.0.2",
-			"resolved": "https://registry.npmjs.org/@wordpress/customize-widgets/-/customize-widgets-5.0.2.tgz",
-			"integrity": "sha512-1c2WADmhLatzMirEQKzxJUniGbyfGdeA6E9wSxZ4l3mpihs8+PFkC0FMClVcv9IjcLVKJoD1erCY6KJdM4bodg==",
+			"version": "5.0.3",
+			"resolved": "https://registry.npmjs.org/@wordpress/customize-widgets/-/customize-widgets-5.0.3.tgz",
+			"integrity": "sha512-TUhuluS/h2uZuaxkG2DobQC4sbBPteqVrL5tkid2CuYQygna0VnsSlE0N5W2/UVDLcmCovNrtBqp6j9Ru/eGaQ==",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
 				"@wordpress/block-editor": "^13.0.2",
-				"@wordpress/block-library": "^9.0.2",
+				"@wordpress/block-library": "^9.0.3",
 				"@wordpress/blocks": "^13.0.2",
 				"@wordpress/components": "^28.0.2",
 				"@wordpress/compose": "^7.0.1",
@@ -6826,15 +6826,15 @@
 			}
 		},
 		"node_modules/@wordpress/edit-post": {
-			"version": "8.0.2",
-			"resolved": "https://registry.npmjs.org/@wordpress/edit-post/-/edit-post-8.0.2.tgz",
-			"integrity": "sha512-+QfgBK+wvPxz44BbodLLTf2HfawajNSZ8UaMFjG5+jgA4gron5I57mSCKEfcfDSPLtiQRnr6gVA+C+NpmSa06Q==",
+			"version": "8.0.3",
+			"resolved": "https://registry.npmjs.org/@wordpress/edit-post/-/edit-post-8.0.3.tgz",
+			"integrity": "sha512-lHAB8Vf3MWOHZRvcrTacS5aGl0Bwy7oWRd0FoUjvp5hiRdFhhnCA6w957odzmUvKrNXzN4+9Z2y969qAexaVBw==",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
 				"@wordpress/a11y": "^4.0.1",
 				"@wordpress/api-fetch": "^7.0.1",
 				"@wordpress/block-editor": "^13.0.2",
-				"@wordpress/block-library": "^9.0.2",
+				"@wordpress/block-library": "^9.0.3",
 				"@wordpress/blocks": "^13.0.2",
 				"@wordpress/commands": "^1.0.2",
 				"@wordpress/components": "^28.0.2",
@@ -6873,9 +6873,9 @@
 			}
 		},
 		"node_modules/@wordpress/edit-site": {
-			"version": "6.0.2",
-			"resolved": "https://registry.npmjs.org/@wordpress/edit-site/-/edit-site-6.0.2.tgz",
-			"integrity": "sha512-BHNJAV3sRgbNoM5iUOByrEC+7Bc61YA2Q2dfqeSeh8wyND0JReIKTLCKOFmx44eSr8EuWwB5qdH5tQbmW2O5Rg==",
+			"version": "6.0.3",
+			"resolved": "https://registry.npmjs.org/@wordpress/edit-site/-/edit-site-6.0.3.tgz",
+			"integrity": "sha512-O9cjfWdJ6a2vfi+LBnXTcoIlOz+OcHrEQT5ghz/AOD6pXMS74IsWbgvNnHFOGFs/QTvsH3tE5UHnPEpn08zpSQ==",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
 				"@react-spring/web": "^9.4.5",
@@ -6883,7 +6883,7 @@
 				"@wordpress/api-fetch": "^7.0.1",
 				"@wordpress/blob": "^4.0.1",
 				"@wordpress/block-editor": "^13.0.2",
-				"@wordpress/block-library": "^9.0.2",
+				"@wordpress/block-library": "^9.0.3",
 				"@wordpress/blocks": "^13.0.2",
 				"@wordpress/commands": "^1.0.2",
 				"@wordpress/components": "^28.0.2",
@@ -6935,14 +6935,14 @@
 			}
 		},
 		"node_modules/@wordpress/edit-widgets": {
-			"version": "6.0.2",
-			"resolved": "https://registry.npmjs.org/@wordpress/edit-widgets/-/edit-widgets-6.0.2.tgz",
-			"integrity": "sha512-hCDMSDPAT8nlt/9U8jtYYnlawc7Xkf31CMhvSCcEu55nMYVppJxqgbs1E/KXmIW/6ljTmyo/uR6bPsS3GPEGvw==",
+			"version": "6.0.3",
+			"resolved": "https://registry.npmjs.org/@wordpress/edit-widgets/-/edit-widgets-6.0.3.tgz",
+			"integrity": "sha512-bYpg2Uq7QRuEUhfaczdTxPZnEhhJ921Ln+nW7GGCb5o6Eq8tNpyk4888HN6qfo+h1LUZNhW9RZOz8z1gq6AXPA==",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
 				"@wordpress/api-fetch": "^7.0.1",
 				"@wordpress/block-editor": "^13.0.2",
-				"@wordpress/block-library": "^9.0.2",
+				"@wordpress/block-library": "^9.0.3",
 				"@wordpress/blocks": "^13.0.2",
 				"@wordpress/components": "^28.0.2",
 				"@wordpress/compose": "^7.0.1",
@@ -37906,9 +37906,9 @@
 			}
 		},
 		"@wordpress/block-directory": {
-			"version": "5.0.2",
-			"resolved": "https://registry.npmjs.org/@wordpress/block-directory/-/block-directory-5.0.2.tgz",
-			"integrity": "sha512-zTaAeNlAPFwvRsd64jvzIx2hn26KxsohUc6RbU/2sHmW1DkL9Vnl70gqy1zNqGnPK/yE4uu9tO3+afWKOeorbQ==",
+			"version": "5.0.3",
+			"resolved": "https://registry.npmjs.org/@wordpress/block-directory/-/block-directory-5.0.3.tgz",
+			"integrity": "sha512-0HQPBrrV1ns5+7iPluoGiK8lKZjefPffIr8W/KbkJCIkweQWQ0J1CYEpG7f7EGwnZ2PuEIyyChsy3Y/WH6FTOg==",
 			"requires": {
 				"@babel/runtime": "^7.16.0",
 				"@wordpress/a11y": "^4.0.1",
@@ -37919,7 +37919,7 @@
 				"@wordpress/compose": "^7.0.1",
 				"@wordpress/core-data": "^7.0.2",
 				"@wordpress/data": "^10.0.2",
-				"@wordpress/edit-post": "^8.0.2",
+				"@wordpress/edit-post": "^8.0.3",
 				"@wordpress/editor": "^14.0.2",
 				"@wordpress/element": "^6.0.1",
 				"@wordpress/hooks": "^4.0.1",
@@ -37987,9 +37987,9 @@
 			}
 		},
 		"@wordpress/block-library": {
-			"version": "9.0.2",
-			"resolved": "https://registry.npmjs.org/@wordpress/block-library/-/block-library-9.0.2.tgz",
-			"integrity": "sha512-vOtZyo0FcuJMAbXhxGjGGg0XPSrJrxrPnIVNjtC6EW99aeMSeFGgubvSUuAGYPsIfDbWkd+8sQZrY8/n9LI6Wg==",
+			"version": "9.0.3",
+			"resolved": "https://registry.npmjs.org/@wordpress/block-library/-/block-library-9.0.3.tgz",
+			"integrity": "sha512-SUn0RRUnZUaGnPyz3SzFTj5CsCDN2iJikHX46LB1AU78vw0ZBI8BplgZV/l7sAPJlx+hfSmWry97iDqo6bl1lw==",
 			"requires": {
 				"@babel/runtime": "^7.16.0",
 				"@wordpress/a11y": "^4.0.1",
@@ -38222,13 +38222,13 @@
 			}
 		},
 		"@wordpress/customize-widgets": {
-			"version": "5.0.2",
-			"resolved": "https://registry.npmjs.org/@wordpress/customize-widgets/-/customize-widgets-5.0.2.tgz",
-			"integrity": "sha512-1c2WADmhLatzMirEQKzxJUniGbyfGdeA6E9wSxZ4l3mpihs8+PFkC0FMClVcv9IjcLVKJoD1erCY6KJdM4bodg==",
+			"version": "5.0.3",
+			"resolved": "https://registry.npmjs.org/@wordpress/customize-widgets/-/customize-widgets-5.0.3.tgz",
+			"integrity": "sha512-TUhuluS/h2uZuaxkG2DobQC4sbBPteqVrL5tkid2CuYQygna0VnsSlE0N5W2/UVDLcmCovNrtBqp6j9Ru/eGaQ==",
 			"requires": {
 				"@babel/runtime": "^7.16.0",
 				"@wordpress/block-editor": "^13.0.2",
-				"@wordpress/block-library": "^9.0.2",
+				"@wordpress/block-library": "^9.0.3",
 				"@wordpress/blocks": "^13.0.2",
 				"@wordpress/components": "^28.0.2",
 				"@wordpress/compose": "^7.0.1",
@@ -38413,15 +38413,15 @@
 			}
 		},
 		"@wordpress/edit-post": {
-			"version": "8.0.2",
-			"resolved": "https://registry.npmjs.org/@wordpress/edit-post/-/edit-post-8.0.2.tgz",
-			"integrity": "sha512-+QfgBK+wvPxz44BbodLLTf2HfawajNSZ8UaMFjG5+jgA4gron5I57mSCKEfcfDSPLtiQRnr6gVA+C+NpmSa06Q==",
+			"version": "8.0.3",
+			"resolved": "https://registry.npmjs.org/@wordpress/edit-post/-/edit-post-8.0.3.tgz",
+			"integrity": "sha512-lHAB8Vf3MWOHZRvcrTacS5aGl0Bwy7oWRd0FoUjvp5hiRdFhhnCA6w957odzmUvKrNXzN4+9Z2y969qAexaVBw==",
 			"requires": {
 				"@babel/runtime": "^7.16.0",
 				"@wordpress/a11y": "^4.0.1",
 				"@wordpress/api-fetch": "^7.0.1",
 				"@wordpress/block-editor": "^13.0.2",
-				"@wordpress/block-library": "^9.0.2",
+				"@wordpress/block-library": "^9.0.3",
 				"@wordpress/blocks": "^13.0.2",
 				"@wordpress/commands": "^1.0.2",
 				"@wordpress/components": "^28.0.2",
@@ -38452,9 +38452,9 @@
 			}
 		},
 		"@wordpress/edit-site": {
-			"version": "6.0.2",
-			"resolved": "https://registry.npmjs.org/@wordpress/edit-site/-/edit-site-6.0.2.tgz",
-			"integrity": "sha512-BHNJAV3sRgbNoM5iUOByrEC+7Bc61YA2Q2dfqeSeh8wyND0JReIKTLCKOFmx44eSr8EuWwB5qdH5tQbmW2O5Rg==",
+			"version": "6.0.3",
+			"resolved": "https://registry.npmjs.org/@wordpress/edit-site/-/edit-site-6.0.3.tgz",
+			"integrity": "sha512-O9cjfWdJ6a2vfi+LBnXTcoIlOz+OcHrEQT5ghz/AOD6pXMS74IsWbgvNnHFOGFs/QTvsH3tE5UHnPEpn08zpSQ==",
 			"requires": {
 				"@babel/runtime": "^7.16.0",
 				"@react-spring/web": "^9.4.5",
@@ -38462,7 +38462,7 @@
 				"@wordpress/api-fetch": "^7.0.1",
 				"@wordpress/blob": "^4.0.1",
 				"@wordpress/block-editor": "^13.0.2",
-				"@wordpress/block-library": "^9.0.2",
+				"@wordpress/block-library": "^9.0.3",
 				"@wordpress/blocks": "^13.0.2",
 				"@wordpress/commands": "^1.0.2",
 				"@wordpress/components": "^28.0.2",
@@ -38506,14 +38506,14 @@
 			}
 		},
 		"@wordpress/edit-widgets": {
-			"version": "6.0.2",
-			"resolved": "https://registry.npmjs.org/@wordpress/edit-widgets/-/edit-widgets-6.0.2.tgz",
-			"integrity": "sha512-hCDMSDPAT8nlt/9U8jtYYnlawc7Xkf31CMhvSCcEu55nMYVppJxqgbs1E/KXmIW/6ljTmyo/uR6bPsS3GPEGvw==",
+			"version": "6.0.3",
+			"resolved": "https://registry.npmjs.org/@wordpress/edit-widgets/-/edit-widgets-6.0.3.tgz",
+			"integrity": "sha512-bYpg2Uq7QRuEUhfaczdTxPZnEhhJ921Ln+nW7GGCb5o6Eq8tNpyk4888HN6qfo+h1LUZNhW9RZOz8z1gq6AXPA==",
 			"requires": {
 				"@babel/runtime": "^7.16.0",
 				"@wordpress/api-fetch": "^7.0.1",
 				"@wordpress/block-editor": "^13.0.2",
-				"@wordpress/block-library": "^9.0.2",
+				"@wordpress/block-library": "^9.0.3",
 				"@wordpress/blocks": "^13.0.2",
 				"@wordpress/components": "^28.0.2",
 				"@wordpress/compose": "^7.0.1",
diff --git a/package.json b/package.json
index ad1e5ffdf4aab..802538953b095 100644
--- a/package.json
+++ b/package.json
@@ -83,9 +83,9 @@
 		"@wordpress/api-fetch": "7.0.1",
 		"@wordpress/autop": "4.0.1",
 		"@wordpress/blob": "4.0.1",
-		"@wordpress/block-directory": "5.0.2",
+		"@wordpress/block-directory": "5.0.3",
 		"@wordpress/block-editor": "13.0.2",
-		"@wordpress/block-library": "9.0.2",
+		"@wordpress/block-library": "9.0.3",
 		"@wordpress/block-serialization-default-parser": "5.0.1",
 		"@wordpress/blocks": "13.0.2",
 		"@wordpress/commands": "1.0.2",
@@ -93,7 +93,7 @@
 		"@wordpress/compose": "7.0.1",
 		"@wordpress/core-commands": "1.0.2",
 		"@wordpress/core-data": "7.0.2",
-		"@wordpress/customize-widgets": "5.0.2",
+		"@wordpress/customize-widgets": "5.0.3",
 		"@wordpress/data": "10.0.2",
 		"@wordpress/data-controls": "4.0.2",
 		"@wordpress/dataviews": "2.0.2",
@@ -101,9 +101,9 @@
 		"@wordpress/deprecated": "4.0.1",
 		"@wordpress/dom": "4.0.1",
 		"@wordpress/dom-ready": "4.0.1",
-		"@wordpress/edit-post": "8.0.2",
-		"@wordpress/edit-site": "6.0.2",
-		"@wordpress/edit-widgets": "6.0.2",
+		"@wordpress/edit-post": "8.0.3",
+		"@wordpress/edit-site": "6.0.3",
+		"@wordpress/edit-widgets": "6.0.3",
 		"@wordpress/editor": "14.0.2",
 		"@wordpress/element": "6.0.1",
 		"@wordpress/escape-html": "3.0.1",
diff --git a/src/wp-includes/blocks/template-part.php b/src/wp-includes/blocks/template-part.php
index b9cae2d48ed17..be867c4ced166 100644
--- a/src/wp-includes/blocks/template-part.php
+++ b/src/wp-includes/blocks/template-part.php
@@ -161,7 +161,7 @@ function render_block_core_template_part( $attributes ) {
 	global $wp_embed;
 	$content = $wp_embed->autoembed( $content );
 
-	if ( empty( $attributes['tagName'] ) ) {
+	if ( empty( $attributes['tagName'] ) || tag_escape( $attributes['tagName'] ) !== $attributes['tagName'] ) {
 		$area_tag = 'div';
 		if ( $area_definition && isset( $area_definition['area_tag'] ) ) {
 			$area_tag = $area_definition['area_tag'];