Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -r8beb79bf3633a3b2f98ddc30099825fb9618f2b6 -r92a0a399021a2d120155b0a779855893284b8cbb
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 8beb79bf3633a3b2f98ddc30099825fb9618f2b6)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 92a0a399021a2d120155b0a779855893284b8cbb)
@@ -391,7 +391,7 @@
             else if ( TRUE == didTimeout( heatersOnWithNoFlowTimer, HEATERS_ON_NO_FLOW_TIMEOUT_MS ) )
             {
                 stopPrimaryHeater();
-                activateAlarmNoData( ALARM_ID_DG_HEATERS_ON_WITH_NO_FLOW_TIMEOUT );
+//                activateAlarmNoData( ALARM_ID_DG_HEATERS_ON_WITH_NO_FLOW_TIMEOUT );
             }
         }
         else
Index: firmware/App/Services/Reservoirs.h
===================================================================
diff -u -re6f3a632890f96a5aa282922d11df148bdd06587 -r92a0a399021a2d120155b0a779855893284b8cbb
--- firmware/App/Services/Reservoirs.h	(.../Reservoirs.h)	(revision e6f3a632890f96a5aa282922d11df148bdd06587)
+++ firmware/App/Services/Reservoirs.h	(.../Reservoirs.h)	(revision 92a0a399021a2d120155b0a779855893284b8cbb)
@@ -39,31 +39,32 @@
 /// Fill command data structure.
 typedef struct
 {
-    U32 fillToVolumeMl;     ///< Target volume to fill to (in mL)
-    U32 cmd;                ///< General command (start/stop)
+    U32 fillToVolumeMl;         ///< Target volume to fill to (in mL)
+    U32 cmd;                    ///< General command (start/stop)
 } FILL_CMD_T;
 
 /// Drain command data structure.
 typedef struct
 {
-    U32 targetVolume;       ///< Target volume to drain to (in mL)
-    BOOL tareLoadCell;      ///< Flag to tare load call
+    U32 targetVolume;           ///< Target volume to drain to (in mL)
+    BOOL tareLoadCell;          ///< Flag to tare load call
+    BOOL rinseConcentrateLines; ///< Flag indicates to rinse concentrate lines or not
 } DRAIN_CMD_T;
 
 /// DG command response data record.
 typedef struct
 {
-    U32 commandID;          ///< The command DG is responding to
-    BOOL rejected;          ///< Flag indicates if the command has been rejected
-    U32 rejectCode;         ///< Reason code for rejecting the command
+    U32 commandID;              ///< The command DG is responding to
+    BOOL rejected;              ///< Flag indicates if the command has been rejected
+    U32 rejectCode;             ///< Reason code for rejecting the command
 } DG_CMD_RESPONSE_T;
 
 /// Reservoir data struct.
 typedef struct
 {
-    U32 activeReservoir;    ///< Active reservoir ID
-    U32 fillToVolumeMl;     ///< Volume target to fill to
-    U32 drainToVolumeMl;    ///< Volume target to drain to
+    U32 activeReservoir;        ///< Active reservoir ID
+    U32 fillToVolumeMl;         ///< Volume target to fill to
+    U32 drainToVolumeMl;        ///< Volume target to drain to
 } RESERVOIR_DATA_T;
 
 #pragma pack(pop)
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r992dce16d63424ddd30fe9ac2f819e9a53b21977 -r92a0a399021a2d120155b0a779855893284b8cbb
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 992dce16d63424ddd30fe9ac2f819e9a53b21977)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 92a0a399021a2d120155b0a779855893284b8cbb)
@@ -26,6 +26,7 @@
 #include "Heaters.h"
 #include "ModeFlush.h"
 #include "ModeGenIdle.h"
+#include "ModeInitPOST.h"
 #include "ModeStandby.h"
 #include "MsgQueues.h"
 #include "NVDataMgmt.h"