diff --git a/wp-includes/class-wp-block-editor-context.php b/wp-includes/class-wp-block-editor-context.php
new file mode 100644
index 0000000000..92957f3bd8
--- /dev/null
+++ b/wp-includes/class-wp-block-editor-context.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Blocks API: WP_Block_Editor_Context class
+ *
+ * @package WordPress
+ * @since 5.8.0
+ */
+
+/**
+ * Class representing a current block editor context.
+ *
+ * The expectation is that block editor can have a different set
+ * of requirements on every screen where it is used. This class
+ * allows to define supporting settings that can be used with filters.
+ *
+ * @since 5.8.0
+ */
+final class WP_Block_Editor_Context {
+	/**
+	 * Post being edited. Optional.
+	 *
+	 * @since 5.8.0
+	 *
+	 * @var WP_Post|null
+	 */
+	public $post = null;
+
+	/**
+	 * Constructor.
+	 *
+	 * Populates optional properties for a given block editor context.
+	 *
+	 * @since 5.8.0
+	 *
+	 * @param array $settings The list of optional settings to expose in a given context.
+	 */
+	public function __construct( array $settings = array() ) {
+		if ( isset( $settings['post'] ) ) {
+			$this->post = $settings['post'];
+		}
+	}
+}
diff --git a/wp-includes/version.php b/wp-includes/version.php
index a5441e9658..531bb6a7d9 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.8-alpha-50956';
+$wp_version = '5.8-alpha-50957';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.