diff --git a/src/main/java/com/google/devtools/build/lib/analysis/AnalysisAndExecutionResult.java b/src/main/java/com/google/devtools/build/lib/analysis/AnalysisAndExecutionResult.java
new file mode 100644
index 00000000000000..3bc6dce35ccced
--- /dev/null
+++ b/src/main/java/com/google/devtools/build/lib/analysis/AnalysisAndExecutionResult.java
@@ -0,0 +1,64 @@
+// Copyright 2018 The Bazel Authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.devtools.build.lib.analysis;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.ImmutableSortedSet;
+import com.google.devtools.build.lib.actions.Artifact;
+import com.google.devtools.build.lib.analysis.config.BuildConfigurationCollection;
+import com.google.devtools.build.lib.skyframe.AspectKeyCreator.AspectKey;
+import java.util.Collection;
+import javax.annotation.Nullable;
+
+/**
+ * Return value for {@link com.google.devtools.build.lib.buildtool.AnalysisAndExecutionPhaseRunner}.
+ * This is meant to be the drop-in replacement for AnalysisResult later on. This is part of
+ * https://github.com/bazelbuild/bazel/issues/14057. Internal: b/147350683.
+ */
+public final class AnalysisAndExecutionResult extends AnalysisResult {
+
+  AnalysisAndExecutionResult(
+      BuildConfigurationCollection configurations,
+      ImmutableSet<ConfiguredTarget> targetsToBuild,
+      ImmutableMap<AspectKey, ConfiguredAspect> aspects,
+      @Nullable ImmutableList<ConfiguredTarget> targetsToTest,
+      ImmutableSet<ConfiguredTarget> targetsToSkip,
+      ImmutableSet<Artifact> artifactsToBuild,
+      ImmutableSet<ConfiguredTarget> parallelTests,
+      ImmutableSet<ConfiguredTarget> exclusiveTests,
+      TopLevelArtifactContext topLevelContext,
+      String workspaceName,
+      Collection<TargetAndConfiguration> topLevelTargetsWithConfigs,
+      ImmutableSortedSet<String> nonSymlinkedDirectoriesUnderExecRoot) {
+    super(
+        configurations,
+        targetsToBuild,
+        aspects,
+        targetsToTest,
+        targetsToSkip,
+        /*failureDetail=*/ null,
+        /*actionGraph=*/ null,
+        artifactsToBuild,
+        parallelTests,
+        exclusiveTests,
+        topLevelContext,
+        /*packageRoots=*/ null,
+        workspaceName,
+        topLevelTargetsWithConfigs,
+        nonSymlinkedDirectoriesUnderExecRoot);
+  }
+}
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/AnalysisResult.java b/src/main/java/com/google/devtools/build/lib/analysis/AnalysisResult.java
index 5b78b8d1eadf64..dae3d10439f757 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/AnalysisResult.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/AnalysisResult.java
@@ -28,10 +28,8 @@
 import java.util.Collection;
 import javax.annotation.Nullable;
 
-/**
- * Return value for {@link com.google.devtools.build.lib.buildtool.AnalysisPhaseRunner}.
- */
-public final class AnalysisResult {
+/** Return value for {@link com.google.devtools.build.lib.buildtool.AnalysisPhaseRunner}. */
+public class AnalysisResult {
   private final BuildConfigurationCollection configurations;
   private final ImmutableSet<ConfiguredTarget> targetsToBuild;
   @Nullable private final ImmutableList<ConfiguredTarget> targetsToTest;
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/BUILD b/src/main/java/com/google/devtools/build/lib/analysis/BUILD
index 64c684a0741f88..b4e6a89a7441af 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/analysis/BUILD
@@ -161,6 +161,7 @@ java_library(
     srcs = [
         "AliasProvider.java",
         "Allowlist.java",
+        "AnalysisAndExecutionResult.java",
         "AnalysisEnvironment.java",
         "AnalysisFailureEvent.java",
         "AnalysisIssues.java",
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java b/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
index 20f6e75ab993d2..b0c9dec777f6fa 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
@@ -202,7 +202,8 @@ public AnalysisResult update(
       int loadingPhaseThreads,
       TopLevelArtifactContext topLevelOptions,
       ExtendedEventHandler eventHandler,
-      EventBus eventBus)
+      EventBus eventBus,
+      boolean includeExecutionPhase)
       throws ViewCreationFailedException, InvalidConfigurationException, InterruptedException {
     logger.atInfo().log("Starting analysis");
     pollInterruptedStatus();
@@ -369,43 +370,36 @@ public AnalysisResult update(
             }
             return result;
           };
-      skyframeAnalysisResult =
-          skyframeBuildView.configureTargets(
-              eventHandler,
-              topLevelCtKeys,
-              aspectsKeys.build(),
-              Suppliers.memoize(configurationLookupSupplier),
-              topLevelOptions,
-              eventBus,
-              keepGoing,
-              loadingPhaseThreads,
-              viewOptions.strictConflictChecks,
-              checkForActionConflicts,
-              viewOptions.cpuHeavySkyKeysThreadPoolSize);
-      setArtifactRoots(skyframeAnalysisResult.getPackageRoots());
+      if (!includeExecutionPhase) {
+        skyframeAnalysisResult =
+            skyframeBuildView.configureTargets(
+                eventHandler,
+                topLevelCtKeys,
+                aspectsKeys.build(),
+                Suppliers.memoize(configurationLookupSupplier),
+                topLevelOptions,
+                eventBus,
+                keepGoing,
+                loadingPhaseThreads,
+                viewOptions.strictConflictChecks,
+                checkForActionConflicts,
+                viewOptions.cpuHeavySkyKeysThreadPoolSize);
+        setArtifactRoots(skyframeAnalysisResult.getPackageRoots());
+      } else {
+        skyframeAnalysisResult =
+            skyframeBuildView.analyzeAndExecuteTargets(
+                eventHandler,
+                topLevelCtKeys,
+                aspectsKeys.build(),
+                topLevelOptions,
+                keepGoing,
+                loadingPhaseThreads,
+                viewOptions.cpuHeavySkyKeysThreadPoolSize);
+      }
     } finally {
       skyframeBuildView.clearInvalidatedActionLookupKeys();
     }
 
-    TopLevelConstraintSemantics topLevelConstraintSemantics =
-        new TopLevelConstraintSemantics(
-            (RuleContextConstraintSemantics) ruleClassProvider.getConstraintSemantics(),
-            skyframeExecutor.getPackageManager(),
-            input -> skyframeExecutor.getConfiguration(eventHandler, input),
-            eventHandler);
-
-    PlatformRestrictionsResult platformRestrictions =
-        topLevelConstraintSemantics.checkPlatformRestrictions(
-            skyframeAnalysisResult.getConfiguredTargets(), explicitTargetPatterns, keepGoing);
-
-    if (!platformRestrictions.targetsWithErrors().isEmpty()) {
-      // If there are any errored targets (e.g. incompatible targets that are explicitly specified
-      // on the command line), remove them from the list of targets to be built.
-      skyframeAnalysisResult =
-          skyframeAnalysisResult.withAdditionalErroredTargets(
-              ImmutableSet.copyOf(platformRestrictions.targetsWithErrors()));
-    }
-
     int numTargetsToAnalyze = topLevelTargetsWithConfigs.size();
     int numSuccessful = skyframeAnalysisResult.getConfiguredTargets().size();
     if (0 < numSuccessful && numSuccessful < numTargetsToAnalyze) {
@@ -417,24 +411,61 @@ public AnalysisResult update(
       logger.atInfo().log(msg);
     }
 
-    Set<ConfiguredTarget> targetsToSkip =
-        Sets.union(
-                topLevelConstraintSemantics.checkTargetEnvironmentRestrictions(
-                    skyframeAnalysisResult.getConfiguredTargets()),
-                platformRestrictions.targetsToSkip())
-            .immutableCopy();
-
-    AnalysisResult result =
-        createResult(
-            eventHandler,
-            eventBus,
-            loadingResult,
-            configurations,
-            topLevelOptions,
-            viewOptions,
-            skyframeAnalysisResult,
-            targetsToSkip,
-            topLevelTargetsWithConfigsResult);
+    AnalysisResult result;
+    if (includeExecutionPhase) {
+      // TODO(b/199053098): Also consider targets with errors like below.
+      result =
+          createResult(
+              eventHandler,
+              eventBus,
+              loadingResult,
+              configurations,
+              topLevelOptions,
+              viewOptions,
+              skyframeAnalysisResult,
+              /*targetsToSkip=*/ ImmutableSet.of(),
+              topLevelTargetsWithConfigsResult,
+              /*includeExecutionPhase=*/ true);
+    } else {
+      TopLevelConstraintSemantics topLevelConstraintSemantics =
+          new TopLevelConstraintSemantics(
+              (RuleContextConstraintSemantics) ruleClassProvider.getConstraintSemantics(),
+              skyframeExecutor.getPackageManager(),
+              input -> skyframeExecutor.getConfiguration(eventHandler, input),
+              eventHandler);
+
+      PlatformRestrictionsResult platformRestrictions =
+          topLevelConstraintSemantics.checkPlatformRestrictions(
+              skyframeAnalysisResult.getConfiguredTargets(), explicitTargetPatterns, keepGoing);
+
+      if (!platformRestrictions.targetsWithErrors().isEmpty()) {
+        // If there are any errored targets (e.g. incompatible targets that are explicitly specified
+        // on the command line), remove them from the list of targets to be built.
+        skyframeAnalysisResult =
+            skyframeAnalysisResult.withAdditionalErroredTargets(
+                platformRestrictions.targetsWithErrors());
+      }
+
+      Set<ConfiguredTarget> targetsToSkip =
+          Sets.union(
+                  topLevelConstraintSemantics.checkTargetEnvironmentRestrictions(
+                      skyframeAnalysisResult.getConfiguredTargets()),
+                  platformRestrictions.targetsToSkip())
+              .immutableCopy();
+
+      result =
+          createResult(
+              eventHandler,
+              eventBus,
+              loadingResult,
+              configurations,
+              topLevelOptions,
+              viewOptions,
+              skyframeAnalysisResult,
+              targetsToSkip,
+              topLevelTargetsWithConfigsResult,
+              /*includeExecutionPhase=*/ false);
+    }
     logger.atInfo().log("Finished analysis");
     return result;
   }
@@ -456,7 +487,8 @@ private AnalysisResult createResult(
       AnalysisOptions viewOptions,
       SkyframeAnalysisResult skyframeAnalysisResult,
       Set<ConfiguredTarget> targetsToSkip,
-      TopLevelTargetsAndConfigsResult topLevelTargetsWithConfigs)
+      TopLevelTargetsAndConfigsResult topLevelTargetsWithConfigs,
+      boolean includeExecutionPhase)
       throws InterruptedException {
     Set<Label> testsToRun = loadingResult.getTestsToRunLabels();
     Set<ConfiguredTarget> configuredTargets =
@@ -525,6 +557,22 @@ private AnalysisResult createResult(
     ImmutableSet<ConfiguredTarget> parallelTests = testsPair.first;
     ImmutableSet<ConfiguredTarget> exclusiveTests = testsPair.second;
 
+    if (includeExecutionPhase) {
+      return new AnalysisAndExecutionResult(
+          configurations,
+          ImmutableSet.copyOf(configuredTargets),
+          aspects,
+          allTargetsToTest == null ? null : ImmutableList.copyOf(allTargetsToTest),
+          ImmutableSet.copyOf(targetsToSkip),
+          artifactsToBuild.build(),
+          parallelTests,
+          exclusiveTests,
+          topLevelOptions,
+          loadingResult.getWorkspaceName(),
+          topLevelTargetsWithConfigs.getTargetsAndConfigs(),
+          loadingResult.getNotSymlinkedInExecrootDirectories());
+    }
+
     FailureDetail failureDetail =
         createFailureDetail(loadingResult, skyframeAnalysisResult, topLevelTargetsWithConfigs);
 
diff --git a/src/main/java/com/google/devtools/build/lib/buildtool/AnalysisAndExecutionPhaseRunner.java b/src/main/java/com/google/devtools/build/lib/buildtool/AnalysisAndExecutionPhaseRunner.java
new file mode 100644
index 00000000000000..e9c3e2ced82fcd
--- /dev/null
+++ b/src/main/java/com/google/devtools/build/lib/buildtool/AnalysisAndExecutionPhaseRunner.java
@@ -0,0 +1,260 @@
+// Copyright 2018 The Bazel Authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+package com.google.devtools.build.lib.buildtool;
+
+import com.google.common.base.Stopwatch;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.flogger.GoogleLogger;
+import com.google.devtools.build.lib.actions.BuildFailedException;
+import com.google.devtools.build.lib.analysis.AnalysisAndExecutionResult;
+import com.google.devtools.build.lib.analysis.AnalysisPhaseCompleteEvent;
+import com.google.devtools.build.lib.analysis.BuildView;
+import com.google.devtools.build.lib.analysis.ViewCreationFailedException;
+import com.google.devtools.build.lib.analysis.config.BuildOptions;
+import com.google.devtools.build.lib.analysis.config.CoreOptions;
+import com.google.devtools.build.lib.analysis.config.InvalidConfigurationException;
+import com.google.devtools.build.lib.buildtool.buildevent.NoAnalyzeEvent;
+import com.google.devtools.build.lib.cmdline.TargetParsingException;
+import com.google.devtools.build.lib.cmdline.TargetPattern;
+import com.google.devtools.build.lib.events.Event;
+import com.google.devtools.build.lib.packages.Target;
+import com.google.devtools.build.lib.pkgcache.LoadingFailedException;
+import com.google.devtools.build.lib.profiler.ProfilePhase;
+import com.google.devtools.build.lib.profiler.Profiler;
+import com.google.devtools.build.lib.profiler.SilentCloseable;
+import com.google.devtools.build.lib.runtime.CommandEnvironment;
+import com.google.devtools.build.lib.server.FailureDetails.BuildConfiguration.Code;
+import com.google.devtools.build.lib.server.FailureDetails.FailureDetail;
+import com.google.devtools.build.lib.skyframe.BuildInfoCollectionFunction;
+import com.google.devtools.build.lib.skyframe.PrecomputedValue;
+import com.google.devtools.build.lib.skyframe.TargetPatternPhaseValue;
+import com.google.devtools.build.lib.util.AbruptExitException;
+import com.google.devtools.build.lib.util.DetailedExitCode;
+import com.google.devtools.build.lib.util.RegexFilter;
+import com.google.devtools.common.options.OptionsParsingException;
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Intended drop-in replacement for AnalysisPhaseRunner after we're done with merging Skyframe's
+ * analysis and execution phases. This is part of https://github.com/bazelbuild/bazel/issues/14057.
+ * Internal: b/147350683.
+ *
+ * <p>TODO(leba): Consider removing this class altogether to reduce complexity.
+ */
+public final class AnalysisAndExecutionPhaseRunner {
+
+  private static final GoogleLogger logger = GoogleLogger.forEnclosingClass();
+
+  private AnalysisAndExecutionPhaseRunner() {}
+
+  static AnalysisAndExecutionResult execute(
+      CommandEnvironment env,
+      BuildRequest request,
+      BuildOptions buildOptions,
+      TargetPatternPhaseValue loadingResult)
+      throws BuildFailedException, InterruptedException, ViewCreationFailedException,
+          TargetParsingException, LoadingFailedException, AbruptExitException,
+          InvalidConfigurationException {
+
+    // Compute the heuristic instrumentation filter if needed.
+    if (request.needsInstrumentationFilter()) {
+      try (SilentCloseable c = Profiler.instance().profile("Compute instrumentation filter")) {
+        String instrumentationFilter =
+            InstrumentationFilterSupport.computeInstrumentationFilter(
+                env.getReporter(),
+                // TODO(ulfjack): Expensive. Make this part of the TargetPatternPhaseValue or write
+                // a new SkyFunction to compute it?
+                loadingResult.getTestsToRun(env.getReporter(), env.getPackageManager()));
+        try {
+          // We're modifying the buildOptions in place, which is not ideal, but we also don't want
+          // to pay the price for making a copy. Maybe reconsider later if this turns out to be a
+          // problem (and the performance loss may not be a big deal).
+          buildOptions.get(CoreOptions.class).instrumentationFilter =
+              new RegexFilter.RegexFilterConverter().convert(instrumentationFilter);
+        } catch (OptionsParsingException e) {
+          throw new InvalidConfigurationException(Code.HEURISTIC_INSTRUMENTATION_FILTER_INVALID, e);
+        }
+      }
+    }
+
+    // Exit if there are any pending exceptions from modules.
+    env.throwPendingException();
+
+    AnalysisAndExecutionResult analysisAndExecutionResult = null;
+    if (request.getBuildOptions().performAnalysisPhase) {
+      Profiler.instance().markPhase(ProfilePhase.ANALYZE);
+
+      // The build info factories are immutable during the life time of this server. However, we
+      // sometimes clean the graph, which requires re-injecting the value, which requires a hook to
+      // do so afterwards, and there is no such hook at the server / workspace level right now. For
+      // simplicity, we keep the code here for now.
+      env.getSkyframeExecutor()
+          .injectExtraPrecomputedValues(
+              ImmutableList.of(
+                  PrecomputedValue.injected(
+                      BuildInfoCollectionFunction.BUILD_INFO_FACTORIES,
+                      env.getRuntime().getRuleClassProvider().getBuildInfoFactoriesAsMap())));
+
+      try (SilentCloseable c = Profiler.instance().profile("runAnalysisAndExecutionPhase")) {
+        analysisAndExecutionResult =
+            runAnalysisAndExecutionPhase(
+                env, request, loadingResult, buildOptions, request.getMultiCpus());
+      }
+      // TODO(b/199053098) Report targets.
+
+    } else {
+      env.getReporter().handle(Event.progress("Loading complete."));
+      env.getReporter().post(new NoAnalyzeEvent());
+      logger.atInfo().log("No analysis requested, so finished");
+      FailureDetail failureDetail = BuildView.createFailureDetail(loadingResult, null, null);
+      if (failureDetail != null) {
+        throw new BuildFailedException(
+            failureDetail.getMessage(), DetailedExitCode.of(failureDetail));
+      }
+    }
+
+    return analysisAndExecutionResult;
+  }
+
+  static TargetPatternPhaseValue evaluateTargetPatterns(
+      CommandEnvironment env, final BuildRequest request, final TargetValidator validator)
+      throws LoadingFailedException, TargetParsingException, InterruptedException {
+    boolean keepGoing = request.getKeepGoing();
+    TargetPatternPhaseValue result =
+        env.getSkyframeExecutor()
+            .loadTargetPatternsWithFilters(
+                env.getReporter(),
+                request.getTargets(),
+                env.getRelativeWorkingDirectory(),
+                request.getLoadingOptions(),
+                request.getLoadingPhaseThreadCount(),
+                keepGoing,
+                request.shouldRunTests());
+    if (validator != null) {
+      Collection<Target> targets =
+          result.getTargets(env.getReporter(), env.getSkyframeExecutor().getPackageManager());
+      validator.validateTargets(targets, keepGoing);
+    }
+    return result;
+  }
+
+  /**
+   * Performs all phases of the build: Setup, Loading, Analysis & Execution.
+   *
+   * <p>Postcondition: On success, populates the BuildRequest's set of targets to build.
+   *
+   * @return null if the build were successful; a useful error message if errors were encountered
+   *     and request.keepGoing.
+   * @throws InterruptedException if the current thread was interrupted.
+   * @throws ViewCreationFailedException if analysis failed for any reason.
+   */
+  private static AnalysisAndExecutionResult runAnalysisAndExecutionPhase(
+      CommandEnvironment env,
+      BuildRequest request,
+      TargetPatternPhaseValue loadingResult,
+      BuildOptions targetOptions,
+      Set<String> multiCpu)
+      throws InterruptedException, InvalidConfigurationException, ViewCreationFailedException {
+    Stopwatch timer = Stopwatch.createStarted();
+    env.getReporter().handle(Event.progress("Loading complete.  Analyzing..."));
+
+    ImmutableSet<String> explicitTargetPatterns =
+        getExplicitTargetPatterns(env, request.getTargets());
+
+    BuildView view =
+        new BuildView(
+            env.getDirectories(),
+            env.getRuntime().getRuleClassProvider(),
+            env.getSkyframeExecutor(),
+            env.getRuntime().getCoverageReportActionFactory(request));
+    AnalysisAndExecutionResult analysisAndExecutionResult =
+        (AnalysisAndExecutionResult)
+            view.update(
+                loadingResult,
+                targetOptions,
+                multiCpu,
+                explicitTargetPatterns,
+                request.getAspects(),
+                request.getViewOptions(),
+                request.getKeepGoing(),
+                request.getCheckForActionConflicts(),
+                request.getLoadingPhaseThreadCount(),
+                request.getTopLevelArtifactContext(),
+                env.getReporter(),
+                env.getEventBus(),
+                /*includeExecutionPhase=*/ true);
+
+    // TODO(bazel-team): Merge these into one event.
+    env.getEventBus()
+        .post(
+            new AnalysisPhaseCompleteEvent(
+                analysisAndExecutionResult.getTargetsToBuild(),
+                view.getEvaluatedCounts(),
+                view.getEvaluatedActionsCounts(),
+                timer.stop().elapsed(TimeUnit.MILLISECONDS),
+                view.getAndClearPkgManagerStatistics(),
+                env.getSkyframeExecutor().wasAnalysisCacheDiscardedAndResetBit()));
+    // TODO(b/199053098) TestFilteringCompleteEvent.
+    return analysisAndExecutionResult;
+  }
+
+  /**
+   * Turns target patterns from the command line into parsed equivalents for single targets.
+   *
+   * <p>Globbing targets like ":all" and "..." are ignored here and will not be in the returned set.
+   *
+   * @param env the action's environment.
+   * @param requestedTargetPatterns the list of target patterns specified on the command line.
+   * @return the set of stringified labels of target patterns that represent single targets. The
+   *     stringified labels are in the "unambiguous canonical form".
+   * @throws ViewCreationFailedException if a pattern fails to parse for some reason.
+   */
+  private static ImmutableSet<String> getExplicitTargetPatterns(
+      CommandEnvironment env, List<String> requestedTargetPatterns)
+      throws ViewCreationFailedException {
+    ImmutableSet.Builder<String> explicitTargetPatterns = ImmutableSet.builder();
+    TargetPattern.Parser parser = new TargetPattern.Parser(env.getRelativeWorkingDirectory());
+
+    for (String requestedTargetPattern : requestedTargetPatterns) {
+      if (requestedTargetPattern.startsWith("-")) {
+        // Excluded patterns are by definition not explicitly requested so we can move on to the
+        // next target pattern.
+        continue;
+      }
+
+      // Parse the pattern. This should always work because this is at least the second time we're
+      // doing it. The previous time is in runAnalysisAndExecutionPhase(). Still, if parsing does
+      // fail we propagate the exception up.
+      TargetPattern parsedPattern;
+      try {
+        parsedPattern = parser.parse(requestedTargetPattern);
+      } catch (TargetParsingException e) {
+        throw new ViewCreationFailedException(
+            "Failed to parse target pattern even though it was previously parsed successfully",
+            e.getDetailedExitCode().getFailureDetail(),
+            e);
+      }
+
+      if (parsedPattern.getType() == TargetPattern.Type.SINGLE_TARGET) {
+        explicitTargetPatterns.add(parsedPattern.getSingleTargetPath());
+      }
+    }
+
+    return ImmutableSet.copyOf(explicitTargetPatterns.build());
+  }
+}
diff --git a/src/main/java/com/google/devtools/build/lib/buildtool/AnalysisPhaseRunner.java b/src/main/java/com/google/devtools/build/lib/buildtool/AnalysisPhaseRunner.java
index 4c35f635bd41fc..aeb23977d87b2e 100644
--- a/src/main/java/com/google/devtools/build/lib/buildtool/AnalysisPhaseRunner.java
+++ b/src/main/java/com/google/devtools/build/lib/buildtool/AnalysisPhaseRunner.java
@@ -226,7 +226,8 @@ private static AnalysisResult runAnalysisPhase(
             request.getLoadingPhaseThreadCount(),
             request.getTopLevelArtifactContext(),
             env.getReporter(),
-            env.getEventBus());
+            env.getEventBus(),
+            /*includeExecutionPhase=*/ false);
 
     // TODO(bazel-team): Merge these into one event.
     env.getEventBus()
diff --git a/src/main/java/com/google/devtools/build/lib/buildtool/BuildRequestOptions.java b/src/main/java/com/google/devtools/build/lib/buildtool/BuildRequestOptions.java
index 44b713a838ade9..db5a0fb33dbc33 100644
--- a/src/main/java/com/google/devtools/build/lib/buildtool/BuildRequestOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/buildtool/BuildRequestOptions.java
@@ -468,6 +468,15 @@ public boolean useTopLevelTargetsForSymlinks() {
               + "line. It is an error to specify a file here as well as command-line patterns.")
   public String targetPatternFile;
 
+  @Option(
+      name = "experimental_merged_skyframe_analysis_execution",
+      defaultValue = "false",
+      documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
+      metadataTags = OptionMetadataTag.EXPERIMENTAL,
+      effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS, OptionEffectTag.EXECUTION},
+      help = "If this flag is set, the analysis and execution phases of Skyframe are merged.")
+  public boolean mergedSkyframeAnalysisExecution;
+
   /** Converter for filesystem value checker threads. */
   public static class ThreadConverter extends ResourceConverter {
     public ThreadConverter() {
diff --git a/src/main/java/com/google/devtools/build/lib/buildtool/BuildTool.java b/src/main/java/com/google/devtools/build/lib/buildtool/BuildTool.java
index 9c1ba8dc172a39..a8cffba26cab24 100644
--- a/src/main/java/com/google/devtools/build/lib/buildtool/BuildTool.java
+++ b/src/main/java/com/google/devtools/build/lib/buildtool/BuildTool.java
@@ -23,6 +23,7 @@
 import com.google.devtools.build.lib.actions.BuildFailedException;
 import com.google.devtools.build.lib.actions.CommandLineExpansionException;
 import com.google.devtools.build.lib.actions.TestExecException;
+import com.google.devtools.build.lib.analysis.AnalysisAndExecutionResult;
 import com.google.devtools.build.lib.analysis.AnalysisResult;
 import com.google.devtools.build.lib.analysis.BuildInfoEvent;
 import com.google.devtools.build.lib.analysis.ConfiguredTarget;
@@ -55,6 +56,7 @@
 import com.google.devtools.build.lib.server.FailureDetails.BuildConfiguration;
 import com.google.devtools.build.lib.server.FailureDetails.FailureDetail;
 import com.google.devtools.build.lib.skyframe.SequencedSkyframeExecutor;
+import com.google.devtools.build.lib.skyframe.TargetPatternPhaseValue;
 import com.google.devtools.build.lib.skyframe.WorkspaceInfoFromDiff;
 import com.google.devtools.build.lib.skyframe.actiongraph.v2.ActionGraphDump;
 import com.google.devtools.build.lib.skyframe.actiongraph.v2.AqueryOutputHandler;
@@ -166,6 +168,34 @@ public void buildTargets(BuildRequest request, BuildResult result, TargetValidat
 
       initializeOutputFilter(request);
 
+      if (request.getBuildOptions().mergedSkyframeAnalysisExecution) {
+        // Target pattern evaluation.
+        TargetPatternPhaseValue loadingResult;
+        Profiler.instance().markPhase(ProfilePhase.TARGET_PATTERN_EVAL);
+        try (SilentCloseable c = Profiler.instance().profile("evaluateTargetPatterns")) {
+          loadingResult =
+              AnalysisAndExecutionPhaseRunner.evaluateTargetPatterns(env, request, validator);
+        }
+        env.setWorkspaceName(loadingResult.getWorkspaceName());
+
+        if (request.getBuildOptions().performAnalysisPhase) {
+          executionTool = new ExecutionTool(env, request);
+
+          try (SilentCloseable c = Profiler.instance().profile("ExecutionTool.init")) {
+            executionTool.prepareForExecution(request.getId());
+          }
+
+          // TODO(b/199053098): implement support for --nobuild.
+          AnalysisAndExecutionResult analysisAndExecutionResult =
+              AnalysisAndExecutionPhaseRunner.execute(env, request, buildOptions, loadingResult);
+
+          result.setBuildConfigurationCollection(
+              analysisAndExecutionResult.getConfigurationCollection());
+          result.setActualTargets(analysisAndExecutionResult.getTargetsToBuild());
+          result.setTestTargets(analysisAndExecutionResult.getTargetsToTest());
+        }
+        return;
+      }
       AnalysisResult analysisResult =
           AnalysisPhaseRunner.execute(env, request, buildOptions, validator);
 
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/BUILD b/src/main/java/com/google/devtools/build/lib/skyframe/BUILD
index 591176c1c40494..fa7085144ff76f 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/BUILD
@@ -25,6 +25,7 @@ java_library(
         "AspectFunction.java",
         "BazelSkyframeExecutorConstants.java",
         "BuildConfigurationFunction.java",
+        "BuildDriverFunction.java",
         "BuildInfoCollectionFunction.java",
         "BuildTopLevelAspectsDetailsFunction.java",
         "BzlLoadFunction.java",
@@ -116,6 +117,8 @@ java_library(
         ":aspect_creation_exception",
         ":aspect_key_creator",
         ":build_configuration_value",
+        ":build_driver_key",
+        ":build_driver_value",
         ":build_info_collection_value",
         ":bzl_compile",
         ":bzl_load_value",
@@ -261,6 +264,7 @@ java_library(
         "//src/main/java/com/google/devtools/build/lib/analysis:dependency_kind",
         "//src/main/java/com/google/devtools/build/lib/analysis:duplicate_exception",
         "//src/main/java/com/google/devtools/build/lib/analysis:exec_group_collection",
+        "//src/main/java/com/google/devtools/build/lib/analysis:extra_action_artifacts_provider",
         "//src/main/java/com/google/devtools/build/lib/analysis:inconsistent_aspect_order_exception",
         "//src/main/java/com/google/devtools/build/lib/analysis:platform_configuration",
         "//src/main/java/com/google/devtools/build/lib/analysis:platform_options",
@@ -1033,30 +1037,6 @@ java_library(
     ],
 )
 
-java_library(
-    name = "build_driver_function",
-    srcs = ["BuildDriverFunction.java"],
-    deps = [
-        ":build_driver_key",
-        ":build_driver_value",
-        ":configured_target_key",
-        ":skyframe_cluster",
-        "//src/main/java/com/google/devtools/build/lib/actions",
-        "//src/main/java/com/google/devtools/build/lib/actions:action_lookup_key",
-        "//src/main/java/com/google/devtools/build/lib/actions:artifacts",
-        "//src/main/java/com/google/devtools/build/lib/analysis:analysis_cluster",
-        "//src/main/java/com/google/devtools/build/lib/analysis:configured_target",
-        "//src/main/java/com/google/devtools/build/lib/analysis:configured_target_value",
-        "//src/main/java/com/google/devtools/build/lib/analysis:extra_action_artifacts_provider",
-        "//src/main/java/com/google/devtools/build/lib/analysis:top_level_artifact_context",
-        "//src/main/java/com/google/devtools/build/lib/util",
-        "//src/main/java/com/google/devtools/build/skyframe",
-        "//src/main/java/com/google/devtools/build/skyframe:skyframe-objects",
-        "//third_party:guava",
-        "//third_party:jsr305",
-    ],
-)
-
 java_library(
     name = "build_driver_key",
     srcs = ["BuildDriverKey.java"],
@@ -1072,7 +1052,6 @@ java_library(
     name = "build_driver_value",
     srcs = ["BuildDriverValue.java"],
     deps = [
-        "//src/main/java/com/google/devtools/build/lib/actions",
         "//src/main/java/com/google/devtools/build/skyframe:skyframe-objects",
     ],
 )
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/BuildDriverFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/BuildDriverFunction.java
index a51f142b25fd95..38fe6dab12d753 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/BuildDriverFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/BuildDriverFunction.java
@@ -13,10 +13,10 @@
 // limitations under the License.
 package com.google.devtools.build.lib.skyframe;
 
+import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
 import com.google.devtools.build.lib.actions.ActionLookupKey;
-import com.google.devtools.build.lib.actions.ActionLookupValue;
 import com.google.devtools.build.lib.actions.Artifact;
 import com.google.devtools.build.lib.analysis.AspectValue;
 import com.google.devtools.build.lib.analysis.ConfiguredTarget;
@@ -24,11 +24,13 @@
 import com.google.devtools.build.lib.analysis.ExtraActionArtifactsProvider;
 import com.google.devtools.build.lib.analysis.TopLevelArtifactContext;
 import com.google.devtools.build.lib.skyframe.AspectCompletionValue.AspectCompletionKey;
+import com.google.devtools.build.lib.skyframe.ToplevelStarlarkAspectFunction.TopLevelAspectsValue;
 import com.google.devtools.build.lib.util.RegexFilter;
 import com.google.devtools.build.skyframe.SkyFunction;
 import com.google.devtools.build.skyframe.SkyFunctionException;
 import com.google.devtools.build.skyframe.SkyKey;
 import com.google.devtools.build.skyframe.SkyValue;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import javax.annotation.Nullable;
@@ -40,7 +42,8 @@ public class BuildDriverFunction implements SkyFunction {
 
   /**
    * From the ConfiguredTarget/Aspect keys, get the top-level artifacts. Then evaluate them together
-   * with the appropriate CompletionFunctions.
+   * with the appropriate CompletionFunctions. This is the bridge between the conceptual analysis &
+   * execution phases.
    *
    * <p>TODO(b/199053098): implement build-info, build-changelist, coverage & exception handling.
    */
@@ -52,16 +55,22 @@ public SkyValue compute(SkyKey skyKey, Environment env)
     TopLevelArtifactContext topLevelArtifactContext =
         ((BuildDriverKey) skyKey).getTopLevelArtifactContext();
 
-    SkyValue actionLookupValue = env.getValue(actionLookupKey);
+    // Why SkyValue and not ActionLookupValue? The evaluation of some ActionLookupKey can result in
+    // classes that don't implement
+    // ActionLookupValue (e.g. ConfiguredTargetKey -> NonRuleConfiguredTargetValue).
+    SkyValue topLevelSkyValue = env.getValue(actionLookupKey);
 
     if (env.valuesMissing()) {
       return null;
     }
     ImmutableSet.Builder<Artifact> artifactsToBuild = ImmutableSet.builder();
 
-    if (actionLookupValue instanceof ConfiguredTargetValue) {
+    Preconditions.checkState(
+        topLevelSkyValue instanceof ConfiguredTargetValue
+            || topLevelSkyValue instanceof TopLevelAspectsValue);
+    if (topLevelSkyValue instanceof ConfiguredTargetValue) {
       ConfiguredTarget configuredTarget =
-          ((ConfiguredTargetValue) actionLookupValue).getConfiguredTarget();
+          ((ConfiguredTargetValue) topLevelSkyValue).getConfiguredTarget();
       addExtraActionsIfRequested(
           configuredTarget.getProvider(ExtraActionArtifactsProvider.class), artifactsToBuild);
       env.getValues(
@@ -70,23 +79,27 @@ public SkyValue compute(SkyKey skyKey, Environment env)
               Collections.singletonList(
                   TargetCompletionValue.key(
                       (ConfiguredTargetKey) actionLookupKey, topLevelArtifactContext, false))));
-    } else if (actionLookupValue instanceof AspectValue) {
-      AspectValue aspectValue = (AspectValue) actionLookupValue;
-      addExtraActionsIfRequested(
-          aspectValue.getConfiguredAspect().getProvider(ExtraActionArtifactsProvider.class),
-          artifactsToBuild);
-      env.getValues(
-          Iterables.concat(
-              artifactsToBuild.build(),
-              Collections.singletonList(
-                  AspectCompletionKey.create(aspectValue.getKey(), topLevelArtifactContext))));
+    } else if (topLevelSkyValue instanceof TopLevelAspectsValue) {
+      List<SkyKey> aspectCompletionKeys = new ArrayList<>();
+      for (SkyValue aspectValue :
+          ((TopLevelAspectsValue) topLevelSkyValue).getTopLevelAspectsValues()) {
+        addExtraActionsIfRequested(
+            ((AspectValue) aspectValue)
+                .getConfiguredAspect()
+                .getProvider(ExtraActionArtifactsProvider.class),
+            artifactsToBuild);
+        aspectCompletionKeys.add(
+            AspectCompletionKey.create(
+                ((AspectValue) aspectValue).getKey(), topLevelArtifactContext));
+      }
+      env.getValues(Iterables.concat(artifactsToBuild.build(), aspectCompletionKeys));
     }
 
     if (env.valuesMissing()) {
       return null;
     }
 
-    return new BuildDriverValue((ActionLookupValue) actionLookupValue);
+    return new BuildDriverValue(topLevelSkyValue);
   }
 
   @Nullable
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/BuildDriverKey.java b/src/main/java/com/google/devtools/build/lib/skyframe/BuildDriverKey.java
index 6cdb53568f849b..0f73f9cfd8644a 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/BuildDriverKey.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/BuildDriverKey.java
@@ -17,6 +17,7 @@
 import com.google.devtools.build.lib.analysis.TopLevelArtifactContext;
 import com.google.devtools.build.skyframe.SkyFunctionName;
 import com.google.devtools.build.skyframe.SkyKey;
+import java.util.Objects;
 
 /**
  * Wraps an {@link ActionLookupKey}. The evaluation of this SkyKey is the entry point of analyzing
@@ -44,4 +45,19 @@ public ActionLookupKey getActionLookupKey() {
   public SkyFunctionName functionName() {
     return SkyFunctions.BUILD_DRIVER;
   }
+
+  @Override
+  public boolean equals(Object other) {
+    if (other instanceof BuildDriverKey) {
+      BuildDriverKey otherBuildDriverKey = (BuildDriverKey) other;
+      return actionLookupKey.equals(otherBuildDriverKey.actionLookupKey)
+          && topLevelArtifactContext.equals(otherBuildDriverKey.topLevelArtifactContext);
+    }
+    return false;
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(actionLookupKey, topLevelArtifactContext);
+  }
 }
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/BuildDriverValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/BuildDriverValue.java
index 67663afeae94a8..466d41138eb7fe 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/BuildDriverValue.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/BuildDriverValue.java
@@ -13,18 +13,17 @@
 // limitations under the License.
 package com.google.devtools.build.lib.skyframe;
 
-import com.google.devtools.build.lib.actions.ActionLookupValue;
 import com.google.devtools.build.skyframe.SkyValue;
 
 /** The result of evaluating a {@link BuildDriverKey}. */
 public class BuildDriverValue implements SkyValue {
-  private final ActionLookupValue actionLookupValue;
+  private final SkyValue wrappedSkyValue;
 
-  BuildDriverValue(ActionLookupValue actionLookupValue) {
-    this.actionLookupValue = actionLookupValue;
+  BuildDriverValue(SkyValue wrappedSkyValue) {
+    this.wrappedSkyValue = wrappedSkyValue;
   }
 
-  public ActionLookupValue getActionLookupValue() {
-    return actionLookupValue;
+  public SkyValue getWrappedSkyValue() {
+    return wrappedSkyValue;
   }
 }
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java
index 867ae690006624..3e56fd1bf35b8b 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java
@@ -114,6 +114,7 @@
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Supplier;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import javax.annotation.Nullable;
 
@@ -627,6 +628,79 @@ public SkyframeAnalysisResult configureTargets(
         packageRoots);
   }
 
+  /**
+   * Performs analysis & execution of the CTs and aspects with Skyframe.
+   *
+   * @return the configured targets that should be built along with a WalkableGraph of the analysis.
+   *     TODO(b/199053098) Have a more appropriate return type.
+   */
+  public SkyframeAnalysisResult analyzeAndExecuteTargets(
+      ExtendedEventHandler eventHandler,
+      List<ConfiguredTargetKey> ctKeys,
+      ImmutableList<TopLevelAspectsKey> topLevelAspectsKey,
+      TopLevelArtifactContext topLevelArtifactContextForConflictPruning,
+      boolean keepGoing,
+      int numThreads,
+      int cpuHeavySkyKeysThreadPoolSize)
+      throws InterruptedException {
+    enableAnalysis(true);
+    EvaluationResult<BuildDriverValue> result;
+    List<BuildDriverKey> buildDriverCTKeys =
+        ctKeys.stream()
+            .map(k -> new BuildDriverKey(k, topLevelArtifactContextForConflictPruning))
+            .collect(Collectors.toList());
+    List<BuildDriverKey> buildDriverAspectKeys =
+        topLevelAspectsKey.stream()
+            .map(k -> new BuildDriverKey(k, topLevelArtifactContextForConflictPruning))
+            .collect(Collectors.toList());
+
+    try (SilentCloseable c = Profiler.instance().profile("skyframeExecutor.configureTargets")) {
+      result =
+          skyframeExecutor.evaluateBuildDriverKeys(
+              eventHandler,
+              buildDriverCTKeys,
+              buildDriverAspectKeys,
+              keepGoing,
+              numThreads,
+              cpuHeavySkyKeysThreadPoolSize);
+    } finally {
+      enableAnalysis(false);
+    }
+
+    Map<AspectKey, ConfiguredAspect> aspects =
+        Maps.newHashMapWithExpectedSize(topLevelAspectsKey.size());
+    for (BuildDriverKey bdAspectKey : buildDriverAspectKeys) {
+      BuildDriverValue value = result.get(bdAspectKey);
+      if (value == null) {
+        // Skip aspects that couldn't be applied to targets.
+        continue;
+      }
+      TopLevelAspectsValue topLevelAspectsValue = (TopLevelAspectsValue) value.getWrappedSkyValue();
+      for (SkyValue val : topLevelAspectsValue.getTopLevelAspectsValues()) {
+        AspectValue aspectValue = (AspectValue) val;
+        aspects.put(aspectValue.getKey(), aspectValue.getConfiguredAspect());
+      }
+    }
+    Collection<ConfiguredTarget> cts = Lists.newArrayListWithCapacity(ctKeys.size());
+    for (BuildDriverKey bdCTKey : buildDriverCTKeys) {
+      BuildDriverValue value = result.get(bdCTKey);
+      if (value == null) {
+        continue;
+      }
+      ConfiguredTargetValue ctValue = (ConfiguredTargetValue) value.getWrappedSkyValue();
+
+      cts.add(ctValue.getConfiguredTarget());
+    }
+    return new SkyframeAnalysisResult(
+        /*hasLoadingError=*/ false,
+        /*hasAnalysisError=*/ false,
+        foundActionConflict,
+        ImmutableList.copyOf(cts),
+        result.getWalkableGraph(),
+        ImmutableMap.copyOf(aspects),
+        null);
+  }
+
   private static AnalysisFailedCause makeArtifactConflictAnalysisFailedCause(
       Supplier<Map<BuildConfigurationValue.Key, BuildConfiguration>> configurationLookupSupplier,
       ConflictException e) {
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
index 75c57df8b76199..a54133f547bbad 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
@@ -646,6 +646,7 @@ private ImmutableMap<SkyFunctionName, SkyFunction> skyFunctions() {
     map.put(
         SkyFunctions.ARTIFACT_NESTED_SET,
         ArtifactNestedSetFunction.createInstance(valueBasedChangePruningEnabled()));
+    map.put(SkyFunctions.BUILD_DRIVER, new BuildDriverFunction());
     map.putAll(extraSkyFunctions);
     return ImmutableMap.copyOf(map);
   }
@@ -2381,6 +2382,38 @@ EvaluationResult<ActionLookupValue> configureTargets(
     return result;
   }
 
+  /**
+   * Evaluates the given collections of CT/Aspect BuildDriverKeys. This is part of
+   * https://github.com/bazelbuild/bazel/issues/14057, internal: b/147350683.
+   */
+  EvaluationResult<BuildDriverValue> evaluateBuildDriverKeys(
+      ExtendedEventHandler eventHandler,
+      List<BuildDriverKey> buildDriverCTKeys,
+      List<BuildDriverKey> buildDriverAspectKeys,
+      boolean keepGoing,
+      int numThreads,
+      int cpuHeavySkyKeysThreadPoolSize)
+      throws InterruptedException {
+    checkActive();
+
+    eventHandler.post(new ConfigurationPhaseStartedEvent(configuredTargetProgress));
+    EvaluationContext evaluationContext =
+        EvaluationContext.newBuilder()
+            .setKeepGoing(keepGoing)
+            .setNumThreads(numThreads)
+            .setExecutorServiceSupplier(
+                () -> NamedForkJoinPool.newNamedPool("skyframe-evaluator", numThreads))
+            .setCPUHeavySkyKeysThreadPoolSize(cpuHeavySkyKeysThreadPoolSize)
+            .setEventHandler(eventHandler)
+            .build();
+    EvaluationResult<BuildDriverValue> result =
+        buildDriver.evaluate(
+            Iterables.concat(buildDriverCTKeys, buildDriverAspectKeys), evaluationContext);
+    // Get rid of any memory retained by the cache -- all loading is done.
+    perBuildSyscallCache.clear();
+    return result;
+  }
+
   /**
    * Checks the given action lookup values for action conflicts. Values satisfying the returned
    * predicate are known to be transitively error-free from action conflicts or other analysis
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewForTesting.java b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewForTesting.java
index 7b1f1d447b874b..2e765bb8cedc84 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewForTesting.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewForTesting.java
@@ -217,7 +217,8 @@ public AnalysisResult update(
         loadingPhaseThreads,
         topLevelOptions,
         eventHandler,
-        eventBus);
+        eventBus,
+        /*includeExecutionPhase=*/ false);
   }
 
   /** Sets the configurations. Not thread-safe. */
diff --git a/src/test/shell/integration/merged_skyframe_phases_test.sh b/src/test/shell/integration/merged_skyframe_phases_test.sh
new file mode 100755
index 00000000000000..126f41ebe874f1
--- /dev/null
+++ b/src/test/shell/integration/merged_skyframe_phases_test.sh
@@ -0,0 +1,87 @@
+#!/bin/bash
+#
+# Copyright 2021 The Bazel Authors. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# execution_phase_tests.sh: miscellaneous integration tests of Bazel for
+# behaviors that affect the execution phase.
+#
+
+# --- begin runfiles.bash initialization ---
+set -euo pipefail
+if [[ ! -d "${RUNFILES_DIR:-/dev/null}" && ! -f "${RUNFILES_MANIFEST_FILE:-/dev/null}" ]]; then
+  if [[ -f "$0.runfiles_manifest" ]]; then
+    export RUNFILES_MANIFEST_FILE="$0.runfiles_manifest"
+  elif [[ -f "$0.runfiles/MANIFEST" ]]; then
+    export RUNFILES_MANIFEST_FILE="$0.runfiles/MANIFEST"
+  elif [[ -f "$0.runfiles/bazel_tools/tools/bash/runfiles/runfiles.bash" ]]; then
+    export RUNFILES_DIR="$0.runfiles"
+  fi
+fi
+if [[ -f "${RUNFILES_DIR:-/dev/null}/bazel_tools/tools/bash/runfiles/runfiles.bash" ]]; then
+  source "${RUNFILES_DIR}/bazel_tools/tools/bash/runfiles/runfiles.bash"
+elif [[ -f "${RUNFILES_MANIFEST_FILE:-/dev/null}" ]]; then
+  source "$(grep -m1 "^bazel_tools/tools/bash/runfiles/runfiles.bash " \
+            "$RUNFILES_MANIFEST_FILE" | cut -d ' ' -f 2-)"
+else
+  echo >&2 "ERROR: cannot find @bazel_tools//tools/bash/runfiles:runfiles.bash"
+  exit 1
+fi
+# --- end runfiles.bash initialization ---
+
+source "$(rlocation "io_bazel/src/test/shell/integration_test_setup.sh")" \
+  || { echo "integration_test_setup.sh not found!" >&2; exit 1; }
+
+case "$(uname -s | tr [:upper:] [:lower:])" in
+msys*|mingw*|cygwin*)
+  declare -r is_windows=true
+  ;;
+*)
+  declare -r is_windows=false
+  ;;
+esac
+
+if "$is_windows"; then
+  export MSYS_NO_PATHCONV=1
+  export MSYS2_ARG_CONV_EXCL="*"
+fi
+
+function set_up() {
+  cd ${WORKSPACE_DIR}
+  mkdir -p "foo"
+}
+
+#### TESTS #############################################################
+function test_flag_enabled() {
+  cat > foo/BUILD <<EOF
+cc_binary(
+    name = "foo",
+    srcs = [
+        "foo.cc",
+    ],
+)
+cc_binary(
+    name = "bar",
+    srcs = [
+        "bar.cc",
+    ],
+)
+EOF
+  touch foo/foo.cc
+  touch foo/bar.cc
+
+  bazel build --noshow_progress --nouse_action_cache --experimental_merged_skyframe_analysis_execution //foo:all &> "$TEST_log" || fail "Expected success"
+}
+
+run_suite "Integration tests of ${PRODUCT_NAME} with merged Analysis & Execution phases of Skyframe."