From 8866ec2c3de1ee2087d10672b7d22c1a61a6b581 Mon Sep 17 00:00:00 2001
From: chriszarate <chris.zarate@automattic.com>
Date: Thu, 19 Feb 2026 11:47:07 -0500
Subject: [PATCH 1/6] Enable RTC by default

---
 backport-changelog/7.0/11159.md            | 3 +++
 lib/compat/wordpress-7.0/collaboration.php | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 backport-changelog/7.0/11159.md

diff --git a/backport-changelog/7.0/11159.md b/backport-changelog/7.0/11159.md
new file mode 100644
index 00000000000000..5c087e83f73061
--- /dev/null
+++ b/backport-changelog/7.0/11159.md
@@ -0,0 +1,3 @@
+https://github.com/WordPress/wordpress-develop/pull/11159
+
+* https://github.com/WordPress/gutenberg/pull/75739
diff --git a/lib/compat/wordpress-7.0/collaboration.php b/lib/compat/wordpress-7.0/collaboration.php
index 4d123d51674ebe..402e54b5b680a6 100644
--- a/lib/compat/wordpress-7.0/collaboration.php
+++ b/lib/compat/wordpress-7.0/collaboration.php
@@ -112,7 +112,7 @@ function gutenberg_register_real_time_collaboration_setting() {
 				'type'              => 'boolean',
 				'description'       => __( 'Enable Real-Time Collaboration', 'gutenberg' ),
 				'sanitize_callback' => 'rest_sanitize_boolean',
-				'default'           => false,
+				'default'           => true,
 				'show_in_rest'      => true,
 			)
 		);
@@ -121,7 +121,7 @@ function gutenberg_register_real_time_collaboration_setting() {
 			$option_name,
 			__( 'Collaboration', 'gutenberg' ),
 			function () use ( $option_name ) {
-				$option_value = get_option( $option_name );
+				$option_value = get_option( $option_name, 1 );
 
 				?>
 				<label for="wp_enable_real_time_collaboration">
@@ -139,7 +139,7 @@ function () use ( $option_name ) {
 	 * Injects the real-time collaboration setting into a global variable.
 	 */
 	function gutenberg_inject_real_time_collaboration_setting() {
-		if ( get_option( 'wp_enable_real_time_collaboration', '0' ) ) {
+		if ( get_option( 'wp_enable_real_time_collaboration', 1 ) ) {
 			wp_add_inline_script(
 				'wp-core-data',
 				'window._wpCollaborationEnabled = true;',

From 66c6ec8373c54714e3d3fc75994f94cbfa4168d4 Mon Sep 17 00:00:00 2001
From: chriszarate <chris.zarate@automattic.com>
Date: Wed, 4 Mar 2026 11:50:35 -0700
Subject: [PATCH 2/6] Update option name

---
 ...ss-gutenberg-rest-autosaves-controller.php |  4 +--
 lib/compat/wordpress-7.0/collaboration.php    | 36 +++++++++----------
 lib/upgrade.php                               | 20 -----------
 .../collaboration-metabox-lock.spec.ts        |  7 ++--
 .../fixtures/collaboration-utils.ts           | 22 ++++++------
 .../editor/collaboration/fixtures/index.ts    |  1 -
 6 files changed, 33 insertions(+), 57 deletions(-)

diff --git a/lib/compat/wordpress-7.0/class-gutenberg-rest-autosaves-controller.php b/lib/compat/wordpress-7.0/class-gutenberg-rest-autosaves-controller.php
index e5730414d51c5c..9d41a1da001ed8 100644
--- a/lib/compat/wordpress-7.0/class-gutenberg-rest-autosaves-controller.php
+++ b/lib/compat/wordpress-7.0/class-gutenberg-rest-autosaves-controller.php
@@ -101,9 +101,9 @@ public function create_item( $request ) {
 		 * Load the real-time collaboration setting and, when enabled, ensure that an
 		 * an autosave revision is always targeted.
 		 */
-		$is_collaboration_enabled = get_option( 'wp_enable_real_time_collaboration' );
+		$is_collaboration_disabled = boolval( get_option( 'wp_disable_real_time_collaboration' ) );
 
-		if ( $is_draft && (int) $post->post_author === $user_id && ! $post_lock && ! $is_collaboration_enabled ) {
+		if ( $is_draft && (int) $post->post_author === $user_id && ! $post_lock && $is_collaboration_disabled ) {
 			/*
 			 * Draft posts for the same author: autosaving updates the post and does not create a revision.
 			 * Convert the post object to an array and add slashes, wp_update_post() expects escaped array.
diff --git a/lib/compat/wordpress-7.0/collaboration.php b/lib/compat/wordpress-7.0/collaboration.php
index 402e54b5b680a6..9f7ec7d2323706 100644
--- a/lib/compat/wordpress-7.0/collaboration.php
+++ b/lib/compat/wordpress-7.0/collaboration.php
@@ -103,16 +103,16 @@ function gutenberg_rest_api_crdt_post_meta() {
 	 * Registers the real-time collaboration setting.
 	 */
 	function gutenberg_register_real_time_collaboration_setting() {
-		$option_name = 'wp_enable_real_time_collaboration';
+		$option_name = 'wp_disable_real_time_collaboration';
 
 		register_setting(
 			'writing',
 			$option_name,
 			array(
 				'type'              => 'boolean',
-				'description'       => __( 'Enable Real-Time Collaboration', 'gutenberg' ),
+				'description'       => __( 'Disable real-time collaboration', 'gutenberg' ),
 				'sanitize_callback' => 'rest_sanitize_boolean',
-				'default'           => true,
+				'default'           => false,
 				'show_in_rest'      => true,
 			)
 		);
@@ -124,9 +124,9 @@ function () use ( $option_name ) {
 				$option_value = get_option( $option_name, 1 );
 
 				?>
-				<label for="wp_enable_real_time_collaboration">
-					<input name="wp_enable_real_time_collaboration" type="checkbox" id="wp_enable_real_time_collaboration" value="1" <?php checked( '1', $option_value ); ?>/>
-					<?php _e( 'Enable real-time collaboration', 'gutenberg' ); ?>
+				<label for="wp_disable_real_time_collaboration">
+					<input name="wp_disable_real_time_collaboration" type="checkbox" id="wp_disable_real_time_collaboration" value="1" <?php checked( '1', $option_value ); ?>/>
+					<?php _e( 'Disable real-time collaboration', 'gutenberg' ); ?>
 				</label>
 				<?php
 			},
@@ -134,18 +134,18 @@ function () use ( $option_name ) {
 		);
 	}
 	add_action( 'admin_init', 'gutenberg_register_real_time_collaboration_setting' );
+}
 
-	/**
-	 * Injects the real-time collaboration setting into a global variable.
-	 */
-	function gutenberg_inject_real_time_collaboration_setting() {
-		if ( get_option( 'wp_enable_real_time_collaboration', 1 ) ) {
-			wp_add_inline_script(
-				'wp-core-data',
-				'window._wpCollaborationEnabled = true;',
-				'after'
-			);
-		}
+/**
+ * Injects the real-time collaboration setting into a global variable.
+ */
+function gutenberg_inject_real_time_collaboration_setting() {
+	if ( ! boolval( get_option( 'wp_disable_real_time_collaboration' ) ) ) {
+		wp_add_inline_script(
+			'wp-core-data',
+			'window._wpCollaborationEnabled = true;',
+			'after'
+		);
 	}
-	add_action( 'admin_init', 'gutenberg_inject_real_time_collaboration_setting' );
 }
+add_action( 'admin_init', 'gutenberg_inject_real_time_collaboration_setting' );
diff --git a/lib/upgrade.php b/lib/upgrade.php
index 9450c1c89439c1..51841efb25d15f 100644
--- a/lib/upgrade.php
+++ b/lib/upgrade.php
@@ -62,23 +62,3 @@ function _gutenberg_migrate_remove_fse_drafts() {
 	delete_option( 'gutenberg_last_synchronize_theme_template_checks' );
 	delete_option( 'gutenberg_last_synchronize_theme_template-part_checks' );
 }
-
-/**
- * Replace unprefixed option enable_real_time_collaboration with prefixed version.
- *
- * Adds a `wp_` prefix to the option name to follow the convention for adding new
- * options to WordPress since WP 5.8.0.
- *
- * @since 22.6.0
- */
-function _gutenberg_migrate_enable_real_time_collaboration() {
-	$current_value = get_option( 'enable_real_time_collaboration', '0' );
-
-	update_option( 'wp_enable_real_time_collaboration', $current_value );
-	delete_option( 'enable_real_time_collaboration' );
-}
-
-// Deletion of the `_wp_file_based` term (in _gutenberg_migrate_remove_fse_drafts) must happen
-// after its taxonomy (`wp_theme`) is registered. This happens in `gutenberg_register_wp_theme_taxonomy`,
-// which is hooked into `init` (default priority, i.e. 10).
-add_action( 'init', '_gutenberg_migrate_database', 20 );
diff --git a/test/e2e/specs/editor/collaboration/collaboration-metabox-lock.spec.ts b/test/e2e/specs/editor/collaboration/collaboration-metabox-lock.spec.ts
index eaf499e1c1569f..e2d1a9f8166c3b 100644
--- a/test/e2e/specs/editor/collaboration/collaboration-metabox-lock.spec.ts
+++ b/test/e2e/specs/editor/collaboration/collaboration-metabox-lock.spec.ts
@@ -22,10 +22,6 @@ test.describe( 'Collaboration with meta boxes', () => {
 		editor,
 		page,
 	} ) => {
-		// Ensure collaboration is enabled (the fixture enables it, but
-		// be explicit to match the pattern of other collaboration tests).
-		await collaborationUtils.setCollaboration( true );
-
 		// Create a draft post.
 		const post = await requestUtils.createPost( {
 			title: 'Meta Box Lock Test',
@@ -43,6 +39,9 @@ test.describe( 'Collaboration with meta boxes', () => {
 			fullscreenMode: false,
 		} );
 
+		// Wait for collaboration runtime and entity record to be ready.
+		await collaborationUtils.waitForEntityReady( page );
+
 		// Wait for meta boxes to initialize and disable collaboration.
 		// collaborationSupported starts as true, then the meta box hook
 		// sets it to false once meta boxes are detected.
diff --git a/test/e2e/specs/editor/collaboration/fixtures/collaboration-utils.ts b/test/e2e/specs/editor/collaboration/fixtures/collaboration-utils.ts
index c7ec6c5d8c9871..29cfbab773510a 100644
--- a/test/e2e/specs/editor/collaboration/fixtures/collaboration-utils.ts
+++ b/test/e2e/specs/editor/collaboration/fixtures/collaboration-utils.ts
@@ -66,14 +66,15 @@ export default class CollaborationUtils {
 		const html = await response.text();
 		const nonce = html.match( /name="_wpnonce" value="([^"]+)"/ )![ 1 ];
 
-		// WordPress core (7.0+) uses 'enable_real_time_collaboration',
-		// while the Gutenberg plugin uses 'wp_enable_real_time_collaboration'.
-		// Detect which field name is present on the page.
-		const optionName = html.includes(
-			'name="enable_real_time_collaboration"'
-		)
-			? 'enable_real_time_collaboration'
-			: 'wp_enable_real_time_collaboration';
+		// WordPress Core Beta 3 switched from 'wp_enable_real_time_collaboration' to
+		// 'wp_disable_real_time_collaboration' (with flipped boolean values). Detect
+		// which field name is present on the page.
+		let optionName = 'wp_disable_real_time_collaboration';
+		let optionValue = enabled ? 0 : 1;
+		if ( html.includes( 'name="wp_enable_real_time_collaboration"' ) ) {
+			optionName = 'wp_enable_real_time_collaboration';
+			optionValue = enabled ? 1 : 0;
+		}
 
 		const formData: Record< string, string | number > = {
 			option_page: 'writing',
@@ -85,9 +86,7 @@ export default class CollaborationUtils {
 			default_post_format: 0,
 		};
 
-		if ( enabled ) {
-			formData[ optionName ] = 1;
-		}
+		formData[ optionName ] = optionValue;
 
 		await this.requestUtils.request.post( '/wp-admin/options.php', {
 			form: formData,
@@ -355,7 +354,6 @@ export default class CollaborationUtils {
 			this.secondPage = null;
 			this.secondEditor = null;
 		}
-		await this.setCollaboration( false );
 		await this.requestUtils.deleteAllUsers();
 	}
 }
diff --git a/test/e2e/specs/editor/collaboration/fixtures/index.ts b/test/e2e/specs/editor/collaboration/fixtures/index.ts
index 335cf21f375b29..fcd523fb96fd24 100644
--- a/test/e2e/specs/editor/collaboration/fixtures/index.ts
+++ b/test/e2e/specs/editor/collaboration/fixtures/index.ts
@@ -24,7 +24,6 @@ export const test = base.extend< Fixtures >( {
 			requestUtils,
 			page,
 		} );
-		await utils.setCollaboration( true );
 		// Clean up any leftover users from previous runs before creating.
 		await requestUtils.deleteAllUsers();
 		await requestUtils.createUser( SECOND_USER );

From 62543ffe14900e1616414722af424a81350e1b40 Mon Sep 17 00:00:00 2001
From: chriszarate <chris.zarate@automattic.com>
Date: Wed, 4 Mar 2026 13:39:15 -0700
Subject: [PATCH 3/6] Temporarily disable RTC for block-hooks E2E tests

---
 .../fixtures/collaboration-utils.ts           | 92 ++++++++++---------
 .../specs/editor/plugins/block-hooks.spec.js  | 21 +++++
 2 files changed, 69 insertions(+), 44 deletions(-)

diff --git a/test/e2e/specs/editor/collaboration/fixtures/collaboration-utils.ts b/test/e2e/specs/editor/collaboration/fixtures/collaboration-utils.ts
index 29cfbab773510a..1cdd6cd7962060 100644
--- a/test/e2e/specs/editor/collaboration/fixtures/collaboration-utils.ts
+++ b/test/e2e/specs/editor/collaboration/fixtures/collaboration-utils.ts
@@ -50,50 +50,6 @@ export default class CollaborationUtils {
 		this.primaryPage = page;
 	}
 
-	/**
-	 * Set the real-time collaboration WordPress setting.
-	 *
-	 * Uses the form-based approach (similar to setGutenbergExperiments)
-	 * because this setting is registered on admin_init in the "writing"
-	 * group and is not exposed via /wp/v2/settings.
-	 *
-	 * @param enabled Whether to enable or disable collaboration.
-	 */
-	async setCollaboration( enabled: boolean ) {
-		const response = await this.requestUtils.request.get(
-			'/wp-admin/options-writing.php'
-		);
-		const html = await response.text();
-		const nonce = html.match( /name="_wpnonce" value="([^"]+)"/ )![ 1 ];
-
-		// WordPress Core Beta 3 switched from 'wp_enable_real_time_collaboration' to
-		// 'wp_disable_real_time_collaboration' (with flipped boolean values). Detect
-		// which field name is present on the page.
-		let optionName = 'wp_disable_real_time_collaboration';
-		let optionValue = enabled ? 0 : 1;
-		if ( html.includes( 'name="wp_enable_real_time_collaboration"' ) ) {
-			optionName = 'wp_enable_real_time_collaboration';
-			optionValue = enabled ? 1 : 0;
-		}
-
-		const formData: Record< string, string | number > = {
-			option_page: 'writing',
-			action: 'update',
-			_wpnonce: nonce,
-			_wp_http_referer: '/wp-admin/options-writing.php',
-			submit: 'Save Changes',
-			default_category: 1,
-			default_post_format: 0,
-		};
-
-		formData[ optionName ] = optionValue;
-
-		await this.requestUtils.request.post( '/wp-admin/options.php', {
-			form: formData,
-			failOnStatusCode: true,
-		} );
-	}
-
 	/**
 	 * Open a collaborative editing session where both the primary user (admin)
 	 * and the second user (collaborator) are editing the same post.
@@ -357,3 +313,51 @@ export default class CollaborationUtils {
 		await this.requestUtils.deleteAllUsers();
 	}
 }
+
+/**
+ * Set the real-time collaboration WordPress setting.
+ *
+ * Uses the form-based approach (similar to setGutenbergExperiments)
+ * because this setting is registered on admin_init in the "writing"
+ * group and is not exposed via /wp/v2/settings.
+ *
+ * @param requestUtils An instance of RequestUtils for making HTTP requests.
+ * @param enabled      Whether to enable or disable collaboration.
+ */
+export async function setCollaboration(
+	requestUtils: RequestUtils,
+	enabled: boolean
+): Promise< void > {
+	const response = await requestUtils.request.get(
+		'/wp-admin/options-writing.php'
+	);
+	const html = await response.text();
+	const nonce = html.match( /name="_wpnonce" value="([^"]+)"/ )![ 1 ];
+
+	// WordPress Core Beta 3 switched from 'wp_enable_real_time_collaboration' to
+	// 'wp_disable_real_time_collaboration' (with flipped boolean values). Detect
+	// which field name is present on the page.
+	let optionName = 'wp_disable_real_time_collaboration';
+	let optionValue = enabled ? 0 : 1;
+	if ( html.includes( 'name="wp_enable_real_time_collaboration"' ) ) {
+		optionName = 'wp_enable_real_time_collaboration';
+		optionValue = enabled ? 1 : 0;
+	}
+
+	const formData: Record< string, string | number > = {
+		option_page: 'writing',
+		action: 'update',
+		_wpnonce: nonce,
+		_wp_http_referer: '/wp-admin/options-writing.php',
+		submit: 'Save Changes',
+		default_category: 1,
+		default_post_format: 0,
+	};
+
+	formData[ optionName ] = optionValue;
+
+	await requestUtils.request.post( '/wp-admin/options.php', {
+		form: formData,
+		failOnStatusCode: true,
+	} );
+}
diff --git a/test/e2e/specs/editor/plugins/block-hooks.spec.js b/test/e2e/specs/editor/plugins/block-hooks.spec.js
index 971dc5d764fd70..f56a1513f4dfea 100644
--- a/test/e2e/specs/editor/plugins/block-hooks.spec.js
+++ b/test/e2e/specs/editor/plugins/block-hooks.spec.js
@@ -3,6 +3,13 @@
  */
 const { test, expect } = require( '@wordpress/e2e-test-utils-playwright' );
 
+/**
+ * Internal dependencies
+ */
+const {
+	setCollaboration,
+} = require( '../../editor/collaboration/fixtures/collaboration-utils' );
+
 const dummyBlocksContent = `<!-- wp:heading -->
 <h2 class="wp-block-heading">This is a dummy heading</h2>
 <!-- /wp:heading -->
@@ -65,6 +72,12 @@ test.describe( 'Block Hooks API', () => {
 				} else {
 					containerPost = postObject;
 				}
+
+				/**
+				 * Since the Block Hooks API relies on server-side rendering to insert
+				 * the hooked blocks, there is a fundamental incompatibility with RTC.
+				 */
+				await setCollaboration( requestUtils, false );
 			} );
 
 			test.afterAll( async ( { requestUtils } ) => {
@@ -74,6 +87,7 @@ test.describe( 'Block Hooks API', () => {
 
 				await requestUtils.deleteAllPosts();
 				await requestUtils.deleteAllBlocks();
+				await setCollaboration( requestUtils, true );
 			} );
 
 			test( `should insert hooked blocks into ${ name } on frontend`, async ( {
@@ -198,6 +212,12 @@ test.describe( 'Block Hooks API', () => {
 				} else {
 					containerPost = postObject;
 				}
+
+				/**
+				 * Since the Block Hooks API relies on server-side rendering to insert
+				 * the hooked blocks, there is a fundamental incompatibility with RTC.
+				 */
+				await setCollaboration( requestUtils, false );
 			} );
 
 			test.afterAll( async ( { requestUtils } ) => {
@@ -207,6 +227,7 @@ test.describe( 'Block Hooks API', () => {
 
 				await requestUtils.deleteAllPosts();
 				await requestUtils.deleteAllBlocks();
+				await setCollaboration( requestUtils, true );
 			} );
 
 			test( `should insert hooked blocks into ${ name } on frontend`, async ( {

From cb8ac17a621a17ddfc299a5887795b9729a6407e Mon Sep 17 00:00:00 2001
From: chriszarate <chris.zarate@automattic.com>
Date: Wed, 4 Mar 2026 19:31:17 -0700
Subject: [PATCH 4/6] Update per "redo"

---
 backport-changelog/7.0/11159.md                   |  3 ---
 backport-changelog/7.0/11161.md                   |  3 +++
 .../class-gutenberg-rest-autosaves-controller.php |  4 ++--
 lib/compat/wordpress-7.0/collaboration.php        | 15 ++++++++-------
 .../collaboration/fixtures/collaboration-utils.ts | 11 ++---------
 5 files changed, 15 insertions(+), 21 deletions(-)
 delete mode 100644 backport-changelog/7.0/11159.md
 create mode 100644 backport-changelog/7.0/11161.md

diff --git a/backport-changelog/7.0/11159.md b/backport-changelog/7.0/11159.md
deleted file mode 100644
index 5c087e83f73061..00000000000000
--- a/backport-changelog/7.0/11159.md
+++ /dev/null
@@ -1,3 +0,0 @@
-https://github.com/WordPress/wordpress-develop/pull/11159
-
-* https://github.com/WordPress/gutenberg/pull/75739
diff --git a/backport-changelog/7.0/11161.md b/backport-changelog/7.0/11161.md
new file mode 100644
index 00000000000000..20313d2cae9c1e
--- /dev/null
+++ b/backport-changelog/7.0/11161.md
@@ -0,0 +1,3 @@
+https://github.com/WordPress/wordpress-develop/pull/11161
+
+* https://github.com/WordPress/gutenberg/pull/75739
diff --git a/lib/compat/wordpress-7.0/class-gutenberg-rest-autosaves-controller.php b/lib/compat/wordpress-7.0/class-gutenberg-rest-autosaves-controller.php
index 9d41a1da001ed8..e5730414d51c5c 100644
--- a/lib/compat/wordpress-7.0/class-gutenberg-rest-autosaves-controller.php
+++ b/lib/compat/wordpress-7.0/class-gutenberg-rest-autosaves-controller.php
@@ -101,9 +101,9 @@ public function create_item( $request ) {
 		 * Load the real-time collaboration setting and, when enabled, ensure that an
 		 * an autosave revision is always targeted.
 		 */
-		$is_collaboration_disabled = boolval( get_option( 'wp_disable_real_time_collaboration' ) );
+		$is_collaboration_enabled = get_option( 'wp_enable_real_time_collaboration' );
 
-		if ( $is_draft && (int) $post->post_author === $user_id && ! $post_lock && $is_collaboration_disabled ) {
+		if ( $is_draft && (int) $post->post_author === $user_id && ! $post_lock && ! $is_collaboration_enabled ) {
 			/*
 			 * Draft posts for the same author: autosaving updates the post and does not create a revision.
 			 * Convert the post object to an array and add slashes, wp_update_post() expects escaped array.
diff --git a/lib/compat/wordpress-7.0/collaboration.php b/lib/compat/wordpress-7.0/collaboration.php
index 9f7ec7d2323706..90eb2d8533905c 100644
--- a/lib/compat/wordpress-7.0/collaboration.php
+++ b/lib/compat/wordpress-7.0/collaboration.php
@@ -103,14 +103,14 @@ function gutenberg_rest_api_crdt_post_meta() {
 	 * Registers the real-time collaboration setting.
 	 */
 	function gutenberg_register_real_time_collaboration_setting() {
-		$option_name = 'wp_disable_real_time_collaboration';
+		$option_name = 'wp_enable_real_time_collaboration';
 
 		register_setting(
 			'writing',
 			$option_name,
 			array(
 				'type'              => 'boolean',
-				'description'       => __( 'Disable real-time collaboration', 'gutenberg' ),
+				'description'       => __( 'Enable Real-Time Collaboration', 'gutenberg' ),
 				'sanitize_callback' => 'rest_sanitize_boolean',
 				'default'           => false,
 				'show_in_rest'      => true,
@@ -121,12 +121,12 @@ function gutenberg_register_real_time_collaboration_setting() {
 			$option_name,
 			__( 'Collaboration', 'gutenberg' ),
 			function () use ( $option_name ) {
-				$option_value = get_option( $option_name, 1 );
+				$option_value = get_option( $option_name );
 
 				?>
-				<label for="wp_disable_real_time_collaboration">
-					<input name="wp_disable_real_time_collaboration" type="checkbox" id="wp_disable_real_time_collaboration" value="1" <?php checked( '1', $option_value ); ?>/>
-					<?php _e( 'Disable real-time collaboration', 'gutenberg' ); ?>
+				<label for="wp_enable_real_time_collaboration">
+					<input name="wp_enable_real_time_collaboration" type="checkbox" id="wp_enable_real_time_collaboration" value="1" <?php checked( '1', $option_value ); ?>/>
+					<?php _e( 'Enable real-time collaboration', 'gutenberg' ); ?>
 				</label>
 				<?php
 			},
@@ -140,7 +140,7 @@ function () use ( $option_name ) {
  * Injects the real-time collaboration setting into a global variable.
  */
 function gutenberg_inject_real_time_collaboration_setting() {
-	if ( ! boolval( get_option( 'wp_disable_real_time_collaboration' ) ) ) {
+	if ( get_option( 'wp_enable_real_time_collaboration' ) ) {
 		wp_add_inline_script(
 			'wp-core-data',
 			'window._wpCollaborationEnabled = true;',
@@ -149,3 +149,4 @@ function gutenberg_inject_real_time_collaboration_setting() {
 	}
 }
 add_action( 'admin_init', 'gutenberg_inject_real_time_collaboration_setting' );
+add_filter( 'default_option_wp_enable_real_time_collaboration', '__return_true' );
diff --git a/test/e2e/specs/editor/collaboration/fixtures/collaboration-utils.ts b/test/e2e/specs/editor/collaboration/fixtures/collaboration-utils.ts
index 1cdd6cd7962060..0b2b3a24779cf4 100644
--- a/test/e2e/specs/editor/collaboration/fixtures/collaboration-utils.ts
+++ b/test/e2e/specs/editor/collaboration/fixtures/collaboration-utils.ts
@@ -334,15 +334,8 @@ export async function setCollaboration(
 	const html = await response.text();
 	const nonce = html.match( /name="_wpnonce" value="([^"]+)"/ )![ 1 ];
 
-	// WordPress Core Beta 3 switched from 'wp_enable_real_time_collaboration' to
-	// 'wp_disable_real_time_collaboration' (with flipped boolean values). Detect
-	// which field name is present on the page.
-	let optionName = 'wp_disable_real_time_collaboration';
-	let optionValue = enabled ? 0 : 1;
-	if ( html.includes( 'name="wp_enable_real_time_collaboration"' ) ) {
-		optionName = 'wp_enable_real_time_collaboration';
-		optionValue = enabled ? 1 : 0;
-	}
+	const optionName = 'wp_enable_real_time_collaboration';
+	const optionValue = enabled ? 1 : 0;
 
 	const formData: Record< string, string | number > = {
 		option_page: 'writing',

From bbe9642d83c72cc31b3e04bfb6c80dfcc51bf324 Mon Sep 17 00:00:00 2001
From: chriszarate <chris.zarate@automattic.com>
Date: Wed, 4 Mar 2026 20:58:08 -0700
Subject: [PATCH 5/6] Floating dates can invalidate any post type

---
 packages/core-data/src/utils/crdt.ts | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/packages/core-data/src/utils/crdt.ts b/packages/core-data/src/utils/crdt.ts
index eb892f7d47d055..36ccbe4c49e277 100644
--- a/packages/core-data/src/utils/crdt.ts
+++ b/packages/core-data/src/utils/crdt.ts
@@ -351,11 +351,8 @@ export function getPostChangesFromCRDTDoc(
 					// Do not overwrite a "floating" date. Borrowing logic from the
 					// isEditedPostDateFloating selector.
 					const currentDateIsFloating =
-						[ 'draft', 'auto-draft', 'pending' ].includes(
-							ymap.get( 'status' ) as string
-						) &&
-						( null === currentValue ||
-							editedRecord.modified === currentValue );
+						null === currentValue ||
+						editedRecord.modified === currentValue;
 
 					if ( currentDateIsFloating ) {
 						return false;

From 469860b66e747b34e4af3e06939bc68fa57f00ad Mon Sep 17 00:00:00 2001
From: chriszarate <chris.zarate@automattic.com>
Date: Wed, 4 Mar 2026 20:58:34 -0700
Subject: [PATCH 6/6] Target a page to avoid addition of Uncategorized on save

---
 test/e2e/specs/editor/various/inner-blocks-templates.spec.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/e2e/specs/editor/various/inner-blocks-templates.spec.js b/test/e2e/specs/editor/various/inner-blocks-templates.spec.js
index eb34b00e8e69dc..1a7609ab837d1d 100644
--- a/test/e2e/specs/editor/various/inner-blocks-templates.spec.js
+++ b/test/e2e/specs/editor/various/inner-blocks-templates.spec.js
@@ -11,7 +11,9 @@ test.describe( 'Inner blocks templates', () => {
 	} );
 
 	test.beforeEach( async ( { admin } ) => {
-		await admin.createNewPost();
+		await admin.createNewPost( {
+			postType: 'page',
+		} );
 	} );
 
 	test.afterAll( async ( { requestUtils } ) => {