diff --git a/platform/external-system-api/src/com/intellij/openapi/externalSystem/model/task/ExternalSystemTaskNotificationListener.java b/platform/external-system-api/src/com/intellij/openapi/externalSystem/model/task/ExternalSystemTaskNotificationListener.java
index 2d6c426f37d6..fd8cded4a1eb 100644
--- a/platform/external-system-api/src/com/intellij/openapi/externalSystem/model/task/ExternalSystemTaskNotificationListener.java
+++ b/platform/external-system-api/src/com/intellij/openapi/externalSystem/model/task/ExternalSystemTaskNotificationListener.java
@@ -15,20 +15,23 @@ public interface ExternalSystemTaskNotificationListener {
     = ExtensionPointName.create("com.intellij.externalSystemTaskNotificationListener");
 
   /**
-   * Notifies that task with the given id is queued for the execution.
-   * <p/>
-   * 'Queued' here means that intellij process-local codebase receives request to execute the target task and even has not been
-   * sent it to the slave gradle api process.
-   *
-   * @param id  target task's id
-   * @param workingDir
+   * @deprecated use {@link #onStart(ExternalSystemTaskId, String)}
    */
   void onQueued(@NotNull ExternalSystemTaskId id, String workingDir);
-  
+
   /**
    * Notifies that task with the given id is about to be started.
-   * 
+   *
    * @param id  target task's id
+   * @param workingDir working directory
+   */
+  default void onStart(@NotNull ExternalSystemTaskId id, String workingDir) {
+    onQueued(id, workingDir);
+    onStart(id);
+  }
+
+  /**
+   * @deprecated use {@link #onStart(ExternalSystemTaskId, String)}
    */
   void onStart(@NotNull ExternalSystemTaskId id);
 
diff --git a/platform/external-system-api/src/com/intellij/openapi/externalSystem/model/task/ExternalSystemTaskNotificationListenerAdapter.java b/platform/external-system-api/src/com/intellij/openapi/externalSystem/model/task/ExternalSystemTaskNotificationListenerAdapter.java
index 87a36684af3b..ec9e20c8289a 100644
--- a/platform/external-system-api/src/com/intellij/openapi/externalSystem/model/task/ExternalSystemTaskNotificationListenerAdapter.java
+++ b/platform/external-system-api/src/com/intellij/openapi/externalSystem/model/task/ExternalSystemTaskNotificationListenerAdapter.java
@@ -10,11 +10,21 @@ public abstract class ExternalSystemTaskNotificationListenerAdapter implements E
 
   @NotNull public static final ExternalSystemTaskNotificationListener NULL_OBJECT = new ExternalSystemTaskNotificationListenerAdapter() { };
 
-  @Override
+  /**
+   * @deprecated use {@link #onStart(ExternalSystemTaskId, String)}
+   */
   public void onQueued(@NotNull ExternalSystemTaskId id, String workingDir) {
   }
 
   @Override
+  public void onStart(@NotNull ExternalSystemTaskId id, String workingDir) {
+    onQueued(id, workingDir);
+    onStart(id);
+  }
+
+  /**
+   * @deprecated use {@link #onStart(ExternalSystemTaskId, String)}
+   */
   public void onStart(@NotNull ExternalSystemTaskId id) {
   }
 
diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/AbstractExternalSystemFacadeImpl.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/AbstractExternalSystemFacadeImpl.java
index bc6efab979ea..9a8e9f3782e3 100644
--- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/AbstractExternalSystemFacadeImpl.java
+++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/AbstractExternalSystemFacadeImpl.java
@@ -210,14 +210,12 @@ public abstract class AbstractExternalSystemFacadeImpl<S extends ExternalSystemE
     public void onQueued(@NotNull ExternalSystemTaskId id, String workingDir) {
     }
 
+    @Override
+    public void onStart(@NotNull ExternalSystemTaskId id, String workingDir) {
+    }
+
     @Override
     public void onStart(@NotNull ExternalSystemTaskId id) {
-      try {
-        myManager.onStart(id);
-      }
-      catch (RemoteException e) {
-        // Ignore
-      }
     }
 
     @Override
@@ -242,52 +240,22 @@ public abstract class AbstractExternalSystemFacadeImpl<S extends ExternalSystemE
 
     @Override
     public void onEnd(@NotNull ExternalSystemTaskId id) {
-      try {
-        myManager.onEnd(id);
-      }
-      catch (RemoteException e) {
-        // Ignore
-      }
     }
 
     @Override
     public void onSuccess(@NotNull ExternalSystemTaskId id) {
-      try {
-        myManager.onSuccess(id);
-      }
-      catch (RemoteException e) {
-        // Ignore
-      }
     }
 
     @Override
     public void onFailure(@NotNull ExternalSystemTaskId id, @NotNull Exception ex) {
-      try {
-        myManager.onFailure(id, ex);
-      }
-      catch (RemoteException e) {
-        // Ignore
-      }
     }
 
     @Override
     public void beforeCancel(@NotNull ExternalSystemTaskId id) {
-      try {
-        myManager.beforeCancel(id);
-      }
-      catch (RemoteException e) {
-        // Ignore
-      }
     }
 
     @Override
     public void onCancel(@NotNull ExternalSystemTaskId id) {
-      try {
-        myManager.onCancel(id);
-      }
-      catch (RemoteException e) {
-        // Ignore
-      }
     }
   }
 }
diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/internal/ExternalSystemProcessingManager.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/internal/ExternalSystemProcessingManager.java
index 8d5da5e7276d..d7cfdf9335fa 100644
--- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/internal/ExternalSystemProcessingManager.java
+++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/internal/ExternalSystemProcessingManager.java
@@ -131,6 +131,11 @@ public class ExternalSystemProcessingManager implements ExternalSystemTaskNotifi
 
   @Override
   public void onQueued(@NotNull ExternalSystemTaskId id, String workingDir) {
+    onStart(id, workingDir);
+  }
+
+  @Override
+  public void onStart(@NotNull ExternalSystemTaskId id, String workingDir) {
     myTasksInProgress.put(id, System.currentTimeMillis() + TOO_LONG_EXECUTION_MS);
     if (myAlarm.getActiveRequestCount() <= 0) {
       myAlarm.addRequest(() -> update(), TOO_LONG_EXECUTION_MS);
diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/internal/ExternalSystemResolveProjectTask.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/internal/ExternalSystemResolveProjectTask.java
index b3c5d709cc99..817d01c69b3c 100644
--- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/internal/ExternalSystemResolveProjectTask.java
+++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/internal/ExternalSystemResolveProjectTask.java
@@ -83,7 +83,7 @@ public class ExternalSystemResolveProjectTask extends AbstractExternalSystemTask
     ExternalSystemProgressNotificationManagerImpl progressNotificationManager =
       (ExternalSystemProgressNotificationManagerImpl)ServiceManager.getService(ExternalSystemProgressNotificationManager.class);
     ExternalSystemTaskId id = getId();
-    progressNotificationManager.onQueued(id, myProjectPath);
+    progressNotificationManager.onStart(id, myProjectPath);
     try {
       DataNode<ProjectData> project = resolver.resolveProjectInfo(id, myProjectPath, myIsPreviewMode, settings);
       if (project != null) {
diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/remote/ExternalSystemProgressNotificationManagerImpl.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/remote/ExternalSystemProgressNotificationManagerImpl.java
index b7eb7e8a6d7e..c21868f668e8 100644
--- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/remote/ExternalSystemProgressNotificationManagerImpl.java
+++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/remote/ExternalSystemProgressNotificationManagerImpl.java
@@ -67,25 +67,15 @@ public class ExternalSystemProgressNotificationManagerImpl extends RemoteObject
   }
 
   @Override
-  public void onQueued(@NotNull ExternalSystemTaskId id, @NotNull String workingDir) {
+  public void onStart(@NotNull ExternalSystemTaskId id, @NotNull String workingDir) {
     for (Map.Entry<ExternalSystemTaskNotificationListener, Set<ExternalSystemTaskId>> entry : myListeners.entrySet()) {
       final Set<ExternalSystemTaskId> ids = entry.getValue();
       if (Collections.EMPTY_SET == ids || ids.contains(id)) {
-        entry.getKey().onQueued(id, workingDir);
+        entry.getKey().onStart(id, workingDir);
       }
     }
   }
 
-  @Override
-  public void onStart(@NotNull ExternalSystemTaskId id) {
-    for (Map.Entry<ExternalSystemTaskNotificationListener, Set<ExternalSystemTaskId>> entry : myListeners.entrySet()) {
-      final Set<ExternalSystemTaskId> ids = entry.getValue();
-      if (Collections.EMPTY_SET == ids || ids.contains(id)) {
-        entry.getKey().onStart(id);
-      }
-    } 
-  }
-
   @Override
   public void onStatusChange(@NotNull ExternalSystemTaskNotificationEvent event) {
     for (Map.Entry<ExternalSystemTaskNotificationListener, Set<ExternalSystemTaskId>> entry : myListeners.entrySet()) {
diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/remote/RemoteExternalSystemProgressNotificationManager.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/remote/RemoteExternalSystemProgressNotificationManager.java
index f151d68cc30a..ca6fb84032de 100644
--- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/remote/RemoteExternalSystemProgressNotificationManager.java
+++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/remote/RemoteExternalSystemProgressNotificationManager.java
@@ -19,11 +19,7 @@ public interface RemoteExternalSystemProgressNotificationManager extends Remote
 
   RemoteExternalSystemProgressNotificationManager NULL_OBJECT = new RemoteExternalSystemProgressNotificationManager() {
     @Override
-    public void onQueued(@NotNull ExternalSystemTaskId id, @NotNull String projectPath) throws RemoteException {
-    }
-
-    @Override
-    public void onStart(@NotNull ExternalSystemTaskId id) {
+    public void onStart(@NotNull ExternalSystemTaskId id, @NotNull String projectPath) throws RemoteException {
     }
 
     @Override
@@ -55,9 +51,7 @@ public interface RemoteExternalSystemProgressNotificationManager extends Remote
     }
   };
 
-  void onQueued(@NotNull ExternalSystemTaskId id, @NotNull String projectPath) throws RemoteException;
-
-  void onStart(@NotNull ExternalSystemTaskId id) throws RemoteException;
+  void onStart(@NotNull ExternalSystemTaskId id, @NotNull String projectPath) throws RemoteException;
 
   void onStatusChange(@NotNull ExternalSystemTaskNotificationEvent event) throws RemoteException;
 
diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/remote/wrapper/ExternalSystemProjectResolverWrapper.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/remote/wrapper/ExternalSystemProjectResolverWrapper.java
index cc5ee1c89293..2b13fb84e19f 100644
--- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/remote/wrapper/ExternalSystemProjectResolverWrapper.java
+++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/remote/wrapper/ExternalSystemProjectResolverWrapper.java
@@ -15,7 +15,7 @@ import java.rmi.RemoteException;
 
 /**
  * Intercepts calls to the target {@link RemoteExternalSystemProjectResolver} and
- * {@link ExternalSystemTaskNotificationListener#onQueued(ExternalSystemTaskId, String) updates 'queued' task status}.
+ * {@link ExternalSystemTaskNotificationListener#onStart(ExternalSystemTaskId, String) updates 'queued' task status}.
  * <p/>
  * Thread-safe.
  *
diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/remote/wrapper/ExternalSystemTaskManagerWrapper.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/remote/wrapper/ExternalSystemTaskManagerWrapper.java
index 51d63d75fcb4..ba5424462f53 100644
--- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/remote/wrapper/ExternalSystemTaskManagerWrapper.java
+++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/remote/wrapper/ExternalSystemTaskManagerWrapper.java
@@ -48,9 +48,10 @@ public class ExternalSystemTaskManagerWrapper<S extends ExternalSystemExecutionS
                            @NotNull String projectPath,
                            @Nullable S settings,
                            @Nullable String debuggerSetup) throws RemoteException, ExternalSystemException {
-    myProgressManager.onQueued(id, projectPath);
+    myProgressManager.onStart(id, projectPath);
     try {
       getDelegate().executeTasks(id, taskNames, projectPath, settings, debuggerSetup);
+      myProgressManager.onSuccess(id);
     }
     catch (ExternalSystemException e) {
       myProgressManager.onFailure(id, e);
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleProjectResolver.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleProjectResolver.java
index 3f0c81a7bd90..d3dcfd55a95f 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleProjectResolver.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleProjectResolver.java
@@ -253,7 +253,6 @@ public class GradleProjectResolver implements ExternalSystemProjectResolver<Grad
           myCancellationMap.putValue(resolverCtx.getExternalSystemTaskId(), new UnsupportedCancellationToken());
         }
       }
-      resolverCtx.getListener().onStart(resolverCtx.getExternalSystemTaskId());
       allModels = buildActionExecutor.run();
       if (allModels == null) {
         throw new IllegalStateException("Unable to get project model for the project: " + resolverCtx.getProjectPath());