Index: sources/gui/GuiController.cpp
===================================================================
diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/gui/GuiController.cpp	(.../GuiController.cpp)	(revision 27cc308ff5113a9386899d3c8f8b29962a8498e1)
+++ sources/gui/GuiController.cpp	(.../GuiController.cpp)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -56,11 +56,11 @@
  */
 void GuiController::quit()
 {
-    // coco begin validated: Application termination is not correctly done in coco!!!
+    // disabled coco begin validated: Application termination is not correctly done in coco!!!
     // it has been tested and works perfectly fine in normal run.
     quitThread(); // validated
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief GuiController::initConnections
@@ -111,7 +111,7 @@
  */
 void GuiController::initThread(QThread &vThread)
 {
-    // coco begin validated: Application termination is not correctly done in coco!!!
+    // disabled coco begin validated: Application termination is not correctly done in coco!!!
     // it has been tested and works perfectly fine in normal run.
     // runs in main thread
     Q_ASSERT_X(QThread::currentThread() == qApp->thread() , __func__, "The Class initialization must be done in Main Thread" );
@@ -121,7 +121,7 @@
     _thread->start();
     moveToThread(_thread);
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief   GuiController::quitThread
@@ -130,14 +130,14 @@
  */
 void GuiController::quitThread()
 {
-    // coco begin validated: Application termination is not correctly done in coco!!!
+    // disabled coco begin validated: Application termination is not correctly done in coco!!!
     // it has been tested and works perfectly fine in normal run.
     if ( ! _thread ) return;
 
     // runs in thread
     moveToThread(qApp->thread()); // validated
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief GuiController initializer
@@ -166,10 +166,10 @@
  */
 void GuiController::doActionTransmit(GuiActionType vAction, const QVariantList &vData)
 {
-    // coco begin validated: This is a sample code and currently does nothing
+    // disabled coco begin validated: This is a sample code and currently does nothing
     // The handleTransmit is a place holder and currently has not been used.
     if (!       handleTransmit(vAction, vData)) {
-        // coco end
+        // disabled coco end
         emit didActionTransmit(vAction, vData);
     }
 }
@@ -185,7 +185,7 @@
  */
 bool GuiController::handleTransmit(GuiActionType vAction, const QVariantList &vData)
 {
-    // coco begin validated: This is a sample code and currently does nothing
+    // disabled coco begin validated: This is a sample code and currently does nothing
     Q_UNUSED(vAction)
     Q_UNUSED(vData)
 
@@ -214,7 +214,7 @@
     }
     return false;
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief   Action commanded by HD
@@ -237,11 +237,11 @@
  */
 void GuiController::onUSBDriveMount()
 {
-    // coco begin validated: This needs user interaction to plug-in USB device
+    // disabled coco begin validated: This needs user interaction to plug-in USB device
     // has been tested manually
     emit didUSBDriveMount();
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief   GuiController::doUSBDriveUmount
@@ -250,11 +250,11 @@
  */
 void GuiController::doUSBDriveUmount()
 {
-    // coco begin validated: This needs user interaction to plug-out the USB device
+    // disabled coco begin validated: This needs user interaction to plug-out the USB device
     // has been tested manually
     emit didUSBDriveUmount();
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief   GuiController::onUSBDriveRemove
@@ -263,11 +263,11 @@
  */
 void GuiController::onUSBDriveRemove()
 {
-    // coco begin validated: This needs user interaction to plug-out the USB device
+    // disabled coco begin validated: This needs user interaction to plug-out the USB device
     // has been tested manually
     emit didUSBDriveRemove();
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief GuiController::onSDCardStateChange
@@ -278,12 +278,12 @@
  */
 void GuiController::onSDCardStateChange(bool vIsReady, bool vIsReadOnly)
 {
-    // coco begin validated: This needs user interaction to plug-out the SD Card
+    // disabled coco begin validated: This needs user interaction to plug-out the SD Card
     // has been tested manually
     /// DEBUG: qDebug() << " ***** GuiController " << Storage::SDCard_Base_Path_Name << vIsReady;
     emit didSDCardStateChange(vIsReady, vIsReadOnly);
 }
-// coco end
+// disabled coco end
 
 
 /*!
@@ -293,11 +293,11 @@
  */
 void GuiController::onSDCardSpaceTooLow(quint8 vAvailablePercent)
 {
-    // coco begin validated: This needs to fill up the SD-Card and test with human interactions.
+    // disabled coco begin validated: This needs to fill up the SD-Card and test with human interactions.
     // has been tested manually
     emit didSDCardSpaceTooLow(vAvailablePercent);
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief   GuiController::onExport
@@ -306,11 +306,11 @@
  */
 void GuiController::onExport()
 {
-    // coco begin validated: This needs user interaction to export to  USB device
+    // disabled coco begin validated: This needs user interaction to export to  USB device
     // has been tested manually
     emit didExport();
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief   GuiController::doExportLog
@@ -319,11 +319,11 @@
  */
 void GuiController::doExportLog()
 {
-    // coco begin validated: This needs user interaction to export to  USB device
+    // disabled coco begin validated: This needs user interaction to export to  USB device
     // has been tested manually
     emit didExportLog();
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief   GuiController::didFailedTransmit