Index: sources/ApplicationController.cpp
===================================================================
diff -u -r5605f930ab5cd1a62b96347f4b4300ef30a830ee -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/ApplicationController.cpp	(.../ApplicationController.cpp)	(revision 5605f930ab5cd1a62b96347f4b4300ef30a830ee)
+++ sources/ApplicationController.cpp	(.../ApplicationController.cpp)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -79,7 +79,7 @@
     // it has been tested and works perfectly fine in normal run.
     quitThread(); // validated
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief   ApplicationController::initConnections
@@ -181,7 +181,7 @@
     // runs in thread
     moveToThread(qApp->thread()); // validated
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief   ApplicationController::onFailedTransmit
@@ -237,7 +237,7 @@
     // has been tested manually
     emit didUSBDriveMount();
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief   ApplicationController::onUSBDriveRemove
@@ -250,7 +250,7 @@
     // has been tested manually
     emit didUSBDriveUmount();
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief   ApplicationController::onUSBDriveRemove
@@ -263,7 +263,7 @@
     // has been tested manually
     emit didUSBDriveRemove();
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief   ApplicationController::onSDCardStateChange
@@ -279,7 +279,7 @@
     /// DEBUG: qDebug() << " ***** ApplicationController " << Storage::SDCard_Base_Path_Name << vIsReady;
     emit didSDCardStateChange(vIsReady, vIsReadOnly);
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief   ApplicationController::onSDCardSpaceTooLow
@@ -292,7 +292,7 @@
     // has been tested manually
     emit didSDCardSpaceTooLow(vAvailablePercent);
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief   ApplicationController::onExportLog
@@ -304,7 +304,7 @@
     // has been tested manually
     LOG_EXPORT;
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief   ApplicationController::onExport
@@ -316,7 +316,7 @@
     // has been tested manually
     emit didExport();
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief   ApplicationController::keepAlive
@@ -339,7 +339,7 @@
             createFakeSequencedLongMessage (mData, mFakeDataLen);
         }
     }
-    // coco end
+    // disabled coco end
     else {
         mData += static_cast<quint8>(GuiActionData::NoData);
     }
@@ -401,7 +401,7 @@
         vData += gFakeData;
     }
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief   ApplicationController::createFakeSequencedAtBeginLongMessage
@@ -462,7 +462,7 @@
         vData += gFakeData;
     }
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief   ApplicationController::initSettings
Index: sources/MainTimer.cpp
===================================================================
diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/MainTimer.cpp	(.../MainTimer.cpp)	(revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f)
+++ sources/MainTimer.cpp	(.../MainTimer.cpp)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -42,7 +42,7 @@
     if (gFakeInterval) {
         startTimer(gFakeInterval);
     }
-    // coco end
+    // disabled coco end
     else {
         startTimer(_interval);
     }
@@ -93,7 +93,7 @@
                 oM = cM;
                 oS = cS;
             }
-            // coco end
+            // disabled coco end
         }
         else
             return false;
Index: sources/Threads.cpp
===================================================================
diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/Threads.cpp	(.../Threads.cpp)	(revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f)
+++ sources/Threads.cpp	(.../Threads.cpp)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -75,7 +75,7 @@
         vThread.quit(); // validated
         vThread.wait(); // validated
     }
-    // coco end
+    // disabled coco end
 
     /*!
      * \brief   quitThreads
@@ -97,5 +97,5 @@
         quitThread(_Application_Thread      );
         quitThread(_Logger_Thread           );
     }
-    // coco end
+    // disabled coco end
 }
Index: sources/bluetooth/BluetoothInterface.cpp
===================================================================
diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/bluetooth/BluetoothInterface.cpp	(.../BluetoothInterface.cpp)	(revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f)
+++ sources/bluetooth/BluetoothInterface.cpp	(.../BluetoothInterface.cpp)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -89,7 +89,7 @@
     // it has been tested and works perfectly fine in normal run.
     quitThread(); // validated
 }
-// coco end
+// disabled coco end
 
 
 /*!
@@ -125,7 +125,7 @@
     // runs in thread
     moveToThread(qApp->thread()); // validated
 }
-// coco end
+// disabled coco end
 
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ //
 // ~~~~~~~~~~ THREAD SAFE state change notifications.~~~~~~~~~~ //
Index: sources/canbus/CanInterface.cpp
===================================================================
diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/canbus/CanInterface.cpp	(.../CanInterface.cpp)	(revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f)
+++ sources/canbus/CanInterface.cpp	(.../CanInterface.cpp)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -49,7 +49,7 @@
 
     // disabled coco begin validated: Manually tested since required to disable and enable the CANBus
     if ( ! initDevice() ) return false;
-    // coco end
+    // disabled coco end
     if ( ! testDevice() ) return false;
 
     initConnections();
@@ -75,7 +75,7 @@
 {
     // disabled coco begin validated: Manually tested since required to disable and enable the CANBus
     if ( ! init() ) return false;
-    // coco end
+    // disabled coco end
     initThread(vThread);
     return true;
 }
@@ -91,7 +91,7 @@
     // it has been tested and works perfectly fine in normal run.
     quitThread(); // verified
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief   CanInterface status
@@ -118,7 +118,7 @@
         LOG_DEBUG("Console out CanInterface disabled");
     }
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief   CanInterface connections definition
@@ -129,7 +129,7 @@
 {
     // disabled coco begin validated: Manually tested since required to disable and enable the CANBus
     if (_canDevice) {
-        // coco end
+        // disabled coco end
         connect(_canDevice, SIGNAL( framesReceived()),
                 this      , SLOT  (onFrameReceive ()));
 
@@ -176,7 +176,7 @@
     // runs in thread
     moveToThread(qApp->thread()); // verified
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief   CanInterface::createDevice
@@ -193,7 +193,7 @@
         LOG_DEBUG(status());
         return false;
     }
-    // coco end
+    // disabled coco end
     return true;
 }
 
@@ -222,7 +222,7 @@
 {
     // disabled coco begin validated: Manually tested since required to disable and enable the CANBus
     if (!_canDevice) return;
-    // coco end
+    // disabled coco end
     _canDevice->disconnectDevice();
     delete _canDevice;
     _canDevice = nullptr;
@@ -261,7 +261,7 @@
 {
     // disabled coco begin validated: Manually tested since required to disable and enable the CANBus
     if( !_canDevice ) return false;
-    //coco end
+    //disabled coco end
     return _canDevice->writeFrame(vFrame);
 }
 
@@ -290,7 +290,7 @@
     // the fprintf is used for the colored output
     fprintf(stderr, "%s %s %s %i %s\n", vFrameCount.toLatin1().constData(), time.toLatin1().constData(), flags.toLatin1().constData(), vFrame.frameId(), view.toLatin1().constData());
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief   CanInterface::rxCount
@@ -325,7 +325,7 @@
     // since it requires massive can messages sent/received to catch the error
     Types::safeIncrement(_erFrameCount);
     return _erFrameCount;
-    // coco end
+    // disabled coco end
 }
 
 /*!
@@ -348,7 +348,7 @@
         result[3] = QLatin1Char('L');
 
     return result;
-    // coco end
+    // disabled coco end
 }
 
 /*!
@@ -380,7 +380,7 @@
     }
     emit didFrameError(_canStatus);
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief   CanInterface::onFrameWritten
@@ -405,14 +405,14 @@
 {
     // disabled coco begin validated: Manually tested since required to disable and enable the CANBus
     if (!_canDevice) return;
-    // coco end
+    // disabled coco end
     while (_canDevice->framesAvailable()) {
         const QCanBusFrame frame = _canDevice->readFrame();
         rxCount();
         // disabled coco begin validated: This code is only for debugging purposes and had been tested manually.
         if ( _enableConsoleOut )
             consoleOut(frame, QString("Rx:%1").arg(_rxFrameCount));
-        // coco end
+        // disabled coco end
         emit didFrameReceive(frame);
     }
 }
@@ -430,6 +430,6 @@
     // disabled coco begin validated: This code is only for debugging purposes and had been tested manually.
     if ( _enableConsoleOut )
         consoleOut(vFrame, QString("Tx:%1").arg(_txFrameCount));
-    // coco end
+    // disabled coco end
     emit didFrameTransmit(ok);
 }
Index: sources/canbus/FrameInterface.cpp
===================================================================
diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/canbus/FrameInterface.cpp	(.../FrameInterface.cpp)	(revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f)
+++ sources/canbus/FrameInterface.cpp	(.../FrameInterface.cpp)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -78,7 +78,7 @@
     // it has been tested and works perfectly fine in normal run.
     quitThread(); // validated
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief   FrameInterface connections definition
@@ -131,7 +131,7 @@
     // runs in thread
     moveToThread(qApp->thread()); // validated
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief   FrameInterface::transmitFrame
@@ -192,7 +192,7 @@
         break;
     // disabled coco begin validated: The HD/DG communication has not been defined and implemented yet.
     case eChlid_DG_HD    :
-    // coco end
+    // disabled coco end
         //  this channel is used for DG CheckIn for HW support and testing for now.
         //channelGroup = ChannelGroup::eChannel_Ignores;
         //break;
@@ -204,7 +204,7 @@
     case eChlid_DG_Alarm :
     case eChlid_DG_UI :
     case eChlid_DG_Sync  :
-    // coco end
+    // disabled coco end
     //case eChlid_DG_UI    : // has duplicate value as eChlid_DG_Alarm
         channelGroup = ChannelGroup::eChannel_Listens;
         break;
@@ -215,7 +215,7 @@
     //case eChlid_UI_DG       :
         channelGroup = ChannelGroup::eChannel_Outputs;
         break;
-    // coco end
+    // disabled coco end
     default:
         ok = false;
         break;
@@ -225,7 +225,7 @@
     if (vOK) *vOK = ok;
     if (vDebugChanngel) *vDebugChanngel = debugChannel;
 
-    // coco end
+    // disabled coco end
     return channelGroup;
 }
 
@@ -325,7 +325,7 @@
             return;
         }
     }
-    // coco end
+    // disabled coco end
     else {
         Frame frame = _txFrameList.first();
         transmitFrame(frame.can_Id, frame.data);
@@ -365,7 +365,7 @@
         if ( i < UINT32_MAX - 1 )   i++  ;
         else                        i = 0;
         return;
-        // coco end
+        // disabled coco end
     }
 
     Frame frame = Frame(vCan_Id, vData);
Index: sources/canbus/MessageAcknowModel.cpp
===================================================================
diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/canbus/MessageAcknowModel.cpp	(.../MessageAcknowModel.cpp)	(revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f)
+++ sources/canbus/MessageAcknowModel.cpp	(.../MessageAcknowModel.cpp)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -76,7 +76,7 @@
     // it has been tested and works perfectly fine in normal run.
     quitThread(); // validated
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief   MessageAcknowModel::initConnections
@@ -124,7 +124,7 @@
     // runs in thread
     moveToThread(qApp->thread()); // validated
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief   MessageAcknowModel::onAcknowTransmit
Index: sources/canbus/MessageBuilder.cpp
===================================================================
diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/canbus/MessageBuilder.cpp	(.../MessageBuilder.cpp)	(revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f)
+++ sources/canbus/MessageBuilder.cpp	(.../MessageBuilder.cpp)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -298,7 +298,7 @@
         LOG_DEBUG("Console out MessageBuilder disabled");
     }
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief   MessageBuilder::hasSyncByte
@@ -470,7 +470,7 @@
         // the fprintf is used for the colored output
         fprintf(stderr, "%s\n", view.constData());
     }
-    // coco end
+    // disabled coco end
 }
 
 /*!
Index: sources/canbus/MessageDispatcher.cpp
===================================================================
diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/canbus/MessageDispatcher.cpp	(.../MessageDispatcher.cpp)	(revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f)
+++ sources/canbus/MessageDispatcher.cpp	(.../MessageDispatcher.cpp)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -79,7 +79,7 @@
     // it has been tested and works perfectly fine in normal run.
     quitThread(); // validated
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief Message Handler connections definition
@@ -145,7 +145,7 @@
     // runs in thread
     moveToThread(qApp->thread()); // validated
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief   MessageDispatcher::onFrameReceive
@@ -163,7 +163,7 @@
     // disabled coco begin validated: if empty (first condition) is true, it must never check for the complete (second condition)
     // because if the list is empty there is no last() item
     if (_messageList[vCan_Id].isEmpty() || _messageList[vCan_Id].last().isComplete()) {
-        // coco end
+        // disabled coco end
         _messageList[vCan_Id].append(Message());
     }
 
@@ -208,7 +208,7 @@
     // disabled coco begin validated: Is a placeholder and has not been implemented yet
     emit didFailedTransmit(vSequence);
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief   MessageDispatcher::onActionTransmit
@@ -367,7 +367,7 @@
     mData += vData.alarmID;
     onActionTransmit(GuiActionType::ID_AlarmClearedConditionReq, mData);
 }
-// coco end */
+// disabled coco end */
 
 /**
  * \details This method transmits the Saline Bolus Adjustment Denali message.
@@ -806,7 +806,7 @@
         LOG_DEBUG(QString("Incorrect Message cannot be built"));  // TODO : LogInfo Improvement
         return;
     }
-    // coco end
+    // disabled coco end
     if (mNeedsAcknow) {
         // NOTE : here vSequence should be used which is not negative
         // because when we get the Acknow it is not the negative
@@ -938,7 +938,7 @@
         ok = true;
         emit didActionReceive(vMessage.actionId, mData);
     }
-    // coco end
+    // disabled coco end
 
     _messageList[vMessage.can_id].removeLast();
     return ok;
@@ -959,7 +959,7 @@
     }
     return _rxSequence;
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief   MessageDispatcher::txCount
@@ -976,7 +976,7 @@
     }
     return _txSequence;
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief   MessageDispatcher::needsAcknow
Index: sources/canbus/MessageGlobals.h
===================================================================
diff -u -r3561f79af1a92356eea01d5d0c3297c69d2ecdf2 -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/canbus/MessageGlobals.h	(.../MessageGlobals.h)	(revision 3561f79af1a92356eea01d5d0c3297c69d2ecdf2)
+++ sources/canbus/MessageGlobals.h	(.../MessageGlobals.h)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -357,15 +357,15 @@
         // initialized flag and data.length() == 0 became the same.
         // It is preferred to keep it as is so that the initialization is independent of data.
         return !initialized || !data.length();
-        // coco end
+        // disabled coco end
     }
     bool isComplete() {
         // disabled coco begin validated:Has been validated manually.
         // Since the crc is part of the data and there is no message without crc
         // then a message would never be empty.
         // It is preferred to keep it as is so that the initialization is independent of data.
         return !isEmpty() && data.length() == length;
-        // coco end
+        // disabled coco end
     }
 };
 
Index: sources/canbus/MessageInterpreter.cpp
===================================================================
diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f)
+++ sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -79,7 +79,7 @@
     // because the isValidMessage is catching errors.
     // only is checking here for developer safety if logic has changed.
     if ( ! ok ) return false;
-    // coco end
+    // disabled coco end
     emit didActionReceive(tModel.data());
     logReceivedMessage(tModel);
     DEBUG_SIGNAL(vIdCheck, typeid(TModel).name())
@@ -290,7 +290,7 @@
     case Gui::GuiActionType::ID_AlarmClearedConditionReq                : INTERPRET_TRANSMIT_MESSAGE(AlarmClearedConditionRequestData               ); break;
     case Gui::GuiActionType::ID_AlarmActiveListReq                      : INTERPRET_TRSMT_MT_MESSAGE(AlarmActiveListRequestData                     ); break;
     case Gui::GuiActionType::ID_AlarmTriggered                          : INTERPRET_TRANSMIT_MESSAGE(AlarmTriggeredRequestData                      ); break;
-    // coco end
+    // disabled coco end
     default:
         QString mActionIdHexString = Format::toHexString(vActionId);
         LOG_DEBUG(tr("Unknown transmit Message with ID '%1'").arg(mActionIdHexString));
@@ -525,7 +525,7 @@
     // disabled coco begin validated: Manually tested. This model class is a placeholder for the message 63(0x3F00) and there is no use case for this now.
     case Gui::GuiActionType::ID_AlarmClearedConditionRsp            : ok = notify<Model::MAlarmClearedCondition                 >(vMessage, vData, Gui::GuiActionType::ID_AlarmClearedConditionRsp              ); break;
     case Gui::GuiActionType::ID_AlarmActiveListRsp                  : ok = notify<Model::MAlarmActiveListResponse               >(vMessage, vData, Gui::GuiActionType::ID_AlarmActiveListRsp                    ); break;
-    // coco end
+    // disabled coco end
 
     // unhandled messages: these will only be logged as received message
     // there has nothing been defined for these messages.
@@ -619,7 +619,7 @@
     ok = GetValue(vMessage.data, index, mCanBUSFaultCount);
     // disabled coco begin validated : developer safety if for any reason length of CanBUSFaultCount set to 0
     if (ok) {
-        // coco end
+        // disabled coco end
         vData += mCanBUSFaultCount.value;
     }
     return ok;
Index: sources/cloudsync/CloudSyncController.cpp
===================================================================
diff -u -rad9c5d96d9288d685a0ff4e41e087258b5a4c91f -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/cloudsync/CloudSyncController.cpp	(.../CloudSyncController.cpp)	(revision ad9c5d96d9288d685a0ff4e41e087258b5a4c91f)
+++ sources/cloudsync/CloudSyncController.cpp	(.../CloudSyncController.cpp)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -77,7 +77,7 @@
     // it has been tested and works perfectly fine in normal run.
     quitThread(); // validated
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief   CloudSyncController::initConnections
@@ -129,7 +129,7 @@
     // runs in thread
     moveToThread(qApp->thread()); // validated
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief   CloudSyncController::timerEvent
Index: sources/device/DeviceController.cpp
===================================================================
diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/device/DeviceController.cpp	(.../DeviceController.cpp)	(revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f)
+++ sources/device/DeviceController.cpp	(.../DeviceController.cpp)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -89,15 +89,15 @@
     // it has been tested and works perfectly fine in normal run.
     quitThread(); // validated
 }
-// coco end
+// disabled coco end
 
 void DeviceController::onRemoveLogs(bool vInProgress)
 {
     // disabled coco begin validated: The log in progress requires user interaction
     // it has been tested and works fine in normal run.
     _pauseSpaceCheck = vInProgress;
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief   DeviceController::initConnections
@@ -154,7 +154,7 @@
     // runs in thread
     moveToThread(qApp->thread()); // validated
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief   DeviceController::usbSeek
@@ -185,7 +185,7 @@
     }
     vDevice = device;
     return false;
-    // coco end
+    // disabled coco end
 }
 
 /*!
@@ -211,7 +211,7 @@
     }
     return isReady;
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief   DeviceController::timerEvent
@@ -246,7 +246,7 @@
             usbRemove();
         }
     }
-    // coco end
+    // disabled coco end
 }
 
 /*!
@@ -298,7 +298,7 @@
     emit didSDCardSpaceChange(mCIsReady, mCTotal, mCAvailable, mPercent);
     /// DEBUG: qDebug() << Storage::SDCard_Base_Path_Name << mCIsReady << mCTotal << mCAvailable << mPercent ;
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief   DeviceController::usbError
@@ -330,7 +330,7 @@
         lastError = error;
     }
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief   DeviceController::onUSBDriveUmount
@@ -343,7 +343,7 @@
     // has been tested manually
     _umounted = true;
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief   DeviceController::usbMount
@@ -369,7 +369,7 @@
     }
     return ok;
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief   DeviceController::usbUmount
@@ -394,7 +394,7 @@
     }
     return ok;
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief   DeviceController::usbRemove
@@ -412,7 +412,7 @@
     LOG_DEBUG("USB drive removed");
     emit didUSBDriveRemove();
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief   DeviceController::checkError
Index: sources/gui/GuiController.cpp
===================================================================
diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/gui/GuiController.cpp	(.../GuiController.cpp)	(revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f)
+++ sources/gui/GuiController.cpp	(.../GuiController.cpp)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -60,7 +60,7 @@
     // it has been tested and works perfectly fine in normal run.
     quitThread(); // validated
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief GuiController::initConnections
@@ -121,7 +121,7 @@
     _thread->start();
     moveToThread(_thread);
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief   GuiController::quitThread
@@ -137,7 +137,7 @@
     // runs in thread
     moveToThread(qApp->thread()); // validated
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief GuiController initializer
@@ -169,7 +169,7 @@
     // 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);
     }
 }
@@ -214,7 +214,7 @@
     }
     return false;
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief   Action commanded by HD
@@ -241,7 +241,7 @@
     // has been tested manually
     emit didUSBDriveMount();
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief   GuiController::doUSBDriveUmount
@@ -254,7 +254,7 @@
     // has been tested manually
     emit didUSBDriveUmount();
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief   GuiController::onUSBDriveRemove
@@ -267,7 +267,7 @@
     // has been tested manually
     emit didUSBDriveRemove();
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief GuiController::onSDCardStateChange
@@ -283,7 +283,7 @@
     /// DEBUG: qDebug() << " ***** GuiController " << Storage::SDCard_Base_Path_Name << vIsReady;
     emit didSDCardStateChange(vIsReady, vIsReadOnly);
 }
-// coco end
+// disabled coco end
 
 
 /*!
@@ -297,7 +297,7 @@
     // has been tested manually
     emit didSDCardSpaceTooLow(vAvailablePercent);
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief   GuiController::onExport
@@ -310,7 +310,7 @@
     // has been tested manually
     emit didExport();
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief   GuiController::doExportLog
@@ -323,7 +323,7 @@
     // has been tested manually
     emit didExportLog();
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief   GuiController::didFailedTransmit
Index: sources/gui/GuiGlobals.cpp
===================================================================
diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/gui/GuiGlobals.cpp	(.../GuiGlobals.cpp)	(revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f)
+++ sources/gui/GuiGlobals.cpp	(.../GuiGlobals.cpp)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -185,7 +185,7 @@
                 }
                 QCoreApplication::exit(-1);
             }
-            // coco end
+            // disabled coco end
         }, Qt::QueuedConnection );
 
         LOG_DEBUG("MainView Starting");
Index: sources/gui/GuiView.cpp
===================================================================
diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/gui/GuiView.cpp	(.../GuiView.cpp)	(revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f)
+++ sources/gui/GuiView.cpp	(.../GuiView.cpp)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -101,7 +101,7 @@
     // has been tested manually
     emit didActionTransmit(vAction, vData);
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief   GuiView::doActionTransmit
@@ -121,7 +121,7 @@
     mData += vData;
     emit didActionTransmit(vAction, mData);
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief GuiView::doUSBDriveMount
@@ -136,7 +136,7 @@
     usbRemoved  (false);
     emit didUSBDriveMount ();
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief   GuiView::doUSBDriveUmount
@@ -151,7 +151,7 @@
     usbRemoved  (false);
     emit didUSBDriveUmount();
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief GuiView::doUSBDriveRemove
@@ -166,7 +166,7 @@
     usbRemoved  (true );
     emit didUSBDriveRemove();
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief GuiView::onSDCardStateChange
@@ -183,7 +183,7 @@
     sdIsReady   (vIsReady   );
     sdIsReadOnly(vIsReadOnly);
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief   GuiController::doSDCardSpaceTooLow
@@ -196,7 +196,7 @@
     // has been tested manually
     sdTooLowPecent(vAvailablePercent);
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief   GuiView::onExport
@@ -209,7 +209,7 @@
     // has been tested manually
     emit didExport();
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief   GuiView::doExportLog
@@ -222,7 +222,7 @@
     // has been tested manually
     emit didExportLog();
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief   GuiView::onSDCardSpaceChange
@@ -246,4 +246,4 @@
     sdPercent   ( vPercent                                      );
     sdIsLow     ( vPercent <= Storage::Available_Space_Percent  );
 }
-// coco end
+// disabled coco end
Index: sources/gui/GuiView.h
===================================================================
diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/gui/GuiView.h	(.../GuiView.h)	(revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f)
+++ sources/gui/GuiView.h	(.../GuiView.h)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -53,7 +53,7 @@
 
     // this property will be set if the sd-card space gets lower than required amount in percent that has been defined in DeviceController.
     PROPERTY(qint8  , sdTooLowPecent, -1) // -1 means the event never happened
-    // coco end
+    // disabled coco end
 
     PROPERTY(bool   , usbReady      , false)
     PROPERTY(bool   , usbRemoved    , true )
Index: sources/model/MModel.h
===================================================================
diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/model/MModel.h	(.../MModel.h)	(revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f)
+++ sources/model/MModel.h	(.../MModel.h)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -313,7 +313,7 @@
     REGISTER_METATYPE(                                                       AlarmClearedData ) \
     /* disabled coco begin validated: Manually tested. This model class is a placeholder and there is no use case for this now.
     REGISTER_METATYPE(                                              AlarmClearedConditionData ) \
-    coco end */                                                                                 \
+    disabled coco end */                                                                                 \
     REGISTER_METATYPE(                                                           DGROPumpData ) \
     REGISTER_METATYPE(                                                        DGPressuresData ) \
     REGISTER_METATYPE(                                                        DGDrainPumpData ) \
@@ -368,7 +368,7 @@
     REGISTER_METATYPE(                                             AlarmActiveListRequestData ) \
     /* disabled coco begin validated: Manually tested. This model class is a placeholder and there is no use case for this now.
     REGISTER_METATYPE(                                       AlarmClearedConditionRequestData ) \
-    coco end*/                                                                                  \
+    disabled coco end*/                                                                                  \
     REGISTER_METATYPE(                                        AdjustBloodDialysateRequestData ) \
     REGISTER_METATYPE(                                              AdjustDurationRequestData ) \
     REGISTER_METATYPE(                                  AdjustUltrafiltrationStateRequestData ) \
@@ -487,7 +487,7 @@
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                AlarmClearedData ) \
     /* disabled coco begin validated: Manually tested. This model class is a placeholder and there is no use case for this now.
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                       AlarmClearedConditionData ) \
-    coco end */                                                                                 \
+    disabled coco end */                                                                                 \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                    DGROPumpData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                 DGPressuresData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                 DGDrainPumpData ) \
@@ -604,7 +604,7 @@
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                      AlarmActiveListRequestData ) \
     /* disabled coco begin validated: Manually tested. This model class is a placeholder and there is no use case for this now.
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                AlarmClearedConditionRequestData ) \
-    coco end */                                                                                 \
+    disabled coco end */                                                                                 \
 
 //===============================================================================//
 /*!
@@ -664,7 +664,7 @@
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                        AlarmClearedData ) \
     /* disabled coco begin validated: Manually tested. This model class is a placeholder and there is no use case for this now.
     ACTION_RECEIVE_BRIDGE_DEFINITION(                               AlarmClearedConditionData ) \
-    coco end */                                                                                 \
+    disabled coco end */                                                                                 \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                            DGROPumpData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                         DGPressuresData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                         DGDrainPumpData ) \
@@ -781,7 +781,7 @@
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                              AlarmActiveListRequestData ) \
     /* disabled coco begin validated: Manually tested. This model class is a placeholder and there is no use case for this now.
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                        AlarmClearedConditionRequestData ) \
-    coco end */                                                                                 \
+    disabled coco end */                                                                                 \
 
 #define ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS_NOEMIT                                          \
     /*   Request   ----------------------- NoEmit -------------------------- */                 \
@@ -831,7 +831,7 @@
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                       AlarmActiveListRequestData ) \
     /* disabled coco begin validated: Manually tested. This model class is a placeholder and there is no use case for this now.
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                 AlarmClearedConditionRequestData ) \
-    coco end */                                                                                 \
+    disabled coco end */                                                                                 \
 
 #define ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS_PUBLIC                                          \
     /*   Request   ----------------------- public --------------------------  */                \
@@ -881,7 +881,7 @@
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                       AlarmActiveListRequestData ) \
     /* disabled coco begin validated: Manually tested. This model class is a placeholder and there is no use case for this now.
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                 AlarmClearedConditionRequestData ) \
-    coco end */                                                                                 \
+    disabled coco end */                                                                                 \
     
 //===============================================================================//
 #define ACTION_RECEIVE_SIGNALS                                                                  \
Index: sources/model/dg/adjustment/settings/MAdjustDGRequests.h
===================================================================
diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/model/dg/adjustment/settings/MAdjustDGRequests.h	(.../MAdjustDGRequests.h)	(revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f)
+++ sources/model/dg/adjustment/settings/MAdjustDGRequests.h	(.../MAdjustDGRequests.h)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -51,7 +51,7 @@
     QString toString() {
         return toString({mEpoch});
     }
-    // coco end
+    // disabled coco end
     static QString toString(const QVariantList &vParameters) {
         return MModel::toString("AdjustDGDateTime", vParameters);
     }
Index: sources/model/dg/data/MDGAccelerometerData.cpp
===================================================================
diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/model/dg/data/MDGAccelerometerData.cpp	(.../MDGAccelerometerData.cpp)	(revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f)
+++ sources/model/dg/data/MDGAccelerometerData.cpp	(.../MDGAccelerometerData.cpp)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -71,4 +71,4 @@
     return data;
 }
 
-// coco end
+// disabled coco end
Index: sources/model/dg/data/MDGAccelerometerData.h
===================================================================
diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/model/dg/data/MDGAccelerometerData.h	(.../MDGAccelerometerData.h)	(revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f)
+++ sources/model/dg/data/MDGAccelerometerData.h	(.../MDGAccelerometerData.h)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -109,4 +109,4 @@
 
 typedef Model::MDGAccelerometer::Data DGAccelerometerData;
 
-// coco end
+// disabled coco end
Index: sources/model/hd/adjustment/disinfect/MDisinfectAdjustRequests.h
===================================================================
diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/model/hd/adjustment/disinfect/MDisinfectAdjustRequests.h	(.../MDisinfectAdjustRequests.h)	(revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f)
+++ sources/model/hd/adjustment/disinfect/MDisinfectAdjustRequests.h	(.../MDisinfectAdjustRequests.h)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -56,7 +56,7 @@
     QString toString() {
         return toString({mState});
     }
-    // coco end
+    // disabled coco end
     static QString toString(const QVariantList &vParameters) {
         return MModel::toString("Disinfect", vParameters);
     }
@@ -82,7 +82,7 @@
     QString toString() {
         return toString({});
     }
-    // coco end
+    // disabled coco end
     static QString toString(const QVariantList &vParameters) {
         return MModel::toString("DisinfectChemicalConfirm", vParameters);
     }
Index: sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustRequests.h
===================================================================
diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustRequests.h	(.../MPostTreatmentAdjustRequests.h)	(revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f)
+++ sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustRequests.h	(.../MPostTreatmentAdjustRequests.h)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -53,7 +53,7 @@
     QString toString() {
         return toString({});
     }
-    // coco end
+    // disabled coco end
     static QString toString(const QVariantList &vParameters) {
         return MModel::toString("PatientDisconnectionConfirm", vParameters);
     }
@@ -79,7 +79,7 @@
     QString toString() {
         return toString({});
     }
-    // coco end
+    // disabled coco end
     static QString toString(const QVariantList &vParameters) {
         return MModel::toString("DisposablesRemovalConfirm", vParameters);
     }
@@ -105,7 +105,7 @@
     QString toString() {
         return toString({});
     }
-    // coco end
+    // disabled coco end
     static QString toString(const QVariantList &vParameters) {
         return MModel::toString("TreatmentLog", vParameters);
     }
Index: sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h
===================================================================
diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h	(.../MPreTreatmentAdjustRequests.h)	(revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f)
+++ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h	(.../MPreTreatmentAdjustRequests.h)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -59,7 +59,7 @@
     QString toString() {
         return toString({requestedState});
     }
-    // coco end
+    // disabled coco end
     static QString toString(const QVariantList &vParameters) {
         return MModel::toString("InitTreatment", vParameters);
     }
@@ -141,7 +141,7 @@
                 dialysateTemp                ,
         });
     }
-    // coco end
+    // disabled coco end
     static QString toString(const QVariantList &vParameters) {
         return MModel::toString("ValidateParameters", vParameters);
     }
@@ -172,7 +172,7 @@
     QString toString() {
         return toString({requestedState});
     }
-    // coco end
+    // disabled coco end
     static QString toString(const QVariantList &vParameters) {
         return MModel::toString("ConfirmParameters", vParameters);
     }
@@ -203,7 +203,7 @@
     QString toString() {
         return toString({requestedState});
     }
-    // coco end
+    // disabled coco end
     static QString toString(const QVariantList &vParameters) {
         return MModel::toString("WaterSample", vParameters);
     }
@@ -235,7 +235,7 @@
     QString toString() {
         return toString({requestedState});
     }
-    // coco end
+    // disabled coco end
     static QString toString(const QVariantList &vParameters) {
         return MModel::toString("WaterSampleResult", vParameters);
     }
@@ -261,7 +261,7 @@
     QString toString() {
         return toString({});
     }
-    // coco end
+    // disabled coco end
     static QString toString(const QVariantList &vParameters) {
         return MModel::toString("ConsumablesConfirm", vParameters);
     }
@@ -287,7 +287,7 @@
     QString toString() {
         return toString({});
     }
-    // coco end
+    // disabled coco end
     static QString toString(const QVariantList &vParameters) {
         return MModel::toString("DisposablesConfirm", vParameters);
     }
@@ -313,7 +313,7 @@
     QString toString() {
         return toString({});
     }
-    // coco end
+    // disabled coco end
     static QString toString(const QVariantList &vParameters) {
         return MModel::toString("DisposablesPrime", vParameters);
     }
@@ -339,7 +339,7 @@
     QString toString() {
         return toString({});
     }
-    // coco end
+    // disabled coco end
     static QString toString(const QVariantList &vParameters) {
         return MModel::toString("PatientConnectionBegin", vParameters);
     }
@@ -366,7 +366,7 @@
     QString toString() {
         return toString({volume});
     }
-    // coco end
+    // disabled coco end
     static QString toString(const QVariantList &vParameters) {
         return MModel::toString("AdjustUFInit", vParameters);
     }
@@ -392,7 +392,7 @@
     QString toString() {
         return toString({});
     }
-    // coco end
+    // disabled coco end
     static QString toString(const QVariantList &vParameters) {
         return MModel::toString("PatientConnectionConfirm", vParameters);
     }
@@ -418,7 +418,7 @@
     QString toString() {
         return toString({});
     }
-    // coco end
+    // disabled coco end
     static QString toString(const QVariantList &vParameters) {
         return MModel::toString("StartTreatment", vParameters);
     }
Index: sources/model/hd/adjustment/settings/MAdjustHDRequests.h
===================================================================
diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/model/hd/adjustment/settings/MAdjustHDRequests.h	(.../MAdjustHDRequests.h)	(revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f)
+++ sources/model/hd/adjustment/settings/MAdjustHDRequests.h	(.../MAdjustHDRequests.h)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -54,7 +54,7 @@
     QString toString() {
         return toString({mEpoch});
     }
-    // coco end
+    // disabled coco end
     static QString toString(const QVariantList &vParameters) {
         return MModel::toString("AdjustHDDateTime", vParameters);
     }
@@ -83,7 +83,7 @@
     QString toString() {
         return toString( { volume } );
     }
-    // coco end
+    // disabled coco end
     static QString toString(const QVariantList &vParameters) {
         return MModel::toString("AdjustHDAlarmVolume", vParameters);
     }
@@ -125,7 +125,7 @@
                             ver_comp    ,
                         });
     }
-    // coco end
+    // disabled coco end
     static QString toString(const QVariantList &vParameters) {
         return MModel::toString("VersionReq", vParameters);
     }
@@ -180,7 +180,7 @@
     QString toString() {
         return toString({});
     }
-    // coco end
+    // disabled coco end
     static QString toString(const QVariantList &vParameters) {
         return MModel::toString("ServiceDates", vParameters);
     }
@@ -212,7 +212,7 @@
     QString toString() {
         return toString( { mResult } );
     }
-    // coco end
+    // disabled coco end
     static QString toString(const QVariantList &vParameters) {
         return MModel::toString("UIPOSTDone", vParameters);
     }
Index: sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h
===================================================================
diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h	(.../MTreatmentAdjustRequests.h)	(revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f)
+++ sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h	(.../MTreatmentAdjustRequests.h)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -57,7 +57,7 @@
     }
 
     explicit MAdjustPowerOffReq(quint8 vState) : state(vState) { }
-    // coco end
+    // disabled coco end
     static QString toString(const QVariantList &vParameters) {
         return MModel::toString("PowerOff", vParameters);
     }
@@ -87,7 +87,7 @@
     QString toString() {
         return toString({bloodFlow , dialysateFlow});
     }
-    // coco end
+    // disabled coco end
     static QString toString(const QVariantList &vParameters) {
         return MModel::toString("AdjustBloodDialysate", vParameters);
     }
@@ -114,7 +114,7 @@
     QString toString() {
         return toString({duration});
     }
-    // coco end
+    // disabled coco end
     static QString toString(const QVariantList &vParameters) {
         return MModel::toString("AdjustDuration", vParameters);
     }
@@ -142,7 +142,7 @@
     QString toString() {
         return toString({requestedState});
     }
-    // coco end
+    // disabled coco end
     static QString toString(const QVariantList &vParameters) {
         return MModel::toString("AdjustUFState", vParameters);
     }
@@ -169,7 +169,7 @@
     QString toString() {
         return toString({volume});
     }
-    // coco end
+    // disabled coco end
     static QString toString(const QVariantList &vParameters) {
         return MModel::toString("AdjustUFEdit", vParameters);
     }
@@ -205,7 +205,7 @@
     QString toString() {
         return toString({volume , option});
     }
-    // coco end
+    // disabled coco end
     static QString toString(const QVariantList &vParameters) {
         return MModel::toString("AdjustUFConfirm", vParameters);
     }
@@ -236,7 +236,7 @@
     QString toString() {
         return toString({requestedState});
     }
-    // coco end
+    // disabled coco end
     static QString toString(const QVariantList &vParameters) {
         return MModel::toString("AdjustSaline", vParameters);
     }
@@ -267,7 +267,7 @@
     QString toString() {
         return toString({requestedState});
     }
-    // coco end
+    // disabled coco end
     static QString toString(const QVariantList &vParameters) {
         return MModel::toString("AdjustHeparin", vParameters);
     }
@@ -316,7 +316,7 @@
                    mVenousLimitHigh
                    });
     }
-    // coco end
+    // disabled coco end
     static QString toString(const QVariantList &vParameters) {
         return MModel::toString("AdjustPressuresLimits", vParameters);
     }
@@ -347,7 +347,7 @@
     QString toString() {
         return toString({requestedState});
     }
-    // coco end
+    // disabled coco end
     static QString toString(const QVariantList &vParameters) {
         return MModel::toString("AdjustRinseback", vParameters);
     }
@@ -378,7 +378,7 @@
     QString toString() {
         return toString({requestedState});
     }
-    // coco end
+    // disabled coco end
     static QString toString(const QVariantList &vParameters) {
         return MModel::toString("AdjustRecirculate", vParameters);
     }
@@ -409,7 +409,7 @@
     QString toString() {
         return toString({requestedState});
     }
-    // coco end
+    // disabled coco end
     static QString toString(const QVariantList &vParameters) {
         return MModel::toString("AdjustTxEnd", vParameters);
     }
@@ -438,7 +438,7 @@
     QString toString() {
         return toString({silence});
     }
-    // coco end
+    // disabled coco end
     static QString toString(const QVariantList &vParameters) {
         return MModel::toString("AlarmSilence", vParameters);
     }
@@ -466,13 +466,13 @@
     QString toString() {
         return toString({alarmID});
     }
-    // coco end
+    // disabled coco end
     // coco begin validate :
     static QString toString(const QVariantList &vParameters) {
         return MModel::toString("AlarmCondition", vParameters);
     }
 };
-// coco end
+// disabled coco end
 
 /*!
  * \brief   The MAlarmUserActionReq class
@@ -495,7 +495,7 @@
     QString toString() {
         return toString({action});
     }
-    // coco end
+    // disabled coco end
     static QString toString(const QVariantList &vParameters) {
         return MModel::toString("AlarmUserAction", vParameters);
     }
Index: sources/model/hd/alarm/MAlarmActiveList.h
===================================================================
diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/model/hd/alarm/MAlarmActiveList.h	(.../MAlarmActiveList.h)	(revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f)
+++ sources/model/hd/alarm/MAlarmActiveList.h	(.../MAlarmActiveList.h)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -48,7 +48,7 @@
     QString toString() {
         return toString({});
     }
-    // coco end
+    // disabled coco end
     static QString toString(const QVariantList &vParameters) {
         return MModel::toString("AlarmActiveList", vParameters);
     }
Index: sources/model/hd/alarm/MAlarmClearedCondition.cpp
===================================================================
diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/model/hd/alarm/MAlarmClearedCondition.cpp	(.../MAlarmClearedCondition.cpp)	(revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f)
+++ sources/model/hd/alarm/MAlarmClearedCondition.cpp	(.../MAlarmClearedCondition.cpp)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -40,4 +40,4 @@
     data.mAlarmID = _data.mAlarmID.value;
     return data;
 }
-// coco end
+// disabled coco end
Index: sources/model/hd/alarm/MAlarmClearedCondition.h
===================================================================
diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/model/hd/alarm/MAlarmClearedCondition.h	(.../MAlarmClearedCondition.h)	(revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f)
+++ sources/model/hd/alarm/MAlarmClearedCondition.h	(.../MAlarmClearedCondition.h)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -64,7 +64,7 @@
     Type_Enum    typeText() const override { return Type_Enum::eEvent         ; }
     Unit_Enum    unitText() const override { return Unit_Enum::eHD            ; }
     QString      infoText() const override { return QString("AlarmCondition") ; }
-    // coco end
+    // disabled coco end
     struct Data {
         quint32     mAlarmID = 0;  ///< Alarm ID
     };
Index: sources/model/hd/alarm/MAlarmTriggered.h
===================================================================
diff -u -r3561f79af1a92356eea01d5d0c3297c69d2ecdf2 -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/model/hd/alarm/MAlarmTriggered.h	(.../MAlarmTriggered.h)	(revision 3561f79af1a92356eea01d5d0c3297c69d2ecdf2)
+++ sources/model/hd/alarm/MAlarmTriggered.h	(.../MAlarmTriggered.h)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -132,7 +132,7 @@
     // disabled coco begin validated: Has been validated manually.
     // This object is used statically for now, kept the logic for later usage.
     QString toString();
-    // coco end
+    // disabled coco end
     static QString toString(const QVariantList &vParameters);
     static Can::Can_Id canid ();
 };
Index: sources/model/hd/data/MHDAccelerometerData.cpp
===================================================================
diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/model/hd/data/MHDAccelerometerData.cpp	(.../MHDAccelerometerData.cpp)	(revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f)
+++ sources/model/hd/data/MHDAccelerometerData.cpp	(.../MHDAccelerometerData.cpp)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -71,4 +71,4 @@
     return data;
 }
 
-// coco end
+// disabled coco end
Index: sources/model/hd/data/MHDAccelerometerData.h
===================================================================
diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/model/hd/data/MHDAccelerometerData.h	(.../MHDAccelerometerData.h)	(revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f)
+++ sources/model/hd/data/MHDAccelerometerData.h	(.../MHDAccelerometerData.h)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -109,4 +109,4 @@
 
 typedef Model::MHDAccelerometer::Data HDAccelerometerData;
 
-// coco end
+// disabled coco end
Index: sources/storage/FileHandler.cpp
===================================================================
diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/storage/FileHandler.cpp	(.../FileHandler.cpp)	(revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f)
+++ sources/storage/FileHandler.cpp	(.../FileHandler.cpp)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -44,7 +44,7 @@
     static QString mCritical;
     // disabled coco begin validated : This has been manually test. Needs file system access to produce errors for hundred times.
     if (mCritical != vMessage || !(count % 1000)) {
-        // coco end
+        // disabled coco end
         count = 0;
         mCritical  = vMessage;
     QTextStream err(stderr);
@@ -79,7 +79,7 @@
         errOut   (msg);
         return false;
     }
-    // coco end
+    // disabled coco end
     QTextStream out(&file);
     out << vContent;
     out.flush();
@@ -152,7 +152,7 @@
     int result = QProcess::execute(cmd, arguments);
     return result;
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief   FileHandler::moveFolder
@@ -172,7 +172,7 @@
     int result = QProcess::execute(cmd, arguments);
     return result;
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief   FileHandler::removeFolder
@@ -193,7 +193,7 @@
     int result = QProcess::execute(cmd, arguments);
     return result;
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief   FileHandler::removeFiles
@@ -229,7 +229,7 @@
             else {
                 errOut(QString("Cannot get last modified date of file : ") + fileName);
             }
-            // coco end
+            // disabled coco end
         }
     }
     return countRemoved;
@@ -283,7 +283,7 @@
     }
     return mounted;
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief   FileHandler::find
@@ -366,7 +366,7 @@
     //             ;
     return fileInfoList;
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief   FileHandler::find
@@ -393,7 +393,7 @@
                 );
     return fileInfoList;
 }
-// coco end
+// disabled coco end
 
 quint64 FileHandler::totalSize(const QFileInfoList &vFileInfoList) {
     // disabled coco begin validated: Manually tested. requires list of files on file system to test and requires manual specific files for test.
@@ -403,7 +403,7 @@
     }
     return total;
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief   FileHandler::subFolders
Index: sources/storage/Logger.cpp
===================================================================
diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/storage/Logger.cpp	(.../Logger.cpp)	(revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f)
+++ sources/storage/Logger.cpp	(.../Logger.cpp)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -76,7 +76,7 @@
     initThread(vThread);
     return true;
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief   Logger::postInit
@@ -119,7 +119,7 @@
     // it has been tested and works perfectly fine in normal run.
     quitThread(); // validated
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief   Logger::initConnections
@@ -164,7 +164,7 @@
     _thread->start();
     moveToThread(_thread);
 }
-// coco end
+// disabled coco end
 /*!
  * \brief   Logger::quitThread
  * \details Moves this object to main thread to be handled by QApplication
@@ -179,7 +179,7 @@
     // runs in thread
     moveToThread(qApp->thread()); // validated
 }
-// coco end
+// disabled coco end
 
 void Logger::onLog(const QString &vContent, LogType vLogType, bool vTimestamp)
 {
@@ -196,7 +196,7 @@
     // disabled coco begin validated: It can only happen if the file system is read-only for any reason.
     // it has been tested and works perfectly fine in normal run.
     if (! setLogPath()) {       // check and create log folders & if unsuccessful then
-        // coco end
+        // disabled coco end
         setLogBasePath(true);   // try to use application folder
         setLogPath    (    );   // check and create log folders // Note: it may require to check for write access regarding device setup
     }
@@ -236,7 +236,7 @@
     if ( ok && ! setLogPath(LogType::eLogTrtmt) ) ok = false;
     return ok;
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief   Logger::setLogPath
@@ -320,7 +320,7 @@
     if (_enableConsoleOut) {
         qDebug().noquote() << mContent;
     }
-    // coco end
+    // disabled coco end
 }
 
 /*!
@@ -348,7 +348,7 @@
     mOSource = "";
     return result >= 0; // refer to QProcess::execute(hit F1 on execute) doc.
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief   Logger::concurrentExportLogs
@@ -365,7 +365,7 @@
     _exportLogsWatcher.setFuture(future);
     return true;
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief   Logger::onExportLogs
@@ -378,7 +378,7 @@
     LOG_DEBUG(QString("Export Logs Ended: %1").arg(_exportLogsWatcher.result()));
     emit didExportLogs();
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief   Logger::removeLogs
@@ -439,7 +439,7 @@
     mOSource = "";
     return removeCount;
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief   Logger::concurrentRemoveLogs
@@ -457,7 +457,7 @@
     _removeLogsWatcher.setFuture(mFuture);
     return true;
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief   Logger::onRemoveLogs
@@ -470,7 +470,7 @@
     LOG_DEBUG(tr("Remove Logs Ended: %1").arg(_removeLogsWatcher.result()));
     emit didRemoveLogs(false);
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief   Logger::onSDCardSpaceChange
@@ -495,7 +495,7 @@
         concurrentRemoveLogs();
     }
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief   Logger::enableConsoleOut
@@ -512,7 +512,7 @@
         LOG_DEBUG("Console out Logging disabled");
     }
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief   Logger::logPath
Index: sources/view/VAdjustmentResponseBase.h
===================================================================
diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/view/VAdjustmentResponseBase.h	(.../VAdjustmentResponseBase.h)	(revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f)
+++ sources/view/VAdjustmentResponseBase.h	(.../VAdjustmentResponseBase.h)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -54,7 +54,7 @@
     // has been manually tested that it works perfectly fine if used.
     // this property changed to trigger since it has been found out during tests that the reason could be same but has to be shown again.
     TRIGGER ( quint32   , adjustment_Reason          , 0)
-    // coco end
+    // disabled coco end
 
     PROPERTY( bool      , adjustment_Accepted        , 0)
 
Index: sources/view/VEventSpy.cpp
===================================================================
diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/view/VEventSpy.cpp	(.../VEventSpy.cpp)	(revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f)
+++ sources/view/VEventSpy.cpp	(.../VEventSpy.cpp)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -44,7 +44,7 @@
     // This should never happen with the current design and usage.
     // put here for developer safety
     if (Gui::_viewer) {
-    // coco end
+    // disabled coco end
         QObject::connect(Gui::_viewer   , SIGNAL(  eventSpy(QEvent*)),
                          this           ,   SLOT(onEventSpy(QEvent*)));
     }
@@ -78,7 +78,7 @@
     // Keyboard
     case QEvent::Type::KeyPress             : keybdEventSpy(vEvent      ); break;
 
-    // coco end
+    // disabled coco end
     default                                 :
         break;
 
@@ -136,7 +136,7 @@
                .arg(y, 4, 10, QChar('0')));
 #endif
 }
-// coco end
+// disabled coco end
 
 // disabled coco begin validated: this code has been manually tested.
 // the only intention of this code is to be used for EMC testing and has been tested and is working fine.
@@ -145,7 +145,7 @@
  * \details mouse event count reset
  */
 void VEventSpy::doMouseReset() { mouseCount(0); }
-// coco end
+// disabled coco end
 
 /*!
  * \brief VEventSpy::touchEventSpy
@@ -179,7 +179,7 @@
     }
     LOG_DEBUG( vTypeName + logString );
 }
-// coco end
+// disabled coco end
 
 // disabled coco begin validated: this code has been manually tested.
 // the only intention of this code is to be used for EMC testing and has been tested and is working fine.
@@ -188,7 +188,7 @@
  * \details touch event counter reset
  */
 void VEventSpy::doTouchReset() { touchCount(0); }
-// coco end
+// disabled coco end
 
 
 // disabled coco begin validated: this code has been manually tested.
@@ -236,4 +236,4 @@
     break;
     }
 }
-// coco end
+// disabled coco end
Index: sources/view/VEventSpy.h
===================================================================
diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/view/VEventSpy.h	(.../VEventSpy.h)	(revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f)
+++ sources/view/VEventSpy.h	(.../VEventSpy.h)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -46,7 +46,7 @@
 
     PROPERTY( quint64 , mouseCount  ,        0 )
     PROPERTY( QPoint  , mousePoint  , QPoint() )
-    // coco end
+    // disabled coco end
 
 private:
     void initConnections();
Index: sources/view/VPowerOff.h
===================================================================
diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/view/VPowerOff.h	(.../VPowerOff.h)	(revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f)
+++ sources/view/VPowerOff.h	(.../VPowerOff.h)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -41,7 +41,7 @@
     // also since the signal passe parameter value is used the property getter in not currently used.
     // manually tested and all of them are working.
     TRIGGER( quint8, poweroff, 0)
-    // coco end
+    // disabled coco end
 
     VIEW_DEC(VPowerOff, PowerOffData)
 };
Index: sources/view/dg/data/VDGAccelerometerData.cpp
===================================================================
diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/view/dg/data/VDGAccelerometerData.cpp	(.../VDGAccelerometerData.cpp)	(revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f)
+++ sources/view/dg/data/VDGAccelerometerData.cpp	(.../VDGAccelerometerData.cpp)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -35,4 +35,4 @@
     zTilt (vData.mZTilt );
 }
 
-// coco end
+// disabled coco end
Index: sources/view/dg/data/VDGAccelerometerData.h
===================================================================
diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/view/dg/data/VDGAccelerometerData.h	(.../VDGAccelerometerData.h)	(revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f)
+++ sources/view/dg/data/VDGAccelerometerData.h	(.../VDGAccelerometerData.h)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -53,4 +53,4 @@
 };
 }
 
-// coco end
+// disabled coco end
Index: sources/view/dg/data/VDGValvesStatesData.h
===================================================================
diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/view/dg/data/VDGValvesStatesData.h	(.../VDGValvesStatesData.h)	(revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f)
+++ sources/view/dg/data/VDGValvesStatesData.h	(.../VDGValvesStatesData.h)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -38,7 +38,7 @@
 
     // disabled coco begin validated: Has been tested manually. This is a general messages received trigger, but is not used yet.
     TRIGGER ( bool , refresh        , false)
-    // coco end
+    // disabled coco end
 
     PROPERTY( quint8 , valveStates_VRF  , 0 )
     PROPERTY( quint8 , valveStates_VRI  , 0 )
Index: sources/view/dg/data/post/VDGPOSTData.h
===================================================================
diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/view/dg/data/post/VDGPOSTData.h	(.../VDGPOSTData.h)	(revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f)
+++ sources/view/dg/data/post/VDGPOSTData.h	(.../VDGPOSTData.h)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -44,7 +44,7 @@
     // and to always trigger the change event to work as a notifier for GUI
     // has been manually tested that it works perfectly fine
     TRIGGER ( bool      , adjustment    , 0)
-    // coco end
+    // disabled coco end
     CONSTANT(quint32    , itemCount   , GuiDGPOSTStates::DG_POST_STATE_COMPLETED - 1 )
 
     PROPERTY(bool       , start         , 0)
Index: sources/view/hd/adjustment/common/VCommonAdjustmentVitals.h
===================================================================
diff -u -r5605f930ab5cd1a62b96347f4b4300ef30a830ee -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/view/hd/adjustment/common/VCommonAdjustmentVitals.h	(.../VCommonAdjustmentVitals.h)	(revision 5605f930ab5cd1a62b96347f4b4300ef30a830ee)
+++ sources/view/hd/adjustment/common/VCommonAdjustmentVitals.h	(.../VCommonAdjustmentVitals.h)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -44,7 +44,7 @@
     // and to always trigger the change event to work as a notifier for GUI
     // has been manually tested that it works perfectly fine
     TRIGGER( bool       , adjustment     , 0)
-    // coco end
+    // disabled coco end
 
     // Vitals data
     // constant range variables / units / ...
Index: sources/view/hd/adjustment/disinfect/VDisinfectAdjustChemicalConfirm.h
===================================================================
diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/view/hd/adjustment/disinfect/VDisinfectAdjustChemicalConfirm.h	(.../VDisinfectAdjustChemicalConfirm.h)	(revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f)
+++ sources/view/hd/adjustment/disinfect/VDisinfectAdjustChemicalConfirm.h	(.../VDisinfectAdjustChemicalConfirm.h)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -43,7 +43,7 @@
     // and to always trigger the change event to work as a notifier for GUI
     // has been manually tested that it works perfectly fine
     TRIGGER( bool      , adjustment     , 0)
-    // coco end
+    // disabled coco end
 
     VIEW_DEC_CLASS_ADJUSTMENT(VDisinfectAdjustChemicalConfirm, AdjustChemicalConfirmResponseData)
 
Index: sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.h
===================================================================
diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.h	(.../VDisinfectAdjustDisinfect.h)	(revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f)
+++ sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.h	(.../VDisinfectAdjustDisinfect.h)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -45,7 +45,7 @@
     // and to always trigger the change event to work as a notifier for GUI
     // has been manually tested that it works perfectly fine
     TRIGGER( bool      , adjustment     , 0)
-    // coco end
+    // disabled coco end
 
     PROPERTY( bool , flush      , 0)
     PROPERTY( bool , heat       , 0)
Index: sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustDisposablesRemovalConfirm.h
===================================================================
diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustDisposablesRemovalConfirm.h	(.../VPostTreatmentAdjustDisposablesRemovalConfirm.h)	(revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f)
+++ sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustDisposablesRemovalConfirm.h	(.../VPostTreatmentAdjustDisposablesRemovalConfirm.h)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -42,7 +42,7 @@
     // and to always trigger the change event to work as a notifier for GUI
     // has been manually tested that it works perfectly fine
     TRIGGER( bool      , adjustment     , 0)
-    // coco end
+    // disabled coco end
 
     VIEW_DEC_CLASS_ADJUSTMENT(VPostTreatmentAdjustmentDisposablesRemovalConfirm, AdjustDisposablesRemovalConfirmResponseData)
 
Index: sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustPatientDisconnectionConfirm.h
===================================================================
diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustPatientDisconnectionConfirm.h	(.../VPostTreatmentAdjustPatientDisconnectionConfirm.h)	(revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f)
+++ sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustPatientDisconnectionConfirm.h	(.../VPostTreatmentAdjustPatientDisconnectionConfirm.h)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -41,7 +41,7 @@
     // and to always trigger the change event to work as a notifier for GUI
     // has been manually tested that it works perfectly fine
     TRIGGER( bool      , adjustment     , 0)
-    // coco end
+    // disabled coco end
 
     VIEW_DEC_CLASS(VPostTreatmentAdjustmentPatientDisconnectionConfirm)
 
Index: sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.h
===================================================================
diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.h	(.../VPostTreatmentAdjustTreatmentLog.h)	(revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f)
+++ sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.h	(.../VPostTreatmentAdjustTreatmentLog.h)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -48,7 +48,7 @@
     // and to always trigger the change event to work as a notifier for GUI
     // has been manually tested that it works perfectly fine
     TRIGGER( bool      , adjustment     , 0)
-    // coco end
+    // disabled coco end
 
     PROPERTY(QString      , patientID                   , "")
 
Index: sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentConsumablesConfirm.h
===================================================================
diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentConsumablesConfirm.h	(.../VPreTreatmentAdjustmentConsumablesConfirm.h)	(revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f)
+++ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentConsumablesConfirm.h	(.../VPreTreatmentAdjustmentConsumablesConfirm.h)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -41,7 +41,7 @@
     // and to always trigger the change event to work as a notifier for GUI
     // has been manually tested that it works perfectly fine
     TRIGGER( bool      , adjustment     , 0)
-    // coco end
+    // disabled coco end
 
     VIEW_DEC_CLASS(VPreTreatmentAdjustmentConsumablesConfirm)
 
Index: sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesConfirm.h
===================================================================
diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesConfirm.h	(.../VPreTreatmentAdjustmentDisposablesConfirm.h)	(revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f)
+++ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesConfirm.h	(.../VPreTreatmentAdjustmentDisposablesConfirm.h)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -42,7 +42,7 @@
     // and to always trigger the change event to work as a notifier for GUI
     // has been manually tested that it works perfectly fine
     TRIGGER( bool      , adjustment     , 0)
-    // coco end
+    // disabled coco end
 
     VIEW_DEC_CLASS_ADJUSTMENT(VPreTreatmentAdjustmentDisposablesConfirm, AdjustDisposablesConfirmResponseData)
 
Index: sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesPrime.h
===================================================================
diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesPrime.h	(.../VPreTreatmentAdjustmentDisposablesPrime.h)	(revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f)
+++ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesPrime.h	(.../VPreTreatmentAdjustmentDisposablesPrime.h)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -42,7 +42,7 @@
     // and to always trigger the change event to work as a notifier for GUI
     // has been manually tested that it works perfectly fine
     TRIGGER( bool      , adjustment     , 0)
-    // coco end
+    // disabled coco end
 
     VIEW_DEC_CLASS_ADJUSTMENT(VPreTreatmentAdjustmentDisposablesPrime, AdjustDisposablesPrimeResponseData)
 
Index: sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentInitTreatment.h
===================================================================
diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentInitTreatment.h	(.../VPreTreatmentAdjustmentInitTreatment.h)	(revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f)
+++ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentInitTreatment.h	(.../VPreTreatmentAdjustmentInitTreatment.h)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -42,7 +42,7 @@
     // and to always trigger the change event to work as a notifier for GUI
     // has been manually tested that it works perfectly fine
     TRIGGER( bool      , adjustment     , 0)
-    // coco end
+    // disabled coco end
 
     VIEW_DEC_CLASS_ADJUSTMENT(VPreTreatmentAdjustmentInitTreatment, AdjustInitTreatmentResponseData)
 
Index: sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentPatientConnectionBegin.h
===================================================================
diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentPatientConnectionBegin.h	(.../VPreTreatmentAdjustmentPatientConnectionBegin.h)	(revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f)
+++ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentPatientConnectionBegin.h	(.../VPreTreatmentAdjustmentPatientConnectionBegin.h)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -42,7 +42,7 @@
     // and to always trigger the change event to work as a notifier for GUI
     // has been manually tested that it works perfectly fine
     TRIGGER( bool      , adjustment     , 0)
-    // coco end
+    // disabled coco end
 
     VIEW_DEC_CLASS_ADJUSTMENT(VPreTreatmentAdjustmentPatientConnectionBegin, AdjustPatientConnectionBeginResponseData)
 
Index: sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentPatientConnectionConfirm.h
===================================================================
diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentPatientConnectionConfirm.h	(.../VPreTreatmentAdjustmentPatientConnectionConfirm.h)	(revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f)
+++ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentPatientConnectionConfirm.h	(.../VPreTreatmentAdjustmentPatientConnectionConfirm.h)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -42,7 +42,7 @@
     // and to always trigger the change event to work as a notifier for GUI
     // has been manually tested that it works perfectly fine
     TRIGGER( bool      , adjustment     , 0)
-    // coco end
+    // disabled coco end
 
     VIEW_DEC_CLASS_ADJUSTMENT(VPreTreatmentAdjustmentPatientConnectionConfirm, AdjustPatientConnectionConfirmResponseData)
 
Index: sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentStartTreatment.h
===================================================================
diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentStartTreatment.h	(.../VPreTreatmentAdjustmentStartTreatment.h)	(revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f)
+++ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentStartTreatment.h	(.../VPreTreatmentAdjustmentStartTreatment.h)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -42,7 +42,7 @@
     // and to always trigger the change event to work as a notifier for GUI
     // has been manually tested that it works perfectly fine
     TRIGGER( bool      , adjustment     , 0)
-    // coco end
+    // disabled coco end
 
     VIEW_DEC_CLASS_ADJUSTMENT(VPreTreatmentAdjustmentStartTreatment, AdjustStartTreatmentResponseData)
 
Index: sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentUltrafiltrationInit.h
===================================================================
diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentUltrafiltrationInit.h	(.../VPreTreatmentAdjustmentUltrafiltrationInit.h)	(revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f)
+++ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentUltrafiltrationInit.h	(.../VPreTreatmentAdjustmentUltrafiltrationInit.h)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -44,7 +44,7 @@
     // and to always trigger the change event to work as a notifier for GUI
     // has been manually tested that it works perfectly fine
     TRIGGER( bool      , adjustment     , 0)
-    // coco end
+    // disabled coco end
 
     // Treatment Ultrafiltration data
     PROPERTY( float     , volume        , 0)
Index: sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.h
===================================================================
diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.h	(.../VPreTreatmentAdjustmentWaterSample.h)	(revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f)
+++ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.h	(.../VPreTreatmentAdjustmentWaterSample.h)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -42,7 +42,7 @@
     // and to always trigger the change event to work as a notifier for GUI
     // has been manually tested that it works perfectly fine
     TRIGGER( bool      , adjustment     , 0)
-    // coco end
+    // disabled coco end
 
     VIEW_DEC_CLASS_ADJUSTMENT(VPreTreatmentAdjustmentWaterSample, AdjustWaterSampleResponseData)
 
Index: sources/view/hd/adjustment/treatment/VTreatmentAdjustmentDuration.h
===================================================================
diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/view/hd/adjustment/treatment/VTreatmentAdjustmentDuration.h	(.../VTreatmentAdjustmentDuration.h)	(revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f)
+++ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentDuration.h	(.../VTreatmentAdjustmentDuration.h)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -44,7 +44,7 @@
     // and to always trigger the change event to work as a notifier for GUI
     // has been manually tested that it works perfectly fine
     TRIGGER( bool      , adjustment                  , 0)
-    // coco end
+    // disabled coco end
 
     // Treatment Duration data
     PROPERTY( quint32   , duration                   , 0)
Index: sources/view/hd/adjustment/treatment/VTreatmentAdjustmentEnd.h
===================================================================
diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/view/hd/adjustment/treatment/VTreatmentAdjustmentEnd.h	(.../VTreatmentAdjustmentEnd.h)	(revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f)
+++ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentEnd.h	(.../VTreatmentAdjustmentEnd.h)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -44,7 +44,7 @@
     // and to always trigger the change event to work as a notifier for GUI
     // has been manually tested that it works perfectly fine
     TRIGGER( bool       , adjustment    , 0     )
-    // coco end
+    // disabled coco end
 
     VIEW_DEC_CLASS_ADJUSTMENT(VTreatmentAdjustmentEnd, AdjustTreatmentEndResponseData)
 
Index: sources/view/hd/adjustment/treatment/VTreatmentAdjustmentFlows.h
===================================================================
diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/view/hd/adjustment/treatment/VTreatmentAdjustmentFlows.h	(.../VTreatmentAdjustmentFlows.h)	(revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f)
+++ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentFlows.h	(.../VTreatmentAdjustmentFlows.h)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -44,7 +44,7 @@
     // and to always trigger the change event to work as a notifier for GUI
     // has been manually tested that it works perfectly fine
     TRIGGER( bool      , adjustment                  , 0)
-    // coco end
+    // disabled coco end
 
     // Treatment Blood/Dialysate Flow data
     PROPERTY( quint32   ,     bloodFlow_FlowSetPoint , 0)
Index: sources/view/hd/adjustment/treatment/VTreatmentAdjustmentHeparin.h
===================================================================
diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/view/hd/adjustment/treatment/VTreatmentAdjustmentHeparin.h	(.../VTreatmentAdjustmentHeparin.h)	(revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f)
+++ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentHeparin.h	(.../VTreatmentAdjustmentHeparin.h)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -44,7 +44,7 @@
     // and to always trigger the change event to work as a notifier for GUI
     // has been manually tested that it works perfectly fine
     TRIGGER( bool       , adjustment    , 0     )
-    // coco end
+    // disabled coco end
 
     VIEW_DEC_CLASS_ADJUSTMENT(VTreatmentAdjustmentHeparin, AdjustHeparinResponseData)
 
Index: sources/view/hd/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.h
===================================================================
diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/view/hd/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.h	(.../VTreatmentAdjustmentPressuresLimits.h)	(revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f)
+++ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.h	(.../VTreatmentAdjustmentPressuresLimits.h)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -44,7 +44,7 @@
     // and to always trigger the change event to work as a notifier for GUI
     // has been manually tested that it works perfectly fine
     TRIGGER( bool    , adjustment        , 0)
-    // coco end
+    // disabled coco end
 
     // Treatment pressures limits data
     PROPERTY( qint32 , arterialLimitLow     , _data.ArterialLimitLowDef  )
@@ -59,7 +59,7 @@
     CONSTANT( qint32 , arterialLimitHighDef , _data.ArterialLimitHighDef ) // default  by PRS355
     CONSTANT( qint32 , venousLimitLowDef    , _data.VenousLimitLowDef    ) // default  by PRS356
     CONSTANT( qint32 , venousLimitHighDef   , _data.VenousLimitHighDef   ) // default  by PRS357
-    // coco end
+    // disabled coco end
     VIEW_DEC_CLASS_ADJUSTMENT(VTreatmentAdjustmentPressuresLimits, AdjustPressuresLimitsResponseData)
 
     // ----- Adjust Pressures Limits
Index: sources/view/hd/adjustment/treatment/VTreatmentAdjustmentRecirculate.h
===================================================================
diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/view/hd/adjustment/treatment/VTreatmentAdjustmentRecirculate.h	(.../VTreatmentAdjustmentRecirculate.h)	(revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f)
+++ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentRecirculate.h	(.../VTreatmentAdjustmentRecirculate.h)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -44,7 +44,7 @@
     // and to always trigger the change event to work as a notifier for GUI
     // has been manually tested that it works perfectly fine
     TRIGGER( bool       , adjustment    , 0     )
-    // coco end
+    // disabled coco end
 
     VIEW_DEC_CLASS_ADJUSTMENT(VTreatmentAdjustmentRecirculate, AdjustRecirculateResponseData)
 
Index: sources/view/hd/adjustment/treatment/VTreatmentAdjustmentRinseback.h
===================================================================
diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/view/hd/adjustment/treatment/VTreatmentAdjustmentRinseback.h	(.../VTreatmentAdjustmentRinseback.h)	(revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f)
+++ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentRinseback.h	(.../VTreatmentAdjustmentRinseback.h)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -44,7 +44,7 @@
     // and to always trigger the change event to work as a notifier for GUI
     // has been manually tested that it works perfectly fine
     TRIGGER( bool       , adjustment    , 0     )
-    // coco end
+    // disabled coco end
 
     VIEW_DEC_CLASS_ADJUSTMENT(VTreatmentAdjustmentRinseback, AdjustRinsebackResponseData)
 
Index: sources/view/hd/adjustment/treatment/VTreatmentAdjustmentSaline.h
===================================================================
diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/view/hd/adjustment/treatment/VTreatmentAdjustmentSaline.h	(.../VTreatmentAdjustmentSaline.h)	(revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f)
+++ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentSaline.h	(.../VTreatmentAdjustmentSaline.h)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -44,7 +44,7 @@
     // and to always trigger the change event to work as a notifier for GUI
     // has been manually tested that it works perfectly fine
     TRIGGER( bool       , adjustment    , 0     )
-    // coco end
+    // disabled coco end
 
     PROPERTY( qint32    , target        , 0     )
 
Index: sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationConfirm.h
===================================================================
diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationConfirm.h	(.../VTreatmentAdjustmentUltrafiltrationConfirm.h)	(revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f)
+++ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationConfirm.h	(.../VTreatmentAdjustmentUltrafiltrationConfirm.h)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -44,7 +44,7 @@
     // and to always trigger the change event to work as a notifier for GUI
     // has been manually tested that it works perfectly fine
     TRIGGER( bool       , adjustment    , 0)
-    // coco end
+    // disabled coco end
 
     // Treatment Ultrafiltration data
     PROPERTY( float     , volume        , 0)
@@ -53,7 +53,7 @@
     PROPERTY( quint32   , duration      , 0)
     // Rate has not been decided to be used anywhere yet.
     PROPERTY( float     , rate          , 0)
-    // coco end
+    // disabled coco end
 
     VIEW_DEC_CLASS_ADJUSTMENT(VTreatmentAdjustmentUltrafiltrationConfirm, AdjustUltrafiltrationConfirmResponseData)
 
Index: sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationEdit.h
===================================================================
diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationEdit.h	(.../VTreatmentAdjustmentUltrafiltrationEdit.h)	(revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f)
+++ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationEdit.h	(.../VTreatmentAdjustmentUltrafiltrationEdit.h)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -44,7 +44,7 @@
     // and to always trigger the change event to work as a notifier for GUI
     // has been manually tested that it works perfectly fine
     TRIGGER( bool      , adjustment     , 0)
-    // coco end
+    // disabled coco end
 
     // Treatment Ultrafiltration data
     PROPERTY( float     , volume        , 0)
Index: sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationState.h
===================================================================
diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationState.h	(.../VTreatmentAdjustmentUltrafiltrationState.h)	(revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f)
+++ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationState.h	(.../VTreatmentAdjustmentUltrafiltrationState.h)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -44,15 +44,15 @@
     // and to always trigger the change event to work as a notifier for GUI
     // has been manually tested that it works perfectly fine
     TRIGGER( bool      , adjustment     ,     0)
-    // coco end
+    // disabled coco end
 
     // disabled coco begin validated: Manually tested
     // This property should not be used in QML since it need exposed enum
     // exposed enum usage in QML is not suggested since QML will not error out on any issue
     // kept for consistency and debugging use cases
     // Look at the VHDTreatmentStates ultrafiltration properties
     PROPERTY( qint32   , state          ,     0)
-    // coco end
+    // disabled coco end
 
     VIEW_DEC_CLASS_ADJUSTMENT(VTreatmentAdjustmentUltrafiltrationState, AdjustUltrafiltrationStateResponseData)
 
Index: sources/view/hd/alarm/VAlarmActiveList.h
===================================================================
diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/view/hd/alarm/VAlarmActiveList.h	(.../VAlarmActiveList.h)	(revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f)
+++ sources/view/hd/alarm/VAlarmActiveList.h	(.../VAlarmActiveList.h)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -43,7 +43,7 @@
     // and to always trigger the change event to work as a notifier for GUI
     // has been manually tested that it works perfectly fine
     TRIGGER( bool      , adjustment     , 0)
-    // coco end
+    // disabled coco end
 
     PROPERTY( quint32, a0ID     , 0 )
     PROPERTY( quint32, a1ID     , 0 )
Index: sources/view/hd/alarm/VAlarmStatus.cpp
===================================================================
diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/view/hd/alarm/VAlarmStatus.cpp	(.../VAlarmStatus.cpp)	(revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f)
+++ sources/view/hd/alarm/VAlarmStatus.cpp	(.../VAlarmStatus.cpp)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -25,7 +25,7 @@
     ADJUST_VIEW_CONNECTION(AlarmUserActionRequestData       );
     /* // disabled coco begin validated: Manually tested. This model class is a placeholder and there is no use case for this now.
     ADJUST_VIEW_CONNECTION(AlarmClearedConditionRequestData );
-    // coco end */
+    // disabled coco end */
 }
 
 /*!
@@ -97,7 +97,7 @@
     data.alarmID = GuiAlarmID::ALARM_ID_HD_COMM_TIMEOUT;
     emit didAdjustment(data);
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief   VAlarmStatus::onActionReceive
@@ -113,7 +113,7 @@
         LOG_DEBUG(tr("Suppressing HD communication timeout."));
         return;
     }
-    // coco end
+    // disabled coco end
 
     // Look for this tag: #First_Time_Message_Sent_With_Silenced
     // this has to be first to make sure in the Notification dialog when we decided to show the dialog,
Index: sources/view/hd/alarm/VAlarmStatus.h
===================================================================
diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/view/hd/alarm/VAlarmStatus.h	(.../VAlarmStatus.h)	(revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f)
+++ sources/view/hd/alarm/VAlarmStatus.h	(.../VAlarmStatus.h)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -69,7 +69,7 @@
     // 3 reserved flags are here... //
     PROPERTY( bool    , alarm_Flag_noMinimize       , false)
     PROPERTY( bool    , alarm_Flag_alarmsCondition  , false)
-    // coco end
+    // disabled coco end
 
     Q_PROPERTY(QString text READ text NOTIFY alarm_AlarmIDChanged)
 
Index: sources/view/hd/data/VHDAccelerometerData.cpp
===================================================================
diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/view/hd/data/VHDAccelerometerData.cpp	(.../VHDAccelerometerData.cpp)	(revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f)
+++ sources/view/hd/data/VHDAccelerometerData.cpp	(.../VHDAccelerometerData.cpp)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -34,4 +34,4 @@
     yTilt (vData.mYTilt );
     zTilt (vData.mZTilt );
 }
-// coco end
+// disabled coco end
Index: sources/view/hd/data/VHDAccelerometerData.h
===================================================================
diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/view/hd/data/VHDAccelerometerData.h	(.../VHDAccelerometerData.h)	(revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f)
+++ sources/view/hd/data/VHDAccelerometerData.h	(.../VHDAccelerometerData.h)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -53,4 +53,4 @@
 };
 }
 
-// coco end
+// disabled coco end
Index: sources/view/hd/data/post/VHDPOSTData.h
===================================================================
diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/view/hd/data/post/VHDPOSTData.h	(.../VHDPOSTData.h)	(revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f)
+++ sources/view/hd/data/post/VHDPOSTData.h	(.../VHDPOSTData.h)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -44,7 +44,7 @@
     // and to always trigger the change event to work as a notifier for GUI
     // has been manually tested that it works perfectly fine
     TRIGGER ( bool      , adjustment    , 0)
-    // coco end
+    // disabled coco end
 
     // the last "test" item is the item just before the complete state.
     // UI doesn't care about the the complete or fail state in Single post messages,
Index: sources/view/hd/data/treatment/VHDTreatmentStatesData.h
===================================================================
diff -u -rdf0329c47627ceb1fe460cda2ae3ff8c9c851106 -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/view/hd/data/treatment/VHDTreatmentStatesData.h	(.../VHDTreatmentStatesData.h)	(revision df0329c47627ceb1fe460cda2ae3ff8c9c851106)
+++ sources/view/hd/data/treatment/VHDTreatmentStatesData.h	(.../VHDTreatmentStatesData.h)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -46,7 +46,7 @@
     PROPERTY( quint32, subMode      , 0)
     PROPERTY( quint32, ufState      , 0)
     PROPERTY( quint32, salineState  , 0)
-    // coco end
+    // disabled coco end
 
     // these groups of properties are mutually exclusive
     // and if one becomes true the other ones become false at the same time
@@ -68,14 +68,14 @@
     PROPERTY( bool   , txRinseback              , false) ///< TREATMENT_RINSEBACK_STATE       = 4 # Perform rinseback with saline.  Dialyzer bypassed. Dialysate recirculating
     PROPERTY( bool   , txRecirculate            , false) ///< TREATMENT_RECIRC_STATE          = 5 # Recirculate saline and dialysate while patient disconnected.  Blood lines open and shunted.  Dialyzer is bypassed
     PROPERTY( bool   , txEnd                    , false) ///< TREATMENT_END_STATE             = 6 # Dialysis has ended.  Blood pump slowed.  Dialyzer is bypassed.  Dialysate is recirculated.  User can rinseback
-    // coco end
+    // disabled coco end
 
     // ---- Ultrafiltration states
     // disabled coco begin validated: Manually tested
     // not useful for UI more FW state entry
     // kept for consistency
     PROPERTY( bool   , ufStart                  , false) ///< UF_START_STATE                            = 0  # Start state of the ultrafiltration state machine
-    // coco end
+    // disabled coco end
     PROPERTY( bool   , ufPaused                 , false) ///< UF_PAUSED_STATE                           = 1  # Paused state of the ultrafiltration state machine
     PROPERTY( bool   , ufRunning                , false) ///< UF_RUNNING_STATE                          = 2  # Running state of the ultrafiltration state machine
 
Index: sources/view/hd/data/treatment/VTreatmentPressureOcclusion.h
===================================================================
diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/view/hd/data/treatment/VTreatmentPressureOcclusion.h	(.../VTreatmentPressureOcclusion.h)	(revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f)
+++ sources/view/hd/data/treatment/VTreatmentPressureOcclusion.h	(.../VTreatmentPressureOcclusion.h)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -43,7 +43,7 @@
     PROPERTY( quint32 , bloodPumpOcclusion           , 0)
     PROPERTY( quint32 , dialysateInletPumpOcclusion  , 0)
     PROPERTY( quint32 , dialysateOutletPumpOcclusion , 0)
-    // coco end
+    // disabled coco end
 
     VIEW_DEC(VTreatmentPressureOcclusion, PressureOcclusionData)
 };
Index: sources/view/hd/data/treatment/VTreatmentUltrafiltration.h
===================================================================
diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/view/hd/data/treatment/VTreatmentUltrafiltration.h	(.../VTreatmentUltrafiltration.h)	(revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f)
+++ sources/view/hd/data/treatment/VTreatmentUltrafiltration.h	(.../VTreatmentUltrafiltration.h)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -38,7 +38,7 @@
 
     // disabled coco begin validated : Manually validated
     PROPERTY( float, minimum                        , 0.000 ) // no message to update this value and is 0 for now.
-    // coco end
+    // disabled coco end
     PROPERTY( float, maximum                        , 0.600 )
 
     PROPERTY( float, ultrafiltration_RefUFVol       , 0)
Index: sources/view/settings/VAdjustmentAlarmVolume.h
===================================================================
diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/view/settings/VAdjustmentAlarmVolume.h	(.../VAdjustmentAlarmVolume.h)	(revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f)
+++ sources/view/settings/VAdjustmentAlarmVolume.h	(.../VAdjustmentAlarmVolume.h)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -44,7 +44,7 @@
     // and to always trigger the change event to work as a notifier for GUI
     // has been manually tested that it works perfectly fine
     TRIGGER( bool       , adjustment     , 0)
-    // coco end
+    // disabled coco end
 
     // HD AlarmVolume data
     PROPERTY( quint8    , hdAlarmVolume     ,  0)
Index: sources/view/settings/VAdjustmentService.h
===================================================================
diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/view/settings/VAdjustmentService.h	(.../VAdjustmentService.h)	(revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f)
+++ sources/view/settings/VAdjustmentService.h	(.../VAdjustmentService.h)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -46,7 +46,7 @@
     // has been manually tested that it works perfectly fine
     TRIGGER( bool       , adjustmentHD      , 0)
     TRIGGER( bool       , adjustmentDG      , 0)
-    // coco end
+    // disabled coco end
 
     // Service seconds
     PROPERTY( quint8    , hdLastServiceEpoch, 0)
Index: sources/view/settings/VAdjustmentVersions.h
===================================================================
diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/view/settings/VAdjustmentVersions.h	(.../VAdjustmentVersions.h)	(revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f)
+++ sources/view/settings/VAdjustmentVersions.h	(.../VAdjustmentVersions.h)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -53,7 +53,7 @@
     // has been manually tested that it works perfectly fine
     TRIGGER( bool       , adjustmentHD     , 0)
     TRIGGER( bool       , adjustmentDG     , 0)
-    // coco end
+    // disabled coco end
 
     // HD Versions data
     PROPERTY( quint8    , hdVerMajor            , 0)
Index: sources/wifi/WifiInterface.cpp
===================================================================
diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/wifi/WifiInterface.cpp	(.../WifiInterface.cpp)	(revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f)
+++ sources/wifi/WifiInterface.cpp	(.../WifiInterface.cpp)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -189,7 +189,7 @@
     // it has been tested and works perfectly fine in normal run.
     quitThread();
 }
-// coco end
+// disabled coco end
 
 /*!
  * \brief   MessageAcknowModel::quitThread
@@ -206,7 +206,7 @@
     // runs in thread
     moveToThread(qApp->thread());
 }
-// coco end
+// disabled coco end
 
 
 /*!