Index: firmware/App/Modes/ModeTreatmentParams.c
===================================================================
diff -u -radec2f189c162c153663d95b68a94406f4af6d0c -r6a348c6ca6ace52afa68d680422c2714251cf84e
--- firmware/App/Modes/ModeTreatmentParams.c	(.../ModeTreatmentParams.c)	(revision adec2f189c162c153663d95b68a94406f4af6d0c)
+++ firmware/App/Modes/ModeTreatmentParams.c	(.../ModeTreatmentParams.c)	(revision 6a348c6ca6ace52afa68d680422c2714251cf84e)
@@ -45,6 +45,7 @@
 #define INSTIT_CHEM_DISINFECT_ENABLE_RANGE      1                       ///< Institutional record chemical disinfect enable/disable allowable range
 #define INSTIT_MAX_RO_REJECTION_RATIO_MIN       0.0F                    ///< Institutional record max RO rejection ratio minimum
 #define INSTIT_MAX_RO_REJECTION_RATIO_MAX       1.0F                    ///< Institutional record max RO rejection ratio maximum
+#define INSTIT_MAX_INLET_WATER_COND_ALARM_USPCM 300.0F                  ///< Institutional record max inlet water conductivity alarm in uS/cm.
 
 /// Record for range and default of treatment parameters.
 typedef struct
@@ -1030,9 +1031,8 @@
     result &= ( ( nvInstRcrd->enableChemicalDisinfect          <= INSTIT_CHEM_DISINFECT_ENABLE_RANGE )                                            ? TRUE : FALSE );
     result &= ( ( nvInstRcrd->maxRORejectionRatio              >= INSTIT_MAX_RO_REJECTION_RATIO_MIN )                                             &&
                 ( nvInstRcrd->maxRORejectionRatio              <= INSTIT_MAX_RO_REJECTION_RATIO_MAX )                                             ? TRUE : FALSE );
-    // TODO Check whether a maximum or upper limit is needed and if there is add a #define
     result &= ( ( nvInstRcrd->minInletWaterCondAlarmLimitUSPCM >= 0.0F )                                                                          &&
-                ( nvInstRcrd->minInletWaterCondAlarmLimitUSPCM <= 700.0F )                                                                        ? TRUE : FALSE );
+                ( nvInstRcrd->minInletWaterCondAlarmLimitUSPCM <= INSTIT_MAX_INLET_WATER_COND_ALARM_USPCM )                                       ? TRUE : FALSE );
 
     return result;
 }
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -ra6822e8e4fc42f9cacbfd39b1e9f9d137fa05dc8 -r6a348c6ca6ace52afa68d680422c2714251cf84e
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision a6822e8e4fc42f9cacbfd39b1e9f9d137fa05dc8)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 6a348c6ca6ace52afa68d680422c2714251cf84e)
@@ -93,6 +93,8 @@
     F32 minHeparinBolusVolumeML;                            ///< Min heparin bolus volume in mL.
     F32 maxHeparinBolusVolumeML;                            ///< Max heparin bolus volume in mL.
     U32 enableChemicalDisinfect;                            ///< Enable/disable chemical disinfect.
+    F32 maxRORejectionRatio;                                ///< Max RO rejection ratio.
+    F32 minInletWaterCondAlarmLimitUSPCM;                   ///< Min inlet water conductivity alarm limit in uS/cm.
 } HD_INSTITUTIONAL_LOCAL_RECORD_T;
 
 typedef struct