Index: firmware/App/HDCommon.h
===================================================================
diff -u -rd4e699aba5ad4e197ef97cba4bc6ebebf210d1b3 -re82f92d4dec50a1e1362cf175fb20d412ddc5b32
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision d4e699aba5ad4e197ef97cba4bc6ebebf210d1b3)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision e82f92d4dec50a1e1362cf175fb20d412ddc5b32)
@@ -25,7 +25,7 @@
 #define HD_VERSION_MAJOR        0
 #define HD_VERSION_MINOR        5
 #define HD_VERSION_MICRO        0
-#define HD_VERSION_BUILD        9016
+#define HD_VERSION_BUILD        9018
 
 // ********** development build switches **********
 
Index: firmware/App/Modes/TreatmentEnd.c
===================================================================
diff -u -rac6532c81f2a6d4ad1c67420c22d59f6aeeaae13 -re82f92d4dec50a1e1362cf175fb20d412ddc5b32
--- firmware/App/Modes/TreatmentEnd.c	(.../TreatmentEnd.c)	(revision ac6532c81f2a6d4ad1c67420c22d59f6aeeaae13)
+++ firmware/App/Modes/TreatmentEnd.c	(.../TreatmentEnd.c)	(revision e82f92d4dec50a1e1362cf175fb20d412ddc5b32)
@@ -222,6 +222,11 @@
         setupForTxEndPausedState();
         result = TREATMENT_END_PAUSED_STATE;
     }
+    // Is treatment end requested?
+    else if ( TRUE == txEndAlarmEndTreatmentRequested )
+    {
+        signalEndTreatment();
+    }
     // Is final rinseback requested?
     else if ( ( TRUE == txEndRinsebackRequested ) || ( TRUE == txEndAlarmRinsebackRequested ) )
     {