diff --git a/storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp b/storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp
index 8172a034985..1f89d9f09ea 100644
--- a/storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp
+++ b/storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp
@@ -141,7 +141,7 @@ public:
     TuxSetLogFlags = 12002,
     TuxMetaDataJunk = 12009,
     
-    DumpTsman = 9002, 
+    DumpTsman = 9800, 
     DumpLgman = 10000,
     DumpPgman = 11000
   };
diff --git a/storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp b/storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
index f1d16f23f50..737b21e6f6f 100644
--- a/storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
+++ b/storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
@@ -578,6 +578,7 @@ void Cmvmi::execCONNECT_REP(Signal *signal){
       /**
        * Dont allow api nodes to connect
        */
+      ndbout_c("%d %d %d", hostId, type, globalData.theStartLevel);
       abort();
       globalTransporterRegistry.do_disconnect(hostId);
     }
@@ -1208,13 +1209,16 @@ Cmvmi::execDUMP_STATE_ORD(Signal* signal)
   if (arg == 9001)
   {
     CLEAR_ERROR_INSERT_VALUE;
-    for (Uint32 i = 0; i<MAX_NODES; i++)
+    if (signal->getLength() == 1 || signal->theData[1])
     {
-      if (c_error_9000_nodes_mask.get(i))
+      for (Uint32 i = 0; i<MAX_NODES; i++)
       {
-	signal->theData[0] = 0;
-	signal->theData[1] = i;
-	EXECUTE_DIRECT(CMVMI, GSN_OPEN_COMREQ, signal, 2);
+	if (c_error_9000_nodes_mask.get(i))
+	{
+	  signal->theData[0] = 0;
+	  signal->theData[1] = i;
+	  EXECUTE_DIRECT(CMVMI, GSN_OPEN_COMREQ, signal, 2);
+	}
       }
     }
     c_error_9000_nodes_mask.clear();
diff --git a/storage/ndb/test/ndbapi/testNodeRestart.cpp b/storage/ndb/test/ndbapi/testNodeRestart.cpp
index ddef9acca58..d346a4f0057 100644
--- a/storage/ndb/test/ndbapi/testNodeRestart.cpp
+++ b/storage/ndb/test/ndbapi/testNodeRestart.cpp
@@ -1005,7 +1005,7 @@ int runBug24717(NDBT_Context* ctx, NDBT_Step* step){
   
   HugoTransactions hugoTrans(*ctx->getTab());
 
-  int dump[] = { 9002, 0 } ;
+  int dump[] = { 9000, 0 } ;
   Uint32 ownNode = refToNode(pNdb->getReference());
   dump[1] = ownNode;
 
@@ -1025,6 +1025,8 @@ int runBug24717(NDBT_Context* ctx, NDBT_Step* step){
       hugoTrans.pkReadRecords(pNdb, 100, 1, NdbOperation::LM_CommittedRead);
     }
     
+    int reset[2] = { 9001, 0 };
+    restarter.dumpStateOneNode(nodeId, reset, 2);
     restarter.waitClusterStarted();
   }