Fix to make proper cleanup of executors in ProjectCommandExecutor