Index: configurations/Messages/Unhandled.conf
===================================================================
diff -u -r20940ea64f55557c7b554533c9f738fc582b0626 -rdee03b164dc65e9926cbf49c64f942ba5feebe38
--- configurations/Messages/Unhandled.conf	(.../Unhandled.conf)	(revision 20940ea64f55557c7b554533c9f738fc582b0626)
+++ configurations/Messages/Unhandled.conf	(.../Unhandled.conf)	(revision dee03b164dc65e9926cbf49c64f942ba5feebe38)
@@ -53,7 +53,7 @@
 
 [0x0300]
 MSG_ID_ALARM_CLEARED
-U32=alarmName
+U32=alarmID
 
 [0x0400]
 MSG_ID_ALARM_CONDITION_CLEARED
@@ -781,7 +781,7 @@
 
 [0x5800]
 MSG_ID_FP_GENP_DEF_DATA
-U32=genPermeateDefExecState
+U32=preGenPermeateDefExecState
 
 [0x5900]
 MSG_ID_FP_PRE_GEN_DEF_DATA
@@ -909,6 +909,7 @@
 U32=dryBiCartCurrentFillTime
 U32=dryBiCartType
 U32=dryBiCartDrainTimePeriod
+U32=dryBiCartPreGenFillState
 
 [0x7100]
 MSG_ID_FP_RO_REJECTION_RATIO_DATA
@@ -1128,10 +1129,12 @@
 MSG_ID_TD_ISOLATED_UF_CONFIRM_RESPONSE
 
 [0xA100]
-MSG_ID_UI_ADJUST_START_TREATMENT_REQUEST
+MSG_ID_UI_START_TREATMENT_REQUEST
 
 [0xA200]
-MSG_ID_TD_ADJUST_START_TREATMENT_RESPONSE
+MSG_ID_TD_START_TREATMENT_RESPONSE
+BOOL=accepted
+U32=rejectionReason
 
 [0xA300]
 MSG_ID_UI_WATER_SAMPLE_RESULT_REQUEST
@@ -1208,7 +1211,7 @@
 MSG_ID_UI_GENERIC_CONFIRMATION_RESULT_RESPONSE
 
 [0xB700]
-MSG_ID_AVAILABLE_B7
+MSG_ID_TD_PRE_TREATMENT_STATES_DATA
 
 [0xB800]
 MSG_ID_UI_VITALS_ADJUSTMENT_REQUEST
@@ -1265,6 +1268,170 @@
 MSG_ID_FP_PERMEATE_FLUSH_DATA
 U32=permeateFlushExecState
 
+[0x1000]
+MSG_ID_UI_DD_NVM_GET_RECORD_REQUEST
+
+[0x1010]
+MSG_ID_DD_NVM_SYSTEM_RECORD_RESPONSE
+
+[0x1020]
+MSG_ID_UI_DD_NVM_SET_SYSTEM_RECORD_REQUEST
+BOOL=isROFeatured
+BOOL=isROFeaturedBoostPump
+U08=mfgLocation
+U32=mfgDate
+U16=crc
+BOOL=isROFeatured
+BOOL=isROFeaturedBoostPump
+U08=mfgLocation
+U32=mfgDate
+U16=crc
+
+[0x1030]
+MSG_ID_DD_NVM_SERVICE_RECORD_RESPONSE
+
+[0x1040]
+MSG_ID_UI_DD_NVM_SET_SERVICE_RECORD_REQUEST
+BOOL=isHDFOnlineFluid
+U32=waterRecovery
+U08=serviceLoc
+U32=lastServiceEpochDate
+U32=serviceIntervalSeconds
+U32=lastResetTimeEpoch
+U16=crc
+BOOL=isHDFOnlineFluid
+U32=waterRecovery
+U08=serviceLoc
+U32=lastServiceEpochDate
+U32=serviceIntervalSeconds
+U32=lastResetTimeEpoch
+U16=crc
+
+[0x1050]
+MSG_ID_DD_NVM_INSTITUTIONAL_RECORD_RESPONSE
+
+[0x1060]
+MSG_ID_UI_DD_NVM_SET_INSTITUTIONAL_RECORD_REQUEST
+U08=idx
+
+[0x1070]
+MSG_ID_DD_NVM_USAGE_INFO_RECORD_RESPONSE
+
+[0x1080]
+MSG_ID_UI_DD_NVM_SET_USAGE_INFO_RECORD_REQUEST
+F32=roWaterGenTotalL
+F32=roWaterGenSinceLastServiceL
+U32=lastBasicFlushCompleteDateEpoch
+U32=lastHeatDisCompleteDateEpoch
+U32=lastHeatActiveCoolCompleteDateEpoch
+U32=lastFilterFlushCompleteDateEpoch
+U32=lastResetTimeEpoch
+U16=crc
+F32=roWaterGenTotalL
+F32=roWaterGenSinceLastServiceL
+U32=lastBasicFlushCompleteDateEpoch
+U32=lastHeatDisCompleteDateEpoch
+U32=lastHeatActiveCoolCompleteDateEpoch
+U32=lastFilterFlushCompleteDateEpoch
+U32=lastResetTimeEpoch
+U16=crc
+
+[0x1090]
+MSG_ID_DD_NVM_CAL_PRESSURE_SENSOR_RESPONSE
+
+[0x10A0]
+MSG_ID_UI_DD_NVM_SET_CAL_PRESSURE_SENSOR_REQUEST
+
+[0x10B0]
+MSG_ID_DD_NVM_CAL_TEMP_SENSOR_RESPONSE
+
+[0x10C0]
+MSG_ID_UI_DD_NVM_SET_CAL_TEMP_SENSOR_REQUEST
+
+[0x10D0]
+MSG_ID_DD_NVM_CAL_CONC_PUMP_RESPONSE
+
+[0x10E0]
+MSG_ID_UI_DD_NVM_SET_CAL_CONC_PUMP_REQUEST
+
+[0x10F0]
+MSG_ID_DD_NVM_CAL_D12_PUMP_RESPONSE
+
+[0x1100]
+MSG_ID_UI_DD_NVM_SET_CAL_D12_PUMP_REQUEST
+
+[0x1110]
+MSG_ID_DD_NVM_CAL_D48_PUMP_RESPONSE
+
+[0x1120]
+MSG_ID_UI_DD_NVM_SET_CAL_D48_PUMP_REQUEST
+
+[0x1130]
+MSG_ID_DD_NVM_CAL_ACID_CONCENTRATE_RESPONSE
+
+[0x1140]
+MSG_ID_UI_DD_NVM_SET_CAL_ACID_CONCENTRATE_REQUEST
+
+[0x1150]
+MSG_ID_DD_NVM_CAL_BICARB_CONCENTRATE_RESPONSE
+
+[0x1160]
+MSG_ID_UI_DD_NVM_SET_CAL_BICARB_CONCENTRATE_REQUEST
+
+[0x1170]
+MSG_ID_DD_NVM_CAL_ACCEL_SENSOR_RESPONSE
+
+[0x1180]
+MSG_ID_UI_DD_NVM_SET_CAL_ACCEL_SENSOR_REQUEST
+
+[0x1190]
+MSG_ID_DD_NVM_CAL_BLOOD_LEAK_SENSOR_RESPONSE
+
+[0x11A0]
+MSG_ID_UI_DD_NVM_SET_CAL_BLOOD_LEAK_SENSOR_REQUEST
+
+[0x11B0]
+MSG_ID_DD_NVM_GET_RECORD_RESPONSE
+
+[0x11C0]
+MSG_ID_DD_NVM_SET_SYSTEM_RECORD_RESPONSE
+
+[0x11D0]
+MSG_ID_DD_NVM_SET_SERVICE_RECORD_RESPONSE
+
+[0x11E0]
+MSG_ID_DD_NVM_SET_INSTITUTIONAL_RECORD_RESPONSE
+
+[0x11F0]
+MSG_ID_DD_NVM_SET_USAGE_INFO_RECORD_RESPONSE
+
+[0x1200]
+MSG_ID_DD_NVM_SET_CAL_PRESSURE_SENSOR_RESPONSE
+
+[0x1210]
+MSG_ID_DD_NVM_SET_CAL_TEMP_SENSOR_RESPONSE
+
+[0x1220]
+MSG_ID_DD_NVM_SET_CAL_CONC_PUMP_RESPONSE
+
+[0x1230]
+MSG_ID_DD_NVM_SET_CAL_D12_PUMP_RESPONSE
+
+[0x1240]
+MSG_ID_DD_NVM_SET_CAL_D48_PUMP_RESPONSE
+
+[0x1250]
+MSG_ID_DD_NVM_SET_CAL_ACID_CONCENTRATE_RESPONSE
+
+[0x1260]
+MSG_ID_DD_NVM_SET_CAL_BICARB_CONCENTRATE_RESPONSE
+
+[0x1270]
+MSG_ID_DD_NVM_SET_CAL_ACCEL_SENSOR_RESPONSE
+
+[0x1280]
+MSG_ID_DD_NVM_SET_CAL_BLOOD_LEAK_SENSOR_RESPONSE
+
 [0x0080]
 MSG_ID_FIRST_TD_TESTER_MESSAGE
 
@@ -1744,6 +1911,12 @@
 U16=alarmID
 }
 
+[0x6580]
+MSG_ID_TD_RINSEBACK_VOLUME_OVERRIDE
+
+[0x6680]
+MSG_ID_TD_RINSEBACK_PUBLISH_INTERVAL_OVERRIDE_REQUEST
+
 [0x6780]
 MSG_ID_TD_AIR_PUMP_RPM_OVERRIDE_REQUEST
 U32=reset
@@ -2452,6 +2625,11 @@
 U32=reset
 F32=state
 
+[0x76A0]
+MSG_ID_DD_NVM_RECORD_CRC_OVERRIDE_REQUEST
+U32=job
+U16=crc
+
 [0x00B0]
 MSG_ID_FIRST_FP_TESTER_MESSAGE