Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -rd325999b7b3ea03b7e294cb8a0b97df93812fbe9 -r75f5cf4a8484f0c08b90edfb4b49a6268e51de65
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision d325999b7b3ea03b7e294cb8a0b97df93812fbe9)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 75f5cf4a8484f0c08b90edfb4b49a6268e51de65)
@@ -7,8 +7,8 @@
 *
 * @file    SystemCommMessages.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      13-Jun-2023
+* @author  (last)      Sean Nash
+* @date    (last)      22-Jun-2023
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -68,8 +68,15 @@
 /// Payload record structure for block message transmission request.
 typedef struct
 {
-    U16 blockedMessages[ MAX_MSGS_BLOCKED_FOR_XMIT ];
+    U16 blockedMessages[ MAX_MSGS_BLOCKED_FOR_XMIT ]; ///< Blocked messages array.
 } BLOCKED_MSGS_DATA_T;
+
+/// Load cells override payload structure
+typedef struct
+{
+    TEST_OVERRIDE_ARRAY_PAYLOAD_T ovRecord;         ///< Test override array payload.
+    BOOL flag;                                      ///< Flag.
+} LC_OVERRIDE_PAYLOAD_T;
 #pragma pack(pop)
 
 // ********** private data **********
@@ -1101,6 +1108,10 @@
         {
             result = requestDGStop();
         }
+        else if ( ( DG_MODE_STAN == dgMode ) && ( FALSE == startingTreatment.start ) )
+        {
+            result = signalAbortWaterSampling();
+        }
     }
 
     sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_DG_2_HD, result );
@@ -1860,7 +1871,6 @@
 void sendROPermeateSampleDispenseReadyToHD( void )
 {
     MESSAGE_T msg;
-    U08 *payloadPtr = msg.payload;
 
     // Create a message record
     blankMessage( &msg );
@@ -2067,12 +2077,6 @@
  *************************************************************************/
 void handleTestLoadCellOverrideRequest( MESSAGE_T *message )
 {
-    typedef struct
-    {
-        TEST_OVERRIDE_ARRAY_PAYLOAD_T ovRecord;
-        BOOL flag;
-    } LC_OVERRIDE_PAYLOAD_T;
-
     LC_OVERRIDE_PAYLOAD_T payload;
     BOOL result = FALSE;