Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r140f7d1be7df0a6dd6597cc4e1469f4741054e7b -rf53ecc014c076fc476e7963b67d688b7233579ee
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 140f7d1be7df0a6dd6597cc4e1469f4741054e7b)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision f53ecc014c076fc476e7963b67d688b7233579ee)
@@ -249,6 +249,7 @@
     {
         cmdStartDG();
         transitionToPatientConnection();
+        currentPreTreatmentState = HD_PRE_TREATMENT_PATIENT_CONNECTION_STATE;
     }
 
     return currentPreTreatmentState;
Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r94ec88c9d751596eaaeae6d87630c7ff4d655c1e -rf53ecc014c076fc476e7963b67d688b7233579ee
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 94ec88c9d751596eaaeae6d87630c7ff4d655c1e)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision f53ecc014c076fc476e7963b67d688b7233579ee)
@@ -309,24 +309,25 @@
     {
         rejReason = REQUEST_REJECT_REASON_BATTERY_IS_NOT_CHARGED;
     }
-#ifdef _RELEASE_
-    else
-#else
+#ifndef _RELEASE_
     else if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SERVICE_AND_DISINFECT_CHECK ) != SW_CONFIG_ENABLE_VALUE )
 #endif
     {
-        // Verify HD and DG are not over due for service
-        if ( ( haveHDDGServicesBeenExpired( &rejReason ) != TRUE ) && ( getTestConfigStatus( TEST_CONFIG_SKIP_DISINFECT_AND_SERVICE_TX_BLOCKERS ) ) != TRUE )
+        if ( getTestConfigStatus( TEST_CONFIG_SKIP_DISINFECT_AND_SERVICE_TX_BLOCKERS ) != TRUE )
         {
-            // Verify DG is disinfected
-            if ( FALSE == isDGDisinfectValid() )
+            // Verify HD and DG are not over due for service
+            if ( haveHDDGServicesBeenExpired( &rejReason ) != TRUE )
             {
-                rejReason = REQUEST_REJECT_REASON_DG_DISINFECT_HAS_BEEN_EXPIRED;
+                // Verify DG is disinfected
+                if ( FALSE == isDGDisinfectValid() )
+                {
+                    rejReason = REQUEST_REJECT_REASON_DG_DISINFECT_HAS_BEEN_EXPIRED;
+                }
+                else if ( getHeatDisinfectTemperatureSensorValue() > MAX_ALLOWED_RO_FILTER_TEMP_FOR_TX_C )
+                {
+                    rejReason = REQUEST_REJECT_REASON_DG_RO_FILTER_TEMPERATURE_OUT_OF_RANGE;
+                }
             }
-            else if ( getHeatDisinfectTemperatureSensorValue() > MAX_ALLOWED_RO_FILTER_TEMP_FOR_TX_C )
-            {
-                rejReason = REQUEST_REJECT_REASON_DG_RO_FILTER_TEMPERATURE_OUT_OF_RANGE;
-            }
         }
     }
 
Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r94ec88c9d751596eaaeae6d87630c7ff4d655c1e -rf53ecc014c076fc476e7963b67d688b7233579ee
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 94ec88c9d751596eaaeae6d87630c7ff4d655c1e)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision f53ecc014c076fc476e7963b67d688b7233579ee)
@@ -1835,7 +1835,7 @@
     }
     else
     {
-        if ( getTestConfigStatus( TEST_CONFIG_DISABLE_WET_SELFTEST_DISPLACEMENT_CHECK ) != TRUE )
+        if ( getTestConfigStatus( TEST_CONFIG_DISABLE_WET_SELFTEST_DISPLACEMENT_ALARM ) != TRUE )
         {
             if ( fabs( resOneDiffAfterDisplacement - resTwoDiffAfterDisplacement) > WET_SELF_TEST_DISPLACEMENT_TOLERANCE_G )
             {
@@ -1985,7 +1985,7 @@
     }
     else
     {
-        if ( getTestConfigStatus( TEST_CONFIG_DISABLE_WET_SELFTEST_DISPLACEMENT_CHECK ) != TRUE )
+        if ( getTestConfigStatus( TEST_CONFIG_DISABLE_WET_SELFTEST_DISPLACEMENT_ALARM ) != TRUE )
         {
             if ( fabs( resOneDiffAfterDisplacement - resTwoDiffAfterDisplacement) > WET_SELF_TEST_DISPLACEMENT_TOLERANCE_G )
             {