diff --git a/wp-includes/class-wp.php b/wp-includes/class-wp.php
index 238e2e6660..74ea29fe6f 100644
--- a/wp-includes/class-wp.php
+++ b/wp-includes/class-wp.php
@@ -629,6 +629,21 @@ class WP {
 	public function handle_404() {
 		global $wp_query;
 
+		/**
+		 * Filter whether to short-circuit default header status handling.
+		 *
+		 * Returning a non-false value from the filter will short-circuit the handling
+		 * and return early.
+		 *
+		 * @since 4.5.0
+		 *
+		 * @param bool     $preempt  Whether to short-circuit default header status handling. Default false.
+		 * @param WP_Query $wp_query WordPress Query object.
+		 */
+		if ( false !== apply_filters( 'pre_handle_404', false, $wp_query ) ) {
+			return;
+		}
+
 		// If we've already issued a 404, bail.
 		if ( is_404() )
 			return;
diff --git a/wp-includes/version.php b/wp-includes/version.php
index d8c60cf599..ce763f297f 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.5-alpha-36628';
+$wp_version = '4.5-alpha-36629';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.