Merge branch 'RDM-2025-0005-Adding_short_names_for_waterMeterSetting_MC' into R5

# Conflicts:
#	TS-0023-SDT_based_Information_Model_and_Mapping_for_Vertical_Industries.md

TS-0023-SDT_based_Information_Model_and_Mapping_for_Vertical_Industries.md

@@ -2009,7 +2009,6 @@ This ModuleClass provides information of measurements of the water meter.
 
 <mark>Editor note: the following attributes are missing from the short name tables in 6.3</mark>
 
-
 **Table 5.3.1.95-1: DataPoints of waterMeterReportInfo ModuleClass**
 
 |Name |Type |R/W |Optional |Unit |Documentation |
@@ -2033,13 +2032,9 @@ This ModuleClass provides information of measurements of the water meter.
 |waterIntervalPressure |list of xs:float |R |true |bar |Water pressure records measured at the interval of "waterPressureInterval" described in clause [5.3.1.96](#53196-watermetersetting) per day. |
 
 
-
-
 #### 5.3.1.96 waterMeterSetting
 This ModuleClass provides capabilities to set service parameters for data sampling and reporting. 
 
-<mark>Editor note: the following attributes are missing from the short name tables in 6.3</mark>
-
 
 **Table 5.3.1.96-1: DataPoints of waterMeterSetting ModuleClass**
 
@@ -2054,7 +2049,6 @@ This ModuleClass provides capabilities to set service parameters for data sampli
 |intensiveReportStartTime |m2m:timestamp |RW |true | |The start time of data intensive report. |
 
 
-
 #### 5.3.1.97 waterSensor
 This ModuleClass provides the capabilities to indicate whether or not water has been sensed, and raising an alarm if the triggering criterion is met. 
 
@@ -6203,6 +6197,7 @@ In protocol bindings resource attributes names for data points of module classes
 |fat |[bioElectricalImpedanceAnalysis](#53113-bioelectricalimpedanceanalysis) |fat |
 |fatFreeMass |[bodyCompositionAnalyser](#53114-bodycompositionanalyser) |faFMs |
 |filterLifetime |[filterInfo](#53135-filterinfo) |filLe |
+|flowInterval |[waterMeterSetting](#53196-watermetersetting) |floIl |
 |foamingStrength |[foaming](#53136-foaming) |foaSh |
 |frequency |[energyConsumption](#53132-energyconsumption) |freqy |
 |friendlyName |[dmDeviceInfo](#583-dmdeviceinfo) |friNe |
@@ -6241,6 +6236,9 @@ In protocol bindings resource attributes names for data points of module classes
 |innerErrorAlarm |[waterMeterAlarm](#53194-watermeteralarm)|inEAm |
 |innerHighInternalTemperatureAlarm |[waterMeterAlarm](#53194-watermeteralarm)|iHITm |
 |innerTemperatureSensorFault |[waterMeterAlarm](#53194-watermeteralarm)|iTSFt |
+|intensiveReportInterval |[waterMeterSetting](#53196-watermetersetting) |inRIl |
+|intensiveReportStartTime |[waterMeterSetting](#53196-watermetersetting) |iRSTe |
+|intensiveSampleInterval |[waterMeterSetting](#53196-watermetersetting) |inSIl |
 |jobModes |[airConJobMode](#5313-airconjobmode), [airPurifierJobMode](#5315-airpurifierjobmode), [clothesWasherDryerJobMode](#53121-clotheswasherdryerjobmode), [clothesWasherJobMode](#53120-clotheswasherjobmode), [cookerHoodJobMode](#53126-cookerhoodjobmode), [dehumidifierJobMode](#53128-dehumidifierjobmode), [dishWasherJobMode](#53129-dishwasherjobmode), [robotCleanerJobMode](#53174-robotcleanerjobmode) [steamClosetJobMode](#53185-steamclosetjobmode),  |jobMs |
 |jobStates |[runState](#53175-runstate) |jobSs |
 |kcal |[bioElectricalImpedanceAnalysis](#53113-bioelectricalimpedanceanalysis) |kcal |
@@ -6387,6 +6385,7 @@ In protocol bindings resource attributes names for data points of module classes
 |reverseFlowAlarm |[waterMeterAlarm](#53194-watermeteralarm)|reFAm |
 |reverseFlowAlarmThreshold |[waterMeterAlarm](#53194-watermeteralarm)|rFATd |
 |reverseFlowDuration |[waterMeterAlarm](#53194-watermeteralarm)|reFDn |
+|reverseFlowInterval |[waterMeterSetting](#53196-watermetersetting) |reFIl |
 |room |[location](#5392-location) |room |
 |roundingEnergyConsumption |[energyConsumption](#53132-energyconsumption) |roECn |
 |roundingEnergyGeneration |[energyGeneration](#53133-energygeneration) |roEGn |
@@ -6492,6 +6491,8 @@ In protocol bindings resource attributes names for data points of module classes
 |washTemp |[clothesWasherJobModeOption](#53122-clotheswasherjobmodeoption) |wasTp |
 |water |[bioElectricalImpedanceAnalysis](#53113-bioelectricalimpedanceanalysis) |water |
 |waterFlowStrength |[waterFlow](#53193-waterflow) |waFSh |
+|waterPressureInterval |[waterMeterSetting](#53196-watermetersetting) |waPIl |
+|waterTemperatureInterval |[waterMeterSetting](#53196-watermetersetting) |waTIl |
 |waterTemperatureSensorFault |[waterMeterAlarm](#53194-watermeteralarm)|wTSFt |
 |weight |[weight](#53199-weight) |weigt |
 |windDirection |[airQualitySensor](#5316-airqualitysensor) |winDn |