diff --git a/wp-includes/blocks/audio/block.json b/wp-includes/blocks/audio/block.json
new file mode 100644
index 0000000000..31c6c8f9ef
--- /dev/null
+++ b/wp-includes/blocks/audio/block.json
@@ -0,0 +1,42 @@
+{
+	"name": "core/audio",
+	"category": "media",
+	"attributes": {
+		"src": {
+			"type": "string",
+			"source": "attribute",
+			"selector": "audio",
+			"attribute": "src"
+		},
+		"caption": {
+			"type": "string",
+			"source": "html",
+			"selector": "figcaption"
+		},
+		"id": {
+			"type": "number"
+		},
+		"autoplay": {
+			"type": "boolean",
+			"source": "attribute",
+			"selector": "audio",
+			"attribute": "autoplay"
+		},
+		"loop": {
+			"type": "boolean",
+			"source": "attribute",
+			"selector": "audio",
+			"attribute": "loop"
+		},
+		"preload": {
+			"type": "string",
+			"source": "attribute",
+			"selector": "audio",
+			"attribute": "preload"
+		}
+	},
+	"supports": {
+		"align": true,
+		"lightBlockWrapper": true
+	}
+}
diff --git a/wp-includes/blocks/button/block.json b/wp-includes/blocks/button/block.json
new file mode 100644
index 0000000000..b2af0f5a4c
--- /dev/null
+++ b/wp-includes/blocks/button/block.json
@@ -0,0 +1,62 @@
+{
+	"name": "core/button",
+	"category": "design",
+	"parent": [
+		"core/buttons"
+	],
+	"attributes": {
+		"url": {
+			"type": "string",
+			"source": "attribute",
+			"selector": "a",
+			"attribute": "href"
+		},
+		"title": {
+			"type": "string",
+			"source": "attribute",
+			"selector": "a",
+			"attribute": "title"
+		},
+		"text": {
+			"type": "string",
+			"source": "html",
+			"selector": "a"
+		},
+		"linkTarget": {
+			"type": "string",
+			"source": "attribute",
+			"selector": "a",
+			"attribute": "target"
+		},
+		"rel": {
+			"type": "string",
+			"source": "attribute",
+			"selector": "a",
+			"attribute": "rel"
+		},
+		"placeholder": {
+			"type": "string"
+		},
+		"borderRadius": {
+			"type": "number"
+		},
+		"style": {
+			"type": "object"
+		},
+		"backgroundColor": {
+			"type": "string"
+		},
+		"textColor": {
+			"type": "string"
+		},
+		"gradient": {
+			"type": "string"
+		}
+	},
+	"supports": {
+		"align": true,
+		"alignWide": false,
+		"reusable": false,
+		"lightBlockWrapper": true
+	}
+}
diff --git a/wp-includes/blocks/buttons/block.json b/wp-includes/blocks/buttons/block.json
new file mode 100644
index 0000000000..4004a9591a
--- /dev/null
+++ b/wp-includes/blocks/buttons/block.json
@@ -0,0 +1,9 @@
+{
+	"name": "core/buttons",
+	"category": "design",
+	"supports": {
+		"align": true,
+		"alignWide": false,
+		"lightBlockWrapper": true
+	}
+}
diff --git a/wp-includes/blocks/classic/block.json b/wp-includes/blocks/classic/block.json
new file mode 100644
index 0000000000..63d2c9f37e
--- /dev/null
+++ b/wp-includes/blocks/classic/block.json
@@ -0,0 +1,15 @@
+{
+	"name": "core/freeform",
+	"category": "text",
+	"attributes": {
+		"content": {
+			"type": "string",
+			"source": "html"
+		}
+	},
+	"supports": {
+		"className": false,
+		"customClassName": false,
+		"reusable": false
+	}
+}
diff --git a/wp-includes/blocks/code/block.json b/wp-includes/blocks/code/block.json
new file mode 100644
index 0000000000..d7cab6cf34
--- /dev/null
+++ b/wp-includes/blocks/code/block.json
@@ -0,0 +1,15 @@
+{
+	"name": "core/code",
+	"category": "text",
+	"attributes": {
+		"content": {
+			"type": "string",
+			"source": "text",
+			"selector": "code"
+		}
+	},
+	"supports": {
+		"html": false,
+		"lightBlockWrapper": true
+	}
+}
diff --git a/wp-includes/blocks/column/block.json b/wp-includes/blocks/column/block.json
new file mode 100644
index 0000000000..328dbb6201
--- /dev/null
+++ b/wp-includes/blocks/column/block.json
@@ -0,0 +1,22 @@
+{
+	"name": "core/column",
+	"category": "text",
+	"parent": [
+		"core/columns"
+	],
+	"attributes": {
+		"verticalAlignment": {
+			"type": "string"
+		},
+		"width": {
+			"type": "number",
+			"min": 0,
+			"max": 100
+		}
+	},
+	"supports": {
+		"reusable": false,
+		"html": false,
+		"lightBlockWrapper": true
+	}
+}
diff --git a/wp-includes/blocks/columns/block.json b/wp-includes/blocks/columns/block.json
new file mode 100644
index 0000000000..352b1e5caa
--- /dev/null
+++ b/wp-includes/blocks/columns/block.json
@@ -0,0 +1,21 @@
+{
+	"name": "core/columns",
+	"category": "design",
+	"attributes": {
+		"verticalAlignment": {
+			"type": "string"
+		}
+	},
+	"supports": {
+		"align": [
+			"wide",
+			"full"
+		],
+		"html": false,
+		"lightBlockWrapper": true,
+		"__experimentalColor": {
+			"gradients": true,
+			"linkColor": true
+		}
+	}
+}
diff --git a/wp-includes/blocks/file/block.json b/wp-includes/blocks/file/block.json
new file mode 100644
index 0000000000..664ec1154a
--- /dev/null
+++ b/wp-includes/blocks/file/block.json
@@ -0,0 +1,41 @@
+{
+	"name": "core/file",
+	"category": "media",
+	"attributes": {
+		"id": {
+			"type": "number"
+		},
+		"href": {
+			"type": "string"
+		},
+		"fileName": {
+			"type": "string",
+			"source": "html",
+			"selector": "a:not([download])"
+		},
+		"textLinkHref": {
+			"type": "string",
+			"source": "attribute",
+			"selector": "a:not([download])",
+			"attribute": "href"
+		},
+		"textLinkTarget": {
+			"type": "string",
+			"source": "attribute",
+			"selector": "a:not([download])",
+			"attribute": "target"
+		},
+		"showDownloadButton": {
+			"type": "boolean",
+			"default": true
+		},
+		"downloadButtonText": {
+			"type": "string",
+			"source": "html",
+			"selector": "a[download]"
+		}
+	},
+	"supports": {
+		"align": true
+	}
+}
diff --git a/wp-includes/blocks/gallery/block.json b/wp-includes/blocks/gallery/block.json
new file mode 100644
index 0000000000..c16a21e734
--- /dev/null
+++ b/wp-includes/blocks/gallery/block.json
@@ -0,0 +1,82 @@
+{
+	"name": "core/gallery",
+	"category": "media",
+	"attributes": {
+		"images": {
+			"type": "array",
+			"default": [],
+			"source": "query",
+			"selector": ".blocks-gallery-item",
+			"query": {
+				"url": {
+					"type": "string",
+					"source": "attribute",
+					"selector": "img",
+					"attribute": "src"
+				},
+				"fullUrl": {
+					"type": "string",
+					"source": "attribute",
+					"selector": "img",
+					"attribute": "data-full-url"
+				},
+				"link": {
+					"type": "string",
+					"source": "attribute",
+					"selector": "img",
+					"attribute": "data-link"
+				},
+				"alt": {
+					"type": "string",
+					"source": "attribute",
+					"selector": "img",
+					"attribute": "alt",
+					"default": ""
+				},
+				"id": {
+					"type": "string",
+					"source": "attribute",
+					"selector": "img",
+					"attribute": "data-id"
+				},
+				"caption": {
+					"type": "string",
+					"source": "html",
+					"selector": ".blocks-gallery-item__caption"
+				}
+			}
+		},
+		"ids": {
+			"type": "array",
+			"items": {
+				"type": "number"
+			},
+			"default": []
+		},
+		"columns": {
+			"type": "number",
+			"minimum": 1,
+			"maximum": 8
+		},
+		"caption": {
+			"type": "string",
+			"source": "html",
+			"selector": ".blocks-gallery-caption"
+		},
+		"imageCrop": {
+			"type": "boolean",
+			"default": true
+		},
+		"linkTo": {
+			"type": "string",
+			"default": "none"
+		},
+		"sizeSlug": {
+			"type": "string",
+			"default": "large"
+		}
+	},
+	"supports": {
+		"align": true
+	}
+}
diff --git a/wp-includes/blocks/group/block.json b/wp-includes/blocks/group/block.json
new file mode 100644
index 0000000000..1e32b1443c
--- /dev/null
+++ b/wp-includes/blocks/group/block.json
@@ -0,0 +1,23 @@
+{
+	"name": "core/group",
+	"category": "design",
+	"attributes": {
+		"tagName": {
+			"type": "string",
+			"default": "div"
+		}
+	},
+	"supports": {
+		"align": [
+			"wide",
+			"full"
+		],
+		"anchor": true,
+		"html": false,
+		"lightBlockWrapper": true,
+		"__experimentalColor": {
+			"gradients": true,
+			"linkColor": true
+		}
+	}
+}
diff --git a/wp-includes/blocks/heading/block.json b/wp-includes/blocks/heading/block.json
new file mode 100644
index 0000000000..fd03a4487e
--- /dev/null
+++ b/wp-includes/blocks/heading/block.json
@@ -0,0 +1,41 @@
+{
+	"name": "core/heading",
+	"category": "text",
+	"attributes": {
+		"align": {
+			"type": "string"
+		},
+		"content": {
+			"type": "string",
+			"source": "html",
+			"selector": "h1,h2,h3,h4,h5,h6",
+			"default": ""
+		},
+		"level": {
+			"type": "number",
+			"default": 2
+		},
+		"placeholder": {
+			"type": "string"
+		}
+	},
+	"supports": {
+		"anchor": true,
+		"className": false,
+		"lightBlockWrapper": true,
+		"__experimentalColor": {
+			"linkColor": true
+		},
+		"__experimentalFontSize": true,
+		"__experimentalLineHeight": true,
+		"__experimentalSelector": {
+			"core/heading/h1": "h1",
+			"core/heading/h2": "h2",
+			"core/heading/h3": "h3",
+			"core/heading/h4": "h4",
+			"core/heading/h5": "h5",
+			"core/heading/h6": "h6"
+		},
+		"__unstablePasteTextInline": true
+	}
+}
diff --git a/wp-includes/blocks/html/block.json b/wp-includes/blocks/html/block.json
new file mode 100644
index 0000000000..b9624b4b3e
--- /dev/null
+++ b/wp-includes/blocks/html/block.json
@@ -0,0 +1,15 @@
+{
+	"name": "core/html",
+	"category": "widgets",
+	"attributes": {
+		"content": {
+			"type": "string",
+			"source": "html"
+		}
+	},
+	"supports": {
+		"customClassName": false,
+		"className": false,
+		"html": false
+	}
+}
diff --git a/wp-includes/blocks/image/block.json b/wp-includes/blocks/image/block.json
new file mode 100644
index 0000000000..d403ec3827
--- /dev/null
+++ b/wp-includes/blocks/image/block.json
@@ -0,0 +1,76 @@
+{
+	"name": "core/image",
+	"category": "media",
+	"attributes": {
+		"align": {
+			"type": "string"
+		},
+		"url": {
+			"type": "string",
+			"source": "attribute",
+			"selector": "img",
+			"attribute": "src"
+		},
+		"alt": {
+			"type": "string",
+			"source": "attribute",
+			"selector": "img",
+			"attribute": "alt",
+			"default": ""
+		},
+		"caption": {
+			"type": "string",
+			"source": "html",
+			"selector": "figcaption"
+		},
+		"title": {
+			"type": "string",
+			"source": "attribute",
+			"selector": "img",
+			"attribute": "title"
+		},
+		"href": {
+			"type": "string",
+			"source": "attribute",
+			"selector": "figure > a",
+			"attribute": "href"
+		},
+		"rel": {
+			"type": "string",
+			"source": "attribute",
+			"selector": "figure > a",
+			"attribute": "rel"
+		},
+		"linkClass": {
+			"type": "string",
+			"source": "attribute",
+			"selector": "figure > a",
+			"attribute": "class"
+		},
+		"id": {
+			"type": "number"
+		},
+		"width": {
+			"type": "number"
+		},
+		"height": {
+			"type": "number"
+		},
+		"sizeSlug": {
+			"type": "string"
+		},
+		"linkDestination": {
+			"type": "string",
+			"default": "none"
+		},
+		"linkTarget": {
+			"type": "string",
+			"source": "attribute",
+			"selector": "figure > a",
+			"attribute": "target"
+		}
+	},
+	"supports": {
+		"lightBlockWrapper": true
+	}
+}
diff --git a/wp-includes/blocks/index.php b/wp-includes/blocks/index.php
new file mode 100644
index 0000000000..53aaf2756a
--- /dev/null
+++ b/wp-includes/blocks/index.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Used to set up all core blocks used with the block editor.
+ *
+ * @package WordPress
+ */
+
+// Include files required for core blocks registration.
+require ABSPATH . WPINC . '/blocks/archives.php';
+require ABSPATH . WPINC . '/blocks/block.php';
+require ABSPATH . WPINC . '/blocks/calendar.php';
+require ABSPATH . WPINC . '/blocks/categories.php';
+require ABSPATH . WPINC . '/blocks/latest-comments.php';
+require ABSPATH . WPINC . '/blocks/latest-posts.php';
+require ABSPATH . WPINC . '/blocks/rss.php';
+require ABSPATH . WPINC . '/blocks/search.php';
+require ABSPATH . WPINC . '/blocks/shortcode.php';
+require ABSPATH . WPINC . '/blocks/social-link.php';
+require ABSPATH . WPINC . '/blocks/tag-cloud.php';
+
+$block_folders = array(
+	'audio',
+	'button',
+	'buttons',
+	'classic',
+	'code',
+	'column',
+	'columns',
+	'file',
+	'gallery',
+	'group',
+	'heading',
+	'html',
+	'image',
+	'list',
+	'media-text',
+	'missing',
+	'more',
+	'nextpage',
+	'paragraph',
+	'preformatted',
+	'pullquote',
+	'quote',
+	'separator',
+	'social-links',
+	'spacer',
+	'subhead',
+	'table',
+	'text-columns',
+	'verse',
+	'video',
+);
+
+foreach ( $block_folders as $block_folder ) {
+	register_block_type_from_metadata(
+		ABSPATH . WPINC . '/blocks/' . $block_folder
+	);
+}
diff --git a/wp-includes/blocks/list/block.json b/wp-includes/blocks/list/block.json
new file mode 100644
index 0000000000..e195a1b6f4
--- /dev/null
+++ b/wp-includes/blocks/list/block.json
@@ -0,0 +1,35 @@
+{
+	"name": "core/list",
+	"category": "text",
+	"attributes": {
+		"ordered": {
+			"type": "boolean",
+			"default": false
+		},
+		"values": {
+			"type": "string",
+			"source": "html",
+			"selector": "ol,ul",
+			"multiline": "li",
+			"__unstableMultilineWrapperTags": [
+				"ol",
+				"ul"
+			],
+			"default": ""
+		},
+		"type": {
+			"type": "string"
+		},
+		"start": {
+			"type": "number"
+		},
+		"reversed": {
+			"type": "boolean"
+		}
+	},
+	"supports": {
+		"className": false,
+		"__unstablePasteTextInline": true,
+		"lightBlockWrapper": true
+	}
+}
diff --git a/wp-includes/blocks/media-text/block.json b/wp-includes/blocks/media-text/block.json
new file mode 100644
index 0000000000..90437cf368
--- /dev/null
+++ b/wp-includes/blocks/media-text/block.json
@@ -0,0 +1,92 @@
+{
+	"name": "core/media-text",
+	"category": "media",
+	"attributes": {
+		"align": {
+			"type": "string",
+			"default": "wide"
+		},
+		"mediaAlt": {
+			"type": "string",
+			"source": "attribute",
+			"selector": "figure img",
+			"attribute": "alt",
+			"default": ""
+		},
+		"mediaPosition": {
+			"type": "string",
+			"default": "left"
+		},
+		"mediaId": {
+			"type": "number"
+		},
+		"mediaUrl": {
+			"type": "string",
+			"source": "attribute",
+			"selector": "figure video,figure img",
+			"attribute": "src"
+		},
+		"mediaLink": {
+			"type": "string"
+		},
+		"linkDestination": {
+			"type": "string"
+		},
+		"linkTarget": {
+			"type": "string",
+			"source": "attribute",
+			"selector": "figure a",
+			"attribute": "target"
+		},
+		"href": {
+			"type": "string",
+			"source": "attribute",
+			"selector": "figure a",
+			"attribute": "href"
+		},
+		"rel": {
+			"type": "string",
+			"source": "attribute",
+			"selector": "figure a",
+			"attribute": "rel"
+		},
+		"linkClass": {
+			"type": "string",
+			"source": "attribute",
+			"selector": "figure a",
+			"attribute": "class"
+		},
+		"mediaType": {
+			"type": "string"
+		},
+		"mediaWidth": {
+			"type": "number",
+			"default": 50
+		},
+		"isStackedOnMobile": {
+			"type": "boolean",
+			"default": true
+		},
+		"verticalAlignment": {
+			"type": "string"
+		},
+		"imageFill": {
+			"type": "boolean"
+		},
+		"focalPoint": {
+			"type": "object"
+		}
+	},
+	"supports": {
+		"align": [
+			"wide",
+			"full"
+		],
+		"html": false,
+		"lightBlockWrapper": true,
+		"__experimentalColor": {
+			"gradients": true,
+			"linkColor": true
+		}
+	}
+}
diff --git a/wp-includes/blocks/missing/block.json b/wp-includes/blocks/missing/block.json
new file mode 100644
index 0000000000..57a246966d
--- /dev/null
+++ b/wp-includes/blocks/missing/block.json
@@ -0,0 +1,23 @@
+{
+	"name": "core/missing",
+	"category": "text",
+	"attributes": {
+		"originalName": {
+			"type": "string"
+		},
+		"originalUndelimitedContent": {
+			"type": "string"
+		},
+		"originalContent": {
+			"type": "string",
+			"source": "html"
+		}
+	},
+	"supports": {
+		"className": false,
+		"customClassName": false,
+		"inserter": false,
+		"html": false,
+		"reusable": false
+	}
+}
diff --git a/wp-includes/blocks/more/block.json b/wp-includes/blocks/more/block.json
new file mode 100644
index 0000000000..7697b06ac4
--- /dev/null
+++ b/wp-includes/blocks/more/block.json
@@ -0,0 +1,19 @@
+{
+	"name": "core/more",
+	"category": "design",
+	"attributes": {
+		"customText": {
+			"type": "string"
+		},
+		"noTeaser": {
+			"type": "boolean",
+			"default": false
+		}
+	},
+	"supports": {
+		"customClassName": false,
+		"className": false,
+		"html": false,
+		"multiple": false
+	}
+}
diff --git a/wp-includes/blocks/nextpage/block.json b/wp-includes/blocks/nextpage/block.json
new file mode 100644
index 0000000000..ed9293b2a9
--- /dev/null
+++ b/wp-includes/blocks/nextpage/block.json
@@ -0,0 +1,10 @@
+{
+	"name": "core/nextpage",
+	"category": "design",
+	"parent": [ "core/post-content" ],
+	"supports": {
+		"customClassName": false,
+		"className": false,
+		"html": false
+	}
+}
diff --git a/wp-includes/blocks/paragraph/block.json b/wp-includes/blocks/paragraph/block.json
new file mode 100644
index 0000000000..959fd92943
--- /dev/null
+++ b/wp-includes/blocks/paragraph/block.json
@@ -0,0 +1,45 @@
+{
+	"name": "core/paragraph",
+	"category": "text",
+	"attributes": {
+		"align": {
+			"type": "string"
+		},
+		"content": {
+			"type": "string",
+			"source": "html",
+			"selector": "p",
+			"default": ""
+		},
+		"dropCap": {
+			"type": "boolean",
+			"default": false
+		},
+		"placeholder": {
+			"type": "string"
+		},
+		"direction": {
+			"type": "string",
+			"enum": [
+				"ltr",
+				"rtl"
+			]
+		}
+	},
+	"supports": {
+		"className": false,
+		"lightBlockWrapper": true,
+		"__experimentalColor": {
+			"linkColor": true
+		},
+		"__experimentalFontSize": true,
+		"__experimentalLineHeight": true,
+		"__experimentalFeatures": {
+			"typography": {
+				"dropCap": true
+			}
+		},
+		"__experimentalSelector": "p",
+		"__unstablePasteTextInline": true
+	}
+}
diff --git a/wp-includes/blocks/preformatted/block.json b/wp-includes/blocks/preformatted/block.json
new file mode 100644
index 0000000000..8220666e29
--- /dev/null
+++ b/wp-includes/blocks/preformatted/block.json
@@ -0,0 +1,16 @@
+{
+	"name": "core/preformatted",
+	"category": "text",
+	"attributes": {
+		"content": {
+			"type": "string",
+			"source": "html",
+			"selector": "pre",
+			"default": "",
+			"__unstablePreserveWhiteSpace": true
+		}
+	},
+	"supports": {
+		"lightBlockWrapper": true
+	}
+}
diff --git a/wp-includes/blocks/pullquote/block.json b/wp-includes/blocks/pullquote/block.json
new file mode 100644
index 0000000000..08ebd960d5
--- /dev/null
+++ b/wp-includes/blocks/pullquote/block.json
@@ -0,0 +1,38 @@
+{
+	"name": "core/pullquote",
+	"category": "text",
+	"attributes": {
+		"value": {
+			"type": "string",
+			"source": "html",
+			"selector": "blockquote",
+			"multiline": "p"
+		},
+		"citation": {
+			"type": "string",
+			"source": "html",
+			"selector": "cite",
+			"default": ""
+		},
+		"mainColor": {
+			"type": "string"
+		},
+		"customMainColor": {
+			"type": "string"
+		},
+		"textColor": {
+			"type": "string"
+		},
+		"customTextColor": {
+			"type": "string"
+		}
+	},
+	"supports": {
+		"align": [
+			"left",
+			"right",
+			"wide",
+			"full"
+		]
+	}
+}
diff --git a/wp-includes/blocks/quote/block.json b/wp-includes/blocks/quote/block.json
new file mode 100644
index 0000000000..fe0ebe1586
--- /dev/null
+++ b/wp-includes/blocks/quote/block.json
@@ -0,0 +1,22 @@
+{
+	"name": "core/quote",
+	"category": "text",
+	"attributes": {
+		"value": {
+			"type": "string",
+			"source": "html",
+			"selector": "blockquote",
+			"multiline": "p",
+			"default": ""
+		},
+		"citation": {
+			"type": "string",
+			"source": "html",
+			"selector": "cite",
+			"default": ""
+		},
+		"align": {
+			"type": "string"
+		}
+	}
+}
diff --git a/wp-includes/blocks/separator/block.json b/wp-includes/blocks/separator/block.json
new file mode 100644
index 0000000000..be78a415d8
--- /dev/null
+++ b/wp-includes/blocks/separator/block.json
@@ -0,0 +1,12 @@
+{
+	"name": "core/separator",
+	"category": "design",
+	"attributes": {
+		"color": {
+			"type": "string"
+		},
+		"customColor": {
+			"type": "string"
+		}
+	}
+}
diff --git a/wp-includes/blocks/social-links/block.json b/wp-includes/blocks/social-links/block.json
new file mode 100644
index 0000000000..816932a9fb
--- /dev/null
+++ b/wp-includes/blocks/social-links/block.json
@@ -0,0 +1,12 @@
+{
+	"name": "core/social-links",
+	"category": "widgets",
+	"supports": {
+		"align": [
+			"left",
+			"center",
+			"right"
+		],
+		"lightBlockWrapper": true
+	}
+}
diff --git a/wp-includes/blocks/spacer/block.json b/wp-includes/blocks/spacer/block.json
new file mode 100644
index 0000000000..4719c6305b
--- /dev/null
+++ b/wp-includes/blocks/spacer/block.json
@@ -0,0 +1,10 @@
+{
+	"name": "core/spacer",
+	"category": "design",
+	"attributes": {
+		"height": {
+			"type": "number",
+			"default": 100
+		}
+	}
+}
diff --git a/wp-includes/blocks/subhead/block.json b/wp-includes/blocks/subhead/block.json
new file mode 100644
index 0000000000..b79fdf6a8f
--- /dev/null
+++ b/wp-includes/blocks/subhead/block.json
@@ -0,0 +1,18 @@
+{
+	"name": "core/subhead",
+	"category": "text",
+	"attributes": {
+		"align": {
+			"type": "string"
+		},
+		"content": {
+			"type": "string",
+			"source": "html",
+			"selector": "p"
+		}
+	},
+	"supports": {
+		"inserter": false,
+		"multiple": false
+	}
+}
diff --git a/wp-includes/blocks/table/block.json b/wp-includes/blocks/table/block.json
new file mode 100644
index 0000000000..81583f2050
--- /dev/null
+++ b/wp-includes/blocks/table/block.json
@@ -0,0 +1,127 @@
+{
+	"name": "core/table",
+	"category": "text",
+	"attributes": {
+		"hasFixedLayout": {
+			"type": "boolean",
+			"default": false
+		},
+		"backgroundColor": {
+			"type": "string"
+		},
+		"caption": {
+			"type": "string",
+			"source": "html",
+			"selector": "figcaption",
+			"default": ""
+		},
+		"head": {
+			"type": "array",
+			"default": [],
+			"source": "query",
+			"selector": "thead tr",
+			"query": {
+				"cells": {
+					"type": "array",
+					"default": [],
+					"source": "query",
+					"selector": "td,th",
+					"query": {
+						"content": {
+							"type": "string",
+							"source": "html"
+						},
+						"tag": {
+							"type": "string",
+							"default": "td",
+							"source": "tag"
+						},
+						"scope": {
+							"type": "string",
+							"source": "attribute",
+							"attribute": "scope"
+						},
+						"align": {
+							"type": "string",
+							"source": "attribute",
+							"attribute": "data-align"
+						}
+					}
+				}
+			}
+		},
+		"body": {
+			"type": "array",
+			"default": [],
+			"source": "query",
+			"selector": "tbody tr",
+			"query": {
+				"cells": {
+					"type": "array",
+					"default": [],
+					"source": "query",
+					"selector": "td,th",
+					"query": {
+						"content": {
+							"type": "string",
+							"source": "html"
+						},
+						"tag": {
+							"type": "string",
+							"default": "td",
+							"source": "tag"
+						},
+						"scope": {
+							"type": "string",
+							"source": "attribute",
+							"attribute": "scope"
+						},
+						"align": {
+							"type": "string",
+							"source": "attribute",
+							"attribute": "data-align"
+						}
+					}
+				}
+			}
+		},
+		"foot": {
+			"type": "array",
+			"default": [],
+			"source": "query",
+			"selector": "tfoot tr",
+			"query": {
+				"cells": {
+					"type": "array",
+					"default": [],
+					"source": "query",
+					"selector": "td,th",
+					"query": {
+						"content": {
+							"type": "string",
+							"source": "html"
+						},
+						"tag": {
+							"type": "string",
+							"default": "td",
+							"source": "tag"
+						},
+						"scope": {
+							"type": "string",
+							"source": "attribute",
+							"attribute": "scope"
+						},
+						"align": {
+							"type": "string",
+							"source": "attribute",
+							"attribute": "data-align"
+						}
+					}
+				}
+			}
+		}
+	},
+	"supports": {
+		"align": true
+	}
+}
diff --git a/wp-includes/blocks/text-columns/block.json b/wp-includes/blocks/text-columns/block.json
new file mode 100644
index 0000000000..32f1651d40
--- /dev/null
+++ b/wp-includes/blocks/text-columns/block.json
@@ -0,0 +1,32 @@
+{
+	"name": "core/text-columns",
+	"icon": "columns",
+	"category": "design",
+	"attributes": {
+		"content": {
+			"type": "array",
+			"source": "query",
+			"selector": "p",
+			"query": {
+				"children": {
+					"type": "string",
+					"source": "html"
+				}
+			},
+			"default": [
+				{},
+				{}
+			]
+		},
+		"columns": {
+			"type": "number",
+			"default": 2
+		},
+		"width": {
+			"type": "string"
+		}
+	},
+	"supports": {
+		"inserter": false
+	}
+}
diff --git a/wp-includes/blocks/verse/block.json b/wp-includes/blocks/verse/block.json
new file mode 100644
index 0000000000..88fc168d45
--- /dev/null
+++ b/wp-includes/blocks/verse/block.json
@@ -0,0 +1,19 @@
+{
+	"name": "core/verse",
+	"category": "text",
+	"attributes": {
+		"content": {
+			"type": "string",
+			"source": "html",
+			"selector": "pre",
+			"default": "",
+			"__unstablePreserveWhiteSpace": true
+		},
+		"textAlign": {
+			"type": "string"
+		}
+	},
+	"supports": {
+		"lightBlockWrapper": true
+	}
+}
diff --git a/wp-includes/blocks/video/block.json b/wp-includes/blocks/video/block.json
new file mode 100644
index 0000000000..4ac3cf98a7
--- /dev/null
+++ b/wp-includes/blocks/video/block.json
@@ -0,0 +1,68 @@
+{
+	"name": "core/video",
+	"category": "media",
+	"attributes": {
+		"autoplay": {
+			"type": "boolean",
+			"source": "attribute",
+			"selector": "video",
+			"attribute": "autoplay"
+		},
+		"caption": {
+			"type": "string",
+			"source": "html",
+			"selector": "figcaption"
+		},
+		"controls": {
+			"type": "boolean",
+			"source": "attribute",
+			"selector": "video",
+			"attribute": "controls",
+			"default": true
+		},
+		"id": {
+			"type": "number"
+		},
+		"loop": {
+			"type": "boolean",
+			"source": "attribute",
+			"selector": "video",
+			"attribute": "loop"
+		},
+		"muted": {
+			"type": "boolean",
+			"source": "attribute",
+			"selector": "video",
+			"attribute": "muted"
+		},
+		"poster": {
+			"type": "string",
+			"source": "attribute",
+			"selector": "video",
+			"attribute": "poster"
+		},
+		"preload": {
+			"type": "string",
+			"source": "attribute",
+			"selector": "video",
+			"attribute": "preload",
+			"default": "metadata"
+		},
+		"src": {
+			"type": "string",
+			"source": "attribute",
+			"selector": "video",
+			"attribute": "src"
+		},
+		"playsInline": {
+			"type": "boolean",
+			"source": "attribute",
+			"selector": "video",
+			"attribute": "playsinline"
+		}
+	},
+	"supports": {
+		"align": true,
+		"lightBlockWrapper": true
+	}
+}
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 552839a799..719f199baa 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.5-alpha-48243';
+$wp_version = '5.5-alpha-48262';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
diff --git a/wp-settings.php b/wp-settings.php
index 02d80702e3..01d605844f 100644
--- a/wp-settings.php
+++ b/wp-settings.php
@@ -285,17 +285,7 @@ require ABSPATH . WPINC . '/class-wp-block.php';
 require ABSPATH . WPINC . '/class-wp-block-list.php';
 require ABSPATH . WPINC . '/class-wp-block-parser.php';
 require ABSPATH . WPINC . '/blocks.php';
-require ABSPATH . WPINC . '/blocks/archives.php';
-require ABSPATH . WPINC . '/blocks/block.php';
-require ABSPATH . WPINC . '/blocks/calendar.php';
-require ABSPATH . WPINC . '/blocks/categories.php';
-require ABSPATH . WPINC . '/blocks/latest-comments.php';
-require ABSPATH . WPINC . '/blocks/latest-posts.php';
-require ABSPATH . WPINC . '/blocks/rss.php';
-require ABSPATH . WPINC . '/blocks/search.php';
-require ABSPATH . WPINC . '/blocks/shortcode.php';
-require ABSPATH . WPINC . '/blocks/social-link.php';
-require ABSPATH . WPINC . '/blocks/tag-cloud.php';
+require ABSPATH . WPINC . '/blocks/index.php';
 
 $GLOBALS['wp_embed'] = new WP_Embed();