diff --git a/wp-includes/post.php b/wp-includes/post.php
index 58504e140a..a9992071f0 100644
--- a/wp-includes/post.php
+++ b/wp-includes/post.php
@@ -69,6 +69,11 @@ function create_initial_post_types() {
 		)
 	);
 
+	// Enhance page editor for block themes by rendering template and content blocks.
+	if ( wp_is_block_theme() && current_theme_supports( 'block-templates' ) ) {
+		add_post_type_support( 'page', 'editor', array( 'default-mode' => 'template-locked' ) );
+	}
+
 	register_post_type(
 		'attachment',
 		array(
diff --git a/wp-includes/version.php b/wp-includes/version.php
index ca7a94ea40..e92d3839a0 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.8-alpha-59884';
+$wp_version = '6.8-alpha-59885';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.