diff --git a/wp-includes/blocks.php b/wp-includes/blocks.php
index f6e023c67f..8c272c088a 100644
--- a/wp-includes/blocks.php
+++ b/wp-includes/blocks.php
@@ -71,6 +71,14 @@ function remove_block_asset_path_prefix( $asset_handle_or_path ) {
  * @return string Generated asset name for the block's field.
  */
 function generate_block_asset_handle( $block_name, $field_name ) {
+	if ( 0 === strpos( $block_name, 'core/' ) ) {
+		$asset_handle = str_replace( 'core/', 'wp-block-', $block_name );
+		if ( 0 === strpos( $field_name, 'editor' ) ) {
+			$asset_handle .= '-editor';
+		}
+		return $asset_handle;
+	}
+
 	$field_mappings = array(
 		'editorScript' => 'editor-script',
 		'script'       => 'script',
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 2c3db15a94..98a0b9517d 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.7-alpha-49849';
+$wp_version = '5.7-alpha-49850';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.