diff --git a/gitlab-ci/generate_supported_dm.sh b/gitlab-ci/generate_supported_dm.sh
index 074cf0e1..fb44cdd8 100755
--- a/gitlab-ci/generate_supported_dm.sh
+++ b/gitlab-ci/generate_supported_dm.sh
@@ -40,7 +40,7 @@ echo "Check if the required tools are generated"
 [ ! -f "out/datamodel_default.xml" ] && echo "XML file with BBF format doesn't exist" && exit 1
 
 echo "Validate datamodel_default generated XML file"
-xmllint --schema test/tools/cwmp-datamodel-1-8.xsd out/datamodel_default.xml --noout
+xmllint --schema test/tools/cwmp-datamodel-*.xsd out/datamodel_default.xml --noout
 check_ret $?
 
 echo "Generation of xml and xls artifacts :: PASS"
diff --git a/libbbfdm/dmtree/json/datamodel.json b/libbbfdm/dmtree/json/datamodel.json
index 11185cd8..42b9302c 100644
--- a/libbbfdm/dmtree/json/datamodel.json
+++ b/libbbfdm/dmtree/json/datamodel.json
@@ -63,7 +63,33 @@
 			"async": true,
 			"protocols": [
 				"usp"
-			]
+			],
+			"input": {
+				"Cause": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"usp"
+					],
+					"description": "The cause that will be contained within the <<event|#.Boot!>> Event. By default the Device SHOULD set this value to <<enum|RemoteReboot>>.",
+					"datatype": "string",
+					"enumerations": [
+						"LocalReboot",
+						"RemoteReboot"
+					]
+				},
+				"Reason": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"usp"
+					],
+					"description": "The reason of the boot (e.g. power on reset, watchdog, overheat, FAN fault, web userinterface, ...). When absent the implementation must set <<param>> to Unknown.",
+					"datatype": "string"
+				}
+			}
 		},
 		"Boot!": {
 			"type": "event",
@@ -98,6 +124,16 @@
 						"RemoteFactoryReset"
 					]
 				},
+				"Reason": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"usp"
+					],
+					"description": "The reason of the boot (e.g. power on reset, watchdog, overheat, FAN fault, web userinterface, ...).",
+					"datatype": "string"
+				},
 				"FirmwareUpdated": {
 					"type": "boolean",
 					"read": true,
@@ -125,7 +161,33 @@
 			"async": true,
 			"protocols": [
 				"usp"
-			]
+			],
+			"input": {
+				"Cause": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"usp"
+					],
+					"description": "The cause that will be contained within the <<event|#.Boot!>> Event. By default the Device SHOULD set this value to <<enum|RemoteFactoryReset>>.",
+					"datatype": "string",
+					"enumerations": [
+						"LocalFactoryReset",
+						"RemoteFactoryReset"
+					]
+				},
+				"Reason": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"usp"
+					],
+					"description": "The reason of the boot (e.g. power on reset, watchdog, overheat, FAN fault, web userinterface, ...). When absent the implementation must set <<param>> to Unknown.",
+					"datatype": "string"
+				}
+			}
 		},
 		"SelfTestDiagnostics()": {
 			"type": "command",
@@ -22960,11 +23022,12 @@
 				"type": "unsignedInt",
 				"read": true,
 				"write": false,
+				"obsolete": true,
 				"protocols": [
 					"cwmp",
 					"usp"
 				],
-				"description": "<<numentries>>",
+				"description": "<<numentries>> <<deprecated|2.18|because the only contained parameter, <<param|Processor.<i>.Architecture>>, is no longer relevant for modern devices.>>",
 				"datatype": "unsignedInt"
 			},
 			"LogRotateNumberOfEntries": {
@@ -23062,7 +23125,7 @@
 				"protocols": [
 					"usp"
 				],
-				"description": "Private Enterprise Number assigned and registered by IANA to the entity responsible for this Agent. Represented as a decimal encoding of the IANA-assinged number. This value MUST remain fixed over the lifetime of the Agent, including across firmware updates. Any change would indicate that its a new Agent and would therefore require a <<event|#.Boot!>> Event with a <<enum|LocalFactoryReset|#.Boot!.Cause>> enumerated value in the <<param|#.Boot!.Cause>> argument.",
+				"description": "Private Enterprise Number assigned and registered by IANA to the entity responsible for this Agent. Represented as a decimal encoding of the IANA-assigned number. This value MUST remain fixed over the lifetime of the Agent, including across firmware updates. Any change would indicate that its a new Agent and would therefore require a <<event|#.Boot!>> Event with a <<enum|LocalFactoryReset|#.Boot!.Cause>> enumerated value in the <<param|#.Boot!.Cause>> argument.",
 				"datatype": "string",
 				"range": [
 					{
@@ -23108,12 +23171,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Name": {
 					"type": "string",
@@ -23182,7 +23240,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "When <<true>>, this parameter indicates that this <<object>> instance is to be used for backup and restoration purposes. Note: The backup and restore operations may require the use of multiple <<object>> instances. In this scenario the mechanism for detemining the order and combination of <<object>> instances used for backup and restoration purposes is implementation specific.",
+					"description": "When <<true>>, this parameter indicates that this <<object>> instance is to be used for backup and restoration purposes. Note: The backup and restore operations may require the use of multiple <<object>> instances. In this scenario the mechanism for determining the order and combination of <<object>> instances used for backup and restoration purposes is implementation specific.",
 					"datatype": "boolean"
 				},
 				"Backup()": {
@@ -23408,6 +23466,173 @@
 					"description": "The sum total free physical Non-Volatile Memory (NVM), in <<units>>, currently available on the device. This memory persists across reboots and is available for use by the system, applications, or users.",
 					"datatype": "unsignedInt",
 					"unit": "KiB"
+				},
+				"Device.DeviceInfo.MemoryStatus.MemoryMonitor.": {
+					"type": "object",
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "This object specifies information that the device has obtained via sampling the memory utilization (RAM) on the device.",
+					"access": false,
+					"array": false,
+					"Enable": {
+						"type": "boolean",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Indicates whether or not memory monitoring is enabled.",
+						"default": "false",
+						"datatype": "boolean"
+					},
+					"MemUtilization": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Memory utilization, in <<units>>, rounded to the nearest whole <<units>>, is the percentage of memory used by the system which cannot be spontaneously reclaimed or repurposed by the system in case it is required. This metric is collected at the <<param|PollingInterval>>. This value is used to determine if a critical condition is reached i.e., the memory utilization exceeds <<param|CriticalRiseThreshold>>.",
+						"datatype": "unsignedInt",
+						"range": [
+							{
+								"max": 100
+							}
+						],
+						"unit": "percent"
+					},
+					"PollingInterval": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "The interval, measured in <<units>>, in which the device polls the memory utilization. If the value is 0 then the device selects its own polling interval. If the value is greater than 0 then the device MUST use this value as the polling interval.",
+						"datatype": "unsignedInt",
+						"unit": "seconds"
+					},
+					"CriticalRiseThreshold": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Memory utilization rise threshold <<units>> value. If the <<param|MemUtilization>> exceeds the rise threshold value, and the <<param|CriticalFallTimeStamp>> is greater than <<param|CriticalRiseTimeStamp>> (indicating that critical condition is reached), the following takes place: * The <<param|CriticalRiseTimeStamp>> is updated to the current time. * A log is generated into the vendor log file referenced by <<param|VendorLogFileRef>> indicating critical condition is reached if the <<param|EnableCriticalLog>> is <<true>>.",
+						"default": "80",
+						"datatype": "unsignedInt",
+						"range": [
+							{
+								"max": 100
+							}
+						],
+						"unit": "percent"
+					},
+					"CriticalFallThreshold": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Memory utilization fall threshold <<units>> value. If the <<param|MemUtilization>> falls below the fall threshold value and <<param|CriticalRiseTimeStamp>> is greater than <<param|CriticalFallTimeStamp>> (indicating that the critical condition is no longer present), the following takes place: * The <<param|CriticalFallTimeStamp>> is updated to current time. * A log is generated into the vendor log file referenced by <<object|.DeviceInfo.VendorLogFile>> indicating that the critical condition is no longer present if the <<param|EnableCriticalLog>> is <<true>>.",
+						"default": "60",
+						"datatype": "unsignedInt",
+						"range": [
+							{
+								"max": 100
+							}
+						],
+						"unit": "percent"
+					},
+					"CriticalRiseTimeStamp": {
+						"type": "dateTime",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Last date and time when the critical condition was reached. See <<param|CriticalRiseThreshold>> description for more details.",
+						"datatype": "dateTime"
+					},
+					"CriticalFallTimeStamp": {
+						"type": "dateTime",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Last date and time when the critical condition was no longer present. See <<param|CriticalFallThreshold>> description for more details.",
+						"datatype": "dateTime"
+					},
+					"EnableCriticalLog": {
+						"type": "boolean",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "This parameter indicates whether a critical log needs to be generated in the vendor log file. * If the value of <<param>> is <<true>>, then a critical log is generated in the vendor log file. * If the value of <<param>> is <<false>>, then no critical log is generated in the vendor log file.",
+						"default": "false",
+						"datatype": "boolean"
+					},
+					"VendorLogFileRef": {
+						"type": "string",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "The reference to <<object|.DeviceInfo.VendorLogFile>> is automatically constructed and the <<object|.DeviceInfo.VendorLogFile>> is populated with the information based on <<param|FilePath>>. E.g. When <<param|FilePath>> = file:///var/log/messages. The following entry is automatically added to <<object|.DeviceInfo.VendorLogFile>>: file:///var/log/messages.",
+						"datatype": "string"
+					},
+					"FilePath": {
+						"type": "string",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Destination path and filename of where to create and keep the log files which MUST use the file URI scheme <<bibref|RFC8089|The file URI Scheme>>. This file is related to <<param|EnableCriticalLog>>.",
+						"datatype": "string"
+					},
+					"MemoryCriticalState!": {
+						"type": "event",
+						"protocols": [
+							"usp"
+						],
+						"output": {
+							"MemUtilization": {
+								"type": "unsignedInt",
+								"read": true,
+								"write": true,
+								"protocols": [
+									"usp"
+								],
+								"description": "Memory utilization, in <<units>>, rounded to the nearest whole <<units>>, collected at the polling interval.",
+								"datatype": "unsignedInt",
+								"range": [
+									{
+										"max": 100
+									}
+								],
+								"unit": "percent"
+							}
+						}
+					}
 				}
 			},
 			"Device.DeviceInfo.ProcessStatus.": {
@@ -23427,7 +23652,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "The total amount of the CPU, in <<units>>, rounded up to the nearest whole <<units>>. In the case that multiple CPU are present, this value represents the average of all CPU.",
+					"description": "The total amount of the CPU, in <<units>>, rounded to the nearest whole <<units>>. In the case that multiple CPU are present, this value represents the average of all CPU.",
 					"datatype": "unsignedInt",
 					"range": [
 						{
@@ -23447,6 +23672,312 @@
 					"description": "<<numentries>> Since a Process can come and go very quickly, the CPE SHOULD place a locally specified limit on the frequency at which it will notify the ACS of value changes, as described in <<bibref|TR-069|Section 3.2.1>>.",
 					"datatype": "unsignedInt"
 				},
+				"CPUNumberOfEntries": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "<<numentries>>",
+					"datatype": "unsignedInt"
+				},
+				"Device.DeviceInfo.ProcessStatus.CPU.{i}.": {
+					"type": "object",
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Each instance in the table represents a CPU on this device. Here CPU can imply main CPU (where system software is executed) or hardware/network acceleration CPU (responsible for data plane traffic).",
+					"uniqueKeys": [
+						"Name",
+						"Alias"
+					],
+					"access": false,
+					"array": true,
+					"Alias": {
+						"type": "string",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
+						"datatype": "_AliasCWMP"
+					},
+					"Name": {
+						"type": "string",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Name of this CPU. This text MUST be sufficient to distinguish this CPU from other CPUs.",
+						"datatype": "string",
+						"range": [
+							{
+								"max": 256
+							}
+						]
+					},
+					"Enable": {
+						"type": "boolean",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Enables or disables the CPU utilization monitoring.",
+						"default": "false",
+						"datatype": "boolean"
+					},
+					"UpTime": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Time in <<units>> since the CPU was last restarted.",
+						"datatype": "unsignedInt",
+						"unit": "seconds"
+					},
+					"UserModeUtilization": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "CPU utilization, in <<units>>, rounded to the nearest whole <<units>>, while executing at the user level. This includes utilization across all cores. This value is calculated the same way as <<param|CPUUtilization>>. See <<param|CPUUtilization>> description for more details.",
+						"datatype": "unsignedInt",
+						"range": [
+							{
+								"max": 100
+							}
+						],
+						"unit": "percent"
+					},
+					"SystemModeUtilization": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "CPU utilization, in <<units>>, rounded to the nearest whole <<units>>, while executing at the system/kernel level. Note that this includes the time spent servicing interrupts as well. This includes utilization across all cores. This value is calculated the same way as <<param|CPUUtilization>>. See <<param|CPUUtilization>> description for more details.",
+						"datatype": "unsignedInt",
+						"range": [
+							{
+								"max": 100
+							}
+						],
+						"unit": "percent"
+					},
+					"IdleModeUtilization": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "CPU utilization, in <<units>>, rounded to the nearest whole <<units>>, while the CPU was idle. This value is calculated the same way as <<param|CPUUtilization>>. See <<param|CPUUtilization>> description for more details.",
+						"datatype": "unsignedInt",
+						"range": [
+							{
+								"max": 100
+							}
+						],
+						"unit": "percent"
+					},
+					"CPUUtilization": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "CPU utilization, in <<units>>, rounded to the nearest whole <<units>>. The CPU Utilization is calculated as a moving window average of <<param|NumSamples>> CPU utilization samples collected at the <<param|PollInterval>>. For example, the CPU utilization is calculated as follows: CPU Utilization = (sample1 + sample2 + ... + sampleN)/N where N is the number of CPU usage samples as represented by <<param|NumSamples>> and sample1, sample2, ..., sampleN are CPU usage samples collected at every <<param|PollInterval>> seconds. This parameter, which reflects system and user mode CPU utilization, is used to determine if the CPU is in critical condition. This value includes system mode and user mode utilization i.e., everything except idle mode utilization.",
+						"datatype": "unsignedInt",
+						"range": [
+							{
+								"max": 100
+							}
+						],
+						"unit": "percent"
+					},
+					"PollInterval": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "The interval, measured in <<units>>, over which the CPU usage is polled. If the value is 0 then the device selects its own polling interval. If the value is greater than 0 then the device MUST use this value as the poll interval.",
+						"default": "5",
+						"datatype": "unsignedInt",
+						"unit": "seconds"
+					},
+					"NumSamples": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "This parameter indicates the number of CPU usage samples that is needed to calculate the average CPU utilization and populate the <<param|CPUUtilization>>",
+						"default": "30",
+						"datatype": "unsignedInt",
+						"range": [
+							{
+								"min": 1,
+								"max": 300
+							}
+						]
+					},
+					"CriticalRiseThreshold": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "CPU utilization rise threshold <<units>> value. If the <<param|CPUUtilization>> exceeds the rise threshold value and the <<param|CriticalFallTimeStamp>> is greater than <<param|CriticalRiseTimeStamp>> (indicating that critical condition is reached), the following takes place: * The <<param|CriticalRiseTimeStamp>> is updated to the current time * A log is generated into the vendor log file referenced by <<object|###.DeviceInfo.VendorLogFile>> indicating critical condition is reached if the <<param|EnableCriticalLog>> is <<true>>. The logs generated should indicate the <<param|Name>> as well as the <<param|CriticalRiseTimeStamp>> of the CPU.",
+						"default": "80",
+						"datatype": "unsignedInt",
+						"range": [
+							{
+								"max": 100
+							}
+						],
+						"unit": "percent"
+					},
+					"CriticalFallThreshold": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "CPU utilization fall threshold <<units>> value. If the <<param|CPUUtilization>> falls below fall threshold value and <<param|CriticalRiseTimeStamp>> is greater than <<param|CriticalFallTimeStamp>> (indicating that critical condition is no longer present), the following takes place: * The <<param|CriticalFallTimeStamp>> is updated to current time * A log is generated into the vendor log file referenced by <<object|###.DeviceInfo.VendorLogFile>> indicating the clearing of critical condition if the <<param|EnableCriticalLog>> is <<true>>. The logs generated should indicate the <<param|Name>> as well as the <<param|CriticalFallTimeStamp>> of the CPU.",
+						"default": "60",
+						"datatype": "unsignedInt",
+						"range": [
+							{
+								"max": 100
+							}
+						],
+						"unit": "percent"
+					},
+					"CriticalRiseTimeStamp": {
+						"type": "dateTime",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Last date and time when the critical condition was reached. See <<param|CriticalRiseThreshold>> description for more details.",
+						"datatype": "dateTime"
+					},
+					"CriticalFallTimeStamp": {
+						"type": "dateTime",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Last date and time when the critical condition is no longer present. See <<param|CriticalFallThreshold>> description for more details.",
+						"datatype": "dateTime"
+					},
+					"EnableCriticalLog": {
+						"type": "boolean",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "This parameter indicates whether a critical log needs to be generated in the vendor log file. * If the value of <<param>> is <<true>>, then a critical log is generated in the vendor log file. * If the value of <<param>> is <<false>>, then no critical log is generated in the vendor log file.",
+						"default": "false",
+						"datatype": "boolean"
+					},
+					"VendorLogFileRef": {
+						"type": "string",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "The reference to <<object|###.DeviceInfo.VendorLogFile>> is automatically constructed and the <<object|###.DeviceInfo.VendorLogFile>> is populated with the information based on <<param|FilePath>>. E.g. When <<param|FilePath>> = file:///var/log/messages. The following entry is automatically added to <<object|###.DeviceInfo.VendorLogFile>>: file:///var/log/messages.",
+						"datatype": "string"
+					},
+					"FilePath": {
+						"type": "string",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Destination path and filename of where to create and keep the log files which MUST use the uri scheme file <<bibref|RFC8089|The file URI Scheme>>. This file is related to <<param|EnableCriticalLog>>.",
+						"datatype": "string"
+					},
+					"CPUCriticalState!": {
+						"type": "event",
+						"protocols": [
+							"usp"
+						],
+						"output": {
+							"CPUUtilization": {
+								"type": "unsignedInt",
+								"read": true,
+								"write": true,
+								"protocols": [
+									"usp"
+								],
+								"description": "CPU utilization, in <<units>>, rounded to the nearest whole <<units>>.",
+								"datatype": "unsignedInt",
+								"range": [
+									{
+										"max": 100
+									}
+								],
+								"unit": "percent"
+							},
+							"Name": {
+								"type": "string",
+								"read": true,
+								"write": true,
+								"protocols": [
+									"usp"
+								],
+								"description": "Name of this CPU. This text MUST be sufficient to distinguish this CPU from other CPUs.",
+								"datatype": "string",
+								"range": [
+									{
+										"max": 256
+									}
+								]
+							}
+						}
+					}
+				},
 				"Device.DeviceInfo.ProcessStatus.Process.{i}.": {
 					"type": "object",
 					"protocols": [
@@ -23589,12 +24120,7 @@
 							"usp"
 						],
 						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"datatype": "_AliasCWMP"
 					},
 					"Enable": {
 						"type": "boolean",
@@ -23864,11 +24390,12 @@
 			},
 			"Device.DeviceInfo.Processor.{i}.": {
 				"type": "object",
+				"obsolete": true,
 				"protocols": [
 					"cwmp",
 					"usp"
 				],
-				"description": "Each table entry represents a hardware or virtual processor that resides on this device.",
+				"description": "Each table entry represents a hardware or virtual processor that resides on this device. <<deprecated|2.18|because the only contained parameter, <<param|Architecture>>, is no longer relevant for modern devices.>>",
 				"uniqueKeys": [
 					"Alias"
 				],
@@ -23878,22 +24405,19 @@
 					"type": "string",
 					"read": true,
 					"write": true,
+					"obsolete": true,
 					"protocols": [
 						"cwmp",
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Architecture": {
 					"type": "string",
 					"read": true,
 					"write": false,
+					"obsolete": true,
 					"protocols": [
 						"cwmp",
 						"usp"
@@ -23936,12 +24460,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Enable": {
 					"type": "boolean",
@@ -24070,12 +24589,7 @@
 							"usp"
 						],
 						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"datatype": "_AliasCWMP"
 					},
 					"Name": {
 						"type": "string",
@@ -24140,12 +24654,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Name": {
 					"type": "string",
@@ -24362,12 +24871,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Location": {
 					"type": "string",
@@ -24421,12 +24925,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Name": {
 					"type": "string",
@@ -24644,7 +25143,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "Total number of Kernel faults which occured since last firmware upgrade.",
+					"description": "Total number of Kernel faults which occurred since last firmware upgrade.",
 					"datatype": "unsignedInt"
 				},
 				"PreviousBootCount": {
@@ -24720,12 +25219,7 @@
 							"usp"
 						],
 						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"datatype": "_AliasCWMP"
 					},
 					"FaultLocation": {
 						"type": "string",
@@ -24768,7 +25262,7 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "The firmeware version that triggered the Kernel fault.",
+						"description": "The firmware version that triggered the Kernel fault.",
 						"datatype": "string"
 					},
 					"ProcessName": {
@@ -24887,7 +25381,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "Total number of process faults which occured since last firmware upgrade.",
+					"description": "Total number of process faults which occurred since last firmware upgrade.",
 					"datatype": "unsignedInt"
 				},
 				"PreviousBootCount": {
@@ -24963,12 +25457,7 @@
 							"usp"
 						],
 						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"datatype": "_AliasCWMP"
 					},
 					"ProcessID": {
 						"type": "string",
@@ -25011,7 +25500,7 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "The time when the process fault occured.",
+						"description": "The time when the process fault occurred.",
 						"datatype": "dateTime"
 					},
 					"FirmwareVersion": {
@@ -25022,7 +25511,7 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "The firmware version that triggered the the process fault.",
+						"description": "The firmware version that triggered the process fault.",
 						"datatype": "string"
 					},
 					"Arguments": {
@@ -25134,12 +25623,7 @@
 						"cwmp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"URL": {
 					"type": "string",
@@ -25271,6 +25755,175 @@
 						"ETSI-M2M"
 					]
 				}
+			},
+			"Device.DeviceInfo.Reboots.": {
+				"type": "object",
+				"protocols": [
+					"usp"
+				],
+				"description": "The monitoring of reboot reasons is essential for diagnosing and troubleshooting issues with applications and processes running on the Device.",
+				"access": false,
+				"array": false,
+				"BootCount": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"usp"
+					],
+					"description": "The number of times the device has rebooted since the last factory reset.",
+					"datatype": "unsignedInt"
+				},
+				"CurrentVersionBootCount": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"usp"
+					],
+					"description": "The number of times the device has rebooted since the latest firmware update.",
+					"datatype": "unsignedInt"
+				},
+				"WatchdogBootCount": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"usp"
+					],
+					"description": "The number of times the device has rebooted by a sw/hw watchdog since the last factory reset. The watchdog is a component within the operating system kernel or Device responsible for monitoring user-space activities. If it detects non-responsiveness in user-space processes, it triggers a reboot of the device.",
+					"datatype": "unsignedInt"
+				},
+				"ColdBootCount": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"usp"
+					],
+					"description": "The number of times the device has cold rebooted since the last factory reset.",
+					"datatype": "unsignedInt"
+				},
+				"WarmBootCount": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"usp"
+					],
+					"description": "The number of times the device has warm rebooted since the last factory reset.",
+					"datatype": "unsignedInt"
+				},
+				"MaxRebootEntries": {
+					"type": "int",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"usp"
+					],
+					"description": "The maximum number of entries available in the <<object|Reboot>> table. Defines the maximum number of <<object|Reboot>> instances that can be stored on the device. When the maximum <<object|Reboot>> entries as indicated by <<param>> are reached, the next boot entry overrides the object with the oldest <<param|Reboot.<i>.TimeStamp>>. Set this parameter to 0 to completely disable the creation of <<object|Reboot>> instances. Set this parameter to -1 to leave it open to the implementation to decide the maximum number of <<object|Reboot>> instances that may be stored on the device. Reducing the <<param>> will cause for the implementation to delete the oldest <<object|Reboot>> instances. This setting does not affect the counting of reboots.",
+					"datatype": "int",
+					"range": [
+						{
+							"min": -1
+						}
+					]
+				},
+				"RebootNumberOfEntries": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"usp"
+					],
+					"description": "<<numentries>>",
+					"datatype": "unsignedInt"
+				},
+				"RemoveAllReboots()": {
+					"type": "command",
+					"async": true,
+					"protocols": [
+						"usp"
+					]
+				},
+				"Device.DeviceInfo.Reboots.Reboot.{i}.": {
+					"type": "object",
+					"protocols": [
+						"usp"
+					],
+					"description": "Each table entry represents a reboot reason that is stored on the device. When the maximum <<object>> entries as indicated by <<param|#.MaxRebootEntries>> are reached, the next boot entry overrides the object with the oldest <<param|TimeStamp>>.",
+					"uniqueKeys": [
+						"Alias",
+						"TimeStamp"
+					],
+					"access": false,
+					"array": true,
+					"Alias": {
+						"type": "string",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"usp"
+						],
+						"description": "A non-volatile unique key used to reference this instance. Alias provides a mechanism for a Controller to label this instance for future reference. The following mandatory constraints MUST be enforced: * The value MUST NOT be empty. * The value MUST start with a letter. * If the value is not assigned by the Controller at creation time, the Agent MUST assign a value with an cpe- prefix. | A non-volatile unique key used to reference this instance. Alias provides a mechanism for a Controller to label this instance for future reference. The following mandatory constraints MUST be enforced: * The value MUST NOT be empty. * The value MUST start with a letter. * If the value is not assigned by the Controller at creation time, the Agent MUST assign a value with an cpe- prefix.",
+						"datatype": "_AliasUSP"
+					},
+					"TimeStamp": {
+						"type": "dateTime",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"usp"
+						],
+						"description": "The time when the reboot occurred.",
+						"datatype": "dateTime"
+					},
+					"FirmwareUpdated": {
+						"type": "boolean",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"usp"
+						],
+						"description": "<<true>> if the Device was rebooted as a result of a firmware update; otherwise <<false>>.",
+						"datatype": "boolean"
+					},
+					"Cause": {
+						"type": "string",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"usp"
+						],
+						"description": "The cause of the boot.",
+						"datatype": "string",
+						"enumerations": [
+							"LocalReboot",
+							"RemoteReboot",
+							"FactoryReset",
+							"LocalFactoryReset",
+							"RemoteFactoryReset"
+						]
+					},
+					"Reason": {
+						"type": "string",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"usp"
+						],
+						"description": "The reason of the boot (e.g. power on reset, watchdog, overheat, FAN fault, web userinterface, ...).",
+						"default": "Unknown",
+						"datatype": "string"
+					},
+					"Remove()": {
+						"type": "command",
+						"async": true,
+						"protocols": [
+							"usp"
+						]
+					}
+				}
 			}
 		},
 		"Device.ManagementServer.": {
@@ -25767,7 +26420,7 @@
 				"protocols": [
 					"cwmp"
 				],
-				"description": "When an XMPP Connection Request is sent to a CPE the XMPP IQ Stanza will contian a from address that contains the Jabber ID of the initiating entity. This parameter is a <<list>> Each entry represents a Jabber ID, or address, that is allowed to initiate an XMPP Connection Request. Each Jabber ID is allowed to be either a Full JID (containing a local-part, domain-part, and resource-part in the following format: local-part@domain-part/resource-part) or a Bare JID (containing a local-part and a domain-part in the following format: local-part@domain-part). Full JID entries require an exact match whereas Bare JID entries are a wildcard match and will match any Jabber ID with the same local-part and domain-part independent of the resource-part. For example, if <<param>> contained ACS1@tr069.example.com, ACS2@tr-069.example.com/resource1 then the following incoming from addresses would be allowed: * ACS1@tr069.example.com/resource1 * ACS1@tr069.example.com/resource2 * ACS2@tr069.example.com/resource1 And the following incoming from addresses would not be allowed: * ACS2@tr069.example.com/resource2 * ACS@tr069.example.com/resource If this Parameter is <<empty>> then all Jabber IDs are allowed and an XMPP Connection Request can not be deemed invalid due to the from address.",
+				"description": "When an XMPP Connection Request is sent to a CPE the XMPP IQ Stanza will contain a from address that contains the Jabber ID of the initiating entity. This parameter is a <<list>> Each entry represents a Jabber ID, or address, that is allowed to initiate an XMPP Connection Request. Each Jabber ID is allowed to be either a Full JID (containing a local-part, domain-part, and resource-part in the following format: local-part@domain-part/resource-part) or a Bare JID (containing a local-part and a domain-part in the following format: local-part@domain-part). Full JID entries require an exact match whereas Bare JID entries are a wildcard match and will match any Jabber ID with the same local-part and domain-part independent of the resource-part. For example, if <<param>> contained ACS1@tr069.example.com, ACS2@tr-069.example.com/resource1 then the following incoming from addresses would be allowed: * ACS1@tr069.example.com/resource1 * ACS1@tr069.example.com/resource2 * ACS2@tr069.example.com/resource1 And the following incoming from addresses would not be allowed: * ACS2@tr069.example.com/resource2 * ACS@tr069.example.com/resource If this Parameter is <<empty>> then all Jabber IDs are allowed and an XMPP Connection Request can not be deemed invalid due to the from address.",
 				"list": {
 					"datatype": "string",
 					"item": {
@@ -26148,12 +26801,7 @@
 								"cwmp"
 							],
 							"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-							"datatype": "Alias",
-							"range": [
-								{
-									"max": 64
-								}
-							]
+							"datatype": "_AliasCWMP"
 						},
 						"Enable": {
 							"type": "boolean",
@@ -26770,12 +27418,7 @@
 						"cwmp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"ParameterName": {
 					"type": "string",
@@ -26800,6 +27443,7 @@
 						"cwmp"
 					],
 					"description": "Each entry in this list represents an Event for which this Parameter MUST be included within the ParameterList argument of the Inform RPC. All Inform Events (see <<bibref|TR-069|Section 3.7.1.5>>), except for 4 VALUE CHANGE, are allowed as entries in this list. 4 VALUE CHANGE is not allowed as that would violate requirements contained in <<bibref|TR-069|Section A.3.3.1>>. <<empty>> means all events except 4 VALUE CHANGE.",
+					"default": "[]",
 					"list": {
 						"datatype": "string"
 					}
@@ -26898,7 +27542,7 @@
 					"cwmp",
 					"usp"
 				],
-				"description": "First NTP timeserver. Either a host name or IP address. <<deprecated|2.16|due to the introduction of <<object|Client>>>>",
+				"description": "First NTP timeserver. Either a host name or IP address. <<deprecated|2.16|due to the introduction of <<object|Client>>>> <<obsoleted|2.18>>",
 				"datatype": "string",
 				"range": [
 					{
@@ -26915,7 +27559,7 @@
 					"cwmp",
 					"usp"
 				],
-				"description": "Second NTP timeserver. Either a host name or IP address. <<deprecated|2.16|due to the introduction of <<object|Client>>>>",
+				"description": "Second NTP timeserver. Either a host name or IP address. <<deprecated|2.16|due to the introduction of <<object|Client>>>> <<obsoleted|2.18>>",
 				"datatype": "string",
 				"range": [
 					{
@@ -26932,7 +27576,7 @@
 					"cwmp",
 					"usp"
 				],
-				"description": "Third NTP timeserver. Either a host name or IP address. <<deprecated|2.16|due to the introduction of <<object|Client>>>>",
+				"description": "Third NTP timeserver. Either a host name or IP address. <<deprecated|2.16|due to the introduction of <<object|Client>>>> <<obsoleted|2.18>>",
 				"datatype": "string",
 				"range": [
 					{
@@ -26949,7 +27593,7 @@
 					"cwmp",
 					"usp"
 				],
-				"description": "Fourth NTP timeserver. Either a host name or IP address. <<deprecated|2.16|due to the introduction of <<object|Client>>>>",
+				"description": "Fourth NTP timeserver. Either a host name or IP address. <<deprecated|2.16|due to the introduction of <<object|Client>>>> <<obsoleted|2.18>>",
 				"datatype": "string",
 				"range": [
 					{
@@ -26966,7 +27610,7 @@
 					"cwmp",
 					"usp"
 				],
-				"description": "Fifth NTP timeserver. Either a host name or IP address. <<deprecated|2.16|due to the introduction of <<object|Client>>>>",
+				"description": "Fifth NTP timeserver. Either a host name or IP address. <<deprecated|2.16|due to the introduction of <<object|Client>>>> <<obsoleted|2.18>>",
 				"datatype": "string",
 				"range": [
 					{
@@ -27072,12 +27716,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Mode": {
 					"type": "string",
@@ -27141,6 +27780,7 @@
 						"usp"
 					],
 					"description": "Points to a CSV list of NTP servers or pools. A NTP server can either be specified as an IP address or a host name. It is expected that the NTP client resolves multiple addresses which can change over time when <<param|ResolveAddresses>> is enabled.",
+					"default": "[]",
 					"list": {
 						"datatype": "string"
 					}
@@ -27165,7 +27805,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "When <<param|ResolveAddresses>> is enabled, This parameter specifies the maxium number of IP addresses that the NTP client can resolve. 0 means that all addresses must be resolved.",
+					"description": "When <<param|ResolveAddresses>> is enabled, This parameter specifies the maximum number of IP addresses that the NTP client can resolve. 0 means that all addresses must be resolved.",
 					"default": "6",
 					"datatype": "unsignedInt"
 				},
@@ -27414,12 +28054,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Mode": {
 					"type": "string",
@@ -27589,7 +28224,8 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "Points to a CSV list of NTP servers. A NTP server can either be specified as an IP address or a host name. When used the NTS-KE server will tell the remote NTS-KE client the NTP hostname or address of the NTP server(s) that should be used. This allows to seperate the NTP server and NTS-KE server implementation.",
+						"description": "Points to a CSV list of NTP servers. A NTP server can either be specified as an IP address or a host name. When used the NTS-KE server will tell the remote NTS-KE client the NTP hostname or address of the NTP server(s) that should be used. This allows to separate the NTP server and NTS-KE server implementation.",
+						"default": "[]",
 						"list": {
 							"datatype": "string"
 						}
@@ -28007,7 +28643,7 @@
 					"cwmp",
 					"usp"
 				],
-				"description": "HTTPAccess is used for modeling the different web interfaces that may be either localy or remotely available in the device. For example with Software Modules it is possible to install multiple services that embed a web interface like a Video service or Photo service. An instance of the <<object>> can model a web interface that is embedded in the device firmware or installed through a Software Modules management system. Access to the web interface MAY require user authentication. To have access authentication the device MUST support a <<object|.Users.User.>> object with at least one instance and an assigned relevant role in <<param|.Users.User.<i>.RoleParticipation>>.",
+				"description": "HTTPAccess is used for modeling the different web interfaces that may be either locally or remotely available in the device. For example with Software Modules it is possible to install multiple services that embed a web interface like a Video service or Photo service. An instance of the <<object>> can model a web interface that is embedded in the device firmware or installed through a Software Modules management system. Access to the web interface MAY require user authentication. To have access authentication the device MUST support a <<object|.Users.User.>> object with at least one instance and an assigned relevant role in <<param|.Users.User.<i>.RoleParticipation>>.",
 				"uniqueKeys": [
 					"Alias"
 				],
@@ -28033,12 +28669,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Order": {
 					"type": "string",
@@ -28097,6 +28728,7 @@
 						"usp"
 					],
 					"description": "Only allow users, defined in <<object|.Users.User.>>, to access the web instance represented by this <<object>> instance that have the following roles assigned that are defined in <<object|.Users.Role.>>.",
+					"default": "[]",
 					"list": {
 						"datatype": "string",
 						"range": [
@@ -28195,7 +28827,57 @@
 						"usp"
 					],
 					"description": "Each string must be a partial path which will result in an incoming request being routed to this instance.",
-					"default": "/",
+					"default": "[/]",
+					"list": {
+						"datatype": "string"
+					}
+				},
+				"AllowAllIPv4": {
+					"type": "boolean",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Allow access from any IPv4 address. The source prefixes defined in <<param|IPv4AllowedSourcePrefix>> will be ignored.",
+					"default": "false",
+					"datatype": "boolean"
+				},
+				"IPv4AllowedSourcePrefix": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Allow only access from the provided list of IPv4 prefixes. When <<param>> is set to <<empty>> and <<param|AllowAllIPv4>> is set to false, no incoming connections are allowed. When <<param|AllowAllIPv4>> is set true, <<param>> is ignored.",
+					"list": {
+						"datatype": "string"
+					}
+				},
+				"AllowAllIPv6": {
+					"type": "boolean",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Allow access from any IPv6 address. The source prefixes defined in <<param|IPv6AllowedSourcePrefix>> will be ignored.",
+					"default": "false",
+					"datatype": "boolean"
+				},
+				"IPv6AllowedSourcePrefix": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Allow only access from the provided list of IPv6 prefixes. When <<param>> is set to <<empty>> and <<param|AllowAllIPv6>> is set to false, no incoming connections are allowed. When <<param|AllowAllIPv6>> is set true, <<param>> is ignored.",
 					"list": {
 						"datatype": "string"
 					}
@@ -28421,7 +29103,7 @@
 					"cwmp",
 					"usp"
 				],
-				"description": "This object contains parameters relating to remotely accessing the CPEs user interface. Remote access is defined as any entity not of a local subnet attempting to connect to the CPE. Remote access requires user authentication. To provide remote access authentication the CPE MUST support a User table with at least one instance that has RemoteAccessCapable set to <<true>>. <<deprecated|2.16|due to the introduction of <<object|#.HTTPAccess>>>>",
+				"description": "This object contains parameters relating to remotely accessing the CPEs user interface. Remote access is defined as any entity not of a local subnet attempting to connect to the CPE. Remote access requires user authentication. To provide remote access authentication the CPE MUST support a User table with at least one instance that has RemoteAccessCapable set to <<true>>. <<deprecated|2.16|due to the introduction of <<object|#.HTTPAccess>>>> <<obsoleted|2.18>>",
 				"access": false,
 				"array": false,
 				"Enable": {
@@ -28787,12 +29469,7 @@
 					"usp"
 				],
 				"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-				"datatype": "Alias",
-				"range": [
-					{
-						"max": 64
-					}
-				]
+				"datatype": "_AliasCWMP"
 			},
 			"HigherLayer": {
 				"type": "string",
@@ -28965,12 +29642,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Name": {
 					"type": "string",
@@ -30822,12 +31494,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Name": {
 					"type": "string",
@@ -31661,12 +32328,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Name": {
 					"type": "string",
@@ -31909,12 +32571,7 @@
 							"usp"
 						],
 						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"datatype": "_AliasCWMP"
 					},
 					"Channel": {
 						"type": "string",
@@ -33395,7 +34052,7 @@
 							"protocols": [
 								"usp"
 							],
-							"description": "The Uncalibrated Echo Response (UER) [a(0),b(0)], [a(1),b(1)], ... <<list|with each list item consisting of the following>> Pair of 32-bit signed integers a(i),b(i) with each pair representing a complex component of the uncalibrated echo response (UER); # Real UER component, a(i) # Imaginary UER component, b(i) for values of i starting at i=0. Both values are represented as signed integers. The interpretation of the UER value is as defined in <<bibref|G.996.2|Clause A.2.2.1>>. | Pair of 32-bit signed integers a(i),b(i) with each pair representing a complex component of the uncalibrated echo response (UER); # Real UER component, a(i) # Imaginary UER component, b(i) for values of i starting at i=0. Both values are represented as signed integers. The interpretation of the UER value is as defined in <<bibref|G.996.2|Clause A.2.2.1>>. The value of UER at frequency i*<<param|UERGroupSize>>*Df = (<<param|UERScaleFactor>>/(2^31))*(a(i)+j*b(i))/(2^31) where Df = 4.3125 kHz. This parameter is defined as CPE SELT uncalibrated echo response (SELT-UER-R) in ITU-T Recommendation <<bibref|G.996.2|Clause A.2.2.1>>.",
+							"description": "The Uncalibrated Echo Response (UER) [a(0),b(0)], [a(1),b(1)], ... <<list|with each list item consisting of the following>> Pair of 32-bit signed integers a(i),b(i) with each pair representing a complex component of the uncalibrated echo response (UER); # Real UER component, a(i) # Imaginary UER component, b(i) for values of i starting at i=0. Both values are represented as signed integers. The interpretation of the UER value is as defined in <<bibref|G.996.2|Clause A.2.2.1>>. | Pair of 32-bit signed integers a(i),b(i) with each pair representing a complex component of the uncalibrated echo response (UER); # Real UER component, a(i) # Imaginary UER component, b(i) for values of i starting at i=0. Both values are represented as signed integers. The interpretation of the UER value is as defined in <<bibref|G.996.2|Clause A.2.2.1>>. The value of UER at frequency i*<<param|UERGroupSize>>*Df = (<<param|UERScaleFactor>>/(2^31^))*(a(i)+j*b(i))/(2^31^) where Df = 4.3125 kHz. This parameter is defined as CPE SELT uncalibrated echo response (SELT-UER-R) in ITU-T Recommendation <<bibref|G.996.2|Clause A.2.2.1>>.",
 							"list": {
 								"datatype": "UERComplex",
 								"item": {
@@ -33411,7 +34068,7 @@
 							"protocols": [
 								"usp"
 							],
-							"description": "The Uncalibrated Echo Response (UER) scale factor. This parameter is defined as part of the CPE SELT uncalibrated echo response (SELT-UER-R) in ITU-T Recommendation <<bibref|G.996.2|Clause A.2.2.1>>. Note that the scale factor is chosen such that max(abs(a(i)), abs(b(i))) over all i is equal to 2^31 - 1, which doesnt allow <<param>> to be zero.",
+							"description": "The Uncalibrated Echo Response (UER) scale factor. This parameter is defined as part of the CPE SELT uncalibrated echo response (SELT-UER-R) in ITU-T Recommendation <<bibref|G.996.2|Clause A.2.2.1>>. Note that the scale factor is chosen such that max(abs(a(i)), abs(b(i))) over all i is equal to 2^31^ - 1, which doesnt allow <<param>> to be zero.",
 							"datatype": "unsignedInt"
 						},
 						"UERGroupSize": {
@@ -34263,7 +34920,7 @@
 						"protocols": [
 							"cwmp"
 						],
-						"description": "The Uncalibrated Echo Response (UER) [a(0),b(0)], [a(1),b(1)], ... <<list|with each list item consisting of the following>> Pair of 32-bit signed integers a(i),b(i) with each pair representing a complex component of the uncalibrated echo response (UER); # Real UER component, a(i) # Imaginary UER component, b(i) for values of i starting at i=0. Both values are represented as signed integers. The interpretation of the UER value is as defined in <<bibref|G.996.2|Clause A.2.2.1>>. | Pair of 32-bit signed integers a(i),b(i) with each pair representing a complex component of the uncalibrated echo response (UER); # Real UER component, a(i) # Imaginary UER component, b(i) for values of i starting at i=0. Both values are represented as signed integers. The interpretation of the UER value is as defined in <<bibref|G.996.2|Clause A.2.2.1>>. The value of UER at frequency i*<<param|UERGroupSize>>*Df = (<<param|UERScaleFactor>>/(2^31))*(a(i)+j*b(i))/(2^31) where Df = 4.3125 kHz. This parameter is defined as CPE SELT uncalibrated echo response (SELT-UER-R) in ITU-T Recommendation <<bibref|G.996.2|Clause A.2.2.1>>.",
+						"description": "The Uncalibrated Echo Response (UER) [a(0),b(0)], [a(1),b(1)], ... <<list|with each list item consisting of the following>> Pair of 32-bit signed integers a(i),b(i) with each pair representing a complex component of the uncalibrated echo response (UER); # Real UER component, a(i) # Imaginary UER component, b(i) for values of i starting at i=0. Both values are represented as signed integers. The interpretation of the UER value is as defined in <<bibref|G.996.2|Clause A.2.2.1>>. | Pair of 32-bit signed integers a(i),b(i) with each pair representing a complex component of the uncalibrated echo response (UER); # Real UER component, a(i) # Imaginary UER component, b(i) for values of i starting at i=0. Both values are represented as signed integers. The interpretation of the UER value is as defined in <<bibref|G.996.2|Clause A.2.2.1>>. The value of UER at frequency i*<<param|UERGroupSize>>*Df = (<<param|UERScaleFactor>>/(2^31^))*(a(i)+j*b(i))/(2^31^) where Df = 4.3125 kHz. This parameter is defined as CPE SELT uncalibrated echo response (SELT-UER-R) in ITU-T Recommendation <<bibref|G.996.2|Clause A.2.2.1>>.",
 						"list": {
 							"datatype": "UERComplex",
 							"item": {
@@ -34279,7 +34936,7 @@
 						"protocols": [
 							"cwmp"
 						],
-						"description": "The Uncalibrated Echo Response (UER) scale factor. This parameter is defined as part of the CPE SELT uncalibrated echo response (SELT-UER-R) in ITU-T Recommendation <<bibref|G.996.2|Clause A.2.2.1>>. Note that the scale factor is chosen such that max(abs(a(i)), abs(b(i))) over all i is equal to 2^31 - 1, which doesnt allow <<param>> to be zero.",
+						"description": "The Uncalibrated Echo Response (UER) scale factor. This parameter is defined as part of the CPE SELT uncalibrated echo response (SELT-UER-R) in ITU-T Recommendation <<bibref|G.996.2|Clause A.2.2.1>>. Note that the scale factor is chosen such that max(abs(a(i)), abs(b(i))) over all i is equal to 2^31^ - 1, which doesnt allow <<param>> to be zero.",
 						"datatype": "unsignedInt"
 					},
 					"UERGroupSize": {
@@ -34708,12 +35365,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Name": {
 					"type": "string",
@@ -36278,7 +36930,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "The current operational state of the optical interface (see <<bibref|TR-181i2|Section 4.2.2>>). Enumeration of: Up, Down, Unknown, Dormant, NotPresent, LowerLayerDown, Error. When <<param|Enable>> is <<false>> then <<param>> SHOULD normally be <<enum|Down>> (or <<enum|NotPresent>> or <<enum|Error>> if there is a fault condition on the interface). When <<param|Enable>> is changed to <<true>> then <<param>> SHOULD change to <<enum|Up>> if and only if the interface is able to transmit and receive network traffic; it SHOULD change to <<enum|Dormant>> if and only if the interface is operable but is waiting for external actions before it can transmit and receive network traffic (and subsequently change to <<enum|Up>> if still operable when the expected actions have completed); it SHOULD change to <<enum|LowerLayerDown>> if and only if the interface is prevented from entering the <<enum|Up>> state because one or more of the interfaces beneath it is down; it SHOULD remain in the <<enum|Error>> state if there is an error or other fault condition detected on the interface; it SHOULD remain in the <<enum|NotPresent>> state if the interface has missing (typically hardware) components; it SHOULD change to <<enum|Unknown>> if the state of the interface can not be determined for some reason. This parameter is based on ifOperStatus from <<bibref|RFC2863>>.",
+					"description": "The current operational state of the interface (see <<bibref|TR-181i2|Section 4.2.2>>). Enumeration of: Up, Down, Unknown, Dormant, NotPresent, LowerLayerDown, Error. When <<param|Enable>> is <<false>> then <<param>> SHOULD normally be <<enum|Down>> (or <<enum|NotPresent>> or <<enum|Error>> if there is a fault condition on the interface). When <<param|Enable>> is changed to <<true>> then <<param>> SHOULD change to <<enum|Up>> if and only if the interface is able to transmit and receive network traffic; it SHOULD change to <<enum|Dormant>> if and only if the interface is operable but is waiting for external actions before it can transmit and receive network traffic (and subsequently change to <<enum|Up>> if still operable when the expected actions have completed); it SHOULD change to <<enum|LowerLayerDown>> if and only if the interface is prevented from entering the <<enum|Up>> state because one or more of the interfaces beneath it is down; it SHOULD remain in the <<enum|Error>> state if there is an error or other fault condition detected on the interface; it SHOULD remain in the <<enum|NotPresent>> state if the interface has missing (typically hardware) components; it SHOULD change to <<enum|Unknown>> if the state of the interface can not be determined for some reason. This parameter is based on ifOperStatus from <<bibref|RFC2863>>.",
 					"datatype": "string",
 					"enumerations": [
 						"Up",
@@ -36299,12 +36951,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Name": {
 					"type": "string",
@@ -36314,7 +36961,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "The textual name of the optical interface as assigned by the CPE.",
+					"description": "The textual name of the interface as assigned by the CPE.",
 					"datatype": "string",
 					"range": [
 						{
@@ -36330,7 +36977,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "The accumulated time in <<units>> since the optical interface entered its current operational state.",
+					"description": "The accumulated time in <<units>> since the interface entered its current operational state.",
 					"datatype": "unsignedInt",
 					"unit": "seconds"
 				},
@@ -36359,6 +37006,23 @@
 					"description": "Indicates whether the interface points towards the Internet (<<true>>) or towards End Devices (<<false>>). For example: * For an Internet Gateway Device, <<param>> will be <<true>> for all WAN interfaces and <<false>> for all LAN interfaces. * For a standalone WiFi Access Point that is connected via Ethernet to an Internet Gateway Device, <<param>> will be <<true>> for the Ethernet interface and <<false>> for the WiFi Radio interface. * For an End Device, <<param>> will be <<true>> for all interfaces.",
 					"datatype": "boolean"
 				},
+				"MaxBitRate": {
+					"type": "int",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "The maximum upstream and downstream PHY bit rate supported by this interface (expressed in <<units>>). A value of -1 indicates automatic selection of the maximum bit rate.",
+					"datatype": "int",
+					"range": [
+						{
+							"min": -1
+						}
+					],
+					"unit": "Mbps"
+				},
 				"OpticalSignalLevel": {
 					"type": "int",
 					"read": true,
@@ -36379,7 +37043,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "Optical level that is used to declare the downstream low received optical power alarm. The value is measured in dBm/1000, i.e. the value divided by 1000 is dB relative to 1 mW. For example, -12345 means -12.345 dBm, 0 means 0 dBm (1 mW) and 12345 means 12.345 dBm. | The value is measured in dBm/1000, i.e. the value divided by 1000 is dB relative to 1 mW. For example, -12345 means -12.345 dBm, 0 means 0 dBm (1 mW) and 12345 means 12.345 dBm. Valid values are -127.5 dBm (coded as -127500) to 0 dBm (coded as 0) in 0.5 dB increments. The value -127500 indicates the devices internal policy. This parameter is based on Lower optical threshold from <<bibref|G.988|section 9.2.1>>. <<deprecated|2.15|because it is not intended for the device to raise an optical power alarm.>> <<obsoleted|2.17>>",
+					"description": "Optical level that is used to declare the downstream low received optical power alarm. The value is measured in dBm/1000, i.e. the value divided by 1000 is dB relative to 1 mW. For example, -12345 means -12.345 dBm, 0 means 0 dBm (1 mW) and 12345 means 12.345 dBm. | The value is measured in dBm/1000, i.e. the value divided by 1000 is dB relative to 1 mW. For example, -12345 means -12.345 dBm, 0 means 0 dBm (1 mW) and 12345 means 12.345 dBm. Valid values are -127.5 dBm (coded as -127500) to 0 dBm (coded as 0) in 0.5 dB increments. The value -127500 indicates the devices internal policy. This parameter is based on Lower optical threshold from <<bibref|G.988|section 9.2.1>>. <<deprecated|2.15|because it is not intended for the device to raise an optical power alarm.>> <<obsoleted|2.17>> <<deleted|2.18>>",
 					"datatype": "Dbm1000"
 				},
 				"UpperOpticalThreshold": {
@@ -36391,7 +37055,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "Optical level that is used to declare the downstream high received optical power alarm. The value is measured in dBm/1000, i.e. the value divided by 1000 is dB relative to 1 mW. For example, -12345 means -12.345 dBm, 0 means 0 dBm (1 mW) and 12345 means 12.345 dBm. | The value is measured in dBm/1000, i.e. the value divided by 1000 is dB relative to 1 mW. For example, -12345 means -12.345 dBm, 0 means 0 dBm (1 mW) and 12345 means 12.345 dBm. Valid values are -127.5 dBm (coded as -127500) to 0 dBm (coded as 0) in 0.5 dB increments. The value -127500 indicates the devices internal policy. This parameter is based on Upper optical threshold from <<bibref|G.988|section 9.2.1>>. <<deprecated|2.15|because it is not intended for the device to raise an optical power alarm.>> <<obsoleted|2.17>>",
+					"description": "Optical level that is used to declare the downstream high received optical power alarm. The value is measured in dBm/1000, i.e. the value divided by 1000 is dB relative to 1 mW. For example, -12345 means -12.345 dBm, 0 means 0 dBm (1 mW) and 12345 means 12.345 dBm. | The value is measured in dBm/1000, i.e. the value divided by 1000 is dB relative to 1 mW. For example, -12345 means -12.345 dBm, 0 means 0 dBm (1 mW) and 12345 means 12.345 dBm. Valid values are -127.5 dBm (coded as -127500) to 0 dBm (coded as 0) in 0.5 dB increments. The value -127500 indicates the devices internal policy. This parameter is based on Upper optical threshold from <<bibref|G.988|section 9.2.1>>. <<deprecated|2.15|because it is not intended for the device to raise an optical power alarm.>> <<obsoleted|2.17>> <<deleted|2.18>>",
 					"datatype": "Dbm1000"
 				},
 				"TransmitOpticalLevel": {
@@ -36414,7 +37078,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "Minimum mean optical launch power that is used to declare the low transmit optical power alarm. The value is measured in dBm/1000, i.e. the value divided by 1000 is dB relative to 1 mW. For example, -12345 means -12.345 dBm, 0 means 0 dBm (1 mW) and 12345 means 12.345 dBm. | The value is measured in dBm/1000, i.e. the value divided by 1000 is dB relative to 1 mW. For example, -12345 means -12.345 dBm, 0 means 0 dBm (1 mW) and 12345 means 12.345 dBm. Valid values are -63.5 dBm (coded as -63500) to +63.5 dBm (coded as 63500) in 0.5 dB increments. The value -63500 indicates the devices internal policy. This parameter is based on Lower transmit power threshold from <<bibref|G.988|section 9.2.1>>. <<deprecated|2.15|because it is not intended for the device to raise an optical power alarm.>> <<obsoleted|2.17>>",
+					"description": "Minimum mean optical launch power that is used to declare the low transmit optical power alarm. The value is measured in dBm/1000, i.e. the value divided by 1000 is dB relative to 1 mW. For example, -12345 means -12.345 dBm, 0 means 0 dBm (1 mW) and 12345 means 12.345 dBm. | The value is measured in dBm/1000, i.e. the value divided by 1000 is dB relative to 1 mW. For example, -12345 means -12.345 dBm, 0 means 0 dBm (1 mW) and 12345 means 12.345 dBm. Valid values are -63.5 dBm (coded as -63500) to +63.5 dBm (coded as 63500) in 0.5 dB increments. The value -63500 indicates the devices internal policy. This parameter is based on Lower transmit power threshold from <<bibref|G.988|section 9.2.1>>. <<deprecated|2.15|because it is not intended for the device to raise an optical power alarm.>> <<obsoleted|2.17>> <<deleted|2.18>>",
 					"datatype": "Dbm1000"
 				},
 				"UpperTransmitPowerThreshold": {
@@ -36426,7 +37090,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "Maximum mean optical launch power that is used to declare the high transmit optical power alarm. The value is measured in dBm/1000, i.e. the value divided by 1000 is dB relative to 1 mW. For example, -12345 means -12.345 dBm, 0 means 0 dBm (1 mW) and 12345 means 12.345 dBm. | The value is measured in dBm/1000, i.e. the value divided by 1000 is dB relative to 1 mW. For example, -12345 means -12.345 dBm, 0 means 0 dBm (1 mW) and 12345 means 12.345 dBm. Valid values are -63.5 dBm (coded as -63500) to +63.5 dBm (coded as 63500) in 0.5 dB increments. The value -63500 indicates the devices internal policy. This parameter is based on Upper transmit power threshold from <<bibref|G.988|section 9.2.1>>. <<deprecated|2.15|because it is not intended for the device to raise an optical power alarm.>> <<obsoleted|2.17>>",
+					"description": "Maximum mean optical launch power that is used to declare the high transmit optical power alarm. The value is measured in dBm/1000, i.e. the value divided by 1000 is dB relative to 1 mW. For example, -12345 means -12.345 dBm, 0 means 0 dBm (1 mW) and 12345 means 12.345 dBm. | The value is measured in dBm/1000, i.e. the value divided by 1000 is dB relative to 1 mW. For example, -12345 means -12.345 dBm, 0 means 0 dBm (1 mW) and 12345 means 12.345 dBm. Valid values are -63.5 dBm (coded as -63500) to +63.5 dBm (coded as 63500) in 0.5 dB increments. The value -63500 indicates the devices internal policy. This parameter is based on Upper transmit power threshold from <<bibref|G.988|section 9.2.1>>. <<deprecated|2.15|because it is not intended for the device to raise an optical power alarm.>> <<obsoleted|2.17>> <<deleted|2.18>>",
 					"datatype": "Dbm1000"
 				},
 				"Device.Optical.Interface.{i}.Stats.": {
@@ -36438,6 +37102,16 @@
 					"description": "Throughput statistics for this interface. The CPE MUST reset the interfaces Stats parameters (unless otherwise stated in individual object or parameter descriptions) either when the interface becomes operationally down due to a previous administrative down (i.e. the interfaces <<param|#.Status>> parameter transitions to a down state after the interface is disabled) or when the interface becomes administratively up (i.e. the interfaces <<param|#.Enable>> parameter transitions from <<false>> to <<true>>). Administrative and operational interface status is discussed in <<bibref|TR-181i2|section 4.2.2>>.",
 					"access": false,
 					"array": false,
+					"Reset": {
+						"type": "boolean",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp"
+						],
+						"description": "Set this to <<true>> to reset all this objects statistics counters to zero.",
+						"datatype": "boolean"
+					},
 					"BytesSent": {
 						"type": "unsignedLong",
 						"read": true,
@@ -36447,7 +37121,7 @@
 							"usp"
 						],
 						"description": "The total number of bytes transmitted out of the interface, including framing characters.",
-						"datatype": "unsignedLong"
+						"datatype": "StatsCounter64"
 					},
 					"BytesReceived": {
 						"type": "unsignedLong",
@@ -36458,7 +37132,7 @@
 							"usp"
 						],
 						"description": "The total number of bytes received on the interface, including framing characters.",
-						"datatype": "unsignedLong"
+						"datatype": "StatsCounter64"
 					},
 					"PacketsSent": {
 						"type": "unsignedLong",
@@ -36469,7 +37143,7 @@
 							"usp"
 						],
 						"description": "The total number of packets transmitted out of the interface.",
-						"datatype": "unsignedLong"
+						"datatype": "StatsCounter64"
 					},
 					"PacketsReceived": {
 						"type": "unsignedLong",
@@ -36480,7 +37154,7 @@
 							"usp"
 						],
 						"description": "The total number of packets received on the interface.",
-						"datatype": "unsignedLong"
+						"datatype": "StatsCounter64"
 					},
 					"ErrorsSent": {
 						"type": "unsignedInt",
@@ -36491,7 +37165,7 @@
 							"usp"
 						],
 						"description": "The total number of outbound packets that could not be transmitted because of errors.",
-						"datatype": "unsignedInt"
+						"datatype": "StatsCounter32"
 					},
 					"ErrorsReceived": {
 						"type": "unsignedInt",
@@ -36502,7 +37176,7 @@
 							"usp"
 						],
 						"description": "The total number of inbound packets that contained errors preventing them from being delivered to a higher-layer protocol.",
-						"datatype": "unsignedInt"
+						"datatype": "StatsCounter32"
 					},
 					"DiscardPacketsSent": {
 						"type": "unsignedInt",
@@ -36513,7 +37187,7 @@
 							"usp"
 						],
 						"description": "The total number of outbound packets which were chosen to be discarded even though no errors had been detected to prevent their being transmitted. One possible reason for discarding such a packet could be to free up buffer space.",
-						"datatype": "unsignedInt"
+						"datatype": "StatsCounter32"
 					},
 					"DiscardPacketsReceived": {
 						"type": "unsignedInt",
@@ -36524,7 +37198,14 @@
 							"usp"
 						],
 						"description": "The total number of inbound packets which were chosen to be discarded even though no errors had been detected to prevent their being delivered. One possible reason for discarding such a packet could be to free up buffer space.",
-						"datatype": "unsignedInt"
+						"datatype": "StatsCounter32"
+					},
+					"Reset()": {
+						"type": "command",
+						"async": true,
+						"protocols": [
+							"usp"
+						]
 					}
 				}
 			}
@@ -36639,12 +37320,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Name": {
 					"type": "string",
@@ -37205,12 +37881,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"APN": {
 					"type": "string",
@@ -37347,7 +38018,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "Enables or disables the link. This parameter is based on ifAdminStatus from <<bibref|RFC2863>>.",
+					"description": "Enables or disables the interface. This parameter is based on ifAdminStatus from <<bibref|RFC2863>>.",
 					"default": "false",
 					"datatype": "boolean"
 				},
@@ -37359,7 +38030,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "The current operational state of the link (see <<bibref|TR-181i2|Section 4.2.2>>). Enumeration of: Up, Down, Unknown, Dormant, NotPresent, LowerLayerDown, Error. When <<param|Enable>> is <<false>> then <<param>> SHOULD normally be <<enum|Down>> (or <<enum|NotPresent>> or <<enum|Error>> if there is a fault condition on the interface). When <<param|Enable>> is changed to <<true>> then <<param>> SHOULD change to <<enum|Up>> if and only if the interface is able to transmit and receive network traffic; it SHOULD change to <<enum|Dormant>> if and only if the interface is operable but is waiting for external actions before it can transmit and receive network traffic (and subsequently change to <<enum|Up>> if still operable when the expected actions have completed); it SHOULD change to <<enum|LowerLayerDown>> if and only if the interface is prevented from entering the <<enum|Up>> state because one or more of the interfaces beneath it is down; it SHOULD remain in the <<enum|Error>> state if there is an error or other fault condition detected on the interface; it SHOULD remain in the <<enum|NotPresent>> state if the interface has missing (typically hardware) components; it SHOULD change to <<enum|Unknown>> if the state of the interface can not be determined for some reason. This parameter is based on ifOperStatus from <<bibref|RFC2863>>.",
+					"description": "The current operational state of the interface (see <<bibref|TR-181i2|Section 4.2.2>>). Enumeration of: Up, Down, Unknown, Dormant, NotPresent, LowerLayerDown, Error. When <<param|Enable>> is <<false>> then <<param>> SHOULD normally be <<enum|Down>> (or <<enum|NotPresent>> or <<enum|Error>> if there is a fault condition on the interface). When <<param|Enable>> is changed to <<true>> then <<param>> SHOULD change to <<enum|Up>> if and only if the interface is able to transmit and receive network traffic; it SHOULD change to <<enum|Dormant>> if and only if the interface is operable but is waiting for external actions before it can transmit and receive network traffic (and subsequently change to <<enum|Up>> if still operable when the expected actions have completed); it SHOULD change to <<enum|LowerLayerDown>> if and only if the interface is prevented from entering the <<enum|Up>> state because one or more of the interfaces beneath it is down; it SHOULD remain in the <<enum|Error>> state if there is an error or other fault condition detected on the interface; it SHOULD remain in the <<enum|NotPresent>> state if the interface has missing (typically hardware) components; it SHOULD change to <<enum|Unknown>> if the state of the interface can not be determined for some reason. This parameter is based on ifOperStatus from <<bibref|RFC2863>>.",
 					"default": "Down",
 					"datatype": "string",
 					"enumerations": [
@@ -37381,12 +38052,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Name": {
 					"type": "string",
@@ -37396,7 +38062,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "The textual name of the link as assigned by the CPE.",
+					"description": "The textual name of the interface as assigned by the CPE.",
 					"datatype": "string",
 					"range": [
 						{
@@ -37412,7 +38078,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "The accumulated time in <<units>> since the link entered its current operational state.",
+					"description": "The accumulated time in <<units>> since the interface entered its current operational state.",
 					"datatype": "unsignedInt",
 					"unit": "seconds"
 				},
@@ -37425,6 +38091,7 @@
 						"usp"
 					],
 					"description": "<<list>> <<reference|an interface object that is stacked immediately below this interface object>> See <<bibref|TR-181i2|Section 4.2.1>>.",
+					"default": "[]",
 					"list": {
 						"datatype": "string",
 						"maxsize": 1024
@@ -37548,6 +38215,16 @@
 					"description": "Throughput statistics for this interface. The CPE MUST reset the interfaces Stats parameters (unless otherwise stated in individual object or parameter descriptions) either when the interface becomes operationally down due to a previous administrative down (i.e. the interfaces <<param|#.Status>> parameter transitions to a down state after the interface is disabled) or when the interface becomes administratively up (i.e. the interfaces <<param|#.Enable>> parameter transitions from <<false>> to <<true>>). Administrative and operational interface status is discussed in <<bibref|TR-181i2|section 4.2.2>>.",
 					"access": false,
 					"array": false,
+					"Reset": {
+						"type": "boolean",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp"
+						],
+						"description": "Set this to <<true>> to reset all this objects statistics counters to zero.",
+						"datatype": "boolean"
+					},
 					"BytesSent": {
 						"type": "unsignedLong",
 						"read": true,
@@ -37557,7 +38234,7 @@
 							"usp"
 						],
 						"description": "The total number of bytes transmitted out of the interface, including framing characters.",
-						"datatype": "unsignedLong"
+						"datatype": "StatsCounter64"
 					},
 					"BytesReceived": {
 						"type": "unsignedLong",
@@ -37568,7 +38245,7 @@
 							"usp"
 						],
 						"description": "The total number of bytes received on the interface, including framing characters.",
-						"datatype": "unsignedLong"
+						"datatype": "StatsCounter64"
 					},
 					"PacketsSent": {
 						"type": "unsignedLong",
@@ -37579,7 +38256,7 @@
 							"usp"
 						],
 						"description": "The total number of packets transmitted out of the interface.",
-						"datatype": "unsignedLong"
+						"datatype": "StatsCounter64"
 					},
 					"PacketsReceived": {
 						"type": "unsignedLong",
@@ -37590,7 +38267,7 @@
 							"usp"
 						],
 						"description": "The total number of packets received on the interface.",
-						"datatype": "unsignedLong"
+						"datatype": "StatsCounter64"
 					},
 					"ErrorsSent": {
 						"type": "unsignedInt",
@@ -37601,7 +38278,7 @@
 							"usp"
 						],
 						"description": "The total number of outbound packets that could not be transmitted because of errors.",
-						"datatype": "unsignedInt"
+						"datatype": "StatsCounter32"
 					},
 					"ErrorsReceived": {
 						"type": "unsignedInt",
@@ -37612,7 +38289,7 @@
 							"usp"
 						],
 						"description": "The total number of inbound packets that contained errors preventing them from being delivered to a higher-layer protocol.",
-						"datatype": "unsignedInt"
+						"datatype": "StatsCounter32"
 					},
 					"UnicastPacketsSent": {
 						"type": "unsignedLong",
@@ -37623,18 +38300,7 @@
 							"usp"
 						],
 						"description": "The total number of packets requested for transmission which were not addressed to a multicast or broadcast address at this layer, including those that were discarded or not sent.",
-						"datatype": "unsignedLong"
-					},
-					"UnicastPacketsReceived": {
-						"type": "unsignedLong",
-						"read": true,
-						"write": false,
-						"protocols": [
-							"cwmp",
-							"usp"
-						],
-						"description": "The total number of received packets, delivered by this layer to a higher layer, which were not addressed to a multicast or broadcast address at this layer.",
-						"datatype": "unsignedLong"
+						"datatype": "StatsCounter64"
 					},
 					"DiscardPacketsSent": {
 						"type": "unsignedInt",
@@ -37645,7 +38311,7 @@
 							"usp"
 						],
 						"description": "The total number of outbound packets which were chosen to be discarded even though no errors had been detected to prevent their being transmitted. One possible reason for discarding such a packet could be to free up buffer space.",
-						"datatype": "unsignedInt"
+						"datatype": "StatsCounter32"
 					},
 					"DiscardPacketsReceived": {
 						"type": "unsignedInt",
@@ -37656,7 +38322,7 @@
 							"usp"
 						],
 						"description": "The total number of inbound packets which were chosen to be discarded even though no errors had been detected to prevent their being delivered. One possible reason for discarding such a packet could be to free up buffer space.",
-						"datatype": "unsignedInt"
+						"datatype": "StatsCounter32"
 					},
 					"MulticastPacketsSent": {
 						"type": "unsignedLong",
@@ -37667,7 +38333,18 @@
 							"usp"
 						],
 						"description": "The total number of packets that higher-level protocols requested for transmission and which were addressed to a multicast address at this layer, including those that were discarded or not sent.",
-						"datatype": "unsignedLong"
+						"datatype": "StatsCounter64"
+					},
+					"UnicastPacketsReceived": {
+						"type": "unsignedLong",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "The total number of received packets, delivered by this layer to a higher layer, which were not addressed to a multicast or broadcast address at this layer.",
+						"datatype": "StatsCounter64"
 					},
 					"MulticastPacketsReceived": {
 						"type": "unsignedLong",
@@ -37678,7 +38355,7 @@
 							"usp"
 						],
 						"description": "The total number of received packets, delivered by this layer to a higher layer, which were addressed to a multicast address at this layer.",
-						"datatype": "unsignedLong"
+						"datatype": "StatsCounter64"
 					},
 					"BroadcastPacketsSent": {
 						"type": "unsignedLong",
@@ -37689,7 +38366,7 @@
 							"usp"
 						],
 						"description": "The total number of packets that higher-level protocols requested for transmission and which were addressed to a broadcast address at this layer, including those that were discarded or not sent.",
-						"datatype": "unsignedLong"
+						"datatype": "StatsCounter64"
 					},
 					"BroadcastPacketsReceived": {
 						"type": "unsignedLong",
@@ -37700,7 +38377,7 @@
 							"usp"
 						],
 						"description": "The total number of received packets, delivered by this layer to a higher layer, which were addressed to a broadcast address at this layer.",
-						"datatype": "unsignedLong"
+						"datatype": "StatsCounter64"
 					},
 					"UnknownProtoPacketsReceived": {
 						"type": "unsignedInt",
@@ -37711,7 +38388,7 @@
 							"usp"
 						],
 						"description": "The total number of packets received via the interface which were discarded because of an unknown or unsupported protocol.",
-						"datatype": "unsignedInt"
+						"datatype": "StatsCounter32"
 					},
 					"TransmittedBlocks": {
 						"type": "unsignedInt",
@@ -37756,6 +38433,13 @@
 						],
 						"description": "Count of the number of Header Error Check related errors at the ATM layer.",
 						"datatype": "unsignedInt"
+					},
+					"Reset()": {
+						"type": "command",
+						"async": true,
+						"protocols": [
+							"usp"
+						]
 					}
 				},
 				"Device.ATM.Link.{i}.QoS.": {
@@ -38250,12 +38934,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Name": {
 					"type": "string",
@@ -38582,12 +39261,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Name": {
 					"type": "string",
@@ -38882,12 +39556,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"ID": {
 					"type": "unsignedInt",
@@ -39165,12 +39834,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"ID": {
 					"type": "int",
@@ -39503,12 +40167,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Name": {
 					"type": "string",
@@ -40292,12 +40951,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Name": {
 					"type": "string",
@@ -40336,6 +40990,7 @@
 						"usp"
 					],
 					"description": "<<list>> <<reference|an interface object that is stacked immediately below this interface object>> See <<bibref|TR-181i2|Section 4.2.1>>.",
+					"default": "[]",
 					"list": {
 						"datatype": "string",
 						"maxsize": 1024
@@ -40602,7 +41257,7 @@
 				"description": "<<numentries>>",
 				"datatype": "unsignedInt"
 			},
-			"RMONStatsNumberOfEntries": {
+			"LAGNumberOfEntries": {
 				"type": "unsignedInt",
 				"read": true,
 				"write": false,
@@ -40613,7 +41268,7 @@
 				"description": "<<numentries>>",
 				"datatype": "unsignedInt"
 			},
-			"LAGNumberOfEntries": {
+			"RMONStatsNumberOfEntries": {
 				"type": "unsignedInt",
 				"read": true,
 				"write": false,
@@ -40677,12 +41332,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Name": {
 					"type": "string",
@@ -40737,6 +41387,23 @@
 					"description": "Indicates whether the interface points towards the Internet (<<true>>) or towards End Devices (<<false>>). For example: * For an Internet Gateway Device, <<param>> will be <<true>> for all WAN interfaces and <<false>> for all LAN interfaces. * For a standalone WiFi Access Point that is connected via Ethernet to an Internet Gateway Device, <<param>> will be <<true>> for the Ethernet interface and <<false>> for the WiFi Radio interface. * For an End Device, <<param>> will be <<true>> for all interfaces.",
 					"datatype": "boolean"
 				},
+				"MaxBitRate": {
+					"type": "int",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "The maximum upstream and downstream PHY bit rate supported by this interface (expressed in <<units>>). A value of -1 indicates automatic selection of the maximum bit rate.",
+					"datatype": "int",
+					"range": [
+						{
+							"min": -1
+						}
+					],
+					"unit": "Mbps"
+				},
 				"MACAddress": {
 					"type": "string",
 					"read": true,
@@ -40765,28 +41432,11 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "Reports the supported link modes. MUST be reported in a compliant way as defined in <<bibref|IANAMauMIB|IANAifMauTypeListBits>>. For example, IANAifMauTypeListBits defines the following link mode types: * 11 (10BASE-T full duplex mode) * 14 (100BASE-T4) * 15 (100BASE-TX half duplex mode) * 16 (100BASE-TX full duplex mode)",
+					"description": "Reports the supported link modes. MUST be reported in a compliant way as defined in <<bibref|IANAMauMIB|IANAifMauTypeListBits>>. For example, IANAifMauTypeListBits defines the following link mode types: * 16 (100BASE-TX full duplex mode) * 26 (1000BASE-SX full duplex mode) * 30 (1000BASE-T full duplex mode) * 54 (10GBASE-T) * 103 (2.5GBASE-T) * 104 (5GBASE-T)",
 					"list": {
 						"datatype": "unsignedInt"
 					}
 				},
-				"MaxBitRate": {
-					"type": "int",
-					"read": true,
-					"write": true,
-					"protocols": [
-						"cwmp",
-						"usp"
-					],
-					"description": "The maximum upstream and downstream PHY bit rate supported by this interface (expressed in <<units>>). A value of -1 indicates automatic selection of the maximum bit rate.",
-					"datatype": "int",
-					"range": [
-						{
-							"min": -1
-						}
-					],
-					"unit": "Mbps"
-				},
 				"CurrentBitRate": {
 					"type": "unsignedInt",
 					"read": true,
@@ -40807,7 +41457,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "The duplex mode available to this connection.",
+					"description": "The duplex mode requested for this connection.",
 					"datatype": "string",
 					"enumerations": [
 						"Half",
@@ -40815,6 +41465,22 @@
 						"Auto"
 					]
 				},
+				"CurrentDuplexMode": {
+					"type": "string",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "The duplex mode currently in use by this connection.",
+					"datatype": "string",
+					"enumerations": [
+						"Unknown",
+						"Half",
+						"Full"
+					]
+				},
 				"EEECapability": {
 					"type": "boolean",
 					"read": true,
@@ -40854,6 +41520,40 @@
 						"Unsupported"
 					]
 				},
+				"MDIX": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Configure the Medium Dependent Interface crossover functionality on the interface.",
+					"default": "Auto",
+					"datatype": "string",
+					"enumerations": [
+						"Auto",
+						"On",
+						"Off"
+					]
+				},
+				"CurrentMDIX": {
+					"type": "string",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "The current Medium Dependent Interface crossover setting in use on the interface.",
+					"datatype": "string",
+					"enumerations": [
+						"Unsupported",
+						"Unknown",
+						"On",
+						"Off"
+					]
+				},
 				"Device.Ethernet.Interface.{i}.Stats.": {
 					"type": "object",
 					"protocols": [
@@ -40863,6 +41563,16 @@
 					"description": "Throughput statistics for this interface. The CPE MUST reset the interfaces Stats parameters (unless otherwise stated in individual object or parameter descriptions) either when the interface becomes operationally down due to a previous administrative down (i.e. the interfaces <<param|#.Status>> parameter transitions to a down state after the interface is disabled) or when the interface becomes administratively up (i.e. the interfaces <<param|#.Enable>> parameter transitions from <<false>> to <<true>>). Administrative and operational interface status is discussed in <<bibref|TR-181i2|section 4.2.2>>.",
 					"access": false,
 					"array": false,
+					"Reset": {
+						"type": "boolean",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp"
+						],
+						"description": "Set this to <<true>> to reset all this objects statistics counters to zero.",
+						"datatype": "boolean"
+					},
 					"BytesSent": {
 						"type": "unsignedLong",
 						"read": true,
@@ -40872,7 +41582,7 @@
 							"usp"
 						],
 						"description": "The total number of bytes transmitted out of the interface, including framing characters.",
-						"datatype": "unsignedLong"
+						"datatype": "StatsCounter64"
 					},
 					"BytesReceived": {
 						"type": "unsignedLong",
@@ -40883,7 +41593,7 @@
 							"usp"
 						],
 						"description": "The total number of bytes received on the interface, including framing characters.",
-						"datatype": "unsignedLong"
+						"datatype": "StatsCounter64"
 					},
 					"PacketsSent": {
 						"type": "unsignedLong",
@@ -40893,8 +41603,8 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "The total number of Ethernet frames transmitted out of the interface.",
-						"datatype": "unsignedLong"
+						"description": "The total number of packets transmitted out of the interface.",
+						"datatype": "StatsCounter64"
 					},
 					"PacketsReceived": {
 						"type": "unsignedLong",
@@ -40904,8 +41614,8 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "The total number of Ethernet frames received on the interface.",
-						"datatype": "unsignedLong"
+						"description": "The total number of packets received on the interface.",
+						"datatype": "StatsCounter64"
 					},
 					"ErrorsSent": {
 						"type": "unsignedInt",
@@ -40915,8 +41625,8 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "The total number of outbound Ethernet frames that could not be transmitted because of errors.",
-						"datatype": "unsignedInt"
+						"description": "The total number of outbound packets that could not be transmitted because of errors.",
+						"datatype": "StatsCounter32"
 					},
 					"ErrorsReceived": {
 						"type": "unsignedInt",
@@ -40926,8 +41636,8 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "The total number of inbound Ethernet frames that contained errors preventing them from being delivered to a higher-layer protocol.",
-						"datatype": "unsignedInt"
+						"description": "The total number of inbound packets that contained errors preventing them from being delivered to a higher-layer protocol.",
+						"datatype": "StatsCounter32"
 					},
 					"UnicastPacketsSent": {
 						"type": "unsignedLong",
@@ -40937,19 +41647,8 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "The total number of Ethernet frames requested for transmission which were not addressed to a multicast or broadcast address at this layer, including those that were discarded or not sent.",
-						"datatype": "unsignedLong"
-					},
-					"UnicastPacketsReceived": {
-						"type": "unsignedLong",
-						"read": true,
-						"write": false,
-						"protocols": [
-							"cwmp",
-							"usp"
-						],
-						"description": "The total number of Ethernet frames packets, delivered by this layer to a higher layer, which were not addressed to a multicast or broadcast address at this layer.",
-						"datatype": "unsignedLong"
+						"description": "The total number of packets requested for transmission which were not addressed to a multicast or broadcast address at this layer, including those that were discarded or not sent.",
+						"datatype": "StatsCounter64"
 					},
 					"DiscardPacketsSent": {
 						"type": "unsignedInt",
@@ -40959,8 +41658,8 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "The total number of outbound Ethernet frames which were chosen to be discarded even though no errors had been detected to prevent their being transmitted. One possible reason for discarding such a packet could be to free up buffer space.",
-						"datatype": "unsignedInt"
+						"description": "The total number of outbound packets which were chosen to be discarded even though no errors had been detected to prevent their being transmitted. One possible reason for discarding such a packet could be to free up buffer space.",
+						"datatype": "StatsCounter32"
 					},
 					"DiscardPacketsReceived": {
 						"type": "unsignedInt",
@@ -40970,8 +41669,8 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "The total number of inbound Ethernet frames which were chosen to be discarded even though no errors had been detected to prevent their being delivered. One possible reason for discarding such a packet could be to free up buffer space.",
-						"datatype": "unsignedInt"
+						"description": "The total number of inbound packets which were chosen to be discarded even though no errors had been detected to prevent their being delivered. One possible reason for discarding such a packet could be to free up buffer space.",
+						"datatype": "StatsCounter32"
 					},
 					"MulticastPacketsSent": {
 						"type": "unsignedLong",
@@ -40981,8 +41680,19 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "The total number of Ethernet frames that higher-level protocols requested for transmission and which were addressed to a multicast address at this layer, including those that were discarded or not sent.",
-						"datatype": "unsignedLong"
+						"description": "The total number of packets that higher-level protocols requested for transmission and which were addressed to a multicast address at this layer, including those that were discarded or not sent.",
+						"datatype": "StatsCounter64"
+					},
+					"UnicastPacketsReceived": {
+						"type": "unsignedLong",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "The total number of received packets, delivered by this layer to a higher layer, which were not addressed to a multicast or broadcast address at this layer.",
+						"datatype": "StatsCounter64"
 					},
 					"MulticastPacketsReceived": {
 						"type": "unsignedLong",
@@ -40992,8 +41702,8 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "The total number of received Ethernet frames, delivered by this layer to a higher layer, which were addressed to a multicast address at this layer.",
-						"datatype": "unsignedLong"
+						"description": "The total number of received packets, delivered by this layer to a higher layer, which were addressed to a multicast address at this layer.",
+						"datatype": "StatsCounter64"
 					},
 					"BroadcastPacketsSent": {
 						"type": "unsignedLong",
@@ -41003,8 +41713,8 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "The total number of Ethernet frames that higher-level protocols requested for transmission and which were addressed to a broadcast address at this layer, including those that were discarded or not sent.",
-						"datatype": "unsignedLong"
+						"description": "The total number of packets that higher-level protocols requested for transmission and which were addressed to a broadcast address at this layer, including those that were discarded or not sent.",
+						"datatype": "StatsCounter64"
 					},
 					"BroadcastPacketsReceived": {
 						"type": "unsignedLong",
@@ -41014,8 +41724,8 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "The total number of received Ethernet frames, delivered by this layer to a higher layer, which were addressed to a broadcast address at this layer.",
-						"datatype": "unsignedLong"
+						"description": "The total number of received packets, delivered by this layer to a higher layer, which were addressed to a broadcast address at this layer.",
+						"datatype": "StatsCounter64"
 					},
 					"UnknownProtoPacketsReceived": {
 						"type": "unsignedInt",
@@ -41025,8 +41735,26 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "The total number of Ethernet frames received via the interface which were discarded because of an unknown or unsupported protocol.",
-						"datatype": "unsignedInt"
+						"description": "The total number of packets received via the interface which were discarded because of an unknown or unsupported protocol.",
+						"datatype": "StatsCounter32"
+					},
+					"Collisions": {
+						"type": "unsignedLong",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "The total number of collisions on the interface.",
+						"datatype": "StatsCounter64"
+					},
+					"Reset()": {
+						"type": "command",
+						"async": true,
+						"protocols": [
+							"usp"
+						]
 					}
 				}
 			},
@@ -41052,7 +41780,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "Enables or disables the link. This parameter is based on ifAdminStatus from <<bibref|RFC2863>>.",
+					"description": "Enables or disables the interface. This parameter is based on ifAdminStatus from <<bibref|RFC2863>>.",
 					"default": "false",
 					"datatype": "boolean"
 				},
@@ -41064,7 +41792,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "The current operational state of the link (see <<bibref|TR-181i2|Section 4.2.2>>). Enumeration of: Up, Down, Unknown, Dormant, NotPresent, LowerLayerDown, Error. When <<param|Enable>> is <<false>> then <<param>> SHOULD normally be <<enum|Down>> (or <<enum|NotPresent>> or <<enum|Error>> if there is a fault condition on the interface). When <<param|Enable>> is changed to <<true>> then <<param>> SHOULD change to <<enum|Up>> if and only if the interface is able to transmit and receive network traffic; it SHOULD change to <<enum|Dormant>> if and only if the interface is operable but is waiting for external actions before it can transmit and receive network traffic (and subsequently change to <<enum|Up>> if still operable when the expected actions have completed); it SHOULD change to <<enum|LowerLayerDown>> if and only if the interface is prevented from entering the <<enum|Up>> state because one or more of the interfaces beneath it is down; it SHOULD remain in the <<enum|Error>> state if there is an error or other fault condition detected on the interface; it SHOULD remain in the <<enum|NotPresent>> state if the interface has missing (typically hardware) components; it SHOULD change to <<enum|Unknown>> if the state of the interface can not be determined for some reason. This parameter is based on ifOperStatus from <<bibref|RFC2863>>.",
+					"description": "The current operational state of the interface (see <<bibref|TR-181i2|Section 4.2.2>>). Enumeration of: Up, Down, Unknown, Dormant, NotPresent, LowerLayerDown, Error. When <<param|Enable>> is <<false>> then <<param>> SHOULD normally be <<enum|Down>> (or <<enum|NotPresent>> or <<enum|Error>> if there is a fault condition on the interface). When <<param|Enable>> is changed to <<true>> then <<param>> SHOULD change to <<enum|Up>> if and only if the interface is able to transmit and receive network traffic; it SHOULD change to <<enum|Dormant>> if and only if the interface is operable but is waiting for external actions before it can transmit and receive network traffic (and subsequently change to <<enum|Up>> if still operable when the expected actions have completed); it SHOULD change to <<enum|LowerLayerDown>> if and only if the interface is prevented from entering the <<enum|Up>> state because one or more of the interfaces beneath it is down; it SHOULD remain in the <<enum|Error>> state if there is an error or other fault condition detected on the interface; it SHOULD remain in the <<enum|NotPresent>> state if the interface has missing (typically hardware) components; it SHOULD change to <<enum|Unknown>> if the state of the interface can not be determined for some reason. This parameter is based on ifOperStatus from <<bibref|RFC2863>>.",
 					"default": "Down",
 					"datatype": "string",
 					"enumerations": [
@@ -41086,12 +41814,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Name": {
 					"type": "string",
@@ -41101,7 +41824,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "The textual name of the link as assigned by the CPE.",
+					"description": "The textual name of the interface as assigned by the CPE.",
 					"datatype": "string",
 					"range": [
 						{
@@ -41117,7 +41840,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "The accumulated time in <<units>> since the link entered its current operational state.",
+					"description": "The accumulated time in <<units>> since the interface entered its current operational state.",
 					"datatype": "unsignedInt",
 					"unit": "seconds"
 				},
@@ -41130,11 +41853,24 @@
 						"usp"
 					],
 					"description": "<<list>> <<reference|an interface object that is stacked immediately below this interface object>> See <<bibref|TR-181i2|Section 4.2.1>>.",
+					"default": "[]",
 					"list": {
 						"datatype": "string",
 						"maxsize": 1024
 					}
 				},
+				"MTU": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Maximum Transmission Unit for this interface (expressed in <<units>>).",
+					"datatype": "unsignedInt",
+					"unit": "bytes"
+				},
 				"MACAddress": {
 					"type": "string",
 					"read": true,
@@ -41179,15 +41915,37 @@
 					"default": "false",
 					"datatype": "boolean"
 				},
+				"NoARP": {
+					"type": "boolean",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Disables or enables sending of ARP messages on the Ethernet link. If <<true>>, the kernel will not send ARP requests and wont send ARP replies.",
+					"default": "false",
+					"datatype": "boolean"
+				},
 				"Device.Ethernet.Link.{i}.Stats.": {
 					"type": "object",
 					"protocols": [
 						"cwmp",
 						"usp"
 					],
-					"description": "Throughput statistics for this link. The CPE MUST reset the links Stats parameters (unless otherwise stated in individual object or parameter descriptions) either when the link becomes operationally down due to a previous administrative down (i.e. the links <<param|#.Status>> parameter transitions to a down state after the link is disabled) or when the link becomes administratively up (i.e. the links <<param|#.Enable>> parameter transitions from <<false>> to <<true>>). Administrative and operational link status is discussed in <<bibref|TR-181i2|section 4.2.2>>.",
+					"description": "Throughput statistics for this interface. The CPE MUST reset the interfaces Stats parameters (unless otherwise stated in individual object or parameter descriptions) either when the interface becomes operationally down due to a previous administrative down (i.e. the interfaces <<param|#.Status>> parameter transitions to a down state after the interface is disabled) or when the interface becomes administratively up (i.e. the interfaces <<param|#.Enable>> parameter transitions from <<false>> to <<true>>). Administrative and operational interface status is discussed in <<bibref|TR-181i2|section 4.2.2>>.",
 					"access": false,
 					"array": false,
+					"Reset": {
+						"type": "boolean",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp"
+						],
+						"description": "Set this to <<true>> to reset all this objects statistics counters to zero.",
+						"datatype": "boolean"
+					},
 					"BytesSent": {
 						"type": "unsignedLong",
 						"read": true,
@@ -41196,8 +41954,8 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "The total number of bytes transmitted out of the link, including framing characters.",
-						"datatype": "unsignedLong"
+						"description": "The total number of bytes transmitted out of the interface, including framing characters.",
+						"datatype": "StatsCounter64"
 					},
 					"BytesReceived": {
 						"type": "unsignedLong",
@@ -41207,8 +41965,8 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "The total number of bytes received on the link, including framing characters.",
-						"datatype": "unsignedLong"
+						"description": "The total number of bytes received on the interface, including framing characters.",
+						"datatype": "StatsCounter64"
 					},
 					"PacketsSent": {
 						"type": "unsignedLong",
@@ -41218,8 +41976,8 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "The total number of Ethernet frames transmitted out of the link.",
-						"datatype": "unsignedLong"
+						"description": "The total number of packets transmitted out of the interface.",
+						"datatype": "StatsCounter64"
 					},
 					"PacketsReceived": {
 						"type": "unsignedLong",
@@ -41229,8 +41987,8 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "The total number of Ethernet frames received on the link.",
-						"datatype": "unsignedLong"
+						"description": "The total number of packets received on the interface.",
+						"datatype": "StatsCounter64"
 					},
 					"ErrorsSent": {
 						"type": "unsignedInt",
@@ -41240,8 +41998,8 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "The total number of outbound Ethernet frames that could not be transmitted because of errors.",
-						"datatype": "unsignedInt"
+						"description": "The total number of outbound packets that could not be transmitted because of errors.",
+						"datatype": "StatsCounter32"
 					},
 					"ErrorsReceived": {
 						"type": "unsignedInt",
@@ -41251,8 +42009,8 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "The total number of inbound Ethernet frames that contained errors preventing them from being delivered to a higher-layer protocol.",
-						"datatype": "unsignedInt"
+						"description": "The total number of inbound packets that contained errors preventing them from being delivered to a higher-layer protocol.",
+						"datatype": "StatsCounter32"
 					},
 					"UnicastPacketsSent": {
 						"type": "unsignedLong",
@@ -41262,19 +42020,8 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "The total number of Ethernet frames requested for transmission which were not addressed to a multicast or broadcast address at this layer, including those that were discarded or not sent.",
-						"datatype": "unsignedLong"
-					},
-					"UnicastPacketsReceived": {
-						"type": "unsignedLong",
-						"read": true,
-						"write": false,
-						"protocols": [
-							"cwmp",
-							"usp"
-						],
-						"description": "The total number of received Ethernet frames, delivered by this layer to a higher layer, which were not addressed to a multicast or broadcast address at this layer.",
-						"datatype": "unsignedLong"
+						"description": "The total number of packets requested for transmission which were not addressed to a multicast or broadcast address at this layer, including those that were discarded or not sent.",
+						"datatype": "StatsCounter64"
 					},
 					"DiscardPacketsSent": {
 						"type": "unsignedInt",
@@ -41284,8 +42031,8 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "The total number of outbound Ethernet frames which were chosen to be discarded even though no errors had been detected to prevent their being transmitted. One possible reason for discarding such a packet could be to free up buffer space.",
-						"datatype": "unsignedInt"
+						"description": "The total number of outbound packets which were chosen to be discarded even though no errors had been detected to prevent their being transmitted. One possible reason for discarding such a packet could be to free up buffer space.",
+						"datatype": "StatsCounter32"
 					},
 					"DiscardPacketsReceived": {
 						"type": "unsignedInt",
@@ -41295,8 +42042,8 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "The total number of inbound Ethernet frames which were chosen to be discarded even though no errors had been detected to prevent their being delivered. One possible reason for discarding such a packet could be to free up buffer space.",
-						"datatype": "unsignedInt"
+						"description": "The total number of inbound packets which were chosen to be discarded even though no errors had been detected to prevent their being delivered. One possible reason for discarding such a packet could be to free up buffer space.",
+						"datatype": "StatsCounter32"
 					},
 					"MulticastPacketsSent": {
 						"type": "unsignedLong",
@@ -41306,8 +42053,19 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "The total number of Ethernet frames that higher-level protocols requested for transmission and which were addressed to a multicast address at this layer, including those that were discarded or not sent.",
-						"datatype": "unsignedLong"
+						"description": "The total number of packets that higher-level protocols requested for transmission and which were addressed to a multicast address at this layer, including those that were discarded or not sent.",
+						"datatype": "StatsCounter64"
+					},
+					"UnicastPacketsReceived": {
+						"type": "unsignedLong",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "The total number of received packets, delivered by this layer to a higher layer, which were not addressed to a multicast or broadcast address at this layer.",
+						"datatype": "StatsCounter64"
 					},
 					"MulticastPacketsReceived": {
 						"type": "unsignedLong",
@@ -41317,8 +42075,8 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "The total number of received Ethernet frames, delivered by this layer to a higher layer, which were addressed to a multicast address at this layer.",
-						"datatype": "unsignedLong"
+						"description": "The total number of received packets, delivered by this layer to a higher layer, which were addressed to a multicast address at this layer.",
+						"datatype": "StatsCounter64"
 					},
 					"BroadcastPacketsSent": {
 						"type": "unsignedLong",
@@ -41328,8 +42086,8 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "The total number of Ethernet frames that higher-level protocols requested for transmission and which were addressed to a broadcast address at this layer, including those that were discarded or not sent.",
-						"datatype": "unsignedLong"
+						"description": "The total number of packets that higher-level protocols requested for transmission and which were addressed to a broadcast address at this layer, including those that were discarded or not sent.",
+						"datatype": "StatsCounter64"
 					},
 					"BroadcastPacketsReceived": {
 						"type": "unsignedLong",
@@ -41339,8 +42097,8 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "The total number of received Ethernet frames, delivered by this layer to a higher layer, which were addressed to a broadcast address at this layer.",
-						"datatype": "unsignedLong"
+						"description": "The total number of received packets, delivered by this layer to a higher layer, which were addressed to a broadcast address at this layer.",
+						"datatype": "StatsCounter64"
 					},
 					"UnknownProtoPacketsReceived": {
 						"type": "unsignedInt",
@@ -41350,8 +42108,37 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "The total number of Ethernet frames received via the link which were discarded because of an unknown or unsupported protocol.",
-						"datatype": "unsignedInt"
+						"description": "The total number of packets received via the interface which were discarded because of an unknown or unsupported protocol.",
+						"datatype": "StatsCounter32"
+					},
+					"PausePacketsSent": {
+						"type": "unsignedLong",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "The total number of Ethernet pause frames sent on the link.",
+						"datatype": "StatsCounter64"
+					},
+					"PausePacketsReceived": {
+						"type": "unsignedLong",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "The total number of Ethernet pause frames received on the link.",
+						"datatype": "StatsCounter64"
+					},
+					"Reset()": {
+						"type": "command",
+						"async": true,
+						"protocols": [
+							"usp"
+						]
 					}
 				}
 			},
@@ -41376,7 +42163,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "Enables or disables the VLANTermination entry. This parameter is based on ifAdminStatus from <<bibref|RFC2863>>.",
+					"description": "Enables or disables the interface. This parameter is based on ifAdminStatus from <<bibref|RFC2863>>.",
 					"default": "false",
 					"datatype": "boolean"
 				},
@@ -41388,7 +42175,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "The current operational state of the VLANTermination entry (see <<bibref|TR-181i2|Section 4.2.2>>). Enumeration of: Up, Down, Unknown, Dormant, NotPresent, LowerLayerDown, Error. When <<param|Enable>> is <<false>> then <<param>> SHOULD normally be <<enum|Down>> (or <<enum|NotPresent>> or <<enum|Error>> if there is a fault condition on the interface). When <<param|Enable>> is changed to <<true>> then <<param>> SHOULD change to <<enum|Up>> if and only if the interface is able to transmit and receive network traffic; it SHOULD change to <<enum|Dormant>> if and only if the interface is operable but is waiting for external actions before it can transmit and receive network traffic (and subsequently change to <<enum|Up>> if still operable when the expected actions have completed); it SHOULD change to <<enum|LowerLayerDown>> if and only if the interface is prevented from entering the <<enum|Up>> state because one or more of the interfaces beneath it is down; it SHOULD remain in the <<enum|Error>> state if there is an error or other fault condition detected on the interface; it SHOULD remain in the <<enum|NotPresent>> state if the interface has missing (typically hardware) components; it SHOULD change to <<enum|Unknown>> if the state of the interface can not be determined for some reason. This parameter is based on ifOperStatus from <<bibref|RFC2863>>.",
+					"description": "The current operational state of the interface (see <<bibref|TR-181i2|Section 4.2.2>>). Enumeration of: Up, Down, Unknown, Dormant, NotPresent, LowerLayerDown, Error. When <<param|Enable>> is <<false>> then <<param>> SHOULD normally be <<enum|Down>> (or <<enum|NotPresent>> or <<enum|Error>> if there is a fault condition on the interface). When <<param|Enable>> is changed to <<true>> then <<param>> SHOULD change to <<enum|Up>> if and only if the interface is able to transmit and receive network traffic; it SHOULD change to <<enum|Dormant>> if and only if the interface is operable but is waiting for external actions before it can transmit and receive network traffic (and subsequently change to <<enum|Up>> if still operable when the expected actions have completed); it SHOULD change to <<enum|LowerLayerDown>> if and only if the interface is prevented from entering the <<enum|Up>> state because one or more of the interfaces beneath it is down; it SHOULD remain in the <<enum|Error>> state if there is an error or other fault condition detected on the interface; it SHOULD remain in the <<enum|NotPresent>> state if the interface has missing (typically hardware) components; it SHOULD change to <<enum|Unknown>> if the state of the interface can not be determined for some reason. This parameter is based on ifOperStatus from <<bibref|RFC2863>>.",
 					"default": "Down",
 					"datatype": "string",
 					"enumerations": [
@@ -41410,12 +42197,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Name": {
 					"type": "string",
@@ -41425,7 +42207,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "The textual name of the VLANTermination entry as assigned by the CPE.",
+					"description": "The textual name of the interface as assigned by the CPE.",
 					"datatype": "string",
 					"range": [
 						{
@@ -41441,7 +42223,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "The accumulated time in <<units>> since the VLANTermination entered its current operational state.",
+					"description": "The accumulated time in <<units>> since the interface entered its current operational state.",
 					"datatype": "unsignedInt",
 					"unit": "seconds"
 				},
@@ -41454,6 +42236,7 @@
 						"usp"
 					],
 					"description": "<<list>> <<reference|an interface object that is stacked immediately below this interface object>> See <<bibref|TR-181i2|Section 4.2.1>>.",
+					"default": "[]",
 					"list": {
 						"datatype": "string",
 						"maxsize": 1024
@@ -41476,6 +42259,23 @@
 						}
 					]
 				},
+				"VLANPriority": {
+					"type": "int",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "The VLAN Priority for this <<object>> entry, also known as 802.1p Priority, is a 3-bit field used to indicate the priority of network traffic within a VLAN. A value of -1 indicates that the VLAN priority should not be changed for this <<object>>.",
+					"datatype": "int",
+					"range": [
+						{
+							"min": -1,
+							"max": 7
+						}
+					]
+				},
 				"TPID": {
 					"type": "unsignedInt",
 					"read": true,
@@ -41497,6 +42297,16 @@
 					"description": "Throughput statistics for this interface. The CPE MUST reset the interfaces Stats parameters (unless otherwise stated in individual object or parameter descriptions) either when the interface becomes operationally down due to a previous administrative down (i.e. the interfaces <<param|#.Status>> parameter transitions to a down state after the interface is disabled) or when the interface becomes administratively up (i.e. the interfaces <<param|#.Enable>> parameter transitions from <<false>> to <<true>>). Administrative and operational interface status is discussed in <<bibref|TR-181i2|section 4.2.2>>.",
 					"access": false,
 					"array": false,
+					"Reset": {
+						"type": "boolean",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp"
+						],
+						"description": "Set this to <<true>> to reset all this objects statistics counters to zero.",
+						"datatype": "boolean"
+					},
 					"BytesSent": {
 						"type": "unsignedLong",
 						"read": true,
@@ -41506,7 +42316,7 @@
 							"usp"
 						],
 						"description": "The total number of bytes transmitted out of the interface, including framing characters.",
-						"datatype": "unsignedLong"
+						"datatype": "StatsCounter64"
 					},
 					"BytesReceived": {
 						"type": "unsignedLong",
@@ -41517,7 +42327,7 @@
 							"usp"
 						],
 						"description": "The total number of bytes received on the interface, including framing characters.",
-						"datatype": "unsignedLong"
+						"datatype": "StatsCounter64"
 					},
 					"PacketsSent": {
 						"type": "unsignedLong",
@@ -41528,7 +42338,7 @@
 							"usp"
 						],
 						"description": "The total number of packets transmitted out of the interface.",
-						"datatype": "unsignedLong"
+						"datatype": "StatsCounter64"
 					},
 					"PacketsReceived": {
 						"type": "unsignedLong",
@@ -41539,7 +42349,7 @@
 							"usp"
 						],
 						"description": "The total number of packets received on the interface.",
-						"datatype": "unsignedLong"
+						"datatype": "StatsCounter64"
 					},
 					"ErrorsSent": {
 						"type": "unsignedInt",
@@ -41550,7 +42360,7 @@
 							"usp"
 						],
 						"description": "The total number of outbound packets that could not be transmitted because of errors.",
-						"datatype": "unsignedInt"
+						"datatype": "StatsCounter32"
 					},
 					"ErrorsReceived": {
 						"type": "unsignedInt",
@@ -41561,7 +42371,7 @@
 							"usp"
 						],
 						"description": "The total number of inbound packets that contained errors preventing them from being delivered to a higher-layer protocol.",
-						"datatype": "unsignedInt"
+						"datatype": "StatsCounter32"
 					},
 					"UnicastPacketsSent": {
 						"type": "unsignedLong",
@@ -41572,18 +42382,7 @@
 							"usp"
 						],
 						"description": "The total number of packets requested for transmission which were not addressed to a multicast or broadcast address at this layer, including those that were discarded or not sent.",
-						"datatype": "unsignedLong"
-					},
-					"UnicastPacketsReceived": {
-						"type": "unsignedLong",
-						"read": true,
-						"write": false,
-						"protocols": [
-							"cwmp",
-							"usp"
-						],
-						"description": "The total number of received packets, delivered by this layer to a higher layer, which were not addressed to a multicast or broadcast address at this layer.",
-						"datatype": "unsignedLong"
+						"datatype": "StatsCounter64"
 					},
 					"DiscardPacketsSent": {
 						"type": "unsignedInt",
@@ -41594,7 +42393,7 @@
 							"usp"
 						],
 						"description": "The total number of outbound packets which were chosen to be discarded even though no errors had been detected to prevent their being transmitted. One possible reason for discarding such a packet could be to free up buffer space.",
-						"datatype": "unsignedInt"
+						"datatype": "StatsCounter32"
 					},
 					"DiscardPacketsReceived": {
 						"type": "unsignedInt",
@@ -41605,7 +42404,7 @@
 							"usp"
 						],
 						"description": "The total number of inbound packets which were chosen to be discarded even though no errors had been detected to prevent their being delivered. One possible reason for discarding such a packet could be to free up buffer space.",
-						"datatype": "unsignedInt"
+						"datatype": "StatsCounter32"
 					},
 					"MulticastPacketsSent": {
 						"type": "unsignedLong",
@@ -41616,7 +42415,18 @@
 							"usp"
 						],
 						"description": "The total number of packets that higher-level protocols requested for transmission and which were addressed to a multicast address at this layer, including those that were discarded or not sent.",
-						"datatype": "unsignedLong"
+						"datatype": "StatsCounter64"
+					},
+					"UnicastPacketsReceived": {
+						"type": "unsignedLong",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "The total number of received packets, delivered by this layer to a higher layer, which were not addressed to a multicast or broadcast address at this layer.",
+						"datatype": "StatsCounter64"
 					},
 					"MulticastPacketsReceived": {
 						"type": "unsignedLong",
@@ -41627,7 +42437,7 @@
 							"usp"
 						],
 						"description": "The total number of received packets, delivered by this layer to a higher layer, which were addressed to a multicast address at this layer.",
-						"datatype": "unsignedLong"
+						"datatype": "StatsCounter64"
 					},
 					"BroadcastPacketsSent": {
 						"type": "unsignedLong",
@@ -41638,7 +42448,7 @@
 							"usp"
 						],
 						"description": "The total number of packets that higher-level protocols requested for transmission and which were addressed to a broadcast address at this layer, including those that were discarded or not sent.",
-						"datatype": "unsignedLong"
+						"datatype": "StatsCounter64"
 					},
 					"BroadcastPacketsReceived": {
 						"type": "unsignedLong",
@@ -41649,7 +42459,7 @@
 							"usp"
 						],
 						"description": "The total number of received packets, delivered by this layer to a higher layer, which were addressed to a broadcast address at this layer.",
-						"datatype": "unsignedLong"
+						"datatype": "StatsCounter64"
 					},
 					"UnknownProtoPacketsReceived": {
 						"type": "unsignedInt",
@@ -41660,7 +42470,328 @@
 							"usp"
 						],
 						"description": "The total number of packets received via the interface which were discarded because of an unknown or unsupported protocol.",
-						"datatype": "unsignedInt"
+						"datatype": "StatsCounter32"
+					},
+					"Reset()": {
+						"type": "command",
+						"async": true,
+						"protocols": [
+							"usp"
+						]
+					}
+				}
+			},
+			"Device.Ethernet.LAG.{i}.": {
+				"type": "object",
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"description": "Ethernet Link Aggregation Group (LAG) table (a stackable interface object as described in <<bibref|TR-181i2|Section 4.2>>). Table entries model the Link Aggregation Sub-Layer as defined in <<bibref|802.3-2015>> and <<bibref|802.1AX-2014>>. It is expected that a <<object>> interface can only be stacked above <<object|#.Interface>> interfaces. The CPE can reject creation of additional LAG instances if this would exceed its capabilities.",
+				"uniqueKeys": [
+					"Alias",
+					"Name",
+					"MACAddress"
+				],
+				"access": true,
+				"array": true,
+				"Enable": {
+					"type": "boolean",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Enables or disables the interface. This parameter is based on ifAdminStatus from <<bibref|RFC2863>>.",
+					"default": "false",
+					"datatype": "boolean"
+				},
+				"Status": {
+					"type": "string",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "The current operational state of the interface (see <<bibref|TR-181i2|Section 4.2.2>>). Enumeration of: Up, Down, Unknown, Dormant, NotPresent, LowerLayerDown, Error. When <<param|Enable>> is <<false>> then <<param>> SHOULD normally be <<enum|Down>> (or <<enum|NotPresent>> or <<enum|Error>> if there is a fault condition on the interface). When <<param|Enable>> is changed to <<true>> then <<param>> SHOULD change to <<enum|Up>> if and only if the interface is able to transmit and receive network traffic; it SHOULD change to <<enum|Dormant>> if and only if the interface is operable but is waiting for external actions before it can transmit and receive network traffic (and subsequently change to <<enum|Up>> if still operable when the expected actions have completed); it SHOULD change to <<enum|LowerLayerDown>> if and only if the interface is prevented from entering the <<enum|Up>> state because one or more of the interfaces beneath it is down; it SHOULD remain in the <<enum|Error>> state if there is an error or other fault condition detected on the interface; it SHOULD remain in the <<enum|NotPresent>> state if the interface has missing (typically hardware) components; it SHOULD change to <<enum|Unknown>> if the state of the interface can not be determined for some reason. This parameter is based on ifOperStatus from <<bibref|RFC2863>>.",
+					"default": "Down",
+					"datatype": "string",
+					"enumerations": [
+						"Up",
+						"Down",
+						"Unknown",
+						"Dormant",
+						"NotPresent",
+						"LowerLayerDown",
+						"Error"
+					]
+				},
+				"Alias": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
+					"datatype": "_AliasCWMP"
+				},
+				"Name": {
+					"type": "string",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "The textual name of the interface as assigned by the CPE.",
+					"datatype": "string",
+					"range": [
+						{
+							"max": 64
+						}
+					]
+				},
+				"LastChange": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "The accumulated time in <<units>> since the interface entered its current operational state.",
+					"datatype": "unsignedInt",
+					"unit": "seconds"
+				},
+				"LowerLayers": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "<<list>> <<reference|an interface object that is stacked immediately below this interface object>> See <<bibref|TR-181i2|Section 4.2.1>>. <<param>> must reference to Device.Ethernet.Interface instances where Link Aggregation Group is configured by the CPE. For example, Device.Ethernet.Interface.1, Device.Ethernet.Interface.2",
+					"default": "[]",
+					"list": {
+						"datatype": "string",
+						"maxsize": 1024
+					}
+				},
+				"MACAddress": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "MAC address of the Link Aggregation Interface.",
+					"datatype": "MACAddress",
+					"range": [
+						{
+							"max": 17
+						}
+					],
+					"pattern": [
+						"",
+						"([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])"
+					]
+				},
+				"Device.Ethernet.LAG.{i}.Stats.": {
+					"type": "object",
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Throughput statistics for this interface. The CPE MUST reset the interfaces Stats parameters (unless otherwise stated in individual object or parameter descriptions) either when the interface becomes operationally down due to a previous administrative down (i.e. the interfaces <<param|#.Status>> parameter transitions to a down state after the interface is disabled) or when the interface becomes administratively up (i.e. the interfaces <<param|#.Enable>> parameter transitions from <<false>> to <<true>>). Administrative and operational interface status is discussed in <<bibref|TR-181i2|section 4.2.2>>.",
+					"access": false,
+					"array": false,
+					"Reset": {
+						"type": "boolean",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp"
+						],
+						"description": "Set this to <<true>> to reset all this objects statistics counters to zero.",
+						"datatype": "boolean"
+					},
+					"BytesSent": {
+						"type": "unsignedLong",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "The total number of bytes transmitted out of the interface, including framing characters.",
+						"datatype": "StatsCounter64"
+					},
+					"BytesReceived": {
+						"type": "unsignedLong",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "The total number of bytes received on the interface, including framing characters.",
+						"datatype": "StatsCounter64"
+					},
+					"PacketsSent": {
+						"type": "unsignedLong",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "The total number of packets transmitted out of the interface.",
+						"datatype": "StatsCounter64"
+					},
+					"PacketsReceived": {
+						"type": "unsignedLong",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "The total number of packets received on the interface.",
+						"datatype": "StatsCounter64"
+					},
+					"ErrorsSent": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "The total number of outbound packets that could not be transmitted because of errors.",
+						"datatype": "StatsCounter32"
+					},
+					"ErrorsReceived": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "The total number of inbound packets that contained errors preventing them from being delivered to a higher-layer protocol.",
+						"datatype": "StatsCounter32"
+					},
+					"UnicastPacketsSent": {
+						"type": "unsignedLong",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "The total number of packets requested for transmission which were not addressed to a multicast or broadcast address at this layer, including those that were discarded or not sent.",
+						"datatype": "StatsCounter64"
+					},
+					"DiscardPacketsSent": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "The total number of outbound packets which were chosen to be discarded even though no errors had been detected to prevent their being transmitted. One possible reason for discarding such a packet could be to free up buffer space.",
+						"datatype": "StatsCounter32"
+					},
+					"DiscardPacketsReceived": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "The total number of inbound packets which were chosen to be discarded even though no errors had been detected to prevent their being delivered. One possible reason for discarding such a packet could be to free up buffer space.",
+						"datatype": "StatsCounter32"
+					},
+					"MulticastPacketsSent": {
+						"type": "unsignedLong",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "The total number of packets that higher-level protocols requested for transmission and which were addressed to a multicast address at this layer, including those that were discarded or not sent.",
+						"datatype": "StatsCounter64"
+					},
+					"UnicastPacketsReceived": {
+						"type": "unsignedLong",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "The total number of received packets, delivered by this layer to a higher layer, which were not addressed to a multicast or broadcast address at this layer.",
+						"datatype": "StatsCounter64"
+					},
+					"MulticastPacketsReceived": {
+						"type": "unsignedLong",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "The total number of received packets, delivered by this layer to a higher layer, which were addressed to a multicast address at this layer.",
+						"datatype": "StatsCounter64"
+					},
+					"BroadcastPacketsSent": {
+						"type": "unsignedLong",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "The total number of packets that higher-level protocols requested for transmission and which were addressed to a broadcast address at this layer, including those that were discarded or not sent.",
+						"datatype": "StatsCounter64"
+					},
+					"BroadcastPacketsReceived": {
+						"type": "unsignedLong",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "The total number of received packets, delivered by this layer to a higher layer, which were addressed to a broadcast address at this layer.",
+						"datatype": "StatsCounter64"
+					},
+					"UnknownProtoPacketsReceived": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "The total number of packets received via the interface which were discarded because of an unknown or unsupported protocol.",
+						"datatype": "StatsCounter32"
+					},
+					"Reset()": {
+						"type": "command",
+						"async": true,
+						"protocols": [
+							"usp"
+						]
 					}
 				}
 			},
@@ -41718,12 +42849,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Name": {
 					"type": "string",
@@ -41981,7 +43107,7 @@
 					"cwmp",
 					"usp"
 				],
-				"description": "This object provides access to the WoL (Wake on LAN) funtionality.",
+				"description": "This object provides access to the WoL (Wake on LAN) functionality.",
 				"access": false,
 				"array": false,
 				"SendMagicPacket": {
@@ -42061,305 +43187,6 @@
 						}
 					}
 				}
-			},
-			"Device.Ethernet.LAG.{i}.": {
-				"type": "object",
-				"protocols": [
-					"cwmp",
-					"usp"
-				],
-				"description": "Ethernet Link Aggregation Group (LAG) table (a stackable interface object as described in <<bibref|TR-181i2|Section 4.2>>). Table entries model the Link Aggregation Sub-Layer as defined in <<bibref|802.3-2015>> and <<bibref|802.1AX-2014>>. It is expected that a <<object>> interface can only be stacked above <<object|#.Interface>> interfaces. The CPE can reject creation of additional LAG instances if this would exceed its capabilities.",
-				"uniqueKeys": [
-					"Alias",
-					"Name",
-					"MACAddress"
-				],
-				"access": true,
-				"array": true,
-				"Enable": {
-					"type": "boolean",
-					"read": true,
-					"write": true,
-					"protocols": [
-						"cwmp",
-						"usp"
-					],
-					"description": "Enables or disables the interface. This parameter is based on ifAdminStatus from <<bibref|RFC2863>>.",
-					"datatype": "boolean"
-				},
-				"Status": {
-					"type": "string",
-					"read": true,
-					"write": false,
-					"protocols": [
-						"cwmp",
-						"usp"
-					],
-					"description": "The current operational state of the interface (see <<bibref|TR-181i2|Section 4.2.2>>). Enumeration of: Up, Down, Unknown, Dormant, NotPresent, LowerLayerDown, Error. When <<param|Enable>> is <<false>> then <<param>> SHOULD normally be <<enum|Down>> (or <<enum|NotPresent>> or <<enum|Error>> if there is a fault condition on the interface). When <<param|Enable>> is changed to <<true>> then <<param>> SHOULD change to <<enum|Up>> if and only if the interface is able to transmit and receive network traffic; it SHOULD change to <<enum|Dormant>> if and only if the interface is operable but is waiting for external actions before it can transmit and receive network traffic (and subsequently change to <<enum|Up>> if still operable when the expected actions have completed); it SHOULD change to <<enum|LowerLayerDown>> if and only if the interface is prevented from entering the <<enum|Up>> state because one or more of the interfaces beneath it is down; it SHOULD remain in the <<enum|Error>> state if there is an error or other fault condition detected on the interface; it SHOULD remain in the <<enum|NotPresent>> state if the interface has missing (typically hardware) components; it SHOULD change to <<enum|Unknown>> if the state of the interface can not be determined for some reason. This parameter is based on ifOperStatus from <<bibref|RFC2863>>.",
-					"datatype": "string",
-					"enumerations": [
-						"Up",
-						"Down",
-						"Unknown",
-						"Dormant",
-						"NotPresent",
-						"LowerLayerDown",
-						"Error"
-					]
-				},
-				"Alias": {
-					"type": "string",
-					"read": true,
-					"write": true,
-					"protocols": [
-						"cwmp",
-						"usp"
-					],
-					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
-				},
-				"Name": {
-					"type": "string",
-					"read": true,
-					"write": false,
-					"protocols": [
-						"cwmp",
-						"usp"
-					],
-					"description": "The textual name of the LAG interface as assigned by the CPE.",
-					"datatype": "string",
-					"range": [
-						{
-							"max": 64
-						}
-					]
-				},
-				"LastChange": {
-					"type": "unsignedInt",
-					"read": true,
-					"write": false,
-					"protocols": [
-						"cwmp",
-						"usp"
-					],
-					"description": "The accumulated time in <<units>> since the interface entered its current operational state.",
-					"datatype": "unsignedInt",
-					"unit": "seconds"
-				},
-				"LowerLayers": {
-					"type": "string",
-					"read": true,
-					"write": true,
-					"protocols": [
-						"cwmp",
-						"usp"
-					],
-					"description": "<<list>> <<reference|an interface object that is stacked immediately below this interface object>>. See <<bibref|TR-181i2|Section 4.2.1>>. <<param>> must reference to Device.Ethernet.Interface instances where Link Aggregation Group is configured by the CPE. For example, Device.Ethernet.Interface.1, Device.Ethernet.Interface.2",
-					"list": {
-						"datatype": "string",
-						"maxsize": 1024
-					}
-				},
-				"MACAddress": {
-					"type": "string",
-					"read": true,
-					"write": true,
-					"protocols": [
-						"cwmp",
-						"usp"
-					],
-					"description": "MAC address of the Link Aggregation Interface.",
-					"datatype": "MACAddress",
-					"range": [
-						{
-							"max": 17
-						}
-					],
-					"pattern": [
-						"",
-						"([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])"
-					]
-				},
-				"Device.Ethernet.LAG.{i}.Stats.": {
-					"type": "object",
-					"protocols": [
-						"cwmp",
-						"usp"
-					],
-					"description": "Throughput statistics for this interface. The CPE MUST reset the interfaces Stats parameters (unless otherwise stated in individual object or parameter descriptions) either when the interface becomes operationally down due to a previous administrative down (i.e. the interfaces <<param|#.Status>> parameter transitions to a down state after the interface is disabled) or when the interface becomes administratively up (i.e. the interfaces <<param|#.Enable>> parameter transitions from <<false>> to <<true>>). Administrative and operational interface status is discussed in <<bibref|TR-181i2|section 4.2.2>>.",
-					"access": false,
-					"array": false,
-					"BytesSent": {
-						"type": "unsignedLong",
-						"read": true,
-						"write": false,
-						"protocols": [
-							"cwmp",
-							"usp"
-						],
-						"description": "The total number of bytes transmitted out of the interface, including framing characters.",
-						"datatype": "StatsCounter64"
-					},
-					"BytesReceived": {
-						"type": "unsignedLong",
-						"read": true,
-						"write": false,
-						"protocols": [
-							"cwmp",
-							"usp"
-						],
-						"description": "The total number of bytes received on the interface, including framing characters.",
-						"datatype": "StatsCounter64"
-					},
-					"PacketsSent": {
-						"type": "unsignedLong",
-						"read": true,
-						"write": false,
-						"protocols": [
-							"cwmp",
-							"usp"
-						],
-						"description": "The total number of packets transmitted out of the interface.",
-						"datatype": "StatsCounter64"
-					},
-					"PacketsReceived": {
-						"type": "unsignedLong",
-						"read": true,
-						"write": false,
-						"protocols": [
-							"cwmp",
-							"usp"
-						],
-						"description": "The total number of packets received on the interface.",
-						"datatype": "StatsCounter64"
-					},
-					"ErrorsSent": {
-						"type": "unsignedInt",
-						"read": true,
-						"write": false,
-						"protocols": [
-							"cwmp",
-							"usp"
-						],
-						"description": "The total number of outbound packets that could not be transmitted because of errors.",
-						"datatype": "StatsCounter32"
-					},
-					"ErrorsReceived": {
-						"type": "unsignedInt",
-						"read": true,
-						"write": false,
-						"protocols": [
-							"cwmp",
-							"usp"
-						],
-						"description": "The total number of inbound packets that contained errors preventing them from being delivered to a higher-layer protocol.",
-						"datatype": "StatsCounter32"
-					},
-					"UnicastPacketsSent": {
-						"type": "unsignedLong",
-						"read": true,
-						"write": false,
-						"protocols": [
-							"cwmp",
-							"usp"
-						],
-						"description": "The total number of packets requested for transmission which were not addressed to a multicast or broadcast address at this layer, including those that were discarded or not sent.",
-						"datatype": "StatsCounter64"
-					},
-					"UnicastPacketsReceived": {
-						"type": "unsignedLong",
-						"read": true,
-						"write": false,
-						"protocols": [
-							"cwmp",
-							"usp"
-						],
-						"description": "The total number of received packets, delivered by this layer to a higher layer, which were not addressed to a multicast or broadcast address at this layer.",
-						"datatype": "StatsCounter64"
-					},
-					"DiscardPacketsSent": {
-						"type": "unsignedInt",
-						"read": true,
-						"write": false,
-						"protocols": [
-							"cwmp",
-							"usp"
-						],
-						"description": "The total number of outbound packets which were chosen to be discarded even though no errors had been detected to prevent their being transmitted. One possible reason for discarding such a packet could be to free up buffer space.",
-						"datatype": "StatsCounter32"
-					},
-					"DiscardPacketsReceived": {
-						"type": "unsignedInt",
-						"read": true,
-						"write": false,
-						"protocols": [
-							"cwmp",
-							"usp"
-						],
-						"description": "The total number of inbound packets which were chosen to be discarded even though no errors had been detected to prevent their being delivered. One possible reason for discarding such a packet could be to free up buffer space.",
-						"datatype": "StatsCounter32"
-					},
-					"MulticastPacketsSent": {
-						"type": "unsignedLong",
-						"read": true,
-						"write": false,
-						"protocols": [
-							"cwmp",
-							"usp"
-						],
-						"description": "The total number of packets that higher-level protocols requested for transmission and which were addressed to a multicast address at this layer, including those that were discarded or not sent.",
-						"datatype": "StatsCounter64"
-					},
-					"MulticastPacketsReceived": {
-						"type": "unsignedLong",
-						"read": true,
-						"write": false,
-						"protocols": [
-							"cwmp",
-							"usp"
-						],
-						"description": "The total number of received packets, delivered by this layer to a higher layer, which were addressed to a multicast address at this layer.",
-						"datatype": "StatsCounter64"
-					},
-					"BroadcastPacketsSent": {
-						"type": "unsignedLong",
-						"read": true,
-						"write": false,
-						"protocols": [
-							"cwmp",
-							"usp"
-						],
-						"description": "The total number of packets that higher-level protocols requested for transmission and which were addressed to a broadcast address at this layer, including those that were discarded or not sent.",
-						"datatype": "StatsCounter64"
-					},
-					"BroadcastPacketsReceived": {
-						"type": "unsignedLong",
-						"read": true,
-						"write": false,
-						"protocols": [
-							"cwmp",
-							"usp"
-						],
-						"description": "The total number of received packets, delivered by this layer to a higher layer, which were addressed to a broadcast address at this layer.",
-						"datatype": "StatsCounter64"
-					},
-					"UnknownProtoPacketsReceived": {
-						"type": "unsignedInt",
-						"read": true,
-						"write": false,
-						"protocols": [
-							"cwmp",
-							"usp"
-						],
-						"description": "The total number of packets received via the interface which were discarded because of an unknown or unsupported protocol.",
-						"datatype": "StatsCounter32"
-					}
-				}
 			}
 		},
 		"Device.USB.": {
@@ -42446,12 +43273,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Name": {
 					"type": "string",
@@ -42752,12 +43574,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Name": {
 					"type": "string",
@@ -42901,12 +43718,7 @@
 							"usp"
 						],
 						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"datatype": "_AliasCWMP"
 					},
 					"Enable": {
 						"type": "boolean",
@@ -43478,12 +44290,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Name": {
 					"type": "string",
@@ -44052,12 +44859,7 @@
 								"usp"
 							],
 							"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-							"datatype": "Alias",
-							"range": [
-								{
-									"max": 64
-								}
-							]
+							"datatype": "_AliasCWMP"
 						},
 						"TrafficClasses": {
 							"type": "string",
@@ -44068,6 +44870,7 @@
 								"usp"
 							],
 							"description": "<<list>> This list identifies the set of traffic classes associated with this flow spec.",
+							"default": "[]",
 							"list": {
 								"datatype": "unsignedInt",
 								"maxsize": 256
@@ -45520,12 +46323,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Name": {
 					"type": "string",
@@ -46536,7 +47334,7 @@
 						"usp"
 					],
 					"description": "Controls whether MoCA 2 Enhanced Privacy, MoCA 2.0 privacy, and MoCA 1 privacy are supported when privacy is enabled. See <<bibref|MoCAv2.5|Section 11 and Table 17-1>>.",
-					"default": "moca1Privacy,moca20Privacy,moca2EnhancedPrivacy",
+					"default": "[moca1Privacy,moca20Privacy,moca2EnhancedPrivacy]",
 					"list": {
 						"datatype": "MocaPrivacy",
 						"enumerations": [
@@ -46948,7 +47746,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "The current MoCA network state of the MoCA Node. <<enum|beginNodeAdmissionState>>, <<enum|newNodeTypeOneProbeTxState>>, <<enum|newNodeTypeOneProbeRxState>>, <<enum|newGcdDistributionState>>, <<enum|beginPhyProfileState>>, <<enum|steadyState>> refer to the Node Admission (see <<bibref|MoCAv2.0|Section 8.3>>). <<enum|typeThreeProbeState>>, <<enum|lmoTypeOneProbeState>>, <<enum|lmoNodeGcdDistributionState>>, <<enum|beginLmoPhyProfileState>>, <<enum|lmoGcdTypeOneProbeLinkState>> refer to the Regular Link Maintenance Operation (see <<bibref|MoCAv2.0|Section 8.9.1>>). <<enum|alternateChannelQuietLineState>>, <<enum|alternateChannelEvmProbeState>>, <<enum|unsolicitedProbeReportState>>, <<enum|beginUnsolicitedPhyProfileState>>, <<enum|rxDeterminedProbeState>>, <<enum|steadyState>> refer to the On-Demand Link Maintenance Operation (see <<bibref|MoCAv2.0|Section 8.9.2>>). <<enum|calibrationState>> refer to the Network Operation after a Network Coordinator handoff or failover (see <<bibref|MoCAv2.0|Section 8.14>>).",
+					"description": "The current Link control state in the MoCA network for the MoCA Node. This network state is a MAC parameter determined by the NC (Network Coordinator) and broadcasted in the MAP to the rest of nodes. <<enum|beginNodeAdmissionState>>, <<enum|newNodeTypeOneProbeTxState>>, <<enum|newNodeTypeOneProbeRxState>>, <<enum|newGcdDistributionState>>, <<enum|beginPhyProfileState>>, <<enum|steadyState>> refer to the Node Admission (see <<bibref|MoCAv2.5|Section 8.3>>). The admission process of a new MoCA node depends on the operation mode of the MoCA Network that it is going to join (MoCA 1 mode, MoCA 2.0 mode or Mixed Mode). The Node Admission process is completed when the NC (Network Controller) changes the network state to Steady State (<<enum|steadyState>>) at the end of the Node Admission process. <<enum|typeThreeProbeState>>, <<enum|lmoTypeOneProbeState>>, <<enum|lmoNodeGcdDistributionState>>, <<enum|beginLmoPhyProfileState>>, <<enum|lmoGcdTypeOneProbeLinkState>>, <<enum|steadyState>> refer to the Regular Link Maintenance Operation (see <<bibref|MoCAv2.5|Section 8.9.1>>). <<enum|alternateChannelQuietLineState>>, <<enum|alternateChannelEvmProbeState>>, <<enum|unsolicitedProbeReportState>>, <<enum|beginUnsolicitedPhyProfileState>>, <<enum|rxDeterminedProbeState>>, <<enum|steadyState>> refer to the On-Demand Link Maintenance Operation (see <<bibref|MoCAv2.5|Section 8.9.2>>). <<enum|calibrationState>> refer to the Network Operation after a NC handoff or failover (see <<bibref|MoCAv2.5|Section 8.14>>).",
 					"datatype": "string",
 					"enumerations": [
 						"beginNodeAdmissionState",
@@ -49655,12 +50453,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Name": {
 					"type": "string",
@@ -51495,12 +52288,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Name": {
 					"type": "string",
@@ -52115,12 +52903,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Name": {
 					"type": "string",
@@ -52753,12 +53536,7 @@
 							"usp"
 						],
 						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"datatype": "_AliasCWMP"
 					},
 					"StartFreq": {
 						"type": "unsignedInt",
@@ -52819,12 +53597,7 @@
 							"usp"
 						],
 						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"datatype": "_AliasCWMP"
 					},
 					"MACAddress": {
 						"type": "string",
@@ -53204,7 +53977,7 @@
 					"cwmp",
 					"usp"
 				],
-				"description": "This object describes a Wi-Fi network containing 1 or more Access Point devices. This object is related to a Wi-Fi network that contains multiple Access Points (Multi-AP) and utilizes software logic to optimize that Wi-Fi network (typically via steering STAs, also known as Associated Devices, to the best Access Point). This object exposes the view of the Wi-Fi netwtork from the perspective of the Multi-AP Controller. The Wi-Fi Alliance EasyMesh solution is one example of managing a Multi-AP network. This object and all sub-objects have been moved to new objects. <<deprecated|2.15|because it has moved to <<object|##.WiFi.DataElements.Network>> MultiAP objects>> <<obsoleted|2.17>>",
+				"description": "This object describes a Wi-Fi network containing 1 or more Access Point devices. This object is related to a Wi-Fi network that contains multiple Access Points (Multi-AP) and utilizes software logic to optimize that Wi-Fi network (typically via steering STAs, also known as Associated Devices, to the best Access Point). This object exposes the view of the Wi-Fi netwtork from the perspective of the Multi-AP Controller. The Wi-Fi Alliance EasyMesh solution is one example of managing a Multi-AP network. This object and all sub-objects have been moved to new objects. <<deprecated|2.15|because it has moved to <<object|##.WiFi.DataElements.Network>> MultiAP objects>> <<obsoleted|2.17>> <<deleted|2.18>>",
 				"access": false,
 				"array": false,
 				"APDeviceNumberOfEntries": {
@@ -53216,7 +53989,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "<<numentries>> <<deprecated|2.15| because the <<object|APDevice.<i>>> is being deprecated>> <<obsoleted|2.17>>",
+					"description": "<<numentries>> <<deprecated|2.15| because the <<object|APDevice.<i>>> is being deprecated>> <<obsoleted|2.17>> <<deleted|2.18>>",
 					"datatype": "unsignedInt"
 				},
 				"Device.WiFi.MultiAP.SteeringSummaryStats.": {
@@ -53226,7 +53999,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "The summary of statistics related to Multi-AP Steering for the Wi-Fi network. The counters contained in <<object>> are all reset on reboot. <<deprecated|2.15|because it has moved to <<object|##.DataElements.Network.MultiAPSteeringSummaryStats>>>> <<obsoleted|2.17>>",
+					"description": "The summary of statistics related to Multi-AP Steering for the Wi-Fi network. The counters contained in <<object>> are all reset on reboot. <<deprecated|2.15|because it has moved to <<object|##.DataElements.Network.MultiAPSteeringSummaryStats>>>> <<obsoleted|2.17>> <<deleted|2.18>>",
 					"access": false,
 					"array": false,
 					"NoCandidateAPFailures": {
@@ -53333,7 +54106,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "Each instance of this object represents an individual Access Point device in the Wi-Fi network. <<deprecated|2.15|because <<param|ManufacturerOUI>> and <<param|LastContactTime>> have moved to <<object|##.DataElements.Network.Device.<i>.MultiAPDevice>>, Backhaul parameters have moved to <<object|##.DataElements.Network.Device.<i>.MultiAPDevice.Backhaul>> and <<param|MACAddress>> is duplicated in <<param|##.DataElements.Network.Device.<i>.ID>>. All the rest are deprecated as noted>> <<obsoleted|2.17>>",
+					"description": "Each instance of this object represents an individual Access Point device in the Wi-Fi network. <<deprecated|2.15|because <<param|ManufacturerOUI>> and <<param|LastContactTime>> have moved to <<object|##.DataElements.Network.Device.<i>.MultiAPDevice>>, Backhaul parameters have moved to <<object|##.DataElements.Network.Device.<i>.MultiAPDevice.Backhaul>> and <<param|MACAddress>> is duplicated in <<param|##.DataElements.Network.Device.<i>.ID>>. All the rest are deprecated as noted>> <<obsoleted|2.17>> <<deleted|2.18>>",
 					"uniqueKeys": [
 						"MACAddress"
 					],
@@ -53348,7 +54121,7 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "A unique identifier for this particular device within the Wi-Fi network. <<deprecated|2.15|because it has been replaced by <<param|##.DataElements.Network.Device.<i>.ID>>>> <<obsoleted|2.17>>",
+						"description": "A unique identifier for this particular device within the Wi-Fi network. <<deprecated|2.15|because it has been replaced by <<param|##.DataElements.Network.Device.<i>.ID>>>> <<obsoleted|2.17>> <<deleted|2.18>>",
 						"datatype": "MACAddress",
 						"range": [
 							{
@@ -53369,7 +54142,7 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "The manufacturer of the Access Point device (human readable string). <<deprecated|2.15|because this information will be part of Data Elements R2>> <<obsoleted|2.17>>",
+						"description": "The manufacturer of the Access Point device (human readable string). <<deprecated|2.15|because this information will be part of Data Elements R2>> <<obsoleted|2.17>> <<deleted|2.18>>",
 						"datatype": "string"
 					},
 					"ManufacturerOUI": {
@@ -53402,7 +54175,7 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "Identifier of the class of product for which the serial number applies. That is, for a given manufacturer, this parameter is used to identify the product or class of product over which the <<param|SerialNumber>> parameter is unique. This value MUST remain fixed over the lifetime of the device, including across firmware updates. <<deprecated|2.15|because this information will be part of Data Elements R2>> <<obsoleted|2.17>>",
+						"description": "Identifier of the class of product for which the serial number applies. That is, for a given manufacturer, this parameter is used to identify the product or class of product over which the <<param|SerialNumber>> parameter is unique. This value MUST remain fixed over the lifetime of the device, including across firmware updates. <<deprecated|2.15|because this information will be part of Data Elements R2>> <<obsoleted|2.17>> <<deleted|2.18>>",
 						"datatype": "string",
 						"range": [
 							{
@@ -53419,7 +54192,7 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "Identifier of the particular Access Point device that is unique for the indicated class of product and manufacturer. This value MUST remain fixed over the lifetime of the device, including across firmware updates. <<deprecated|2.15|because this information will be part of Data Elements R2>> <<obsoleted|2.17>>",
+						"description": "Identifier of the particular Access Point device that is unique for the indicated class of product and manufacturer. This value MUST remain fixed over the lifetime of the device, including across firmware updates. <<deprecated|2.15|because this information will be part of Data Elements R2>> <<obsoleted|2.17>> <<deleted|2.18>>",
 						"datatype": "string",
 						"range": [
 							{
@@ -53436,7 +54209,7 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "A string identifying the software version currently installed in the Access Point device (i.e. version of the overall firmware). To allow version comparisons, this element SHOULD be in the form of dot-delimited integers, where each successive integer represents a more minor category of variation. For example, 3.0.21 where the components mean: Major.Minor.Build. <<deprecated|2.15|because this information will be part of Data Elements R2>> <<obsoleted|2.17>>",
+						"description": "A string identifying the software version currently installed in the Access Point device (i.e. version of the overall firmware). To allow version comparisons, this element SHOULD be in the form of dot-delimited integers, where each successive integer represents a more minor category of variation. For example, 3.0.21 where the components mean: Major.Minor.Build. <<deprecated|2.15|because this information will be part of Data Elements R2>> <<obsoleted|2.17>> <<deleted|2.18>>",
 						"datatype": "string",
 						"range": [
 							{
@@ -53595,7 +54368,7 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "Enables or disables Dynamic Frequency Selection (DFS). <<deprecated|2.15|because this information will be part of Data Elements R2>> <<obsoleted|2.17>>",
+						"description": "Enables or disables Dynamic Frequency Selection (DFS). <<deprecated|2.15|because this information will be part of Data Elements R2>> <<obsoleted|2.17>> <<deleted|2.18>>",
 						"datatype": "boolean"
 					},
 					"RadioNumberOfEntries": {
@@ -53607,7 +54380,7 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "<<numentries>> <<deprecated|2.15| because the <<object|Radio.<i>>> is being deprecated>> <<obsoleted|2.17>>",
+						"description": "<<numentries>> <<deprecated|2.15| because the <<object|Radio.<i>>> is being deprecated>> <<obsoleted|2.17>> <<deleted|2.18>>",
 						"datatype": "unsignedInt"
 					},
 					"Device.WiFi.MultiAP.APDevice.{i}.Radio.{i}.": {
@@ -53617,7 +54390,7 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "This object represents all of the individual Radios contained within the identified Access Point device known to the controller. <<deprecated|2.15|because <<param|MACAddress>> is duplicated in <<param|###.DataElements.Network.Device.<i>.Radio.<i>.ID>> and <<param|OperatingFrequencyBand>> is replaced with <<param|###.DataElements.Network.Device.<i>.Radio.<i>.CurrentOperatingClassProfile.<i>.Class>>. <<param|Channel>> is duplicated in <<param|###.DataElements.Network.Device.<i>.Radio.<i>.CurrentOperatingClassProfile.<i>.Channel>>. <<param|TransmitPower>> is duplicated in <<param|###.DataElements.Network.Device.<i>.Radio.<i>.CurrentOperatingClassProfile.<i>.TxPower>>. The remaining parameters deprecated as noted>> <<obsoleted|2.17>>",
+						"description": "This object represents all of the individual Radios contained within the identified Access Point device known to the controller. <<deprecated|2.15|because <<param|MACAddress>> is duplicated in <<param|###.DataElements.Network.Device.<i>.Radio.<i>.ID>> and <<param|OperatingFrequencyBand>> is replaced with <<param|###.DataElements.Network.Device.<i>.Radio.<i>.CurrentOperatingClassProfile.<i>.Class>>. <<param|Channel>> is duplicated in <<param|###.DataElements.Network.Device.<i>.Radio.<i>.CurrentOperatingClassProfile.<i>.Channel>>. <<param|TransmitPower>> is duplicated in <<param|###.DataElements.Network.Device.<i>.Radio.<i>.CurrentOperatingClassProfile.<i>.TxPower>>. The remaining parameters deprecated as noted>> <<obsoleted|2.17>> <<deleted|2.18>>",
 						"uniqueKeys": [
 							"MACAddress"
 						],
@@ -53632,7 +54405,7 @@
 								"cwmp",
 								"usp"
 							],
-							"description": "A unique identifier for this particular Radio within the identified Access Point. <<deprecated|2.15|because it is duplicated in <<param|###.DataElements.Network.Device.<i>.Radio.<i>.ID>>>> <<obsoleted|2.17>>",
+							"description": "A unique identifier for this particular Radio within the identified Access Point. <<deprecated|2.15|because it is duplicated in <<param|###.DataElements.Network.Device.<i>.Radio.<i>.ID>>>> <<obsoleted|2.17>> <<deleted|2.18>>",
 							"datatype": "MACAddress",
 							"range": [
 								{
@@ -53653,7 +54426,7 @@
 								"cwmp",
 								"usp"
 							],
-							"description": "Indicates the frequency band at which the radio is operating. Enumeration of: 2.4GHz, 5GHz, 6GHz. <<deprecated|2.15|because it is replaced with <<param|###.DataElements.Network.Device.<i>.Radio.<i>.CurrentOperatingClassProfile.<i>.Class>>>> <<obsoleted|2.17>>",
+							"description": "Indicates the frequency band at which the radio is operating. Enumeration of: 2.4GHz, 5GHz, 6GHz. <<deprecated|2.15|because it is replaced with <<param|###.DataElements.Network.Device.<i>.Radio.<i>.CurrentOperatingClassProfile.<i>.Class>>>> <<obsoleted|2.17>> <<deleted|2.18>>",
 							"datatype": "string",
 							"enumerations": [
 								"2.4GHz",
@@ -53670,7 +54443,7 @@
 								"cwmp",
 								"usp"
 							],
-							"description": "<<list>> List items indicate which IEEE 802.11 standard this <<object>> instance is configured for. Enumeration of: a, b, g, n, ac, ax. If <<param|OperatingFrequencyBand>> is set to <<enum|2.4GHz|OperatingFrequencyBand>>, only values <<enum|b>>, <<enum|g>>, <<enum|n>>, <<enum|ax>> are applicable. If <<param|OperatingFrequencyBand>> is set to <<enum|5GHz|OperatingFrequencyBand>>, only values <<enum|a>>, <<enum|n>>, <<enum|ac>>, <<enum|ax>> are applicable. If <<param|OperatingFrequencyBand>> is set to <<enum|6GHz|OperatingFrequencyBand>>, only value <<enum|ax>> is allowed. For example, a value of g,b (or b,g - order is not important) means that the 802.11g standard <<bibref|802.11g-2003>> is used with a backwards-compatible mode for 802.11b <<bibref|802.11b-1999>>. A value of g means that only the 802.11g standard is in use. <<deprecated|2.15|because this information cannot be obtained by EasyMesh>> <<obsoleted|2.17>>",
+							"description": "<<list>> List items indicate which IEEE 802.11 standard this <<object>> instance is configured for. Enumeration of: a, b, g, n, ac, ax. If <<param|OperatingFrequencyBand>> is set to <<enum|2.4GHz|OperatingFrequencyBand>>, only values <<enum|b>>, <<enum|g>>, <<enum|n>>, <<enum|ax>> are applicable. If <<param|OperatingFrequencyBand>> is set to <<enum|5GHz|OperatingFrequencyBand>>, only values <<enum|a>>, <<enum|n>>, <<enum|ac>>, <<enum|ax>> are applicable. If <<param|OperatingFrequencyBand>> is set to <<enum|6GHz|OperatingFrequencyBand>>, only value <<enum|ax>> is allowed. For example, a value of g,b (or b,g - order is not important) means that the 802.11g standard <<bibref|802.11g-2003>> is used with a backwards-compatible mode for 802.11b <<bibref|802.11b-1999>>. A value of g means that only the 802.11g standard is in use. <<deprecated|2.15|because this information cannot be obtained by EasyMesh>> <<obsoleted|2.17>> <<deleted|2.18>>",
 							"list": {
 								"datatype": "string",
 								"enumerations": [
@@ -53692,7 +54465,7 @@
 								"cwmp",
 								"usp"
 							],
-							"description": "The current radio channel used by the connection. To request automatic channel selection, set <<param|###.Radio.<i>.AutoChannelEnable>> to <<true>>. Whenever <<param|###.Radio.<i>.AutoChannelEnable>> is <<true>>, the value of the <<param>> parameter MUST be the channel selected by the automatic channel selection procedure. For channels in wide mode (where a channel bandwidth strictly greater than 20 MHz is used), this parameter is used for Primary Channel only. The secondary or extension channel information is available through <<param|ExtensionChannel>>. Note: Valid <<param>> values depend on the <<param|OperatingFrequencyBand>> value specified and the regulatory domain. <<deprecated|2.15|because it is replaced with <<param|###.DataElements.Network.Device.<i>.Radio.<i>.CurrentOperatingClassProfile.<i>.Channel>>>> <<obsoleted|2.17>>",
+							"description": "The current radio channel used by the connection. To request automatic channel selection, set <<param|###.Radio.<i>.AutoChannelEnable>> to <<true>>. Whenever <<param|###.Radio.<i>.AutoChannelEnable>> is <<true>>, the value of the <<param>> parameter MUST be the channel selected by the automatic channel selection procedure. For channels in wide mode (where a channel bandwidth strictly greater than 20 MHz is used), this parameter is used for Primary Channel only. The secondary or extension channel information is available through <<param|ExtensionChannel>>. Note: Valid <<param>> values depend on the <<param|OperatingFrequencyBand>> value specified and the regulatory domain. <<deprecated|2.15|because it is replaced with <<param|###.DataElements.Network.Device.<i>.Radio.<i>.CurrentOperatingClassProfile.<i>.Channel>>>> <<obsoleted|2.17>> <<deleted|2.18>>",
 							"datatype": "unsignedInt",
 							"range": [
 								{
@@ -53710,7 +54483,7 @@
 								"cwmp",
 								"usp"
 							],
-							"description": "The secondary extension channel position, applicable when operating in wide channel mode (i.e. when <<param|CurrentOperatingChannelBandwidth>> is <<enum|40MHz|CurrentOperatingChannelBandwidth>> If not operating in wide channel mode (i.e. when <<param|CurrentOperatingChannelBandwidth>> is something other than <<enum|40MHz|CurrentOperatingChannelBandwidth>>, then the value of <<param>> is <<enum|None>>. Enumeration of: None, AboveControlChannel, BelowControlChannel. <<deprecated|2.15|because this information is not available via EasyMesh>> <<obsoleted|2.17>>",
+							"description": "The secondary extension channel position, applicable when operating in wide channel mode (i.e. when <<param|CurrentOperatingChannelBandwidth>> is <<enum|40MHz|CurrentOperatingChannelBandwidth>> If not operating in wide channel mode (i.e. when <<param|CurrentOperatingChannelBandwidth>> is something other than <<enum|40MHz|CurrentOperatingChannelBandwidth>>, then the value of <<param>> is <<enum|None>>. Enumeration of: None, AboveControlChannel, BelowControlChannel. <<deprecated|2.15|because this information is not available via EasyMesh>> <<obsoleted|2.17>> <<deleted|2.18>>",
 							"datatype": "string",
 							"enumerations": [
 								"None",
@@ -53727,7 +54500,7 @@
 								"cwmp",
 								"usp"
 							],
-							"description": "<<list>> List items represent possible radio channels for the wireless standard (a, b, g, n, ac, ax) and the regulatory domain. Ranges in the form n-m are permitted. For example, for 802.11b and North America, would be 1-11. <<deprecated|2.15|because it is not available via EasyMesh>> <<obsoleted|2.17>>",
+							"description": "<<list>> List items represent possible radio channels for the wireless standard (a, b, g, n, ac, ax) and the regulatory domain. Ranges in the form n-m are permitted. For example, for 802.11b and North America, would be 1-11. <<deprecated|2.15|because it is not available via EasyMesh>> <<obsoleted|2.17>> <<deleted|2.18>>",
 							"list": {
 								"datatype": "string",
 								"maxsize": 1024
@@ -53742,7 +54515,7 @@
 								"cwmp",
 								"usp"
 							],
-							"description": "The channel bandwidth currently in use. Enumeration of: 20MHz, 40MHz, 80MHz, 160MHz. <<deprecated|2.15|because it is not available via EasyMesh>> <<obsoleted|2.17>>",
+							"description": "The channel bandwidth currently in use. Enumeration of: 20MHz, 40MHz, 80MHz, 160MHz. <<deprecated|2.15|because it is not available via EasyMesh>> <<obsoleted|2.17>> <<deleted|2.18>>",
 							"datatype": "string",
 							"enumerations": [
 								"20MHz",
@@ -53760,7 +54533,7 @@
 								"cwmp",
 								"usp"
 							],
-							"description": "The Modulation Coding Scheme index (applicable to 802.11n and 802.11ac specifications only). Values from 0 to 15 MUST be supported (<<bibref|802.11n-2009>>). Values from 0 to 9 MUST be supported for <<bibref|802.11ac-2013>>. <<deprecated|2.15|because this information is not available in EasyMesh>> <<obsoleted|2.17>>",
+							"description": "The Modulation Coding Scheme index (applicable to 802.11n and 802.11ac specifications only). Values from 0 to 15 MUST be supported (<<bibref|802.11n-2009>>). Values from 0 to 9 MUST be supported for <<bibref|802.11ac-2013>>. <<deprecated|2.15|because this information is not available in EasyMesh>> <<obsoleted|2.17>> <<deleted|2.18>>",
 							"datatype": "int",
 							"range": [
 								{
@@ -53782,7 +54555,7 @@
 								"cwmp",
 								"usp"
 							],
-							"description": "Indicates the current transmit power level as a <<units>> of full power. <<deprecated|2.15|because it is duplicated in <<param|###.DataElements.Network.Device.<i>.Radio.<i>.CurrentOperatingClassProfile.<i>.TxPower>>>> <<obsoleted|2.17>>",
+							"description": "Indicates the current transmit power level as a <<units>> of full power. <<deprecated|2.15|because it is duplicated in <<param|###.DataElements.Network.Device.<i>.Radio.<i>.CurrentOperatingClassProfile.<i>.TxPower>>>> <<obsoleted|2.17>> <<deleted|2.18>>",
 							"datatype": "int",
 							"range": [
 								{
@@ -53801,7 +54574,7 @@
 								"cwmp",
 								"usp"
 							],
-							"description": "Indicates the maximum Effective Isotropic Radiated Power (EIRP) per 20 MHz bandwidth representing the nominal transmit power limit for this radio. The field is coded in units of <<units>> relative to 1 mW. <<bibref|EasyMesh|Clause 17.2.15>> <<deprecated|2.15|because it is not available in EasyMesh>> <<obsoleted|2.17>>",
+							"description": "Indicates the maximum Effective Isotropic Radiated Power (EIRP) per 20 MHz bandwidth representing the nominal transmit power limit for this radio. The field is coded in units of <<units>> relative to 1 mW. <<bibref|EasyMesh|Clause 17.2.15>> <<deprecated|2.15|because it is not available in EasyMesh>> <<obsoleted|2.17>> <<deleted|2.18>>",
 							"datatype": "int",
 							"range": [
 								{
@@ -53820,7 +54593,7 @@
 								"cwmp",
 								"usp"
 							],
-							"description": "<<numentries>> <<deprecated|2.15| because the <<object|AP.<i>.>> is being deprecated>> <<obsoleted|2.17>>",
+							"description": "<<numentries>> <<deprecated|2.15| because the <<object|AP.<i>.>> is being deprecated>> <<obsoleted|2.17>> <<deleted|2.18>>",
 							"datatype": "unsignedInt"
 						},
 						"Device.WiFi.MultiAP.APDevice.{i}.Radio.{i}.AP.{i}.": {
@@ -53830,7 +54603,7 @@
 								"cwmp",
 								"usp"
 							],
-							"description": "A single logical Access Point operating on this radio. <<deprecated|2.15|because it has moved to <<object|####.DataElements.Network.Device.<i>.Radio.<i>.BSS.<i>.MultiAPSteering.>> except <<param|SSID>> and <<param|BSSID>> which are duplicated in <<object|####.DataElements.Network.Device.<i>.Radio.<i>.BSS.<i>.>>>> <<obsoleted|2.17>>",
+							"description": "A single logical Access Point operating on this radio. <<deprecated|2.15|because it has moved to <<object|####.DataElements.Network.Device.<i>.Radio.<i>.BSS.<i>.MultiAPSteering.>> except <<param|SSID>> and <<param|BSSID>> which are duplicated in <<object|####.DataElements.Network.Device.<i>.Radio.<i>.BSS.<i>.>>>> <<obsoleted|2.17>> <<deleted|2.18>>",
 							"uniqueKeys": [
 								"BSSID"
 							],
@@ -53914,7 +54687,7 @@
 									"cwmp",
 									"usp"
 								],
-								"description": "<<numentries>> <<deprecated|2.15| because the <<object|AssociatedDevice.<i>.>> is being deprecated>> <<obsoleted|2.17>>",
+								"description": "<<numentries>> <<deprecated|2.15| because the <<object|AssociatedDevice.<i>.>> is being deprecated>> <<obsoleted|2.17>> <<deleted|2.18>>",
 								"datatype": "unsignedInt"
 							},
 							"Device.WiFi.MultiAP.APDevice.{i}.Radio.{i}.AP.{i}.AssociatedDevice.{i}.": {
@@ -53924,7 +54697,7 @@
 									"cwmp",
 									"usp"
 								],
-								"description": "Object describing a single Associated Device (STA). <<deprecated|2.15|because it has moved <<param|AssociationTime>>, <<param|Noise>> into <<object|#####.DataElements.Network.Device.<i>.Radio.<i>.BSS.<i>.STA.<i>.MultiAPSTA.>> and the remaining parameters are duplicated in <<object|#####.DataElements.Network.Device.<i>.Radio.<i>.BSS.<i>.STA.<i>.>> except <<param|OperatingStandard>> which was deprecated as noted>> <<obsoleted|2.17>>",
+								"description": "Object describing a single Associated Device (STA). <<deprecated|2.15|because it has moved <<param|AssociationTime>>, <<param|Noise>> into <<object|#####.DataElements.Network.Device.<i>.Radio.<i>.BSS.<i>.STA.<i>.MultiAPSTA.>> and the remaining parameters are duplicated in <<object|#####.DataElements.Network.Device.<i>.Radio.<i>.BSS.<i>.STA.<i>.>> except <<param|OperatingStandard>> which was deprecated as noted>> <<obsoleted|2.17>> <<deleted|2.18>>",
 								"uniqueKeys": [
 									"MACAddress"
 								],
@@ -53960,7 +54733,7 @@
 										"cwmp",
 										"usp"
 									],
-									"description": "The operating standard that this associated device is connected with. Enumeration of: a, b, g, n, ac, ax. <<deprecated|2.15|because this information cannot be obtained by EasyMesh>> <<obsoleted|2.17>>",
+									"description": "The operating standard that this associated device is connected with. Enumeration of: a, b, g, n, ac, ax. <<deprecated|2.15|because this information cannot be obtained by EasyMesh>> <<obsoleted|2.17>> <<deleted|2.18>>",
 									"datatype": "string",
 									"enumerations": [
 										"a",
@@ -53980,7 +54753,7 @@
 										"cwmp",
 										"usp"
 									],
-									"description": "Whether or not this associated device is currently present on the Wi-Fi Access Point device. The ability to list inactive nodes is OPTIONAL. If the Access Point devices includes inactive nodes in this table, <<param>> MUST be set to <<false>> for each inactive node. The length of time an inactive node remains listed in this table is a local matter to the CPE. <<deprecated|2.15|because this information cannot be obtained by EasyMesh>> <<obsoleted|2.17>>",
+									"description": "Whether or not this associated device is currently present on the Wi-Fi Access Point device. The ability to list inactive nodes is OPTIONAL. If the Access Point devices includes inactive nodes in this table, <<param>> MUST be set to <<false>> for each inactive node. The length of time an inactive node remains listed in this table is a local matter to the CPE. <<deprecated|2.15|because this information cannot be obtained by EasyMesh>> <<obsoleted|2.17>> <<deleted|2.18>>",
 									"datatype": "boolean"
 								},
 								"AssociationTime": {
@@ -54065,7 +54838,7 @@
 										"cwmp",
 										"usp"
 									],
-									"description": "<<numentries>> <<deprecated|2.15| because the <<object|#####.MultiAP.APDevice.<i>.Radio.<i>.AP.<i>.AssociatedDevice.<i>.SteeringHistory.<i>.>> is being deprecated>> <<obsoleted|2.17>>",
+									"description": "<<numentries>> <<deprecated|2.15| because the <<object|#####.MultiAP.APDevice.<i>.Radio.<i>.AP.<i>.AssociatedDevice.<i>.SteeringHistory.<i>.>> is being deprecated>> <<obsoleted|2.17>> <<deleted|2.18>>",
 									"datatype": "unsignedInt"
 								},
 								"Device.WiFi.MultiAP.APDevice.{i}.Radio.{i}.AP.{i}.AssociatedDevice.{i}.Stats.": {
@@ -54075,7 +54848,7 @@
 										"cwmp",
 										"usp"
 									],
-									"description": "Object describing the Statistics for a single Associated Device (STA). <<deprecated|2.15|because it is duplicated in <<object|######.DataElements.Network.Device.<i>.Radio.<i>.BSS.<i>.STA.<i>.>>>> <<obsoleted|2.17>>",
+									"description": "Object describing the Statistics for a single Associated Device (STA). <<deprecated|2.15|because it is duplicated in <<object|######.DataElements.Network.Device.<i>.Radio.<i>.BSS.<i>.STA.<i>.>>>> <<obsoleted|2.17>> <<deleted|2.18>>",
 									"access": false,
 									"array": false,
 									"BytesSent": {
@@ -54170,7 +54943,7 @@
 										"cwmp",
 										"usp"
 									],
-									"description": "The summary of statistics related to Multi-AP Steering for an individual STA on the Wi-Fi network. The counters contained in <<object>> are all reset on reboot. <<deprecated|2.15|because it has moved to <<object|######.DataElements.Network.Device.<i>.Radio.<i>.BSS.<i>.STA.<i>.MultiAPSTA.SteeringSummaryStats.>>>> <<obsoleted|2.17>>",
+									"description": "The summary of statistics related to Multi-AP Steering for an individual STA on the Wi-Fi network. The counters contained in <<object>> are all reset on reboot. <<deprecated|2.15|because it has moved to <<object|######.DataElements.Network.Device.<i>.Radio.<i>.BSS.<i>.STA.<i>.MultiAPSTA.SteeringSummaryStats.>>>> <<obsoleted|2.17>> <<deleted|2.18>>",
 									"access": false,
 									"array": false,
 									"NoCandidateAPFailures": {
@@ -54290,7 +55063,7 @@
 										"cwmp",
 										"usp"
 									],
-									"description": "The history of Multi-AP Steering for an individual STA on the Wi-Fi network. The contents of this multi-instance object are reset on reboot. <<deprecated|2.15|because it has moved to <<object|######.DataElements.Network.Device.<i>.Radio.<i>.BSS.<i>.STA.<i>.MultiAPSTA.SteeringHistory.<i>.>>>> <<obsoleted|2.17>>",
+									"description": "The history of Multi-AP Steering for an individual STA on the Wi-Fi network. The contents of this multi-instance object are reset on reboot. <<deprecated|2.15|because it has moved to <<object|######.DataElements.Network.Device.<i>.Radio.<i>.BSS.<i>.STA.<i>.MultiAPSTA.SteeringHistory.<i>.>>>> <<obsoleted|2.17>> <<deleted|2.18>>",
 									"uniqueKeys": [
 										"Time",
 										"APOrigin",
@@ -54418,7 +55191,7 @@
 						"datatype": "string"
 					},
 					"TimeStamp": {
-						"type": "string",
+						"type": "dateTime",
 						"read": true,
 						"write": false,
 						"protocols": [
@@ -54426,7 +55199,7 @@
 							"usp"
 						],
 						"description": "The time this group was collected. Formatted with the date-and-time string format as defined in <<bibref|RFC3339|Section 3>>.",
-						"datatype": "string"
+						"datatype": "dateTime"
 					},
 					"ControllerID": {
 						"type": "string",
@@ -55216,12 +55989,7 @@
 									"usp"
 								],
 								"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-								"datatype": "Alias",
-								"range": [
-									{
-										"max": 64
-									}
-								]
+								"datatype": "_AliasCWMP"
 							},
 							"Day": {
 								"type": "string",
@@ -55618,7 +56386,7 @@
 								"cwmp",
 								"usp"
 							],
-							"description": "Associated Wi-Fi6 STA Status Inclusion Policy. : <<true>>: Include Associated Wi-Fi6 STA Status TLV in AP Metrics Response. : <<false>>: Do not include Associated Wi-Fi6 STA Status TLV [3] in AP Metrics Response. <<deprecated|2.16|because it was the same as <<param|Radio.<i>.APMetricsWiFi6>>.>>",
+							"description": "Associated Wi-Fi6 STA Status Inclusion Policy. : <<true>>: Include Associated Wi-Fi6 STA Status TLV in AP Metrics Response. : <<false>>: Do not include Associated Wi-Fi6 STA Status TLV [3] in AP Metrics Response. <<deprecated|2.16|because it was the same as <<param|Radio.<i>.APMetricsWiFi6>>.>> <<obsoleted|2.18>>",
 							"datatype": "boolean"
 						},
 						"CountryCode": {
@@ -55713,7 +56481,7 @@
 								"cwmp",
 								"usp"
 							],
-							"description": "For EasyMesh <<bibref|EasyMesh>>, this is the Associated Wi-Fi6 STA Status Inclusion Policy. : <<true>>: Include Associated Wi-Fi6 STA Status TLV in AP Metrics Response; : <<false>>: Do not include Associated Wi-Fi6 STA Status TLV in AP Metrics Response. <<deprecated|2.16|because it was the same as <<param|Radio.<i>.APMetricsWiFi6>>.>>",
+							"description": "For EasyMesh <<bibref|EasyMesh>>, this is the Associated Wi-Fi6 STA Status Inclusion Policy. : <<true>>: Include Associated Wi-Fi6 STA Status TLV in AP Metrics Response; : <<false>>: Do not include Associated Wi-Fi6 STA Status TLV in AP Metrics Response. <<deprecated|2.16|because it was the same as <<param|Radio.<i>.APMetricsWiFi6>>.>> <<obsoleted|2.18>>",
 							"datatype": "boolean"
 						},
 						"MaxUnsuccessfulAssociationReportingRate": {
@@ -56412,7 +57180,8 @@
 								],
 								"description": "This object describes available channels identified by Channel Availability Check (CAC).",
 								"uniqueKeys": [
-									"OpClass"
+									"OpClass",
+									"Channel"
 								],
 								"access": false,
 								"array": true,
@@ -56474,7 +57243,8 @@
 								],
 								"description": "This object describes channels identified by Channel Availability Check (CAC) that may not be occupied.",
 								"uniqueKeys": [
-									"OpClass"
+									"OpClass",
+									"Channel"
 								],
 								"access": false,
 								"array": true,
@@ -56536,7 +57306,8 @@
 								],
 								"description": "This object describes channels with ongoing Channel Availability Check (CAC).",
 								"uniqueKeys": [
-									"OpClass"
+									"OpClass",
+									"Channel"
 								],
 								"access": false,
 								"array": true,
@@ -56870,7 +57641,7 @@
 										"cwmp",
 										"usp"
 									],
-									"description": "Number of repetitions of the burst of channel usage; : 0 = single burst, : 2^32-1 = indefinite/unknown.",
+									"description": "Number of repetitions of the burst of channel usage; : 0 = single burst, : 2^32^-1 = indefinite/unknown.",
 									"datatype": "unsignedInt"
 								},
 								"BurstInterval": {
@@ -56968,11 +57739,12 @@
 								"type": "string",
 								"read": true,
 								"write": false,
+								"obsolete": true,
 								"protocols": [
 									"cwmp",
 									"usp"
 								],
-								"description": "Organizationally unique identifier of the Access Point device manufacturer. Represented as a six hexadecimal-digit value using all upper-case letters and including any leading zeros. <<pattern>> The value MUST be a valid OUI as defined in <<bibref|OUI>>. This value MUST remain fixed over the lifetime of the device, including across firmware updates. If the instance of this <<object>> is the same as <<object|Device.>>, then this parameter is the same as <<param|Device.DeviceInfo.ManufacturerOUI>>.",
+								"description": "Organizationally unique identifier of the Access Point device manufacturer. Represented as a six hexadecimal-digit value using all upper-case letters and including any leading zeros. <<pattern>> The value MUST be a valid OUI as defined in <<bibref|OUI>>. This value MUST remain fixed over the lifetime of the device, including across firmware updates. If the instance of this <<object>> is the same as <<object|Device.>>, then this parameter is the same as <<param|Device.DeviceInfo.ManufacturerOUI>>. <<deprecated|2.18|because it was essentially the same as <<param|#.Manufacturer>>.>>",
 								"datatype": "string",
 								"range": [
 									{
@@ -57010,11 +57782,12 @@
 								"type": "string",
 								"read": true,
 								"write": false,
+								"obsolete": true,
 								"protocols": [
 									"cwmp",
 									"usp"
 								],
-								"description": "This parameter represents the status of Wi-Fi CERTIFIED EasyMeshTM controller functionality. Enumeration of: NotSupported, SupportedNotEnabled, Running.",
+								"description": "This parameter represents the status of Wi-Fi CERTIFIED EasyMeshTM controller functionality. Enumeration of: NotSupported, SupportedNotEnabled, Running. <<deprecated|2.18|because it was the same as <<param|#.ControllerOperationMode>>.>>",
 								"datatype": "string",
 								"enumerations": [
 									"NotSupported",
@@ -57044,18 +57817,19 @@
 									"cwmp",
 									"usp"
 								],
-								"description": "This object represents an individual Access Point devices Backhaul and unique aspects in the Wi-Fi network. The endpoints of the backhaul interface are represented by the (Devices ID and interface MAC Address). This object represents the upward view of the backhaul interface. The two endpoints of the backhaul interface are - (<<param|BackhaulDeviceID>>, <<param|BackhaulMACAddress>>) of the uplinked Backhaul Device - <<param|MACAddress>> of this Access Point Device <<param|BackhaulDeviceID>> / <<param|BackhaulMACAddress>> <-- <<param|LinkType>> --- < <<param|MACAddress>> <<empty>> is reserved for the <<object>> instance that represents the Multi-AP Controller.",
+								"description": "This object represents an individual Access Point devices Backhaul and unique aspects in the Wi-Fi network. The endpoints of the backhaul interface are represented by the (Devices ID and interface MAC Address). This object represents the upward view of the backhaul interface. The two endpoints of the backhaul interface are - (<<param|BackhaulDeviceID|deprecated>>, <<param|BackhaulMACAddress|deprecated>>) of the uplinked Backhaul Device - <<param|MACAddress|deprecated>> of this Access Point Device. <<empty>> is reserved for the <<object>> instance that represents the Multi-AP Controller.",
 								"access": false,
 								"array": false,
 								"LinkType": {
 									"type": "string",
 									"read": true,
 									"write": false,
+									"obsolete": true,
 									"protocols": [
 										"cwmp",
 										"usp"
 									],
-									"description": "The medium being used to backhaul this Access Point Device to the Backhaul Access Point Device. The <<enum|None>> value is reserved for the <<object>> instance that represents the Multi-AP Controller. Enumeration of: None, Wi-Fi, MoCA, Ethernet, G.hn, HPNA, HomePlug, UPA.",
+									"description": "The medium being used to backhaul this Access Point Device to the Backhaul Access Point Device. The <<enum|None>> value is reserved for the <<object>> instance that represents the Multi-AP Controller. Enumeration of: None, Wi-Fi, MoCA, Ethernet, G.hn, HPNA, HomePlug, UPA. <<deprecated|2.18|because it was essentially the same as <<param|##.BackhaulMediaType>>.>>",
 									"datatype": "string",
 									"enumerations": [
 										"None",
@@ -57072,11 +57846,12 @@
 									"type": "string",
 									"read": true,
 									"write": false,
+									"obsolete": true,
 									"protocols": [
 										"cwmp",
 										"usp"
 									],
-									"description": "The MAC Address at the far end of the backhaul link of the interface on the network that is providing a backhaul for this Access Point Device. This along with <<param|BackhaulDeviceID>>, helps to identfy the backhaul interface endpoint. <<empty>> is reserved for the <<object>> instance that represents the Multi-AP Controller.",
+									"description": "The MAC Address at the far end of the backhaul link of the interface on the network that is providing a backhaul for this Access Point Device. This along with <<param|BackhaulDeviceID|deprecated>>, helps to identify the backhaul interface endpoint. <<empty>> is reserved for the <<object>> instance that represents the Multi-AP Controller. <<deprecated|2.18|because it was the same as <<param|##.BackhaulMACAddress>>.>>",
 									"datatype": "MACAddress",
 									"range": [
 										{
@@ -57092,11 +57867,12 @@
 									"type": "string",
 									"read": true,
 									"write": false,
+									"obsolete": true,
 									"protocols": [
 										"cwmp",
 										"usp"
 									],
-									"description": "The Devices ID of the Device on the network that is providing a Backhaul Link for this Access Point Device.",
+									"description": "The Devices ID of the Device on the network that is providing a Backhaul Link for this Access Point Device. <<deprecated|2.18|because it was essentially the same as <<param|##.BackhaulALID>>.>>",
 									"datatype": "MACAddress",
 									"range": [
 										{
@@ -57112,11 +57888,12 @@
 									"type": "string",
 									"read": true,
 									"write": false,
+									"obsolete": true,
 									"protocols": [
 										"cwmp",
 										"usp"
 									],
-									"description": "The MAC Address at the near end of the backhaul link of this Access Point Devices backhaul interface that is connecting via <<param|LinkType>> to <<param|BackhaulMACAddress>> of the Backhaul Device identified by <<param|BackhaulDeviceID>>.",
+									"description": "The MAC Address at the near end of the backhaul link of this Access Point Devices backhaul interface that is connecting via <<param|##.BackhaulMediaType>> to <<param|BackhaulMACAddress>> of the Backhaul Device identified by <<param|BackhaulDeviceID>>. <<deprecated|2.18|because it was the same as <<param|##.Radio.<i>.BackhaulSta.MACAddress>>.>>",
 									"datatype": "MACAddress",
 									"range": [
 										{
@@ -57301,7 +58078,7 @@
 											"cwmp",
 											"usp"
 										],
-										"description": "The total number of bytes transmitted across the backhaul medium (as identified by the value of the <<param|#.LinkType>> parameter), including framing characters.",
+										"description": "The total number of bytes transmitted across the backhaul medium (as identified by the value of the <<param|###.BackhaulMediaType>>>> parameter), including framing characters.",
 										"datatype": "StatsCounter64"
 									},
 									"BytesReceived": {
@@ -57312,7 +58089,7 @@
 											"cwmp",
 											"usp"
 										],
-										"description": "The total number of bytes received across the backhaul medium (as identified by the value of the <<param|#.LinkType>> parameter), including framing characters.",
+										"description": "The total number of bytes received across the backhaul medium (as identified by the value of the <<param|###.BackhaulMediaType>> parameter), including framing characters.",
 										"datatype": "StatsCounter64"
 									},
 									"PacketsSent": {
@@ -57323,7 +58100,7 @@
 											"cwmp",
 											"usp"
 										],
-										"description": "The total number of packets transmitted across the backhaul medium (as identified by the value of the <<param|#.LinkType>> parameter), including framing characters.",
+										"description": "The total number of packets transmitted across the backhaul medium (as identified by the value of the <<param|###.BackhaulMediaType>> parameter), including framing characters.",
 										"datatype": "StatsCounter64"
 									},
 									"PacketsReceived": {
@@ -57334,7 +58111,7 @@
 											"cwmp",
 											"usp"
 										],
-										"description": "The total number of packets received across the backhaul medium (as identified by the value of the <<param|#.LinkType>> parameter), including framing characters.",
+										"description": "The total number of packets received across the backhaul medium (as identified by the value of the <<param|###.BackhaulMediaType>> parameter), including framing characters.",
 										"datatype": "StatsCounter64"
 									},
 									"ErrorsSent": {
@@ -57367,7 +58144,7 @@
 											"cwmp",
 											"usp"
 										],
-										"description": "Current utilization (expressed in <<units>>) of the medium (as identified by the value of the <<param|#.LinkType>> parameter) being used to backhaul this Access Point device to the Multi-AP Controller. A value of 0 is used for the <<object>> instance that represents the Access Point on the Multi-AP Controller.",
+										"description": "Current utilization (expressed in <<units>>) of the medium (as identified by the value of the <<param|###.BackhaulMediaType>> parameter) being used to backhaul this Access Point device to the Multi-AP Controller. A value of 0 is used for the <<object>> instance that represents the Access Point on the Multi-AP Controller.",
 										"datatype": "unsignedInt",
 										"range": [
 											{
@@ -57384,7 +58161,7 @@
 											"cwmp",
 											"usp"
 										],
-										"description": "An indicator of radio signal strength of the backhaul link of the Access Point (AP) to the Multi-AP Controller, measured in <<units>>. RCPI is encoded per <<bibref|802.11-2020|Table 9-176>>. The value of this parameter is indeterminate if the value of the <<param|#.LinkType>> parameter is anything other than <<enum|Wi-Fi|#.LinkType>>.",
+										"description": "An indicator of radio signal strength of the backhaul link of the Access Point (AP) to the Multi-AP Controller, measured in <<units>>. RCPI is encoded per <<bibref|802.11-2020|Table 9-176>>. The value of this parameter is indeterminate if the value of the <<param|###.BackhaulMediaType>> parameter is anything other than a type of IEEE 802.11 Wi-Fi.",
 										"datatype": "unsignedInt",
 										"range": [
 											{
@@ -57495,7 +58272,7 @@
 									"cwmp",
 									"usp"
 								],
-								"description": "(Total Channel Utililzation) The percentage of time (linearly scaled with 255 representing 100%) that the Access Point device sensed the medium was busy, as indicated by either the physical or virtual carier sense (CS) mechanism. This is essentially the amount of time spent transmiting (both successful and failed transmissions), receiving (both local and non-local transmissions), and processing noise <<bibref|802.11-2020|Section 9.4.2.27>>. When more than one channel is in use for the BSS operating on the radio, the <<param>> value is calculated only for the primary channel.",
+								"description": "(Total Channel Utililzation) The percentage of time (linearly scaled with 255 representing 100%) that the Access Point device sensed the medium was busy, as indicated by either the physical or virtual carier sense (CS) mechanism. This is essentially the amount of time spent transmitting (both successful and failed transmissions), receiving (both local and non-local transmissions), and processing noise <<bibref|802.11-2020|Section 9.4.2.27>>. When more than one channel is in use for the BSS operating on the radio, the <<param>> value is calculated only for the primary channel.",
 								"datatype": "unsignedInt",
 								"range": [
 									{
@@ -57545,7 +58322,7 @@
 									"cwmp",
 									"usp"
 								],
-								"description": "(Receive Non-Local Channel Utilization) The percentage of time (linearly scaled with 255 representing 100%) that the radio has spent on receiving individually or group addressed non-local transmissions (i.e. valid IEEE 802.11 PPDUs that are not associated with any BSS operatin gon this radio). When more than one channel is in use for the BSS operating on the radio, the <<param>> value is calculated only for the primary channel.",
+								"description": "(Receive Non-Local Channel Utilization) The percentage of time (linearly scaled with 255 representing 100%) that the radio has spent on receiving individually or group addressed non-local transmissions (i.e. valid IEEE 802.11 PPDUs that are not associated with any BSS operating on this radio). When more than one channel is in use for the BSS operating on the radio, the <<param>> value is calculated only for the primary channel.",
 								"datatype": "unsignedInt",
 								"range": [
 									{
@@ -58143,7 +58920,7 @@
 								"access": false,
 								"array": true,
 								"TimeStamp": {
-									"type": "string",
+									"type": "dateTime",
 									"read": true,
 									"write": false,
 									"protocols": [
@@ -58151,7 +58928,7 @@
 										"usp"
 									],
 									"description": "The timestamp of the last scan. Formatted with the date-and-time string format as defined in <<bibref|RFC3339|Section 3>>.",
-									"datatype": "string"
+									"datatype": "dateTime"
 								},
 								"AggregateScanDuration": {
 									"type": "unsignedInt",
@@ -58255,7 +59032,7 @@
 											]
 										},
 										"TimeStamp": {
-											"type": "string",
+											"type": "dateTime",
 											"read": true,
 											"write": false,
 											"protocols": [
@@ -58263,7 +59040,7 @@
 												"usp"
 											],
 											"description": "The timestamp of the last scan of the channel. Formatted with the date-and-time string format as defined in <<bibref|RFC3339|Section 3>>.",
-											"datatype": "string"
+											"datatype": "dateTime"
 										},
 										"Utilization": {
 											"type": "unsignedInt",
@@ -58571,7 +59348,8 @@
 									"datatype": "unsignedInt",
 									"range": [
 										{
-											"max": 3
+											"min": 1,
+											"max": 4
 										}
 									]
 								},
@@ -58813,7 +59591,7 @@
 										"cwmp",
 										"usp"
 									],
-									"description": "Describes the HE capabilities of the radio as defined by the HECapabilities TLV <<bibref|EasyMesh|Section 17.2.10>>. <<deprecated|2.15|because it is superseded by <<object|WiFi6APRole>> and <<object|WiFi6bSTARole>>>> <<obsoleted|2.17>>",
+									"description": "Describes the HE capabilities of the radio as defined by the HECapabilities TLV <<bibref|EasyMesh|Section 17.2.10>>. <<deprecated|2.15|because it is superseded by <<object|WiFi6APRole>> and <<object|WiFi6bSTARole>>>> <<obsoleted|2.17>> <<deleted|2.18>>",
 									"datatype": "base64",
 									"range": [
 										{
@@ -60232,7 +61010,7 @@
 									"unit": "dBm"
 								},
 								"TimeStamp": {
-									"type": "string",
+									"type": "dateTime",
 									"read": true,
 									"write": false,
 									"protocols": [
@@ -60240,7 +61018,7 @@
 										"usp"
 									],
 									"description": "The time this group was collected. Formatted with the date-and-time string format as defined in <<bibref|RFC3339|Section 3>>.",
-									"datatype": "string"
+									"datatype": "dateTime"
 								}
 							},
 							"Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.DisAllowedOpClassChannels.{i}.": {
@@ -60529,7 +61307,7 @@
 									"unit": "seconds"
 								},
 								"TimeStamp": {
-									"type": "string",
+									"type": "dateTime",
 									"read": true,
 									"write": false,
 									"protocols": [
@@ -60537,7 +61315,7 @@
 										"usp"
 									],
 									"description": "The time this group was collected. Formatted with the date-and-time string format as defined in <<bibref|RFC3339|Section 3>>.",
-									"datatype": "string"
+									"datatype": "dateTime"
 								},
 								"UnicastBytesSent": {
 									"type": "unsignedLong",
@@ -61955,7 +62733,7 @@
 										]
 									},
 									"TimeStamp": {
-										"type": "string",
+										"type": "dateTime",
 										"read": true,
 										"write": false,
 										"protocols": [
@@ -61963,7 +62741,7 @@
 											"usp"
 										],
 										"description": "The time this group was collected. Formatted with the date-and-time string format as defined in <<bibref|RFC3339|Section 3>>.",
-										"datatype": "string"
+										"datatype": "dateTime"
 									},
 									"HTCapabilities": {
 										"type": "base64",
@@ -62008,7 +62786,7 @@
 											"cwmp",
 											"usp"
 										],
-										"description": "Describes the HE capabilities of the Associated Device (STA). <<deprecated|2.15|because it is superseded by <<object|WiFi6Capabilities>>>> <<obsoleted|2.17>>",
+										"description": "Describes the HE capabilities of the Associated Device (STA). <<deprecated|2.15|because it is superseded by <<object|WiFi6Capabilities>>>> <<obsoleted|2.17>> <<deleted|2.18>>",
 										"datatype": "base64",
 										"range": [
 											{
@@ -62125,7 +62903,7 @@
 											"cwmp",
 											"usp"
 										],
-										"description": "The time in <<units>> since this Assocated Device (STA) was associated.",
+										"description": "The time in <<units>> since this Associated Device (STA) was associated.",
 										"datatype": "unsignedInt",
 										"unit": "seconds"
 									},
@@ -62517,22 +63295,24 @@
 											"type": "dateTime",
 											"read": true,
 											"write": false,
+											"obsolete": true,
 											"protocols": [
 												"cwmp",
 												"usp"
 											],
-											"description": "Date and time in UTC when the device was associated. If the instance of this <<object>> is the same as <<object|Device.WiFi.AccessPoint.<i>.AssociatedDevice.<i>.>>, then this parameter is the same as <<param|Device.WiFi.AccessPoint.<i>.AssociatedDevice.<i>.AssociationTime>>.",
+											"description": "Date and time in UTC when the device was associated. If the instance of this <<object>> is the same as <<object|Device.WiFi.AccessPoint.<i>.AssociatedDevice.<i>.>>, then this parameter is the same as <<param|Device.WiFi.AccessPoint.<i>.AssociatedDevice.<i>.AssociationTime>>. <<deprecated|2.18|because it was essentially the same as <<param|#.LastConnectTime>>.>>",
 											"datatype": "dateTime"
 										},
 										"Noise": {
 											"type": "unsignedInt",
 											"read": true,
 											"write": false,
+											"obsolete": true,
 											"protocols": [
 												"cwmp",
 												"usp"
 											],
-											"description": "An indicator of the average radio noise plus interference power measured on the uplink from the Associated Device (STA) to the Access Point (AP). Encoded as defined for ANPI in <<bibref|802.11-2020|Section 11.10.9.4>>. If the instance of this <<object>> is the same as <<object|Device.WiFi.AccessPoint.<i>.AssociatedDevice.<i>.>>, then this parameter is the same as <<param|Device.WiFi.AccessPoint.<i>.AssociatedDevice.<i>.Noise>>.",
+											"description": "An indicator of the average radio noise plus interference power measured on the uplink from the Associated Device (STA) to the Access Point (AP). Encoded as defined for ANPI in <<bibref|802.11-2020|Section 11.10.9.4>>. If the instance of this <<object>> is the same as <<object|Device.WiFi.AccessPoint.<i>.AssociatedDevice.<i>.>>, then this parameter is the same as <<param|Device.WiFi.AccessPoint.<i>.AssociatedDevice.<i>.Noise>>. <<deprecated|2.18|because it should be the same as <<param|###.Noise>>.>>",
 											"datatype": "unsignedInt",
 											"range": [
 												{
@@ -62566,7 +63346,7 @@
 													"protocols": [
 														"usp"
 													],
-													"description": "The time for which the associated device is to be disassociated in <<units>>. If set to 0, then the associated device is blocked indefinately.",
+													"description": "The time for which the associated device is to be disassociated in <<units>>. If set to 0, then the associated device is blocked indefinitely.",
 													"datatype": "unsignedInt",
 													"unit": "minutes"
 												},
@@ -63272,11 +64052,12 @@
 									"type": "string",
 									"read": true,
 									"write": false,
+									"obsolete": true,
 									"protocols": [
 										"cwmp",
 										"usp"
 									],
-									"description": "<<list>> List items represent channels in the non-occupancy list due to radars detected by Dynamic Frequency Selection (DFS) Channel Availability Check (CAC).",
+									"description": "<<list>> List items represent channels in the non-occupancy list due to radars detected by Dynamic Frequency Selection (DFS) Channel Availability Check (CAC). <<deprecated|2.18|because it was superseded by <<object|##.CACStatus.<i>.>>.>>",
 									"list": {
 										"datatype": "unsignedInt",
 										"maxsize": 1024
@@ -64835,14 +65616,14 @@
 						],
 						"output": {
 							"TimeStamp": {
-								"type": "string",
+								"type": "dateTime",
 								"read": true,
 								"write": true,
 								"protocols": [
 									"usp"
 								],
 								"description": "The time this event happened. Formatted with the date-and-time string format as defined in <<bibref|RFC3339|Section 3>>.",
-								"datatype": "string"
+								"datatype": "dateTime"
 							},
 							"BSSID": {
 								"type": "string",
@@ -64932,7 +65713,7 @@
 								"protocols": [
 									"usp"
 								],
-								"description": "Describes the HE capabilities of the Associated Device (STA). <<deprecated|2.16|because it is superseded by <<object|WiFi6Capabilities>>.>>",
+								"description": "Describes the HE capabilities of the Associated Device (STA). <<deprecated|2.16|because it is superseded by <<object|WiFi6Capabilities>>.>> <<obsoleted|2.18>>",
 								"datatype": "base64",
 								"range": [
 									{
@@ -64964,7 +65745,7 @@
 						"access": false,
 						"array": true,
 						"TimeStamp": {
-							"type": "string",
+							"type": "dateTime",
 							"read": true,
 							"write": false,
 							"obsolete": true,
@@ -64973,7 +65754,7 @@
 								"usp"
 							],
 							"description": "The time this event happened. Formatted with the date-and-time string format as defined in <<bibref|RFC3339|Section 3>>.",
-							"datatype": "string"
+							"datatype": "dateTime"
 						},
 						"BSSID": {
 							"type": "string",
@@ -65074,7 +65855,7 @@
 								"cwmp",
 								"usp"
 							],
-							"description": "Describes the HE capabilities of the Associated Device (STA). <<deprecated|2.16|because it is superseded by <<object|WiFi6Capabilities>>.>>",
+							"description": "Describes the HE capabilities of the Associated Device (STA). <<deprecated|2.16|because it is superseded by <<object|WiFi6Capabilities>>.>> <<obsoleted|2.18>>",
 							"datatype": "base64",
 							"range": [
 								{
@@ -65556,14 +66337,14 @@
 								"datatype": "StatsCounter32"
 							},
 							"TimeStamp": {
-								"type": "string",
+								"type": "dateTime",
 								"read": true,
 								"write": true,
 								"protocols": [
 									"usp"
 								],
 								"description": "The time this event happened. Formatted with the date-and-time string format as defined in <<bibref|RFC3339|Section 3>>.",
-								"datatype": "string"
+								"datatype": "dateTime"
 							},
 							"LastDataDownlinkRate": {
 								"type": "unsignedInt",
@@ -65654,7 +66435,7 @@
 								"protocols": [
 									"usp"
 								],
-								"description": "The time in <<units>> since this Assocated Device (STA) was associated.",
+								"description": "The time in <<units>> since this Associated Device (STA) was associated.",
 								"datatype": "unsignedInt",
 								"unit": "seconds"
 							},
@@ -65841,7 +66622,7 @@
 							"datatype": "StatsCounter32"
 						},
 						"TimeStamp": {
-							"type": "string",
+							"type": "dateTime",
 							"read": true,
 							"write": false,
 							"obsolete": true,
@@ -65850,7 +66631,7 @@
 								"usp"
 							],
 							"description": "The time this event happened. Formatted with the date-and-time string format as defined in <<bibref|RFC3339|Section 3>>.",
-							"datatype": "string"
+							"datatype": "dateTime"
 						},
 						"LastDataDownlinkRate": {
 							"type": "unsignedInt",
@@ -65957,7 +66738,7 @@
 								"cwmp",
 								"usp"
 							],
-							"description": "The time in <<units>> since this Assocated Device (STA) was associated.",
+							"description": "The time in <<units>> since this Associated Device (STA) was associated.",
 							"datatype": "unsignedInt",
 							"unit": "seconds"
 						},
@@ -66085,14 +66866,14 @@
 								"datatype": "unsignedInt"
 							},
 							"TimeStamp": {
-								"type": "string",
+								"type": "dateTime",
 								"read": true,
 								"write": true,
 								"protocols": [
 									"usp"
 								],
 								"description": "The time this event happened. Formatted with the date-and-time string format as defined in <<bibref|RFC3339|Section 3>>.",
-								"datatype": "string"
+								"datatype": "dateTime"
 							}
 						}
 					},
@@ -66173,7 +66954,7 @@
 							"datatype": "unsignedInt"
 						},
 						"TimeStamp": {
-							"type": "string",
+							"type": "dateTime",
 							"read": true,
 							"write": false,
 							"obsolete": true,
@@ -66182,7 +66963,7 @@
 								"usp"
 							],
 							"description": "The time this event happened. Formatted with the date-and-time string format as defined in <<bibref|RFC3339|Section 3>>.",
-							"datatype": "string"
+							"datatype": "dateTime"
 						}
 					}
 				}
@@ -66240,12 +67021,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Name": {
 					"type": "string",
@@ -68249,12 +69025,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Name": {
 					"type": "string",
@@ -68293,6 +69064,7 @@
 						"usp"
 					],
 					"description": "<<list>> <<reference|an interface object that is stacked immediately below this interface object>> See <<bibref|TR-181i2|Section 4.2.1>>.",
+					"default": "[]",
 					"list": {
 						"datatype": "string",
 						"maxsize": 1024
@@ -68809,12 +69581,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"SSIDReference": {
 					"type": "string",
@@ -69617,7 +70384,7 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "An indicator of radio noise on the uplink from the associated device to the access point, measured in <<units>>, as an average of the last 100 packets received from the device (see ANPI definition in <<bibref|802.11-2012|Clause 10.11.9.4>>) If the instance of this <<object>> is the same as <<object|Device.WiFi.DataElements.Network.Device.<i>.Radio.<i>.BSS.<i>.STA.<i>.>>, then this parameter is the same as <<param|Device.WiFi.DataElements.Network.Device.<i>.Radio.<i>.BSS.<i>.STA.<i>.MultiAPSTA.Noise>>.",
+						"description": "An indicator of radio noise on the uplink from the associated device to the access point, measured in <<units>>, as an average of the last 100 packets received from the device (see ANPI definition in <<bibref|802.11-2012|Clause 10.11.9.4>>) If the instance of this <<object>> is the same as <<object|Device.WiFi.DataElements.Network.Device.<i>.Radio.<i>.BSS.<i>.STA.<i>.>>, then this parameter is the same as <<param|Device.WiFi.DataElements.Network.Device.<i>.Radio.<i>.BSS.<i>.STA.<i>.MultiAPSTA.Noise|deprecated>>.",
 						"datatype": "int",
 						"range": [
 							{
@@ -69816,7 +70583,8 @@
 					],
 					"description": "This object contains parameters related to WiFi QoS for different 802.11e access categories (priorities). Access categories are: BE, BK, VI, and VO. These parameters can help control and monitor 802.11e Enhanced distributed channel access (EDCA). The size of this table is fixed, with four entries which are identified by the <<param|AccessCategory>> parameter as follows: * BE (Best Effort) * BK (Background) * VI (Video) * VO (Voice)",
 					"uniqueKeys": [
-						"AccessCategory"
+						"AccessCategory",
+						"Alias"
 					],
 					"access": false,
 					"array": true,
@@ -69846,12 +70614,7 @@
 							"usp"
 						],
 						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"datatype": "_AliasCWMP"
 					},
 					"AIFSN": {
 						"type": "unsignedInt",
@@ -69862,7 +70625,7 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "Arbitration Inter Frame Spacing (Number). This is the number of time slots in the arbitration interframe space. <<deprecated|2.15|because it is superseded by the WMM Specification>> <<obsoleted|2.17>>",
+						"description": "Arbitration Inter Frame Spacing (Number). This is the number of time slots in the arbitration interframe space. <<deprecated|2.15|because it is superseded by the WMM Specification>> <<obsoleted|2.17>> <<deleted|2.18>>",
 						"datatype": "unsignedInt",
 						"range": [
 							{
@@ -69880,7 +70643,7 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "Exponent of Contention Window (Minimum). This encodes the values of CWMin as an exponent: CWMin = 2^ECWMin - 1. For example, if ECWMin is 8, then CWMin is 2^8 - 1, or 255, (expressed in <<units>>). <<deprecated|2.15|because it is superseded by the WMM Specification>> <<obsoleted|2.17>>",
+						"description": "Exponent of Contention Window (Minimum). This encodes the values of CWMin as an exponent: CWMin = 2^ECWMin^ - 1. For example, if ECWMin is 8, then CWMin is 2^8^ - 1, or 255, (expressed in <<units>>). <<deprecated|2.15|because it is superseded by the WMM Specification>> <<obsoleted|2.17>> <<deleted|2.18>>",
 						"datatype": "unsignedInt",
 						"range": [
 							{
@@ -69899,7 +70662,7 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "Exponent of Contention Window (Maximum). This encodes the values of CWMax as an exponent: CWMax = 2^ECWMax - 1. For example, if ECWMax is 8, then CWMax is 2^8 - 1, or 255, (expressed in <<units>>). <<deprecated|2.15|because it is superseded by the WMM Specification>> <<obsoleted|2.17>>",
+						"description": "Exponent of Contention Window (Maximum). This encodes the values of CWMax as an exponent: CWMax = 2^ECWMax^ - 1. For example, if ECWMax is 8, then CWMax is 2^8^ - 1, or 255, (expressed in <<units>>). <<deprecated|2.15|because it is superseded by the WMM Specification>> <<obsoleted|2.17>> <<deleted|2.18>>",
 						"datatype": "unsignedInt",
 						"range": [
 							{
@@ -69918,7 +70681,7 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "Maximum transmit opportunity, in multiples of <<units>>. A TXOP time interval of 0 means it is limited to a single MAC protocol data unit (MPDU). <<deprecated|2.15|because it is superseded by the WMM Specification>> <<obsoleted|2.17>>",
+						"description": "Maximum transmit opportunity, in multiples of <<units>>. A TXOP time interval of 0 means it is limited to a single MAC protocol data unit (MPDU). <<deprecated|2.15|because it is superseded by the WMM Specification>> <<obsoleted|2.17>> <<deleted|2.18>>",
 						"datatype": "unsignedInt",
 						"range": [
 							{
@@ -70261,12 +71024,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"ProfileReference": {
 					"type": "string",
@@ -70486,12 +71244,7 @@
 							"usp"
 						],
 						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"datatype": "_AliasCWMP"
 					},
 					"SSID": {
 						"type": "string",
@@ -70759,7 +71512,8 @@
 					],
 					"description": "This object contains parameters related to WiFi QoS for different 802.11e access categories (priorities). Access categories are: BE, BK, VI, and VO. These parameters can help control and monitor 802.11e Enhanced distributed channel access (EDCA). The size of this table is fixed, with four entries which are identified by the <<param|AccessCategory>> parameter as follows: * BE (Best Effort) * BK (Background) * VI (Video) * VO (Voice)",
 					"uniqueKeys": [
-						"AccessCategory"
+						"AccessCategory",
+						"Alias"
 					],
 					"access": false,
 					"array": true,
@@ -70789,12 +71543,7 @@
 							"usp"
 						],
 						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"datatype": "_AliasCWMP"
 					},
 					"AIFSN": {
 						"type": "unsignedInt",
@@ -70805,7 +71554,7 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "Arbitration Inter Frame Spacing (Number). This is the number of time slots in the arbitration interframe space. <<deprecated|2.15|because it is superseded by the WMM Specification>> <<obsoleted|2.17>>",
+						"description": "Arbitration Inter Frame Spacing (Number). This is the number of time slots in the arbitration interframe space. <<deprecated|2.15|because it is superseded by the WMM Specification>> <<obsoleted|2.17>> <<deleted|2.18>>",
 						"datatype": "unsignedInt",
 						"range": [
 							{
@@ -70823,7 +71572,7 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "Exponent of Contention Window (Minimum). This encodes the values of CWMin as an exponent: CWMin = 2^ECWMin - 1. For example, if ECWMin is 8, then CWMin is 2^8 - 1, or 255, (expressed in <<units>>). <<deprecated|2.15|because it is superseded by the WMM Specification>> <<obsoleted|2.17>>",
+						"description": "Exponent of Contention Window (Minimum). This encodes the values of CWMin as an exponent: CWMin = 2^ECWMin^ - 1. For example, if ECWMin is 8, then CWMin is 2^8^ - 1, or 255, (expressed in <<units>>). <<deprecated|2.15|because it is superseded by the WMM Specification>> <<obsoleted|2.17>> <<deleted|2.18>>",
 						"datatype": "unsignedInt",
 						"range": [
 							{
@@ -70842,7 +71591,7 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "Exponent of Contention Window (Maximum). This encodes the values of CWMax as an exponent: CWMax = 2^ECWMax - 1. For example, if ECWMax is 8, then CWMax is 2^8 - 1, or 255, (expressed in <<units>>). <<deprecated|2.15|because it is superseded by the WMM Specification>> <<obsoleted|2.17>>",
+						"description": "Exponent of Contention Window (Maximum). This encodes the values of CWMax as an exponent: CWMax = 2^ECWMax^ - 1. For example, if ECWMax is 8, then CWMax is 2^8^ - 1, or 255, (expressed in <<units>>). <<deprecated|2.15|because it is superseded by the WMM Specification>> <<obsoleted|2.17>> <<deleted|2.18>>",
 						"datatype": "unsignedInt",
 						"range": [
 							{
@@ -70861,7 +71610,7 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "Maximum transmit opportunity, in multiples of <<units>>. A TXOP time interval of 0 means it is limited to a single MAC protocol data unit (MPDU). <<deprecated|2.15|because it is superseded by the WMM Specification>> <<obsoleted|2.17>>",
+						"description": "Maximum transmit opportunity, in multiples of <<units>>. A TXOP time interval of 0 means it is limited to a single MAC protocol data unit (MPDU). <<deprecated|2.15|because it is superseded by the WMM Specification>> <<obsoleted|2.17>> <<deleted|2.18>>",
 						"datatype": "unsignedInt",
 						"range": [
 							{
@@ -71117,12 +71866,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Name": {
 					"type": "string",
@@ -71414,7 +72158,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "This table provides information about other ZigBee devices that are directly accessible via this interface. <<keys>> It is possible that instances of this object have the same key value when the value of <<param|IEEEAddress>> parameter is FF:FF:FF:FF:FF:FF:FF:FF and the ZigBee Coordinators on two or more separate area networks assign the same value for the <<param|NetworkAddress>>. This is because the ZigBee specification describes only intra-area network topologies <<bibref|ZigBee2007|Section 1.1.4 Network Topology>>. As such if two or more <<object>> instances have the same key value the implemenation is undefined.",
+					"description": "This table provides information about other ZigBee devices that are directly accessible via this interface. <<keys>> It is possible that instances of this object have the same key value when the value of <<param|IEEEAddress>> parameter is FF:FF:FF:FF:FF:FF:FF:FF and the ZigBee Coordinators on two or more separate area networks assign the same value for the <<param|NetworkAddress>>. This is because the ZigBee specification describes only intra-area network topologies <<bibref|ZigBee2007|Section 1.1.4 Network Topology>>. As such if two or more <<object>> instances have the same key value the implementation is undefined.",
 					"uniqueKeys": [
 						"IEEEAddress",
 						"NetworkAddress"
@@ -71496,10 +72240,11 @@
 					"cwmp",
 					"usp"
 				],
-				"description": "ZigBee Device Object (ZDO) provides management capabilities of the ZigBee Application Support (APS) and Network (NWK) layers of a ZigBee Device as defined in <<bibref|ZigBee2007|section 2.5>>. <<keys>> It is possible that instances of this object have the same key value when the value of <<param|IEEEAddress>> parameter is FF:FF:FF:FF:FF:FF:FF:FF and the ZigBee Coordinators on two or more separate area networks assign the same value for the <<param|NetworkAddress>>. This is because the ZigBee specification describes only intra-area network topologies <<bibref|ZigBee2007|Section 1.1.4 Network Topology>>. As such if two or more <<object>> instances have the same key value the implemenation is undefined",
+				"description": "ZigBee Device Object (ZDO) provides management capabilities of the ZigBee Application Support (APS) and Network (NWK) layers of a ZigBee Device as defined in <<bibref|ZigBee2007|section 2.5>>. <<keys>> It is possible that instances of this object have the same key value when the value of <<param|IEEEAddress>> parameter is FF:FF:FF:FF:FF:FF:FF:FF and the ZigBee Coordinators on two or more separate area networks assign the same value for the <<param|NetworkAddress>>. This is because the ZigBee specification describes only intra-area network topologies <<bibref|ZigBee2007|Section 1.1.4 Network Topology>>. As such if two or more <<object>> instances have the same key value the implementation is undefined",
 				"uniqueKeys": [
 					"IEEEAddress",
-					"NetworkAddress"
+					"NetworkAddress",
+					"Alias"
 				],
 				"access": false,
 				"array": true,
@@ -71512,12 +72257,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"IEEEAddress": {
 					"type": "string",
@@ -72341,12 +73081,7 @@
 							"usp"
 						],
 						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"datatype": "_AliasCWMP"
 					},
 					"SourceEndpoint": {
 						"type": "unsignedInt",
@@ -72505,12 +73240,7 @@
 							"usp"
 						],
 						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"datatype": "_AliasCWMP"
 					},
 					"GroupId": {
 						"type": "string",
@@ -72584,12 +73314,7 @@
 							"usp"
 						],
 						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"datatype": "_AliasCWMP"
 					},
 					"EndpointId": {
 						"type": "unsignedInt",
@@ -72785,12 +73510,7 @@
 							"usp"
 						],
 						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"datatype": "_AliasCWMP"
 					},
 					"Coordinator": {
 						"type": "string",
@@ -73003,12 +73723,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Name": {
 					"type": "string",
@@ -73279,12 +73994,7 @@
 							"usp"
 						],
 						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"datatype": "_AliasCWMP"
 					},
 					"Name": {
 						"type": "string",
@@ -73323,6 +74033,7 @@
 							"usp"
 						],
 						"description": "<<list>> <<reference|an interface object that is stacked immediately below this interface object>> See <<bibref|TR-181i2|Section 4.2.1>>. When <<param|ManagementPort>> is set to <<true>> the CPE MUST set <<param>> to reference all non-management bridge ports that are within the same <<object|##.Bridge>> instance (and update <<param>> when subsequent non-management bridge ports are added or deleted on that Bridge). The Controller SHOULD NOT set <<param>> in this case.",
+						"default": "[]",
 						"list": {
 							"datatype": "string",
 							"maxsize": 1024
@@ -73384,7 +74095,7 @@
 							"usp"
 						],
 						"description": "<<list>> List items represent user priority regeneration values for each ingress user priority on this Bridge Port.",
-						"default": "0,1,2,3,4,5,6,7",
+						"default": "[0,1,2,3,4,5,6,7]",
 						"list": {
 							"datatype": "unsignedInt",
 							"item": {
@@ -73499,7 +74210,7 @@
 							"usp"
 						],
 						"description": "<<list>> List items represent service access priority translation values for each ingress priority on this <<object>> as described in <<bibref|802.1Q-2011|section 6.13>>. The parameter is applicable to deployments of <<object|##.Bridge>> instances that are referenced by <<param|###.Bridging.ProviderBridge.<i>.SVLANcomponent>>.",
-						"default": "0,1,2,3,4,5,6,7",
+						"default": "[0,1,2,3,4,5,6,7]",
 						"list": {
 							"datatype": "unsignedInt",
 							"item": {
@@ -73875,12 +74586,7 @@
 							"usp"
 						],
 						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"datatype": "_AliasCWMP"
 					},
 					"Name": {
 						"type": "string",
@@ -73951,12 +74657,7 @@
 							"usp"
 						],
 						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"datatype": "_AliasCWMP"
 					},
 					"VLAN": {
 						"type": "string",
@@ -74036,12 +74737,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Status": {
 					"type": "string",
@@ -74152,6 +74848,7 @@
 						"usp"
 					],
 					"description": "Classification criterion. <<list>> Each list item represents an Ethertype value. Note that neither 802.1D <<bibref|802.1D-2004>> nor 802.1Q <<bibref|802.1Q-2011>> support classification based on Ethertype.",
+					"default": "[]",
 					"list": {
 						"datatype": "unsignedInt",
 						"maxsize": 256
@@ -74178,6 +74875,7 @@
 						"usp"
 					],
 					"description": "Classification criterion. <<list|each representing a MAC Address>> Each list entry MAY optionally specify a bit-mask, where matching of a packets MAC address is only to be done for bit positions set to one in the mask. If no mask is specified, all bits of the MAC Address are to be used for matching. For example, the list might be: 01:02:03:04:05:06, 1:22:33:00:00:00/FF:FF:FF:00:00:00, 88:77:66:55:44:33 Note that neither 802.1D <<bibref|802.1D-2004>> nor 802.1Q <<bibref|802.1Q-2011>> support classification based on source MAC address.",
+					"default": "[]",
 					"list": {
 						"datatype": "string",
 						"maxsize": 512
@@ -74204,6 +74902,7 @@
 						"usp"
 					],
 					"description": "Classification criterion. <<list>> Each list item specifies a MAC Address. List items MAY optionally specify a bit-mask after the MAC Address, where matching of a packets MAC address is only to be done for bit positions set to one in the mask. If no mask is specified, all bits of the MAC Address are to be used for matching. For example, the list might be: 01:02:03:04:05:06, 1:22:33:00:00:00/FF:FF:FF:00:00:00, 88:77:66:55:44:33",
+					"default": "[]",
 					"list": {
 						"datatype": "string",
 						"maxsize": 512
@@ -74245,7 +74944,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "Classification criterion. A hexbinary string used to identify one or more devices via DHCP for which MAC address filtering would subsequently apply. A device is considered matching if the most recent DHCPv6 Vendor Class Identifier (Option 16 as defined in <<bibref|RFC3315>>) was equal to the specified value. The option value is binary, so an exact match is REQUIRED. Note that neither 802.1D <<bibref|802.1D-2004>> nor 802.1Q <<bibref|802.1Q-2011>> support classification based on source MAC address. Note: This parameter is DHCPv6-specific. It only applies when <<param|DHCPType>> is <<enum|DHCPv6|DHCPType>>.",
+					"description": "Classification criterion. A hexbinary string used to identify one or more devices via DHCP for which MAC address filtering would subsequently apply. A device is considered matching if the most recent DHCPv6 Vendor Class Identifier (Option 16 as defined in <<bibref|RFC8415>>) was equal to the specified value. The option value is binary, so an exact match is REQUIRED. Note that neither 802.1D <<bibref|802.1D-2004>> nor 802.1Q <<bibref|802.1Q-2011>> support classification based on source MAC address. Note: This parameter is DHCPv6-specific. It only applies when <<param|DHCPType>> is <<enum|DHCPv6|DHCPType>>.",
 					"datatype": "hexBinary",
 					"range": [
 						{
@@ -74307,7 +75006,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "Classification criterion. A hexbinary string used to identify one or more devices via DHCP for which MAC address filtering would subsequently apply. A device is considered matching if the most recent DHCPv6 Vendor Class Identifier (Option 16 as defined in <<bibref|RFC3315>>) was equal to the specified value. The option value is binary, so an exact match is REQUIRED. Note: This parameter is DHCPv6-specific. It only applies when <<param|DHCPType>> is <<enum|DHCPv6|DHCPType>>.",
+					"description": "Classification criterion. A hexbinary string used to identify one or more devices via DHCP for which MAC address filtering would subsequently apply. A device is considered matching if the most recent DHCPv6 Vendor Class Identifier (Option 16 as defined in <<bibref|RFC8415>>) was equal to the specified value. The option value is binary, so an exact match is REQUIRED. Note: This parameter is DHCPv6-specific. It only applies when <<param|DHCPType>> is <<enum|DHCPv6|DHCPType>>.",
 					"datatype": "hexBinary",
 					"range": [
 						{
@@ -74353,7 +75052,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "Classification criterion. A hexbinary string used to identify one or more devices via DHCP for which MAC address filtering would subsequently apply. A device is considered matching if the most recent DHCP Client Identifier (via DHCP lease acquisition or renewal for DHCPv4) was equal to the specified value. The DHCP Client Identifier is Option 61 (as defined in <<bibref|RFC2132>>) for <<enum|DHCPv4|DHCPType>>, or is Option 1 (as defined in <<bibref|RFC3315>>) for <<enum|DHCPv6|DHCPType>>. The option value is binary, so an exact match is REQUIRED. Note that neither 802.1D <<bibref|802.1D-2004>> nor 802.1Q <<bibref|802.1Q-2011>> support classification based on source MAC address. Note: DHCPv4 Option values are limited to a length of 255, while DHCPv6 Option values can have a maximum length of 65535. Note: This parameter is DHCP version neutral. The specific DHCP version in use with this parameter is indicated by <<param|DHCPType>>. Note: DHCPv6 Option 1 (Client Identifier) is sometimes referred to as DUID.",
+					"description": "Classification criterion. A hexbinary string used to identify one or more devices via DHCP for which MAC address filtering would subsequently apply. A device is considered matching if the most recent DHCP Client Identifier (via DHCP lease acquisition or renewal for DHCPv4) was equal to the specified value. The DHCP Client Identifier is Option 61 (as defined in <<bibref|RFC2132>>) for <<enum|DHCPv4|DHCPType>>, or is Option 1 (as defined in <<bibref|RFC8415>>) for <<enum|DHCPv6|DHCPType>>. The option value is binary, so an exact match is REQUIRED. Note that neither 802.1D <<bibref|802.1D-2004>> nor 802.1Q <<bibref|802.1Q-2011>> support classification based on source MAC address. Note: DHCPv4 Option values are limited to a length of 255, while DHCPv6 Option values can have a maximum length of 65535. Note: This parameter is DHCP version neutral. The specific DHCP version in use with this parameter is indicated by <<param|DHCPType>>. Note: DHCPv6 Option 1 (Client Identifier) is sometimes referred to as DUID.",
 					"datatype": "hexBinary",
 					"range": [
 						{
@@ -74381,7 +75080,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "Classification criterion. A hexbinary string used to identify one or more devices via DHCP for which MAC address filtering would subsequently apply. A device is considered matching if the most recent DHCP Client Identifier (via DHCP lease acquisition or renewal for DHCPv4) was equal to the specified value. The DHCP Client Identifier is Option 61 (as defined in <<bibref|RFC2132>>) for <<enum|DHCPv4|DHCPType>>, or is Option 1 (as defined in <<bibref|RFC3315>>) for <<enum|DHCPv6|DHCPType>>. The option value is binary, so an exact match is REQUIRED. Note: DHCPv4 Option values are limited to a length of 255, while DHCPv6 Option values can have a maximum length of 65535. Note: This parameter is DHCP version neutral. The specific DHCP version in use with this parameter is indicated by <<param|DHCPType>>. Note: DHCPv6 Option 1 (Client Identifier) is sometimes referred to as DUID.",
+					"description": "Classification criterion. A hexbinary string used to identify one or more devices via DHCP for which MAC address filtering would subsequently apply. A device is considered matching if the most recent DHCP Client Identifier (via DHCP lease acquisition or renewal for DHCPv4) was equal to the specified value. The DHCP Client Identifier is Option 61 (as defined in <<bibref|RFC2132>>) for <<enum|DHCPv4|DHCPType>>, or is Option 1 (as defined in <<bibref|RFC8415>>) for <<enum|DHCPv6|DHCPType>>. The option value is binary, so an exact match is REQUIRED. Note: DHCPv4 Option values are limited to a length of 255, while DHCPv6 Option values can have a maximum length of 65535. Note: This parameter is DHCP version neutral. The specific DHCP version in use with this parameter is indicated by <<param|DHCPType>>. Note: DHCPv6 Option 1 (Client Identifier) is sometimes referred to as DUID.",
 					"datatype": "hexBinary",
 					"range": [
 						{
@@ -74409,7 +75108,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "Classification criterion. A hexbinary string used to identify one or more devices via DHCP for which MAC address filtering would subsequently apply. A device is considered matching if the most recent DHCP User Class Identifier (via DHCP lease acquisition or renewal for DHCPv4) was equal to the specified value. The DHCP User Class Identifier is Option 77 (as defined in <<bibref|RFC3004>>) for <<enum|DHCPv4|DHCPType>>, or is Option 15 (as defined in <<bibref|RFC3315>>) for <<enum|DHCPv6|DHCPType>>. The option value is binary, so an exact match is REQUIRED. Note that neither 802.1D <<bibref|802.1D-2004>> nor 802.1Q <<bibref|802.1Q-2011>> support classification based on source MAC address. Note: DHCPv4 Option values are limited to a length of 255, while DHCPv6 Option values can have a maximum length of 65535. Note: This parameter is DHCP version neutral. The specific DHCP version in use with this parameter is indicated by <<param|DHCPType>>.",
+					"description": "Classification criterion. A hexbinary string used to identify one or more devices via DHCP for which MAC address filtering would subsequently apply. A device is considered matching if the most recent DHCP User Class Identifier (via DHCP lease acquisition or renewal for DHCPv4) was equal to the specified value. The DHCP User Class Identifier is Option 77 (as defined in <<bibref|RFC3004>>) for <<enum|DHCPv4|DHCPType>>, or is Option 15 (as defined in <<bibref|RFC8415>>) for <<enum|DHCPv6|DHCPType>>. The option value is binary, so an exact match is REQUIRED. Note that neither 802.1D <<bibref|802.1D-2004>> nor 802.1Q <<bibref|802.1Q-2011>> support classification based on source MAC address. Note: DHCPv4 Option values are limited to a length of 255, while DHCPv6 Option values can have a maximum length of 65535. Note: This parameter is DHCP version neutral. The specific DHCP version in use with this parameter is indicated by <<param|DHCPType>>.",
 					"datatype": "hexBinary",
 					"range": [
 						{
@@ -74437,7 +75136,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "Classification criterion. A hexbinary string used to identify one or more devices via DHCP for which MAC address filtering would subsequently apply. A device is considered matching if the most recent DHCP User Class Identifier (via DHCP lease acquisition or renewal for DHCPv4) was equal to the specified value. The DHCP User Class Identifier is Option 77 (as defined in <<bibref|RFC3004>>) for <<enum|DHCPv4|DHCPType>>, or is Option 15 (as defined in <<bibref|RFC3315>>) for <<enum|DHCPv6|DHCPType>>. The option value is binary, so an exact match is REQUIRED. Note: DHCPv4 Option values are limited to a length of 255, while DHCPv6 Option values can have a maximum length of 65535. Note: This parameter is DHCP version neutral. The specific DHCP version in use with this parameter is indicated by <<param|DHCPType>>.",
+					"description": "Classification criterion. A hexbinary string used to identify one or more devices via DHCP for which MAC address filtering would subsequently apply. A device is considered matching if the most recent DHCP User Class Identifier (via DHCP lease acquisition or renewal for DHCPv4) was equal to the specified value. The DHCP User Class Identifier is Option 77 (as defined in <<bibref|RFC3004>>) for <<enum|DHCPv4|DHCPType>>, or is Option 15 (as defined in <<bibref|RFC8415>>) for <<enum|DHCPv6|DHCPType>>. The option value is binary, so an exact match is REQUIRED. Note: DHCPv4 Option values are limited to a length of 255, while DHCPv6 Option values can have a maximum length of 65535. Note: This parameter is DHCP version neutral. The specific DHCP version in use with this parameter is indicated by <<param|DHCPType>>.",
 					"datatype": "hexBinary",
 					"range": [
 						{
@@ -74723,12 +75422,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Type": {
 					"type": "string",
@@ -74770,6 +75464,7 @@
 						"usp"
 					],
 					"description": "<<list>> <<reference|a <<object|#.Bridge>> instance that specifies a C-VLAN component for the <<object>>>>",
+					"default": "[]",
 					"list": {
 						"datatype": "string",
 						"range": [
@@ -74876,12 +75571,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Name": {
 					"type": "string",
@@ -74920,6 +75610,7 @@
 						"usp"
 					],
 					"description": "<<list>> <<reference|an interface object that is stacked immediately below this interface object>> See <<bibref|TR-181i2|Section 4.2.1>>.",
+					"default": "[]",
 					"list": {
 						"datatype": "string",
 						"maxsize": 1024
@@ -75338,6 +76029,7 @@
 							"usp"
 						],
 						"description": "<<list>> Items represent DNS Server IPv4 address(es) received via IPCP <<bibref|RFC1877>>.",
+						"default": "[]",
 						"list": {
 							"datatype": "IPv4Address",
 							"item": {
@@ -75699,7 +76391,7 @@
 				"description": "The ULA /48 prefix <<bibref|RFC4193|Section 3>>.",
 				"datatype": "IPv6Prefix"
 			},
-			"InterfaceNumberOfEntries": {
+			"ActivePortNumberOfEntries": {
 				"type": "unsignedInt",
 				"read": true,
 				"write": false,
@@ -75710,7 +76402,7 @@
 				"description": "<<numentries>>",
 				"datatype": "unsignedInt"
 			},
-			"ActivePortNumberOfEntries": {
+			"InterfaceNumberOfEntries": {
 				"type": "unsignedInt",
 				"read": true,
 				"write": false,
@@ -75757,29 +76449,6 @@
 					"description": "If set to <<true>>, attaches this interface to the IPv4 stack. If set to <<false>>, detaches this interface from the IPv4 stack. Once detached from the IPv4 stack, the interface will now no longer be able to pass IPv4 packets, and will be operationally down (unless also attached to an enabled IPv6 stack). For an IPv4 capable device, if <<param>> is not present this interface SHOULD be permanently attached to the IPv4 stack. Note that <<param>> is independent of <<param|Enable>>, and that to administratively enable an interface for IPv4 it is necessary for both <<param|Enable>> and <<param>> to be <<true>>.",
 					"datatype": "boolean"
 				},
-				"IPv6Enable": {
-					"type": "boolean",
-					"read": true,
-					"write": true,
-					"protocols": [
-						"cwmp",
-						"usp"
-					],
-					"description": "If set to <<true>>, attaches this interface to the IPv6 stack. If set to <<false>>, detaches this interface from the IPv6 stack. Once detached from the IPv6 stack, the interface will now no longer be able to pass IPv6 packets, and will be operationally down (unless also attached to an enabled IPv4 stack). For an IPv6 capable device, if <<param>> is not present this interface SHOULD be permanently attached to the IPv6 stack. Note that <<param>> is independent of <<param|Enable>>, and that to administratively enable an interface for IPv6 it is necessary for both <<param|Enable>> and <<param>> to be <<true>>.",
-					"datatype": "boolean"
-				},
-				"ULAEnable": {
-					"type": "boolean",
-					"read": true,
-					"write": true,
-					"protocols": [
-						"cwmp",
-						"usp"
-					],
-					"description": "Controls whether or not ULAs <<bibref|RFC4193>> are generated and used on this interface.",
-					"default": "false",
-					"datatype": "boolean"
-				},
 				"Status": {
 					"type": "string",
 					"read": true,
@@ -75810,12 +76479,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Name": {
 					"type": "string",
@@ -75854,6 +76518,7 @@
 						"usp"
 					],
 					"description": "<<list>> <<reference|an interface object that is stacked immediately below this interface object>> See <<bibref|TR-181i2|Section 4.2.1>>. <<param>> MUST be <<empty>> and read-only when <<param|Type>> is <<enum|Loopback|Type>>, <<enum|Tunnel|Type>>, or <<enum|Tunneled|Type>>.",
+					"default": "[]",
 					"list": {
 						"datatype": "string",
 						"maxsize": 1024
@@ -75886,6 +76551,29 @@
 					"default": "false",
 					"datatype": "boolean"
 				},
+				"IPv6Enable": {
+					"type": "boolean",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "If set to <<true>>, attaches this interface to the IPv6 stack. If set to <<false>>, detaches this interface from the IPv6 stack. Once detached from the IPv6 stack, the interface will now no longer be able to pass IPv6 packets, and will be operationally down (unless also attached to an enabled IPv4 stack). For an IPv6 capable device, if <<param>> is not present this interface SHOULD be permanently attached to the IPv6 stack. Note that <<param>> is independent of <<param|Enable>>, and that to administratively enable an interface for IPv6 it is necessary for both <<param|Enable>> and <<param>> to be <<true>>.",
+					"datatype": "boolean"
+				},
+				"ULAEnable": {
+					"type": "boolean",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Controls whether or not ULAs <<bibref|RFC4193>> are generated and used on this interface.",
+					"default": "false",
+					"datatype": "boolean"
+				},
 				"MaxMTUSize": {
 					"type": "unsignedInt",
 					"read": true,
@@ -76002,7 +76690,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "IPv4 address table. Entries are auto-created and auto-deleted as IP addresses are added and deleted via DHCP, auto-IP, or IPCP. Static entries are created and configured by the Controller.",
+					"description": "IPv4 address table. Entries are auto-created and auto-deleted as IP addresses are added and deleted via DHCP, auto-IP, 3GPP-NAS, or IPCP. Static entries are created and configured by the Controller.",
 					"uniqueKeys": [
 						"Alias",
 						"IPAddress",
@@ -76049,12 +76737,7 @@
 							"usp"
 						],
 						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. This parameter can only be modified if <<param|AddressingType>> is <<enum|Static|AddressingType>>.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"datatype": "_AliasCWMP"
 					},
 					"IPAddress": {
 						"type": "string",
@@ -76104,7 +76787,7 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "Addressing method used to assign the IP address. Enumeration of: DHCP, IKEv2, AutoIP, IPCP, Static.",
+						"description": "Addressing method used to assign the IP address. Enumeration of: DHCP, IKEv2, AutoIP, IPCP, Static, 3GPP-NAS.",
 						"default": "Static",
 						"datatype": "string",
 						"enumerations": [
@@ -76112,7 +76795,8 @@
 							"IKEv2",
 							"AutoIP",
 							"IPCP",
-							"Static"
+							"Static",
+							"3GPP-NAS"
 						]
 					}
 				},
@@ -76125,6 +76809,16 @@
 					"description": "Throughput statistics for this interface. The CPE MUST reset the interfaces Stats parameters (unless otherwise stated in individual object or parameter descriptions) either when the interface becomes operationally down due to a previous administrative down (i.e. the interfaces <<param|#.Status>> parameter transitions to a down state after the interface is disabled) or when the interface becomes administratively up (i.e. the interfaces <<param|#.Enable>> parameter transitions from <<false>> to <<true>>). Administrative and operational interface status is discussed in <<bibref|TR-181i2|section 4.2.2>>.",
 					"access": false,
 					"array": false,
+					"Reset": {
+						"type": "boolean",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp"
+						],
+						"description": "Set this to <<true>> to reset all this objects statistics counters to zero.",
+						"datatype": "boolean"
+					},
 					"BytesSent": {
 						"type": "unsignedLong",
 						"read": true,
@@ -76134,7 +76828,7 @@
 							"usp"
 						],
 						"description": "The total number of bytes transmitted out of the interface, including framing characters.",
-						"datatype": "unsignedLong"
+						"datatype": "StatsCounter64"
 					},
 					"BytesReceived": {
 						"type": "unsignedLong",
@@ -76145,7 +76839,7 @@
 							"usp"
 						],
 						"description": "The total number of bytes received on the interface, including framing characters.",
-						"datatype": "unsignedLong"
+						"datatype": "StatsCounter64"
 					},
 					"PacketsSent": {
 						"type": "unsignedLong",
@@ -76156,7 +76850,7 @@
 							"usp"
 						],
 						"description": "The total number of packets transmitted out of the interface.",
-						"datatype": "unsignedLong"
+						"datatype": "StatsCounter64"
 					},
 					"PacketsReceived": {
 						"type": "unsignedLong",
@@ -76167,7 +76861,7 @@
 							"usp"
 						],
 						"description": "The total number of packets received on the interface.",
-						"datatype": "unsignedLong"
+						"datatype": "StatsCounter64"
 					},
 					"ErrorsSent": {
 						"type": "unsignedInt",
@@ -76178,7 +76872,7 @@
 							"usp"
 						],
 						"description": "The total number of outbound packets that could not be transmitted because of errors.",
-						"datatype": "unsignedInt"
+						"datatype": "StatsCounter32"
 					},
 					"ErrorsReceived": {
 						"type": "unsignedInt",
@@ -76189,7 +76883,7 @@
 							"usp"
 						],
 						"description": "The total number of inbound packets that contained errors preventing them from being delivered to a higher-layer protocol.",
-						"datatype": "unsignedInt"
+						"datatype": "StatsCounter32"
 					},
 					"UnicastPacketsSent": {
 						"type": "unsignedLong",
@@ -76200,18 +76894,7 @@
 							"usp"
 						],
 						"description": "The total number of packets requested for transmission which were not addressed to a multicast or broadcast address at this layer, including those that were discarded or not sent.",
-						"datatype": "unsignedLong"
-					},
-					"UnicastPacketsReceived": {
-						"type": "unsignedLong",
-						"read": true,
-						"write": false,
-						"protocols": [
-							"cwmp",
-							"usp"
-						],
-						"description": "The total number of received packets, delivered by this layer to a higher layer, which were not addressed to a multicast or broadcast address at this layer.",
-						"datatype": "unsignedLong"
+						"datatype": "StatsCounter64"
 					},
 					"DiscardPacketsSent": {
 						"type": "unsignedInt",
@@ -76222,7 +76905,7 @@
 							"usp"
 						],
 						"description": "The total number of outbound packets which were chosen to be discarded even though no errors had been detected to prevent their being transmitted. One possible reason for discarding such a packet could be to free up buffer space.",
-						"datatype": "unsignedInt"
+						"datatype": "StatsCounter32"
 					},
 					"DiscardPacketsReceived": {
 						"type": "unsignedInt",
@@ -76233,7 +76916,7 @@
 							"usp"
 						],
 						"description": "The total number of inbound packets which were chosen to be discarded even though no errors had been detected to prevent their being delivered. One possible reason for discarding such a packet could be to free up buffer space.",
-						"datatype": "unsignedInt"
+						"datatype": "StatsCounter32"
 					},
 					"MulticastPacketsSent": {
 						"type": "unsignedLong",
@@ -76244,7 +76927,18 @@
 							"usp"
 						],
 						"description": "The total number of packets that higher-level protocols requested for transmission and which were addressed to a multicast address at this layer, including those that were discarded or not sent.",
-						"datatype": "unsignedLong"
+						"datatype": "StatsCounter64"
+					},
+					"UnicastPacketsReceived": {
+						"type": "unsignedLong",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "The total number of received packets, delivered by this layer to a higher layer, which were not addressed to a multicast or broadcast address at this layer.",
+						"datatype": "StatsCounter64"
 					},
 					"MulticastPacketsReceived": {
 						"type": "unsignedLong",
@@ -76255,7 +76949,7 @@
 							"usp"
 						],
 						"description": "The total number of received packets, delivered by this layer to a higher layer, which were addressed to a multicast address at this layer.",
-						"datatype": "unsignedLong"
+						"datatype": "StatsCounter64"
 					},
 					"BroadcastPacketsSent": {
 						"type": "unsignedLong",
@@ -76266,7 +76960,7 @@
 							"usp"
 						],
 						"description": "The total number of packets that higher-level protocols requested for transmission and which were addressed to a broadcast address at this layer, including those that were discarded or not sent. Note that IPv6 does not define broadcast addresses, so IPv6 packets will never cause this counter to increment.",
-						"datatype": "unsignedLong"
+						"datatype": "StatsCounter64"
 					},
 					"BroadcastPacketsReceived": {
 						"type": "unsignedLong",
@@ -76277,7 +76971,7 @@
 							"usp"
 						],
 						"description": "The total number of received packets, delivered by this layer to a higher layer, which were addressed to a broadcast address at this layer. Note that IPv6 does not define broadcast addresses, so IPv6 packets will never cause this counter to increment.",
-						"datatype": "unsignedLong"
+						"datatype": "StatsCounter64"
 					},
 					"UnknownProtoPacketsReceived": {
 						"type": "unsignedInt",
@@ -76288,7 +76982,14 @@
 							"usp"
 						],
 						"description": "The total number of packets received via the interface which were discarded because of an unknown or unsupported protocol.",
-						"datatype": "unsignedInt"
+						"datatype": "StatsCounter32"
+					},
+					"Reset()": {
+						"type": "command",
+						"async": true,
+						"protocols": [
+							"usp"
+						]
 					}
 				},
 				"Device.IP.Interface.{i}.TWAMPReflector.{i}.": {
@@ -76340,12 +77041,7 @@
 							"usp"
 						],
 						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"datatype": "_AliasCWMP"
 					},
 					"Port": {
 						"type": "unsignedInt",
@@ -76404,7 +77100,7 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "<<list>> List items represent source port ranges from which test packets MUST always be received. <<empty>> list will allow test packets to be received from any source port. Each entry in the list MUST be either a port number or a range of port numbers separated by a hypen (-). For example, an entry with the value: 2-40 accepts test packets from any allowed source IP addresses with a source port between 2 and 40 inclusive. An entry of 3 accepts test packets from allow source IP addresses with a port of 3.",
+						"description": "<<list>> List items represent source port ranges from which test packets MUST always be received. <<empty>> list will allow test packets to be received from any source port. Each entry in the list MUST be either a port number or a range of port numbers separated by a hyphen (-). For example, an entry with the value: 2-40 accepts test packets from any allowed source IP addresses with a source port between 2 and 40 inclusive. An entry of 3 accepts test packets from allow source IP addresses with a port of 3.",
 						"list": {
 							"datatype": "string",
 							"maxsize": 255
@@ -76417,7 +77113,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "This table contains the IP interfaces IPv6 unicast addresses. There MUST be an entry for each such address, including anycast addresses. There are several ways in which entries can be added to and deleted from this table, including: * Automatically via SLAAC <<bibref|RFC4862>>, which covers generation of link-local addresses (for all types of device) and global addresses (for non-router devices). * Automatically via DHCPv6 <<bibref|RFC3315>>, which covers generation of any type of address (subject to the configured DHCP server policy). * Manually via a GUI or some other local management interface. * Manually via factory default configuration. * By the Controller. This table MUST NOT include entries for the Subnet-Router anycast address <<bibref|RFC4291|Section 2.6.1>>. Such entries would be identical to others but with a zero interface identifier, and would add no value. A loopback interface will always have address ::1 <<bibref|RFC4291|Section 2.5.3>> and MAY also have link-local address fe80::1. This object is based on ipAddressTable from <<bibref|RFC4293>>.",
+					"description": "This table contains the IP interfaces IPv6 unicast addresses. There MUST be an entry for each such address, including anycast addresses. There are several ways in which entries can be added to and deleted from this table, including: * Automatically via SLAAC <<bibref|RFC4862>>, which covers generation of link-local addresses (for all types of device) and global addresses (for non-router devices). * Automatically via DHCPv6 <<bibref|RFC8415>>, which covers generation of any type of address (subject to the configured DHCP server policy). * Manually via a GUI or some other local management interface. * Manually via factory default configuration. * By the Controller. This table MUST NOT include entries for the Subnet-Router anycast address <<bibref|RFC4291|Section 2.6.1>>. Such entries would be identical to others but with a zero interface identifier, and would add no value. A loopback interface will always have address ::1 <<bibref|RFC4291|Section 2.5.3>> and MAY also have link-local address fe80::1. This object is based on ipAddressTable from <<bibref|RFC4293>>.",
 					"uniqueKeys": [
 						"Alias",
 						"IPAddress"
@@ -76485,12 +77181,7 @@
 							"usp"
 						],
 						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. This parameter can only be modified if <<param|Origin>> is <<enum|Static|Origin>>.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"datatype": "_AliasCWMP"
 					},
 					"IPAddress": {
 						"type": "string",
@@ -76511,7 +77202,7 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "Mechanism via which the IP address was assigned. Enumeration of: AutoConfigured, DHCPv6, IKEv2, MAP, WellKnown, Static. This parameter is based on ipOrigin from <<bibref|RFC4293>>.",
+						"description": "Mechanism via which the IP address was assigned. Enumeration of: AutoConfigured, DHCPv6, IKEv2, MAP, WellKnown, 3GPP-NAS, Static. This parameter is based on ipOrigin from <<bibref|RFC4293>>.",
 						"default": "Static",
 						"datatype": "string",
 						"enumerations": [
@@ -76520,6 +77211,7 @@
 							"IKEv2",
 							"MAP",
 							"WellKnown",
+							"3GPP-NAS",
 							"Static"
 						]
 					},
@@ -76577,7 +77269,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "This table contains the interfaces IPv6 prefixes. There MUST be an entry for each such prefix, not only for prefixes learned from router advertisements. There are several ways in which entries can be added to and deleted from this table, including: * Automatically via <<bibref|RFC4861>> Router Advertisements. See also <<object|###.RouterAdvertisement>>. * Automatically via DHCPv6 <<bibref|RFC3315>> prefix delegation <<bibref|RFC3633>>. See also <<object|###.DHCPv6.Client>>. * Automatically via internal CPE logic, e.g. creation of child prefixes derived from a parent prefix. * Manually via a GUI or some other local management interface. * Manually via factory default configuration. * By the Controller. The CPE MAY choose not to create <<object>> entries for <<enum|WellKnown|Origin>> prefixes or for the ULA /48 prefix <<bibref|RFC4193>>. If an <<object>> entry exists for the ULA /48 prefix, it MUST be on a downstream interface (i.e. an interface for which the physical layer interface object has Upstream = <<false>>). This object is based on ipAddressPrefixTable from <<bibref|RFC4293>>.",
+					"description": "This table contains the interfaces IPv6 prefixes. There MUST be an entry for each such prefix, not only for prefixes learned from router advertisements. There are several ways in which entries can be added to and deleted from this table, including: * Automatically via <<bibref|RFC4861>> Router Advertisements. See also <<object|###.RouterAdvertisement>>. * Automatically via DHCPv6 <<bibref|RFC8415>> prefix delegation <<bibref|RFC8415>>. See also <<object|###.DHCPv6.Client>>. * Automatically via internal CPE logic, e.g. creation of child prefixes derived from a parent prefix. * Manually via a GUI or some other local management interface. * Manually via factory default configuration. * By the Controller. The CPE MAY choose not to create <<object>> entries for <<enum|WellKnown|Origin>> prefixes or for the ULA /48 prefix <<bibref|RFC4193>>. If an <<object>> entry exists for the ULA /48 prefix, it MUST be on a downstream interface (i.e. an interface for which the physical layer interface object has Upstream = <<false>>). This object is based on ipAddressPrefixTable from <<bibref|RFC4293>>.",
 					"uniqueKeys": [
 						"Alias",
 						"Prefix"
@@ -76641,12 +77333,7 @@
 							"usp"
 						],
 						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. This parameter can only be modified if <<param|Origin>> is <<enum|Static|Origin>>.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"datatype": "_AliasCWMP"
 					},
 					"Prefix": {
 						"type": "string",
@@ -78118,7 +78805,7 @@
 							"protocols": [
 								"usp"
 							],
-							"description": "The number of <<units>> of the test file sent during the FTP/HTTP transaction including FTP/HTTP headers, between <<param|BOMTime>> and <<param|EOMTime>> acrosss all connections.",
+							"description": "The number of <<units>> of the test file sent during the FTP/HTTP transaction including FTP/HTTP headers, between <<param|BOMTime>> and <<param|EOMTime>> across all connections.",
 							"datatype": "StatsCounter64"
 						},
 						"TotalBytesReceived": {
@@ -79023,7 +79710,7 @@
 							"protocols": [
 								"usp"
 							],
-							"description": "Timeout value. Value specified in <<units>>. The default value SHOULD be 5 <<units>>. <<deprecated|2.15|because it is superseded by <<param|TimeoutNoTestTraffic>> due to new precision requirement. Refer to <<bibref|TR-471>> for details>> <<obsoleted|2.17>>",
+							"description": "Timeout value. Value specified in <<units>>. The default value SHOULD be 5 <<units>>. <<deprecated|2.15|because it is superseded by <<param|TimeoutNoTestTraffic>> due to new precision requirement. Refer to <<bibref|TR-471>> for details>> <<obsoleted|2.17>> <<deleted|2.18>>",
 							"datatype": "unsignedInt",
 							"range": [
 								{
@@ -79329,7 +80016,7 @@
 							"protocols": [
 								"usp"
 							],
-							"description": "The maximum IP-Layer Capacity metric from among all <<param|IncrementalResult.<i>.IPLayerCapacity>> values measured between <<param|BOMTime>> and <<param|EOMTime>> across all connections for this test. This is calculated according to <<bibref|TR-471>> Equation 1. Result is expressed in <<units>> with 2 digits beyond the decimal. 10^6 bits/second = 1 <<units>>.",
+							"description": "The maximum IP-Layer Capacity metric from among all <<param|IncrementalResult.<i>.IPLayerCapacity>> values measured between <<param|BOMTime>> and <<param|EOMTime>> across all connections for this test. This is calculated according to <<bibref|TR-471>> Equation 1. Result is expressed in <<units>> with 2 digits beyond the decimal. 10^6^ bits/second = 1 <<units>>.",
 							"datatype": "decimal"
 						},
 						"TimeOfMax": {
@@ -79349,7 +80036,7 @@
 							"protocols": [
 								"usp"
 							],
-							"description": "Results of measurements using the Maximum IP-Layer Capacity metric, according to <<bibref|TR-471>> Equation 1, and calculations to estimate the capacity at Layer 2 with Preamble and Inter-frame gap, but no ETH Frame Check Sequence. Result is expressed in <<units>> with 2 digits beyond the decimal. 10^6 bits/second = 1 <<units>>.",
+							"description": "Results of measurements using the Maximum IP-Layer Capacity metric, according to <<bibref|TR-471>> Equation 1, and calculations to estimate the capacity at Layer 2 with Preamble and Inter-frame gap, but no ETH Frame Check Sequence. Result is expressed in <<units>> with 2 digits beyond the decimal. 10^6^ bits/second = 1 <<units>>.",
 							"datatype": "decimal"
 						},
 						"MaxETHCapacityWithFCS": {
@@ -79359,7 +80046,7 @@
 							"protocols": [
 								"usp"
 							],
-							"description": "Results of measurements using the Maximum IP-Layer Capacity metric, according to <<bibref|TR-471>> Equation 1, and calculations to estimate the capacity at Layer 2 with ETH Frame Check Sequence. Result is expressed in <<units>> with 2 digits beyond the decimal. 10^6bits/second = 1 <<units>>.",
+							"description": "Results of measurements using the Maximum IP-Layer Capacity metric, according to <<bibref|TR-471>> Equation 1, and calculations to estimate the capacity at Layer 2 with ETH Frame Check Sequence. Result is expressed in <<units>> with 2 digits beyond the decimal. 10^6^ bits/second = 1 <<units>>.",
 							"datatype": "decimal"
 						},
 						"MaxETHCapacityWithFCSVLAN": {
@@ -79369,7 +80056,7 @@
 							"protocols": [
 								"usp"
 							],
-							"description": "Results of measurements using the Maximum IP-Layer Capacity metric, according to <<bibref|TR-471>> Equation 1, and calculations to estimate the capacity at Layer 2 with ETH Frame Check Sequence and VLAN tag. Result is expressed in <<units>> with 2 digits beyond the decimal. 10^6bits/second = 1 <<units>>.",
+							"description": "Results of measurements using the Maximum IP-Layer Capacity metric, according to <<bibref|TR-471>> Equation 1, and calculations to estimate the capacity at Layer 2 with ETH Frame Check Sequence and VLAN tag. Result is expressed in <<units>> with 2 digits beyond the decimal. 10^6^ bits/second = 1 <<units>>.",
 							"datatype": "decimal"
 						},
 						"LossRatioAtMax": {
@@ -79439,7 +80126,7 @@
 							"protocols": [
 								"usp"
 							],
-							"description": "The number of bits observed on the Interface during an IP-Layer Capacity test for time interval of duration <<param|TestSubInterval>> ending at <<param|IncrementalResult.<i>.TimeOfSubInterval>> corresponding to the <<param|MaxIPLayerCapacity>>, divided by the duration of <<param|TestSubInterval>>. Result is expressed in Mbps with 2 digits beyond the decimal. 10^6 bits/second = 1 <<units>>. This is primarily a diagnostic measurement. Measurement direction follows the <<param|Role>>.",
+							"description": "The number of bits observed on the Interface during an IP-Layer Capacity test for time interval of duration <<param|TestSubInterval>> ending at <<param|IncrementalResult.<i>.TimeOfSubInterval>> corresponding to the <<param|MaxIPLayerCapacity>>, divided by the duration of <<param|TestSubInterval>>. Result is expressed in Mbps with 2 digits beyond the decimal. 10^6^ bits/second = 1 <<units>>. This is primarily a diagnostic measurement. Measurement direction follows the <<param|Role>>.",
 							"datatype": "decimal"
 						},
 						"IPLayerCapacitySummary": {
@@ -79449,7 +80136,7 @@
 							"protocols": [
 								"usp"
 							],
-							"description": "The IP-Layer Capacity metric from among all <<param|IncrementalResult.<i>.IPLayerCapacity>> values measured between <<param|BOMTime>> and <<param|EOMTime>> across all connections for this test. This is calculated according to <<bibref|TR-471>> Equation 1. Result is expressed in <<units>> with 2 digits beyond the decimal. 10^6 bits/second = 1 <<units>>.",
+							"description": "The IP-Layer Capacity metric from among all <<param|IncrementalResult.<i>.IPLayerCapacity>> values measured between <<param|BOMTime>> and <<param|EOMTime>> across all connections for this test. This is calculated according to <<bibref|TR-471>> Equation 1. Result is expressed in <<units>> with 2 digits beyond the decimal. 10^6^ bits/second = 1 <<units>>.",
 							"datatype": "decimal"
 						},
 						"LossRatioSummary": {
@@ -79529,7 +80216,7 @@
 							"protocols": [
 								"usp"
 							],
-							"description": "The number of bits observed on the <<param|Interface>> during an IP-Layer Capacity test for the entire time interval of duration <<param|TestInterval>>, divided by the duration of <<param|TestInterval>>. Result is expressed in <<units>> with 2 digits beyond the decimal. 10^6 bits/second = 1 <<units>>. This is primarily a diagnostic measurement. Measurement direction follows the <<param|Role>>.",
+							"description": "The number of bits observed on the <<param|Interface>> during an IP-Layer Capacity test for the entire time interval of duration <<param|TestInterval>>, divided by the duration of <<param|TestInterval>>. Result is expressed in <<units>> with 2 digits beyond the decimal. 10^6^ bits/second = 1 <<units>>. This is primarily a diagnostic measurement. Measurement direction follows the <<param|Role>>.",
 							"datatype": "decimal"
 						},
 						"TmaxRTTUsed": {
@@ -81036,7 +81723,7 @@
 						"protocols": [
 							"cwmp"
 						],
-						"description": "The number of <<units>> of the test file sent during the FTP/HTTP transaction including FTP/HTTP headers, between <<param|BOMTime>> and <<param|EOMTime>> acrosss all connections.",
+						"description": "The number of <<units>> of the test file sent during the FTP/HTTP transaction including FTP/HTTP headers, between <<param|BOMTime>> and <<param|EOMTime>> across all connections.",
 						"datatype": "StatsCounter64"
 					},
 					"TotalBytesReceived": {
@@ -82383,7 +83070,7 @@
 						"protocols": [
 							"cwmp"
 						],
-						"description": "Timeout value. Value specified in <<units>>. The default value SHOULD be 5 <<units>>. <<deprecated|2.15|because it is superseded by <<param|TimeoutNoTestTraffic>> due to new precision requirement. Refer to <<bibref|TR-471>> for details>> <<obsoleted|2.17>>",
+						"description": "Timeout value. Value specified in <<units>>. The default value SHOULD be 5 <<units>>. <<deprecated|2.15|because it is superseded by <<param|TimeoutNoTestTraffic>> due to new precision requirement. Refer to <<bibref|TR-471>> for details>> <<obsoleted|2.17>> <<deleted|2.18>>",
 						"datatype": "unsignedInt",
 						"range": [
 							{
@@ -82683,7 +83370,7 @@
 						"protocols": [
 							"cwmp"
 						],
-						"description": "The maximum IP-Layer Capacity metric from among all <<param|IncrementalResult.<i>.IPLayerCapacity>> values measured between <<param|BOMTime>> and <<param|EOMTime>> across all connections for this test. This is calculated according to <<bibref|TR-471>> Equation 1. Result is expressed in <<units>> with 2 digits beyond the decimal. 10^6 bits/second = 1 <<units>>.",
+						"description": "The maximum IP-Layer Capacity metric from among all <<param|IncrementalResult.<i>.IPLayerCapacity>> values measured between <<param|BOMTime>> and <<param|EOMTime>> across all connections for this test. This is calculated according to <<bibref|TR-471>> Equation 1. Result is expressed in <<units>> with 2 digits beyond the decimal. 10^6^ bits/second = 1 <<units>>.",
 						"datatype": "decimal"
 					},
 					"TimeOfMax": {
@@ -82703,7 +83390,7 @@
 						"protocols": [
 							"cwmp"
 						],
-						"description": "Results of measurements using the Maximum IP-Layer Capacity metric, according to <<bibref|TR-471>> Equation 1, and calculations to estimate the capacity at Layer 2 with Preamble and Inter-frame gap, but no ETH Frame Check Sequence. Result is expressed in <<units>> with 2 digits beyond the decimal. 10^6 bits/second = 1 <<units>>.",
+						"description": "Results of measurements using the Maximum IP-Layer Capacity metric, according to <<bibref|TR-471>> Equation 1, and calculations to estimate the capacity at Layer 2 with Preamble and Inter-frame gap, but no ETH Frame Check Sequence. Result is expressed in <<units>> with 2 digits beyond the decimal. 10^6^ bits/second = 1 <<units>>.",
 						"datatype": "decimal"
 					},
 					"MaxETHCapacityWithFCS": {
@@ -82713,7 +83400,7 @@
 						"protocols": [
 							"cwmp"
 						],
-						"description": "Results of measurements using the Maximum IP-Layer Capacity metric, according to <<bibref|TR-471>> Equation 1, and calculations to estimate the capacity at Layer 2 with ETH Frame Check Sequence. Result is expressed in <<units>> with 2 digits beyond the decimal. 10^6bits/second = 1 <<units>>.",
+						"description": "Results of measurements using the Maximum IP-Layer Capacity metric, according to <<bibref|TR-471>> Equation 1, and calculations to estimate the capacity at Layer 2 with ETH Frame Check Sequence. Result is expressed in <<units>> with 2 digits beyond the decimal. 10^6^ bits/second = 1 <<units>>.",
 						"datatype": "decimal"
 					},
 					"MaxETHCapacityWithFCSVLAN": {
@@ -82723,7 +83410,7 @@
 						"protocols": [
 							"cwmp"
 						],
-						"description": "Results of measurements using the Maximum IP-Layer Capacity metric, according to <<bibref|TR-471>> Equation 1, and calculations to estimate the capacity at Layer 2 with ETH Frame Check Sequence and VLAN tag. Result is expressed in <<units>> with 2 digits beyond the decimal. 10^6bits/second = 1 <<units>>.",
+						"description": "Results of measurements using the Maximum IP-Layer Capacity metric, according to <<bibref|TR-471>> Equation 1, and calculations to estimate the capacity at Layer 2 with ETH Frame Check Sequence and VLAN tag. Result is expressed in <<units>> with 2 digits beyond the decimal. 10^6^ bits/second = 1 <<units>>.",
 						"datatype": "decimal"
 					},
 					"LossRatioAtMax": {
@@ -82793,7 +83480,7 @@
 						"protocols": [
 							"cwmp"
 						],
-						"description": "The number of bits observed on the Interface during an IP-Layer Capacity test for time interval of duration <<param|TestSubInterval>> ending at <<param|IncrementalResult.<i>.TimeOfSubInterval>> corresponding to the <<param|MaxIPLayerCapacity>>, divided by the duration of <<param|TestSubInterval>>. Result is expressed in Mbps with 2 digits beyond the decimal. 10^6 bits/second = 1 <<units>>. This is primarily a diagnostic measurement. Measurement direction follows the <<param|Role>>.",
+						"description": "The number of bits observed on the Interface during an IP-Layer Capacity test for time interval of duration <<param|TestSubInterval>> ending at <<param|IncrementalResult.<i>.TimeOfSubInterval>> corresponding to the <<param|MaxIPLayerCapacity>>, divided by the duration of <<param|TestSubInterval>>. Result is expressed in Mbps with 2 digits beyond the decimal. 10^6^ bits/second = 1 <<units>>. This is primarily a diagnostic measurement. Measurement direction follows the <<param|Role>>.",
 						"datatype": "decimal"
 					},
 					"IPLayerCapacitySummary": {
@@ -82803,7 +83490,7 @@
 						"protocols": [
 							"cwmp"
 						],
-						"description": "The IP-Layer Capacity metric from among all <<param|IncrementalResult.<i>.IPLayerCapacity>> values measured between <<param|BOMTime>> and <<param|EOMTime>> across all connections for this test. This is calculated according to <<bibref|TR-471>> Equation 1. Result is expressed in <<units>> with 2 digits beyond the decimal. 10^6 bits/second = 1 <<units>>.",
+						"description": "The IP-Layer Capacity metric from among all <<param|IncrementalResult.<i>.IPLayerCapacity>> values measured between <<param|BOMTime>> and <<param|EOMTime>> across all connections for this test. This is calculated according to <<bibref|TR-471>> Equation 1. Result is expressed in <<units>> with 2 digits beyond the decimal. 10^6^ bits/second = 1 <<units>>.",
 						"datatype": "decimal"
 					},
 					"LossRatioSummary": {
@@ -82883,7 +83570,7 @@
 						"protocols": [
 							"cwmp"
 						],
-						"description": "The number of bits observed on the <<param|Interface>> during an IP-Layer Capacity test for the entire time interval of duration <<param|TestInterval>>, divided by the duration of <<param|TestInterval>>. Result is expressed in <<units>> with 2 digits beyond the decimal. 10^6 bits/second = 1 <<units>>. This is primarily a diagnostic measurement. Measurement direction follows the <<param|Role>>.",
+						"description": "The number of bits observed on the <<param|Interface>> during an IP-Layer Capacity test for the entire time interval of duration <<param|TestInterval>>, divided by the duration of <<param|TestInterval>>. Result is expressed in <<units>> with 2 digits beyond the decimal. 10^6^ bits/second = 1 <<units>>. This is primarily a diagnostic measurement. Measurement direction follows the <<param|Role>>.",
 						"datatype": "decimal"
 					},
 					"TmaxRTTUsed": {
@@ -82938,7 +83625,7 @@
 							"protocols": [
 								"cwmp"
 							],
-							"description": "The maximum IP-Layer Capacity metric from among all <<param|#.IncrementalResult.<i>.IPLayerCapacity>> values within corresponding mode across all connections for this test. This is calculated according to <<bibref|TR-471>> Equation 1. Result is expressed in <<units>> with 2 digits beyond the decimal. 10^6bits/second = 1 <<units>>.",
+							"description": "The maximum IP-Layer Capacity metric from among all <<param|#.IncrementalResult.<i>.IPLayerCapacity>> values within corresponding mode across all connections for this test. This is calculated according to <<bibref|TR-471>> Equation 1. Result is expressed in <<units>> with 2 digits beyond the decimal. 10^6^ bits/second = 1 <<units>>.",
 							"datatype": "decimal"
 						},
 						"TimeOfMax": {
@@ -82958,7 +83645,7 @@
 							"protocols": [
 								"cwmp"
 							],
-							"description": "Results of measurements using the Maximum IP-Layer Capacity metric, according to <<bibref|TR-471>> Equation 1, and calculations to estimate the capacity at Layer 2 with Preamble and Inter-frame gap, but no ETH Frame Check Sequence. Result is expressed in <<units>> with 2 digits beyond the decimal. 10^6bits/second = 1 <<units>>.",
+							"description": "Results of measurements using the Maximum IP-Layer Capacity metric, according to <<bibref|TR-471>> Equation 1, and calculations to estimate the capacity at Layer 2 with Preamble and Inter-frame gap, but no ETH Frame Check Sequence. Result is expressed in <<units>> with 2 digits beyond the decimal. 10^6^ bits/second = 1 <<units>>.",
 							"datatype": "decimal"
 						},
 						"MaxETHCapacityWithFCS": {
@@ -82968,7 +83655,7 @@
 							"protocols": [
 								"cwmp"
 							],
-							"description": "Results of measurements using the Maximum IP-Layer Capacity metric, according to <<bibref|TR-471>> Equation 1, and calculations to estimate the capacity at Layer 2 with ETH Frame Check Sequence. Result is expressed in <<units>> with 2 digits beyond the decimal. 10^6bits/second = 1 <<units>>.",
+							"description": "Results of measurements using the Maximum IP-Layer Capacity metric, according to <<bibref|TR-471>> Equation 1, and calculations to estimate the capacity at Layer 2 with ETH Frame Check Sequence. Result is expressed in <<units>> with 2 digits beyond the decimal. 10^6^ bits/second = 1 <<units>>.",
 							"datatype": "decimal"
 						},
 						"MaxETHCapacityWithFCSVLAN": {
@@ -82978,7 +83665,7 @@
 							"protocols": [
 								"cwmp"
 							],
-							"description": "Results of measurements using the Maximum IP-Layer Capacity metric, according to <<bibref|TR-471>> Equation 1, and calculations to estimate the capacity at Layer 2 with ETH Frame Check Sequence and VLAN tag. Result is expressed in <<units>> with 2 digits beyond the decimal. 10^6bits/second = 1 <<units>>.",
+							"description": "Results of measurements using the Maximum IP-Layer Capacity metric, according to <<bibref|TR-471>> Equation 1, and calculations to estimate the capacity at Layer 2 with ETH Frame Check Sequence and VLAN tag. Result is expressed in <<units>> with 2 digits beyond the decimal. 10^6^ bits/second = 1 <<units>>.",
 							"datatype": "decimal"
 						},
 						"LossRatioAtMax": {
@@ -83048,7 +83735,7 @@
 							"protocols": [
 								"cwmp"
 							],
-							"description": "The number of bits observed on the <<param|#.Interface>> during an IP-Layer Capacity test for time interval of duration <<param|#.TestSubInterval>> ending at <<param|#.IncrementalResult.<i>.TimeOfSubInterval>> corresponding to the <<param|MaxIPLayerCapacity>>, divided by the duration of <<param|#.TestSubInterval>>. Result is expressed in Mbps with 2 digits beyond the decimal. 10^6 bits/second = 1 <<units>>. This is primarily a diagnostic measurement. Measurement direction follows the <<param|#.Role>>.",
+							"description": "The number of bits observed on the <<param|#.Interface>> during an IP-Layer Capacity test for time interval of duration <<param|#.TestSubInterval>> ending at <<param|#.IncrementalResult.<i>.TimeOfSubInterval>> corresponding to the <<param|MaxIPLayerCapacity>>, divided by the duration of <<param|#.TestSubInterval>>. Result is expressed in Mbps with 2 digits beyond the decimal. 10^6^ bits/second = 1 <<units>>. This is primarily a diagnostic measurement. Measurement direction follows the <<param|#.Role>>.",
 							"datatype": "decimal"
 						}
 					},
@@ -83067,7 +83754,7 @@
 							"protocols": [
 								"cwmp"
 							],
-							"description": "Results of measurements using the maximum IP-Layer Capacity metric calculation for a single interval from <<bibref|TR-471>> Equation 1, for time interval of duration <<param|#.TestSubInterval>> ending at <<param|TimeOfSubInterval>> across all connections for this test. Result is expressed in <<units>> with 2 digits beyond the decimal. 10^6 bits/second = 1 <<units>>.",
+							"description": "Results of measurements using the maximum IP-Layer Capacity metric calculation for a single interval from <<bibref|TR-471>> Equation 1, for time interval of duration <<param|#.TestSubInterval>> ending at <<param|TimeOfSubInterval>> across all connections for this test. Result is expressed in <<units>> with 2 digits beyond the decimal. 10^6^ bits/second = 1 <<units>>.",
 							"datatype": "decimal"
 						},
 						"TimeOfSubInterval": {
@@ -83147,7 +83834,7 @@
 							"protocols": [
 								"cwmp"
 							],
-							"description": "The number of bits observed on the <<param|#.Interface>> during an IP-Layer Capacity test for time interval of duration <<param|#.TestSubInterval>> ending at <<param|TimeOfSubInterval>>, divided by the duration of <<param|#.TestSubInterval>>. Result is expressed in Mbps with 2 digits beyond the decimal. 10^6 bits/second = 1 <<units>>. This is primarily a diagnostic measurement. Measurement direction follows the <<param|#.Role>>.",
+							"description": "The number of bits observed on the <<param|#.Interface>> during an IP-Layer Capacity test for time interval of duration <<param|#.TestSubInterval>> ending at <<param|TimeOfSubInterval>>, divided by the duration of <<param|#.TestSubInterval>>. Result is expressed in Mbps with 2 digits beyond the decimal. 10^6^ bits/second = 1 <<units>>. This is primarily a diagnostic measurement. Measurement direction follows the <<param|#.Role>>.",
 							"datatype": "decimal"
 						}
 					}
@@ -84245,12 +84932,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Interface": {
 					"type": "string",
@@ -84544,12 +85226,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"MaxChildSAs": {
 					"type": "unsignedInt",
@@ -84683,6 +85360,7 @@
 						"usp"
 					],
 					"description": "Allowed AH integrity algorithms <<bibref|IKEv2-params|Transform Type 3>> <<bibref|RFC4835|Section 3.2>>.",
+					"default": "[]",
 					"list": {
 						"datatype": "string"
 					}
@@ -84696,6 +85374,7 @@
 						"usp"
 					],
 					"description": "Allowed ESP integrity algorithms <<bibref|IKEv2-params|Transform Type 3>> <<bibref|RFC4835|Section 3.1.1>>.",
+					"default": "[]",
 					"list": {
 						"datatype": "string"
 					}
@@ -84904,12 +85583,7 @@
 							"usp"
 						],
 						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"datatype": "_AliasCWMP"
 					},
 					"Type": {
 						"type": "unsignedInt",
@@ -84969,12 +85643,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"TunnelInterface": {
 					"type": "string",
@@ -85085,7 +85754,8 @@
 				],
 				"description": "Represents an IKEv2 Security Association (SA), corresponding to an IKEv2 session. Instances are automatically created and deleted as IKEv2 SAs are created and deleted.",
 				"uniqueKeys": [
-					"Tunnel"
+					"Tunnel",
+					"Alias"
 				],
 				"access": false,
 				"array": true,
@@ -85116,12 +85786,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Tunnel": {
 					"type": "string",
@@ -85442,7 +86107,8 @@
 					"description": "Represents a child Security Association (SA) pair, i.e. an inbound child SA and an outbound child SA.",
 					"uniqueKeys": [
 						"InboundSPI",
-						"OutboundSPI"
+						"OutboundSPI",
+						"Alias"
 					],
 					"access": false,
 					"array": true,
@@ -85473,12 +86139,7 @@
 							"usp"
 						],
 						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"datatype": "_AliasCWMP"
 					},
 					"InboundSPI": {
 						"type": "unsignedInt",
@@ -85715,12 +86376,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"RemoteEndpoints": {
 					"type": "string",
@@ -85989,12 +86645,7 @@
 							"usp"
 						],
 						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"datatype": "_AliasCWMP"
 					},
 					"Name": {
 						"type": "string",
@@ -86270,12 +86921,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Interface": {
 					"type": "string",
@@ -86432,12 +87078,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"RemoteEndpoints": {
 					"type": "string",
@@ -86778,12 +87419,7 @@
 							"usp"
 						],
 						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"datatype": "_AliasCWMP"
 					},
 					"Name": {
 						"type": "string",
@@ -87044,12 +87680,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Interface": {
 					"type": "string",
@@ -87206,12 +87837,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"RemoteEndpoints": {
 					"type": "string",
@@ -87514,12 +88140,7 @@
 							"usp"
 						],
 						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"datatype": "_AliasCWMP"
 					},
 					"Name": {
 						"type": "string",
@@ -87752,12 +88373,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Interface": {
 					"type": "string",
@@ -87918,12 +88534,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"TransportMode": {
 					"type": "string",
@@ -88000,7 +88611,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "Port-set ID (PSID) offset in <<units>>. The number of Port-sets is 2^<<param>>. Corresponds to the <<bibref|RFC7598>> S46_PORTPARAMS (Port Parameters) options offset field. <<deprecated|2.12|because details changed between drafting this data model and the RFC being published. This parameter has been moved to the proper location within the <<object|Rule.<i>.>> object>> <<obsoleted|2.14-2.17>>",
+					"description": "Port-set ID (PSID) offset in <<units>>. The number of Port-sets is 2^<<param>>^. Corresponds to the <<bibref|RFC7598>> S46_PORTPARAMS (Port Parameters) options offset field. <<deprecated|2.12|because details changed between drafting this data model and the RFC being published. This parameter has been moved to the proper location within the <<object|Rule.<i>.>> object>> <<obsoleted|2.14-2.17>> <<deleted|2.18>>",
 					"default": "6",
 					"datatype": "unsignedInt",
 					"range": [
@@ -88020,7 +88631,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "The length in <<units>> of the Port-set id (PSID) configured in the <<param|PSID>> parameter. Corresponds to the <<bibref|RFC7598>> S46_PORTPARAMS (Port Parameters) options PSID-len field. <<deprecated|2.12|because details changed between drafting this data model and the RFC being published. This parameter has been moved to the proper location within the <<object|Rule.<i>.>> object>> <<obsoleted|2.14-2.17>>",
+					"description": "The length in <<units>> of the Port-set id (PSID) configured in the <<param|PSID>> parameter. Corresponds to the <<bibref|RFC7598>> S46_PORTPARAMS (Port Parameters) options PSID-len field. <<deprecated|2.12|because details changed between drafting this data model and the RFC being published. This parameter has been moved to the proper location within the <<object|Rule.<i>.>> object>> <<obsoleted|2.14-2.17>> <<deleted|2.18>>",
 					"default": "0",
 					"datatype": "unsignedInt",
 					"range": [
@@ -88040,7 +88651,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "Port-set ID (PSID) to use in preference to the value extracted from the Embedded Address (EA) bits. Only the high order <<param|PSIDLength>> bits of the <<param>> value are used, so the parameter is ignored when <<param|PSIDLength>> is zero. Corresponds to the <<bibref|RFC7598>> S46_PORTPARAMS (Port Parameters) options PSID field. <<deprecated|2.12|because details changed between drafting this data model and the RFC being published. This parameter has been moved to the proper location within the <<object|Rule.<i>.>> object>> <<obsoleted|2.14-2.17>>",
+					"description": "Port-set ID (PSID) to use in preference to the value extracted from the Embedded Address (EA) bits. Only the high order <<param|PSIDLength>> bits of the <<param>> value are used, so the parameter is ignored when <<param|PSIDLength>> is zero. Corresponds to the <<bibref|RFC7598>> S46_PORTPARAMS (Port Parameters) options PSID field. <<deprecated|2.12|because details changed between drafting this data model and the RFC being published. This parameter has been moved to the proper location within the <<object|Rule.<i>.>> object>> <<obsoleted|2.14-2.17>> <<deleted|2.18>>",
 					"default": "0",
 					"datatype": "unsignedInt",
 					"range": [
@@ -88059,7 +88670,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "Whether to include low-numbered (system) ports in the Port-sets. Normally ports in the range [0:2^(16-<<param|PSIDOffset|obsoleted>>)-1] are excluded, e.g. for the default <<param|PSIDOffset|obsoleted>> value of 6, ports [0:1023] are not included in the Port-sets. This parameter is related to <<bibref|RFC7597>>s N, which is defined as the number of ports (e.g., 1024) excluded from the lower end of the range. The parameter is relevant only when <<param|PSIDOffset|obsoleted>> is 0; <<false>> corresponds to N=1024 and <<true>> corresponds to N=0. <<deprecated|2.15|because details changed between drafting this data model and the RFC being published. This parameter has been moved to the proper location within the <<object|Rule.<i>.>> object>> <<obsoleted|2.17>>",
+					"description": "Whether to include low-numbered (system) ports in the Port-sets. Normally ports in the range [0:2^(16-<<param|PSIDOffset|deleted>>)^-1] are excluded, e.g. for the default <<param|PSIDOffset|deleted>> value of 6, ports [0:1023] are not included in the Port-sets. This parameter is related to <<bibref|RFC7597>>s N, which is defined as the number of ports (e.g., 1024) excluded from the lower end of the range. The parameter is relevant only when <<param|PSIDOffset|deleted>> is 0; <<false>> corresponds to N=1024 and <<true>> corresponds to N=0. <<deprecated|2.15|because details changed between drafting this data model and the RFC being published. This parameter has been moved to the proper location within the <<object|Rule.<i>.>> object>> <<obsoleted|2.17>> <<deleted|2.18>>",
 					"default": "false",
 					"datatype": "boolean"
 				},
@@ -88126,12 +88737,7 @@
 							"usp"
 						],
 						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"datatype": "_AliasCWMP"
 					},
 					"Origin": {
 						"type": "string",
@@ -88222,7 +88828,7 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "Port-set ID (PSID) offset in <<units>>. The number of Port-sets is 2^<<param>>. Corresponds to the <<bibref|RFC7598>> S46_PORTPARAMS (Port Parameters) options offset field.",
+						"description": "Port-set ID (PSID) offset in <<units>>. The number of Port-sets is 2^<<param>>^. Corresponds to the <<bibref|RFC7598>> S46_PORTPARAMS (Port Parameters) options offset field.",
 						"default": "6",
 						"datatype": "unsignedInt",
 						"range": [
@@ -88278,7 +88884,7 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "Whether to include low-numbered (system) ports in the Port-sets. Normally ports in the range [0:2^(16-<<param|PSIDOffset>>)-1] are excluded, e.g. for the default <<param|PSIDOffset>> value of 6, ports [0:1023] are not included in the Port-sets. This parameter is related to <<bibref|RFC7597>>s N, which is defined as the number of ports (e.g., 1024) excluded from the lower end of the range. The parameter is relevant only when <<param|PSIDOffset>> is 0; <<false>> corresponds to N=1024 and <<true>> corresponds to N=0.",
+						"description": "Whether to include low-numbered (system) ports in the Port-sets. Normally ports in the range [0:2^(16-<<param|PSIDOffset>>)^-1] are excluded, e.g. for the default <<param|PSIDOffset>> value of 6, ports [0:1023] are not included in the Port-sets. This parameter is related to <<bibref|RFC7597>>s N, which is defined as the number of ports (e.g., 1024) excluded from the lower end of the range. The parameter is relevant only when <<param|PSIDOffset>> is 0; <<false>> corresponds to N=1024 and <<true>> corresponds to N=0.",
 						"default": "false",
 						"datatype": "boolean"
 					}
@@ -88328,17 +88934,13 @@
 						"type": "string",
 						"read": true,
 						"write": true,
+						"obsolete": true,
 						"protocols": [
 							"cwmp",
 							"usp"
 						],
-						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. <<deprecated|2.18|because <<object|#>> already has an Alias parameter.>>",
+						"datatype": "_AliasCWMP"
 					},
 					"Name": {
 						"type": "string",
@@ -88695,12 +89297,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"IPv4ForwardingNumberOfEntries": {
 					"type": "unsignedInt",
@@ -88730,7 +89327,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "Layer 3 IPv4 forwarding table. In addition to statically configured routes, this table MUST include dynamic routes learned through layer 3 routing protocols, including RIP (i.e. RIP version 2), OSPF, DHCPv4, and IPCP. The CPE MAY reject attempts to delete or modify a dynamic route entry. For each incoming packet, the layer 3 forwarding decision is conceptually made as follows: * Only enabled table entries with a matching <<param|ForwardingPolicy>> are considered, i.e. those that either do not specify a <<param|ForwardingPolicy>>, or else specify a <<param|ForwardingPolicy>> that matches that of the incoming packet. * Next, table entries that also have a matching destination address/mask are considered, and the matching entry with the longest prefix is applied to the packet (i.e. the entry with the most specific network). An unspecified destination address is a wild-card and always matches, but with a prefix length of zero. For enabled table entries, if <<param|Interface>> is not a valid reference to an IPv4-capable interface (that is attached to the IPv4 stack), then the table entry is inoperable and the CPE MUST set <<param|Status>> to <<enum|Error_Misconfigured|Status>>. Note: The <<object>> table includes a unique key parameter that is a strong reference. If a strongly referenced object is deleted, the CPE will set the referencing parameter to <<empty>>. However, doing so under these circumstances might cause the updated <<object>> row to then violate the tables unique key constraint; if this occurs, the CPE MUST disable the offending <<object>> row.",
+					"description": "Layer 3 IPv4 forwarding table. In addition to statically configured routes, this table MUST include dynamic routes learned through layer 3 routing protocols, including RIP (i.e. RIP version 2), OSPF, DHCPv4, 3GPP-NAS and IPCP. The CPE MAY reject attempts to delete or modify a dynamic route entry. For each incoming packet, the layer 3 forwarding decision is conceptually made as follows: * Only enabled table entries with a matching <<param|ForwardingPolicy>> are considered, i.e. those that either do not specify a <<param|ForwardingPolicy>>, or else specify a <<param|ForwardingPolicy>> that matches that of the incoming packet. * Next, table entries that also have a matching destination address/mask are considered, and the matching entry with the longest prefix is applied to the packet (i.e. the entry with the most specific network). An unspecified destination address is a wild-card and always matches, but with a prefix length of zero. For enabled table entries, if <<param|Interface>> is not a valid reference to an IPv4-capable interface (that is attached to the IPv4 stack), then the table entry is inoperable and the CPE MUST set <<param|Status>> to <<enum|Error_Misconfigured|Status>>. Note: The <<object>> table includes a unique key parameter that is a strong reference. If a strongly referenced object is deleted, the CPE will set the referencing parameter to <<empty>>. However, doing so under these circumstances might cause the updated <<object>> row to then violate the tables unique key constraint; if this occurs, the CPE MUST disable the offending <<object>> row.",
 					"uniqueKeys": [
 						"Alias",
 						"DestIPAddress",
@@ -88781,12 +89378,7 @@
 							"usp"
 						],
 						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"datatype": "_AliasCWMP"
 					},
 					"Type": {
 						"type": "string",
@@ -88920,7 +89512,7 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "Protocol via which the IPv4 forwarding rule was learned. Enumeration of: DHCPv4, OSPF, IPCP, RIP, Static.",
+						"description": "Protocol via which the IPv4 forwarding rule was learned. Enumeration of: DHCPv4, OSPF, IPCP, RIP, 3GPP-NAS, Static.",
 						"default": "Static",
 						"datatype": "string",
 						"enumerations": [
@@ -88928,6 +89520,7 @@
 							"OSPF",
 							"IPCP",
 							"RIP",
+							"3GPP-NAS",
 							"Static"
 						]
 					},
@@ -88955,7 +89548,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "Layer 3 IPv6 forwarding table. In addition to statically configured routes, this table MUST include dynamic routes learned through layer 3 routing protocols, including RIPng, OSPF, DHCPv6, and RA. The CPE MAY reject attempts to delete or modify a dynamic route entry. For each incoming packet, the layer 3 forwarding decision is conceptually made as follows: * Only enabled table entries with a matching <<param|ForwardingPolicy>> are considered, i.e. those that either do not specify a <<param|ForwardingPolicy>>, or else specify a <<param|ForwardingPolicy>> that matches that of the incoming packet. * Next, table entries that also have a matching destination prefix are considered, and the matching entry with the longest prefix length is applied to the packet (i.e. the entry with the most specific network). An unspecified destination address is a wild-card and always matches, but with a prefix length of zero. For enabled table entries, if <<param|Interface>> is not a valid reference to an IPv6-capable interface (that is attached to the IPv6 stack), then the table entry is inoperable and the CPE MUST set <<param|Status>> to <<enum|Error_Misconfigured|Status>>. This object is based on inetCidrRouteTable from <<bibref|RFC4292>>.",
+					"description": "Layer 3 IPv6 forwarding table. In addition to statically configured routes, this table MUST include dynamic routes learned through layer 3 routing protocols, including RIPng, OSPF, DHCPv6, 3GPP-NAS, and RA. The CPE MAY reject attempts to delete or modify a dynamic route entry. For each incoming packet, the layer 3 forwarding decision is conceptually made as follows: * Only enabled table entries with a matching <<param|ForwardingPolicy>> are considered, i.e. those that either do not specify a <<param|ForwardingPolicy>>, or else specify a <<param|ForwardingPolicy>> that matches that of the incoming packet. * Next, table entries that also have a matching destination prefix are considered, and the matching entry with the longest prefix length is applied to the packet (i.e. the entry with the most specific network). An unspecified destination address is a wild-card and always matches, but with a prefix length of zero. For enabled table entries, if <<param|Interface>> is not a valid reference to an IPv6-capable interface (that is attached to the IPv6 stack), then the table entry is inoperable and the CPE MUST set <<param|Status>> to <<enum|Error_Misconfigured|Status>>. This object is based on inetCidrRouteTable from <<bibref|RFC4292>>.",
 					"uniqueKeys": [
 						"Alias",
 						"DestIPPrefix",
@@ -89005,12 +89598,7 @@
 							"usp"
 						],
 						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"datatype": "_AliasCWMP"
 					},
 					"Type": {
 						"type": "string",
@@ -89094,7 +89682,7 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "Protocol via which the IPv6 forwarding rule was learned. Enumeration of: DHCPv6, OSPF, RA, RIPng, Static.",
+						"description": "Protocol via which the IPv6 forwarding rule was learned. Enumeration of: DHCPv6, OSPF, RA, RIPng, 3GPP-NAS, Static.",
 						"default": "Static",
 						"datatype": "string",
 						"enumerations": [
@@ -89102,6 +89690,7 @@
 							"OSPF",
 							"RA",
 							"RIPng",
+							"3GPP-NAS",
 							"Static"
 						]
 					},
@@ -89235,12 +89824,7 @@
 							"usp"
 						],
 						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"datatype": "_AliasCWMP"
 					},
 					"Interface": {
 						"type": "string",
@@ -89501,12 +90085,7 @@
 								"usp"
 							],
 							"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-							"datatype": "Alias",
-							"range": [
-								{
-									"max": 64
-								}
-							]
+							"datatype": "_AliasCWMP"
 						},
 						"Tag": {
 							"type": "unsignedInt",
@@ -89853,12 +90432,7 @@
 							"usp"
 						],
 						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"datatype": "_AliasCWMP"
 					},
 					"InterfaceReference": {
 						"type": "string",
@@ -90307,7 +90881,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "This object provides parameters for routes recieved from neighbors and internal routes.",
+					"description": "This object provides parameters for routes received from neighbors and internal routes.",
 					"uniqueKeys": [
 						"RoutePrefix",
 						"SourceRouterID"
@@ -90462,12 +91036,7 @@
 							"usp"
 						],
 						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"datatype": "_AliasCWMP"
 					},
 					"DefaultApply": {
 						"type": "boolean",
@@ -90512,12 +91081,7 @@
 								"usp"
 							],
 							"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-							"datatype": "Alias",
-							"range": [
-								{
-									"max": 64
-								}
-							]
+							"datatype": "_AliasCWMP"
 						},
 						"KeyUseSend": {
 							"type": "boolean",
@@ -90676,12 +91240,7 @@
 							"usp"
 						],
 						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"datatype": "_AliasCWMP"
 					},
 					"DefaultApply": {
 						"type": "boolean",
@@ -90726,12 +91285,7 @@
 								"usp"
 							],
 							"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-							"datatype": "Alias",
-							"range": [
-								{
-									"max": 64
-								}
-							]
+							"datatype": "_AliasCWMP"
 						},
 						"CertValue": {
 							"type": "string",
@@ -90858,12 +91412,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Interface": {
 					"type": "string",
@@ -91043,12 +91592,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Interface": {
 					"type": "string",
@@ -91088,6 +91632,7 @@
 						"usp"
 					],
 					"description": "The RDNSS parameter contains one or more IPv6 addresses of RDNSSes as described in <<bibref|RFC8106|5.1. Recursive DNS Server Option>>. When <<param|RDNSSMode>> is not <<enum|Static|RDNSSMode>>, this parameter will contain the list of IPv6 addresses, automatically filled in by the system, that needs to be advertised. <<empty>> means that no RDNSS information is being advertised.",
+					"default": "[]",
 					"list": {
 						"datatype": "IPv6Address"
 					}
@@ -91101,6 +91646,7 @@
 						"usp"
 					],
 					"description": "The DNSSL parameter contains one or more domain names of DNS suffixes as described in <<bibref|RFC8106|5.2. DNS Search List Option>>. <<empty>> means that no DNSSL information is being advertised.",
+					"default": "[]",
 					"list": {
 						"datatype": "string"
 					}
@@ -91114,6 +91660,7 @@
 						"usp"
 					],
 					"description": "<<list>> <<reference>> Manually-configured prefixes that will be sent in Router Advertisement messages. Each referenced prefix MUST have a <<param|##.IP.Interface.<i>.IPv6Prefix.<i>.StaticType>> of <<enum|Static|##.IP.Interface.<i>.IPv6Prefix.<i>.StaticType>> or <<enum|Child|##.IP.Interface.<i>.IPv6Prefix.<i>.StaticType>>. Router Advertisement messages MUST include Prefix Information Options <<bibref|RFC4861>> for all Valid (<<param|##.IP.Interface.<i>.IPv6Prefix.<i>.ValidLifetime>> is infinite or in the future) prefixes in this list. Prefixes MUST be associated with the interface instance referenced by <<param|Interface>>.",
+					"default": "[]",
 					"list": {
 						"datatype": "string",
 						"item": {
@@ -91201,7 +91748,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "The value placed in the Managed address configuration (M) flag field of Router Advertisement messages on this interafce (see <<bibref|RFC4861|Section 4.2>>, and <<bibref|RFC4862>>).",
+					"description": "The value placed in the Managed address configuration (M) flag field of Router Advertisement messages on this interface (see <<bibref|RFC4861|Section 4.2>>, and <<bibref|RFC4862>>).",
 					"default": "false",
 					"datatype": "boolean"
 				},
@@ -91399,12 +91946,7 @@
 							"usp"
 						],
 						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"datatype": "_AliasCWMP"
 					},
 					"Tag": {
 						"type": "unsignedInt",
@@ -91522,12 +92064,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"BorderRelayIPv4Addresses": {
 					"type": "string",
@@ -91723,12 +92260,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"EndpointAssignmentPrecedence": {
 					"type": "string",
@@ -92205,12 +92737,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"DHCPType": {
 					"type": "string",
@@ -92761,7 +93288,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "Classification criterion. A hexbinary string used to identify one or more LAN devices, value of the DHCPv6 Vendor Class Identifier (Option 16) as defined in <<bibref|RFC3315>>. The option value is binary, so an exact match is REQUIRED. <<empty>> indicates this criterion is not used for classification. Note: This parameter is DHCPv6-specific. It only applies when <<param|DHCPType>> is <<enum|DHCPv6|DHCPType>>.",
+					"description": "Classification criterion. A hexbinary string used to identify one or more LAN devices, value of the DHCPv6 Vendor Class Identifier (Option 16) as defined in <<bibref|RFC8415>>. The option value is binary, so an exact match is REQUIRED. <<empty>> indicates this criterion is not used for classification. Note: This parameter is DHCPv6-specific. It only applies when <<param|DHCPType>> is <<enum|DHCPv6|DHCPType>>.",
 					"datatype": "hexBinary",
 					"range": [
 						{
@@ -92823,7 +93350,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "Classification criterion. A hexbinary string used to identify one or more LAN devices, value of the DHCPv6 Vendor Class Identifier (Option 16) as defined in <<bibref|RFC3315>>. The option value is binary, so an exact match is REQUIRED. <<empty>> indicates this criterion is not used for classification. Note: This parameter is DHCPv6-specific. It only applies when <<param|DHCPType>> is <<enum|DHCPv6|DHCPType>>.",
+					"description": "Classification criterion. A hexbinary string used to identify one or more LAN devices, value of the DHCPv6 Vendor Class Identifier (Option 16) as defined in <<bibref|RFC8415>>. The option value is binary, so an exact match is REQUIRED. <<empty>> indicates this criterion is not used for classification. Note: This parameter is DHCPv6-specific. It only applies when <<param|DHCPType>> is <<enum|DHCPv6|DHCPType>>.",
 					"datatype": "hexBinary",
 					"range": [
 						{
@@ -92869,7 +93396,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "Classification criterion. A hexbinary string used to identify one or more LAN devices, value of the DHCP Client Identifier. The DHCP Client Identifier is Option 61 (as defined in <<bibref|RFC2132>>) for <<enum|DHCPv4|DHCPType>>, or is Option 1 (as defined in <<bibref|RFC3315>>) for <<enum|DHCPv6|DHCPType>>. The option value is binary, so an exact match is REQUIRED. <<empty>> indicates this criterion is not used for classification. Note: DHCPv4 Option values are limited to a length of 255, while DHCPv6 Option values can have a maximum length of 65535. Note: This parameter is DHCP version neutral. The specific DHCP version in use with this parameter is indicated by <<param|DHCPType>>. Note: DHCPv6 Option 1 (Client Identifier) is sometimes referred to as DUID.",
+					"description": "Classification criterion. A hexbinary string used to identify one or more LAN devices, value of the DHCP Client Identifier. The DHCP Client Identifier is Option 61 (as defined in <<bibref|RFC2132>>) for <<enum|DHCPv4|DHCPType>>, or is Option 1 (as defined in <<bibref|RFC8415>>) for <<enum|DHCPv6|DHCPType>>. The option value is binary, so an exact match is REQUIRED. <<empty>> indicates this criterion is not used for classification. Note: DHCPv4 Option values are limited to a length of 255, while DHCPv6 Option values can have a maximum length of 65535. Note: This parameter is DHCP version neutral. The specific DHCP version in use with this parameter is indicated by <<param|DHCPType>>. Note: DHCPv6 Option 1 (Client Identifier) is sometimes referred to as DUID.",
 					"datatype": "hexBinary",
 					"range": [
 						{
@@ -92897,7 +93424,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "Classification criterion. A hexbinary string used to identify one or more LAN devices, value of the DHCP Client Identifier. The DHCP Client Identifier is Option 61 (as defined in <<bibref|RFC2132>>) for <<enum|DHCPv4|DHCPType>>, or is Option 1 (as defined in <<bibref|RFC3315>>) for <<enum|DHCPv6|DHCPType>>. The option value is binary, so an exact match is REQUIRED. <<empty>> indicates this criterion is not used for classification. Note: DHCPv4 Option values are limited to a length of 255, while DHCPv6 Option values can have a maximum length of 65535. Note: This parameter is DHCP version neutral. The specific DHCP version in use with this parameter is indicated by <<param|DHCPType>>. Note: DHCPv6 Option 1 (Client Identifier) is sometimes referred to as DUID.",
+					"description": "Classification criterion. A hexbinary string used to identify one or more LAN devices, value of the DHCP Client Identifier. The DHCP Client Identifier is Option 61 (as defined in <<bibref|RFC2132>>) for <<enum|DHCPv4|DHCPType>>, or is Option 1 (as defined in <<bibref|RFC8415>>) for <<enum|DHCPv6|DHCPType>>. The option value is binary, so an exact match is REQUIRED. <<empty>> indicates this criterion is not used for classification. Note: DHCPv4 Option values are limited to a length of 255, while DHCPv6 Option values can have a maximum length of 65535. Note: This parameter is DHCP version neutral. The specific DHCP version in use with this parameter is indicated by <<param|DHCPType>>. Note: DHCPv6 Option 1 (Client Identifier) is sometimes referred to as DUID.",
 					"datatype": "hexBinary",
 					"range": [
 						{
@@ -92925,7 +93452,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "Classification criterion. A hexbinary string used to identify one or more LAN devices, value of the DHCP User Class Identifier. The DHCP User Class Identifier is Option 77 (as defined in <<bibref|RFC3004>>) for <<enum|DHCPv4|DHCPType>>, or is Option 15 (as defined in <<bibref|RFC3315>>) for <<enum|DHCPv6|DHCPType>>. The option value is binary, so an exact match is REQUIRED. <<empty>> indicates this criterion is not used for classification. Note: DHCPv4 Option values are limited to a length of 255, while DHCPv6 Option values can have a maximum length of 65535. Note: This parameter is DHCP version neutral. The specific DHCP version in use with this parameter is indicated by <<param|DHCPType>>.",
+					"description": "Classification criterion. A hexbinary string used to identify one or more LAN devices, value of the DHCP User Class Identifier. The DHCP User Class Identifier is Option 77 (as defined in <<bibref|RFC3004>>) for <<enum|DHCPv4|DHCPType>>, or is Option 15 (as defined in <<bibref|RFC8415>>) for <<enum|DHCPv6|DHCPType>>. The option value is binary, so an exact match is REQUIRED. <<empty>> indicates this criterion is not used for classification. Note: DHCPv4 Option values are limited to a length of 255, while DHCPv6 Option values can have a maximum length of 65535. Note: This parameter is DHCP version neutral. The specific DHCP version in use with this parameter is indicated by <<param|DHCPType>>.",
 					"datatype": "hexBinary",
 					"range": [
 						{
@@ -92953,7 +93480,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "Classification criterion. A hexbinary string used to identify one or more LAN devices, value of the DHCP User Class Identifier. The DHCP User Class Identifier is Option 77 (as defined in <<bibref|RFC3004>>) for <<enum|DHCPv4|DHCPType>>, or is Option 15 (as defined in <<bibref|RFC3315>>) for <<enum|DHCPv6|DHCPType>>. The option value is binary, so an exact match is REQUIRED. <<empty>> indicates this criterion is not used for classification. Note: DHCPv4 Option values are limited to a length of 255, while DHCPv6 Option values can have a maximum length of 65535. Note: This parameter is DHCP version neutral. The specific DHCP version in use with this parameter is indicated by <<param|DHCPType>>.",
+					"description": "Classification criterion. A hexbinary string used to identify one or more LAN devices, value of the DHCP User Class Identifier. The DHCP User Class Identifier is Option 77 (as defined in <<bibref|RFC3004>>) for <<enum|DHCPv4|DHCPType>>, or is Option 15 (as defined in <<bibref|RFC8415>>) for <<enum|DHCPv6|DHCPType>>. The option value is binary, so an exact match is REQUIRED. <<empty>> indicates this criterion is not used for classification. Note: DHCPv4 Option values are limited to a length of 255, while DHCPv6 Option values can have a maximum length of 65535. Note: This parameter is DHCP version neutral. The specific DHCP version in use with this parameter is indicated by <<param|DHCPType>>.",
 					"datatype": "hexBinary",
 					"range": [
 						{
@@ -92981,7 +93508,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "Classification criterion. A hexbinary string used to identify one or more LAN devices, value of the DHCP Vendor-specific Information, matched according to the criteria in <<param|SourceVendorSpecificInfoEnterprise>> and <<param|SourceVendorSpecificInfoSubOption>>. The DHCP Vendor-specific Information is Option 125 (as defined in <<bibref|RFC3925>>) for <<enum|DHCPv4|DHCPType>>, or is Option 17 (as defined in <<bibref|RFC3315>>) for <<enum|DHCPv6|DHCPType>>. <<empty>> indicates this criterion is not used for classification. Note: DHCPv4 Option values are limited to a length of 255, while DHCPv6 Option values can have a maximum length of 65535. Note: This parameter is DHCP version neutral. The specific DHCP version in use with this parameter is indicated by <<param|DHCPType>>.",
+					"description": "Classification criterion. A hexbinary string used to identify one or more LAN devices, value of the DHCP Vendor-specific Information, matched according to the criteria in <<param|SourceVendorSpecificInfoEnterprise>> and <<param|SourceVendorSpecificInfoSubOption>>. The DHCP Vendor-specific Information is Option 125 (as defined in <<bibref|RFC3925>>) for <<enum|DHCPv4|DHCPType>>, or is Option 17 (as defined in <<bibref|RFC8415>>) for <<enum|DHCPv6|DHCPType>>. <<empty>> indicates this criterion is not used for classification. Note: DHCPv4 Option values are limited to a length of 255, while DHCPv6 Option values can have a maximum length of 65535. Note: This parameter is DHCP version neutral. The specific DHCP version in use with this parameter is indicated by <<param|DHCPType>>.",
 					"datatype": "hexBinary",
 					"range": [
 						{
@@ -93039,7 +93566,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "Classification criterion. A hexbinary string used to identify one or more LAN devices, value of the DHCP Vendor-specific Information, matched according to the criteria in <<param|DestVendorSpecificInfoEnterprise>> and <<param|DestVendorSpecificInfoSubOption>>. The DHCP Vendor-specific Information is Option 125 (as defined in <<bibref|RFC3925>>) for <<enum|DHCPv4|DHCPType>>, or is Option 17 (as defined in <<bibref|RFC3315>>) for <<enum|DHCPv6|DHCPType>>. <<empty>> indicates this criterion is not used for classification. Note: DHCPv4 Option values are limited to a length of 255, while DHCPv6 Option values can have a maximum length of 65535. Note: This parameter is DHCP version neutral. The specific DHCP version in use with this parameter is indicated by <<param|DHCPType>>.",
+					"description": "Classification criterion. A hexbinary string used to identify one or more LAN devices, value of the DHCP Vendor-specific Information, matched according to the criteria in <<param|DestVendorSpecificInfoEnterprise>> and <<param|DestVendorSpecificInfoSubOption>>. The DHCP Vendor-specific Information is Option 125 (as defined in <<bibref|RFC3925>>) for <<enum|DHCPv4|DHCPType>>, or is Option 17 (as defined in <<bibref|RFC8415>>) for <<enum|DHCPv6|DHCPType>>. <<empty>> indicates this criterion is not used for classification. Note: DHCPv4 Option values are limited to a length of 255, while DHCPv6 Option values can have a maximum length of 65535. Note: This parameter is DHCP version neutral. The specific DHCP version in use with this parameter is indicated by <<param|DHCPType>>.",
 					"datatype": "hexBinary",
 					"range": [
 						{
@@ -93121,9 +93648,10 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "Classification criterion. Minimum IP Packet Length (including header) in bytes.",
+					"description": "Classification criterion. Minimum IP Packet Length (including header) in <<units>>.",
 					"default": "0",
-					"datatype": "unsignedInt"
+					"datatype": "unsignedInt",
+					"unit": "bytes"
 				},
 				"IPLengthMax": {
 					"type": "unsignedInt",
@@ -93133,9 +93661,10 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "Classification criterion. Maximum IP Packet Length (including header) in bytes. A value of zero indicates that no maximum is specified (an umlimited maximum length).",
+					"description": "Classification criterion. Maximum IP Packet Length (including header) in <<units>>. A value of zero indicates that no maximum is specified (an umlimited maximum length).",
 					"default": "0",
-					"datatype": "unsignedInt"
+					"datatype": "unsignedInt",
+					"unit": "bytes"
 				},
 				"IPLengthExclude": {
 					"type": "boolean",
@@ -93475,12 +94004,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"ProtocolIdentifier": {
 					"type": "string",
@@ -93655,12 +94179,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Type": {
 					"type": "string",
@@ -93687,6 +94206,7 @@
 						"usp"
 					],
 					"description": "Each entry is a name-value pair representing additional criteria to identify the flow type. The use and interpretation is specific to the particular FlowType URN.Encoded using the x-www-form-urlencoded content type defined in <<bibref|HTML4.01>>.",
+					"default": "[]",
 					"list": {
 						"datatype": "string",
 						"range": [
@@ -93870,24 +94390,19 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"CommittedRate": {
-					"type": "unsignedInt",
+					"type": "unsignedLong",
 					"read": true,
 					"write": true,
 					"protocols": [
 						"cwmp",
 						"usp"
 					],
-					"description": "Committed rate allowed for this policer in <<units>>.",
+					"description": "Committed rate allowed for this policer in <<units>>. Note: To be able to support higher bit rates, this parameter was changed to unsignedLong in the Device:2.18 version.",
 					"default": "0",
-					"datatype": "unsignedInt",
+					"datatype": "unsignedLong",
 					"unit": "bits per second"
 				},
 				"CommittedBurstSize": {
@@ -93898,9 +94413,10 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "Committed Burstsize in bytes.",
+					"description": "Committed Burstsize in <<units>>.",
 					"default": "0",
-					"datatype": "unsignedInt"
+					"datatype": "unsignedInt",
+					"unit": "bytes"
 				},
 				"ExcessBurstSize": {
 					"type": "unsignedInt",
@@ -93910,21 +94426,22 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "Excess Burstsize in bytes. Applied for a <<enum|SingleRateThreeColor|MeterType>> meter.",
+					"description": "Excess Burstsize in <<units>>. Applied for a <<enum|SingleRateThreeColor|MeterType>> meter.",
 					"default": "0",
-					"datatype": "unsignedInt"
+					"datatype": "unsignedInt",
+					"unit": "bytes"
 				},
 				"PeakRate": {
-					"type": "unsignedInt",
+					"type": "unsignedLong",
 					"read": true,
 					"write": true,
 					"protocols": [
 						"cwmp",
 						"usp"
 					],
-					"description": "Peak rate allowed for this Meter in <<units>>. Applied for <<enum|TwoRateThreeColor|MeterType>> meters.",
+					"description": "Peak rate allowed for this Meter in <<units>>. Applied for <<enum|TwoRateThreeColor|MeterType>> meters. Note: To be able to support higher bit rates, this parameter was changed to unsignedLong in the Device:2.18 version.",
 					"default": "0",
-					"datatype": "unsignedInt",
+					"datatype": "unsignedLong",
 					"unit": "bits per second"
 				},
 				"PeakBurstSize": {
@@ -93935,9 +94452,10 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "Peak Burstsize in bytes. Applied for <<enum|TwoRateThreeColor|MeterType>> meters.",
+					"description": "Peak Burstsize in <<units>>. Applied for <<enum|TwoRateThreeColor|MeterType>> meters.",
 					"default": "0",
-					"datatype": "unsignedInt"
+					"datatype": "unsignedInt",
+					"unit": "bytes"
 				},
 				"MeterType": {
 					"type": "string",
@@ -94174,12 +94692,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Children": {
 					"type": "string",
@@ -94203,6 +94716,7 @@
 						"usp"
 					],
 					"description": "<<list>> Each list item identifies the set of traffic classes associated with this queue. Traffic is sent to this queue if a <<object|#.Classification>>, <<object|#.App>> or <<object|#.Flow>> table entry specifies a traffic class, e.g. via the <<param|#.Classification.<i>.TrafficClass>> parameter. If more than one queue on a given egress interface is associated with a given traffic class, the implementation will choose which queue to send traffic of this class to.",
+					"default": "[]",
 					"list": {
 						"datatype": "unsignedInt",
 						"maxsize": 256
@@ -94256,8 +94770,9 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "Number of bytes in the buffer. Queue buffer size for all egress interfaces for which this queue exists. If the buffer size is not the same for all such egress interfaces, this parameter MUST be 0.",
-					"datatype": "unsignedInt"
+					"description": "Number of <<units>> in the buffer. Queue buffer size for all egress interfaces for which this queue exists. If the buffer size is not the same for all such egress interfaces, this parameter MUST be 0.",
+					"datatype": "unsignedInt",
+					"unit": "bytes"
 				},
 				"Weight": {
 					"type": "unsignedInt",
@@ -94358,16 +94873,16 @@
 					]
 				},
 				"ShapingRate": {
-					"type": "int",
+					"type": "long",
 					"read": true,
 					"write": true,
 					"protocols": [
 						"cwmp",
 						"usp"
 					],
-					"description": "Rate to shape this queues traffic to. For leaky bucket (constant rate shaping), this is the constant rate. For token bucket (variable rate shaping), this is the average rate. If <= 100, in percent of the rate of the highest rate-constrained layer over which the packet will travel on egress. If > 100, in bits per second. A value of -1 indicates no shaping. For example, for packets destined for a WAN DSL interface, if the egress will be on a PPP or IP link with a specified ShapingRate, the percentage is calculated relative to this rate. Otherwise, if the ATM layer is rate-constrained, then the rate is calculated relative to this rate. Otherwise, the rate is calculated relative to the physical-layer DSL rate.",
+					"description": "Rate to shape this queues traffic to. For leaky bucket (constant rate shaping), this is the constant rate. For token bucket (variable rate shaping), this is the average rate. If <= 100, in percent of the rate of the highest rate-constrained layer over which the packet will travel on egress. If > 100, in bits per second. A value of -1 indicates no shaping. For example, for packets destined for a WAN DSL interface, if the egress will be on a PPP or IP link with a specified ShapingRate, the percentage is calculated relative to this rate. Otherwise, if the ATM layer is rate-constrained, then the rate is calculated relative to this rate. Otherwise, the rate is calculated relative to the physical-layer DSL rate. Note: To be able to support higher bit rates, this parameter was changed to unsignedLong in the Device:2.18 version.",
 					"default": "-1",
-					"datatype": "int",
+					"datatype": "long",
 					"range": [
 						{
 							"min": -1
@@ -94375,16 +94890,16 @@
 					]
 				},
 				"CurrentShapingRate": {
-					"type": "int",
+					"type": "long",
 					"read": true,
 					"write": false,
 					"protocols": [
 						"cwmp",
 						"usp"
 					],
-					"description": "If the Queue is active, the CurrentShapingRate must reflect the actual configured ShapingRate, in <<units>> per second. -1 means no rate due to do Queue not active.",
+					"description": "If the Queue is active, the CurrentShapingRate must reflect the actual configured ShapingRate, in <<units>> per second. -1 means no rate due to do Queue not active. Note: To be able to support higher bit rates, this parameter was changed to unsignedLong in the Device:2.18 version.",
 					"default": "-1",
-					"datatype": "int",
+					"datatype": "long",
 					"range": [
 						{
 							"min": -1
@@ -94393,16 +94908,16 @@
 					"unit": "bits per second"
 				},
 				"AssuredRate": {
-					"type": "int",
+					"type": "long",
 					"read": true,
 					"write": true,
 					"protocols": [
 						"cwmp",
 						"usp"
 					],
-					"description": "Minimum rate to shape this queues traffic to. If <= 100, in percent of the rate of the highest rate-constrained layer over which the packet will travel on egress. If > 100, in bits per second. A value of -1 indicates no shaping.",
+					"description": "Minimum rate to shape this queues traffic to. If <= 100, in percent of the rate of the highest rate-constrained layer over which the packet will travel on egress. If > 100, in bits per second. A value of -1 indicates no shaping. Note: To be able to support higher bit rates, this parameter was changed to unsignedLong in the Device:2.18 version.",
 					"default": "-1",
-					"datatype": "int",
+					"datatype": "long",
 					"range": [
 						{
 							"min": -1
@@ -94410,16 +94925,16 @@
 					]
 				},
 				"CurrentAssuredRate": {
-					"type": "int",
+					"type": "long",
 					"read": true,
 					"write": false,
 					"protocols": [
 						"cwmp",
 						"usp"
 					],
-					"description": "If the Queue is active, the CurrentAssuredRate must reflect the actual configured AssuredRate, in bits per second. -1 means no rate due to do Queue not active.",
+					"description": "If the Queue is active, the CurrentAssuredRate must reflect the actual configured AssuredRate, in bits per second. -1 means no rate due to do Queue not active. Note: To be able to support higher bit rates, this parameter was changed to unsignedLong in the Device:2.18 version.",
 					"default": "-1",
-					"datatype": "int",
+					"datatype": "long",
 					"range": [
 						{
 							"min": -1
@@ -94434,8 +94949,9 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "Burst size in bytes. For both leaky bucket (constant rate shaping) and token bucket (variable rate shaping) this is the bucket size and is therefore the maximum burst size.",
-					"datatype": "unsignedInt"
+					"description": "Burst size in <<units>>. For both leaky bucket (constant rate shaping) and token bucket (variable rate shaping) this is the bucket size and is therefore the maximum burst size.",
+					"datatype": "unsignedInt",
+					"unit": "bytes"
 				}
 			},
 			"Device.QoS.QueueStats.{i}.": {
@@ -94490,12 +95006,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Queue": {
 					"type": "string",
@@ -94549,9 +95060,10 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "Number of bytes output through the queue.",
+					"description": "Number of <<units>> output through the queue.",
 					"default": "0",
-					"datatype": "unsignedInt"
+					"datatype": "unsignedInt",
+					"unit": "bytes"
 				},
 				"DroppedPackets": {
 					"type": "unsignedInt",
@@ -94573,9 +95085,10 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "Number of bytes dropped by the queue.",
+					"description": "Number of <<units>> dropped by the queue.",
 					"default": "0",
-					"datatype": "unsignedInt"
+					"datatype": "unsignedInt",
+					"unit": "bytes"
 				},
 				"QueueOccupancyPackets": {
 					"type": "unsignedInt",
@@ -94661,12 +95174,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Children": {
 					"type": "string",
@@ -94698,16 +95206,16 @@
 					]
 				},
 				"ShapingRate": {
-					"type": "int",
+					"type": "long",
 					"read": true,
 					"write": true,
 					"protocols": [
 						"cwmp",
 						"usp"
 					],
-					"description": "Rate to shape the associated interface connections egress traffic to. For leaky bucket (constant rate shaping), this is the constant rate. For token bucket (variable rate shaping), this is the average rate. If <= 100, in percent of the rate of the highest rate-constrained layer over which the packet will travel on egress. If > 100, in bits per second. A value of -1 indicates no shaping. For example, for packets destined for a WAN DSL interface, if the ATM layer is rate-constrained, then the rate is calculated relative to this rate. Otherwise, the rate is calculated relative to the physical-layer DSL rate.",
+					"description": "Rate to shape the associated interface connections egress traffic to. For leaky bucket (constant rate shaping), this is the constant rate. For token bucket (variable rate shaping), this is the average rate. If <= 100, in percent of the rate of the highest rate-constrained layer over which the packet will travel on egress. If > 100, in bits per second. A value of -1 indicates no shaping. For example, for packets destined for a WAN DSL interface, if the ATM layer is rate-constrained, then the rate is calculated relative to this rate. Otherwise, the rate is calculated relative to the physical-layer DSL rate. Note: To be able to support higher bit rates, this parameter was changed to unsignedLong in the Device:2.18 version.",
 					"default": "-1",
-					"datatype": "int",
+					"datatype": "long",
 					"range": [
 						{
 							"min": -1
@@ -94722,8 +95230,9 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "Burst size in bytes. For both leaky bucket (constant rate shaping) and token bucket (variable rate shaping) this is the bucket size and is therefore the maximum burst size.",
-					"datatype": "unsignedInt"
+					"description": "Burst size in <<units>>. For both leaky bucket (constant rate shaping) and token bucket (variable rate shaping) this is the bucket size and is therefore the maximum burst size.",
+					"datatype": "unsignedInt",
+					"unit": "bytes"
 				}
 			},
 			"Device.QoS.Scheduler.{i}.": {
@@ -94777,12 +95286,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Children": {
 					"type": "string",
@@ -94831,16 +95335,16 @@
 					]
 				},
 				"ShapingRate": {
-					"type": "int",
+					"type": "long",
 					"read": true,
 					"write": true,
 					"protocols": [
 						"cwmp",
 						"usp"
 					],
-					"description": "Rate to shape this schedulers traffic to. For leaky bucket (constant rate shaping), this is the constant rate. For token bucket (variable rate shaping), this is the average rate. If <= 100, in percent of the rate of the highest rate-constrained layer over which the packet will travel on egress. If > 100, in bits per second. A value of -1 indicates no shaping.",
+					"description": "Rate to shape this schedulers traffic to. For leaky bucket (constant rate shaping), this is the constant rate. For token bucket (variable rate shaping), this is the average rate. If <= 100, in percent of the rate of the highest rate-constrained layer over which the packet will travel on egress. If > 100, in bits per second. A value of -1 indicates no shaping. Note: To be able to support higher bit rates, this parameter was changed to unsignedLong in the Device:2.18 version.",
 					"default": "-1",
-					"datatype": "int",
+					"datatype": "long",
 					"range": [
 						{
 							"min": -1
@@ -94848,16 +95352,16 @@
 					]
 				},
 				"AssuredRate": {
-					"type": "int",
+					"type": "long",
 					"read": true,
 					"write": true,
 					"protocols": [
 						"cwmp",
 						"usp"
 					],
-					"description": "Minimum guaranteed rate to shape this schedulers traffic to. Must be > 0 and < ShapingRate, for a valid rate. A value of -1 indicates the ShapingRates value is not used.",
+					"description": "Minimum guaranteed rate to shape this schedulers traffic to. Must be > 0 and < ShapingRate, for a valid rate. A value of -1 indicates the ShapingRates value is not used. Note: To be able to support higher bit rates, this parameter was changed to unsignedLong in the Device:2.18 version.",
 					"default": "-1",
-					"datatype": "int",
+					"datatype": "long",
 					"range": [
 						{
 							"min": -1
@@ -94961,12 +95465,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. <<deprecated|2.11|because <<object>> is a transient object>> <<obsoleted|2.14>> <<deleted|2.15>>",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"PhysAddress": {
 					"type": "string",
@@ -95399,22 +95898,17 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Origin": {
 					"type": "string",
 					"read": true,
-					"write": false,
+					"write": true,
 					"protocols": [
 						"cwmp",
 						"usp"
 					],
-					"description": "Indicates the owner of the <<object>> instance.",
+					"description": "Indicates the owner of the <<object>> instance. Note: This parameter was changed to writeOnceReadOnly in the Device:2.18 version.",
 					"default": "Controller",
 					"datatype": "string",
 					"enumerations": [
@@ -95491,7 +95985,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "Allows or denies access for a device. If <<param>> is set to Allow, device access is allowed based on the <<object|Schedule>> objects. Access is enabled if there is no <<object|Schedule>> object defined. If <<param>> is set to Deny, defined <<object|Schedule>> objects are ignored and no access is allowed for the device.",
+					"description": "Allows or denies access for a device. If <<param>> is set to Allow, device access is allowed based on the <<object|.Schedules.Schedule>> objects referenced by the <<param|ScheduleRef>> parameter. Access is enabled if there is no <<object|.Schedules.Schedule>> object referenced by the <<param|ScheduleRef>> parameter. If <<param>> is set to Deny, <<object|.Schedules.Schedule>> objects referenced by the <<param|ScheduleRef>> parameter are ignored and no access is allowed for the device.",
 					"default": "Allow",
 					"datatype": "string",
 					"enumerations": [
@@ -95499,24 +95993,40 @@
 						"Deny"
 					]
 				},
+				"ScheduleRef": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Each reference provides a schedule where time based access can be enabled. When <<param>> is <<empty>> the <<object>> is not scheduled, and the <<param|Enable>> defines the operational state.",
+					"default": "[]",
+					"list": {
+						"datatype": "string"
+					}
+				},
 				"ScheduleNumberOfEntries": {
 					"type": "unsignedInt",
 					"read": true,
 					"write": false,
+					"obsolete": true,
 					"protocols": [
 						"cwmp",
 						"usp"
 					],
-					"description": "<<numentries>>",
+					"description": "<<deprecated|2.18|in favor of <<object|.Schedules.>>>> <<numentries>>",
 					"datatype": "unsignedInt"
 				},
 				"Device.Hosts.AccessControl.{i}.Schedule.{i}.": {
 					"type": "object",
+					"obsolete": true,
 					"protocols": [
 						"cwmp",
 						"usp"
 					],
-					"description": "Each instance of this object provides a schedule where access is enabled.",
+					"description": "<<deprecated|2.18|in favor of <<object|.Schedules.>>>> Each instance of this object provides a schedule where access is enabled.",
 					"uniqueKeys": [
 						"Alias"
 					],
@@ -95526,22 +96036,19 @@
 						"type": "string",
 						"read": true,
 						"write": true,
+						"obsolete": true,
 						"protocols": [
 							"cwmp",
 							"usp"
 						],
 						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"datatype": "_AliasCWMP"
 					},
 					"Enable": {
 						"type": "boolean",
 						"read": true,
 						"write": true,
+						"obsolete": true,
 						"protocols": [
 							"cwmp",
 							"usp"
@@ -95554,6 +96061,7 @@
 						"type": "string",
 						"read": true,
 						"write": true,
+						"obsolete": true,
 						"protocols": [
 							"cwmp",
 							"usp"
@@ -95576,6 +96084,7 @@
 						"type": "string",
 						"read": true,
 						"write": true,
+						"obsolete": true,
 						"protocols": [
 							"cwmp",
 							"usp"
@@ -95596,6 +96105,7 @@
 						"type": "unsignedInt",
 						"read": true,
 						"write": true,
+						"obsolete": true,
 						"protocols": [
 							"cwmp",
 							"usp"
@@ -95672,12 +96182,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Enable": {
 					"type": "boolean",
@@ -95709,12 +96214,12 @@
 				"Origin": {
 					"type": "string",
 					"read": true,
-					"write": false,
+					"write": true,
 					"protocols": [
 						"cwmp",
 						"usp"
 					],
-					"description": "The mechanism via which the Zone was created.",
+					"description": "The mechanism via which the Zone was created. Note: This parameter was changed to writeOnceReadOnly in the Device:2.18 version.",
 					"default": "System",
 					"datatype": "string",
 					"enumerations": [
@@ -95771,12 +96276,7 @@
 							"usp"
 						],
 						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"datatype": "_AliasCWMP"
 					},
 					"Enable": {
 						"type": "boolean",
@@ -95815,7 +96315,7 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "Indicates the owner of the <<object>> instance.",
+						"description": "Indicates the owner of the <<object>> instance. Note: This parameter was changed to writeOnceReadOnly in the Device:2.18 version.",
 						"default": "System",
 						"datatype": "string",
 						"enumerations": [
@@ -95906,7 +96406,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "This table contains the DNS Server IP address to be used by the DNS Client (it does not model a DNS Server). Entries are either automatically created as result of DHCP (v4 or v6), IPCP, or RA received DNS server information, or are statically configured by the Controller.",
+					"description": "This table contains the DNS Server IP address to be used by the DNS Client (it does not model a DNS Server). Entries are either automatically created as result of DHCP (v4 or v6), IPCP, 3GPP-NAS, or RA received DNS server information, or are statically configured by the Controller.",
 					"uniqueKeys": [
 						"DNSServer",
 						"Alias"
@@ -95951,12 +96451,7 @@
 							"usp"
 						],
 						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"datatype": "_AliasCWMP"
 					},
 					"DNSServer": {
 						"type": "string",
@@ -95966,7 +96461,7 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "DNS server IP address. Note: <<param>> is only writable when <<param|Type>> is <<enum|Static|Type>>; otherwise, <<param>> is automatically configured as result of DHCP, IPCP, or RA received DNS server information.",
+						"description": "DNS server IP address. Note: <<param>> is only writable when <<param|Type>> is <<enum|Static|Type>>; otherwise, <<param>> is automatically configured as result of DHCP, IPCP, 3GPP-NAS, or RA received DNS server information.",
 						"datatype": "IPAddress",
 						"range": [
 							{
@@ -95982,7 +96477,7 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "<<reference>> This parameter specifies the IP interface over which the DNS query is sent. <<template|INTERFACE-ROUTING>> Note: <<param>> is only writable when <<param|Type>> is <<enum|Static|Type>>; otherwise, <<param>> is automatically configured as result of DHCP, IPCP, or RA received DNS server information.",
+						"description": "<<reference>> This parameter specifies the IP interface over which the DNS query is sent. <<template|INTERFACE-ROUTING>> Note: <<param>> is only writable when <<param|Type>> is <<enum|Static|Type>>; otherwise, <<param>> is automatically configured as result of DHCP, IPCP, 3GPP-NAS, or RA received DNS server information.",
 						"datatype": "string",
 						"range": [
 							{
@@ -95998,7 +96493,7 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "Method used to assign the <<param|DNSServer>> address. Enumeration of: DHCP, DHCPv4, DHCPv6, RouterAdvertisement, IPCP, Static. Table entries that are automatically created as result of DHCP, IPCP, or RA received DNS server information will have <<param>> set to <<enum|DHCPv4>>, <<enum|DHCPv6>>, <<enum|IPCP>>, or <<enum|RouterAdvertisement>>, as the case may be. Manually created table entires will have their <<param>> set to <<enum|Static>>.",
+						"description": "Method used to assign the <<param|DNSServer>> address. Enumeration of: DHCP, DHCPv4, DHCPv6, RouterAdvertisement, IPCP, 3GPP-NAS, Static. Table entries that are automatically created as result of DHCP, IPCP, 3GPP-NAS, or RA received DNS server information will have <<param>> set to <<enum|DHCPv4>>, <<enum|DHCPv6>>, <<enum|IPCP>>, <<enum|3GPP-NAS>> or <<enum|RouterAdvertisement>>, as the case may be. Manually created table entries will have their <<param>> set to <<enum|Static>>.",
 						"default": "Static",
 						"datatype": "string",
 						"enumerations": [
@@ -96007,6 +96502,7 @@
 							"DHCPv6",
 							"RouterAdvertisement",
 							"IPCP",
+							"3GPP-NAS",
 							"Static"
 						]
 					}
@@ -96091,12 +96587,7 @@
 							"usp"
 						],
 						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"datatype": "_AliasCWMP"
 					},
 					"Forwarders": {
 						"type": "string",
@@ -96107,6 +96598,7 @@
 							"usp"
 						],
 						"description": "Specifies the list of the DNS forwarders to be used.",
+						"default": "[]",
 						"list": {
 							"datatype": "string",
 							"range": [
@@ -96152,7 +96644,7 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "Specifies the minium TTL amount of time, in <<units>>, that an entry MUST be kept in the cache regardless of what has been specified by the domain owner. When 0 is specified, then the TTL chosen by the domain owner will be applied.",
+						"description": "Specifies the minimum TTL amount of time, in <<units>>, that an entry MUST be kept in the cache regardless of what has been specified by the domain owner. When 0 is specified, then the TTL chosen by the domain owner will be applied.",
 						"default": "0",
 						"datatype": "unsignedInt",
 						"unit": "seconds"
@@ -96229,12 +96721,7 @@
 							"usp"
 						],
 						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"datatype": "_AliasCWMP"
 					},
 					"DNSServer": {
 						"type": "string",
@@ -96276,7 +96763,7 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "Method used to assign the <<param|DNSServer>> address. Enumeration of: DHCP, DHCPv4, DHCPv6, RouterAdvertisement, IPCP, Static. Table entries that are automatically created as result of DHCP, IPCP, or RA received DNS server information will have <<param>> set to <<enum|DHCPv4>>, <<enum|DHCPv6>>, <<enum|IPCP>>, or <<enum|RouterAdvertisement>>, as the case may be. Manually created table entires will have their <<param>> set to <<enum|Static>>.",
+						"description": "Method used to assign the <<param|DNSServer>> address. Enumeration of: DHCP, DHCPv4, DHCPv6, RouterAdvertisement, IPCP, Static. Table entries that are automatically created as result of DHCP, IPCP, or RA received DNS server information will have <<param>> set to <<enum|DHCPv4>>, <<enum|DHCPv6>>, <<enum|IPCP>>, or <<enum|RouterAdvertisement>>, as the case may be. Manually created table entries will have their <<param>> set to <<enum|Static>>.",
 						"default": "Static",
 						"datatype": "string",
 						"enumerations": [
@@ -96708,12 +97195,7 @@
 							"usp"
 						],
 						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"datatype": "_AliasCWMP"
 					},
 					"Status": {
 						"type": "string",
@@ -96752,12 +97234,12 @@
 					"InstanceName": {
 						"type": "string",
 						"read": true,
-						"write": false,
+						"write": true,
 						"protocols": [
 							"cwmp",
 							"usp"
 						],
-						"description": "Human-readable instance name <<bibref|DNS-SD|Section 4.1.1 Instance Names>> (i.e. The [<<param>>] portion of the Service Instance Name).",
+						"description": "Human-readable instance name <<bibref|DNS-SD|Section 4.1.1 Instance Names>> (i.e. The [<<param>>] portion of the Service Instance Name). Note: This parameter was promoted to readWrite in the Device:2.18 version.",
 						"datatype": "string",
 						"range": [
 							{
@@ -96768,12 +97250,12 @@
 					"ApplicationProtocol": {
 						"type": "string",
 						"read": true,
-						"write": false,
+						"write": true,
 						"protocols": [
 							"cwmp",
 							"usp"
 						],
-						"description": "The Application Protocol, without the leading underscore, associated with the service (e.g., daap) as defined by the DNS-SD service <<bibref|DNS-SD|Section 7 Application Protocol Names>>.",
+						"description": "The Application Protocol, without the leading underscore, associated with the service (e.g., daap) as defined by the DNS-SD service <<bibref|DNS-SD|Section 7 Application Protocol Names>>. Note: This parameter was promoted to readWrite in the Device:2.18 version.",
 						"datatype": "string",
 						"range": [
 							{
@@ -96784,12 +97266,12 @@
 					"TransportProtocol": {
 						"type": "string",
 						"read": true,
-						"write": false,
+						"write": true,
 						"protocols": [
 							"cwmp",
 							"usp"
 						],
-						"description": "The Transport Protocol associated with the service as defined by the DNS-SD service <<bibref|DNS-SD|Section 4.1.2 Service Names>>.",
+						"description": "The Transport Protocol associated with the service as defined by the DNS-SD service <<bibref|DNS-SD|Section 4.1.2 Service Names>>. Note: This parameter was promoted to readWrite in the Device:2.18 version.",
 						"datatype": "string",
 						"enumerations": [
 							"TCP",
@@ -96799,12 +97281,12 @@
 					"Domain": {
 						"type": "string",
 						"read": true,
-						"write": false,
+						"write": true,
 						"protocols": [
 							"cwmp",
 							"usp"
 						],
-						"description": "The value to be entered into the Name field of the DNS SRV record <<bibref|RFC2782>> which represents the fully qualified domain name (FQDN) associated with the service as defined by the DNS-SD service <<bibref|DNS-SD|Section 4.1.3 Domain Names>>.",
+						"description": "The value to be entered into the Name field of the DNS SRV record <<bibref|RFC2782>> which represents the fully qualified domain name (FQDN) associated with the service as defined by the DNS-SD service <<bibref|DNS-SD|Section 4.1.3 Domain Names>>. Note: This parameter was promoted to readWrite in the Device:2.18 version.",
 						"default": "local",
 						"datatype": "string",
 						"range": [
@@ -96816,12 +97298,12 @@
 					"Port": {
 						"type": "unsignedInt",
 						"read": true,
-						"write": false,
+						"write": true,
 						"protocols": [
 							"cwmp",
 							"usp"
 						],
-						"description": "The value to be entered into the Port field of the DNS SRV record <<bibref|RFC2782>> that is used to contact the service.",
+						"description": "The value to be entered into the Port field of the DNS SRV record <<bibref|RFC2782>> that is used to contact the service. Note: This parameter was promoted to readWrite in the Device:2.18 version.",
 						"datatype": "unsignedInt",
 						"range": [
 							{
@@ -96846,8 +97328,8 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "This object maintains an instance of a (key/value pairs) of the service. The information is to be provided in the DNS TXT records <<bibref|RFC1035>> of the advertised service. When multiple instances of the <<object>> table have the same value for the <<param|Key>> parameter, the implementation is CPE specific.",
-						"access": false,
+						"description": "This object maintains an instance of a (key/value pairs) of the service. The information is to be provided in the DNS TXT records <<bibref|RFC1035>> of the advertised service. When multiple instances of the <<object>> table have the same value for the <<param|Key>> parameter, the implementation is CPE specific. Note: This object was promoted to readWrite in the Device:2.18 version.",
+						"access": true,
 						"array": true,
 						"Key": {
 							"type": "string",
@@ -97260,12 +97742,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Interface": {
 					"type": "string",
@@ -97292,6 +97769,7 @@
 						"usp"
 					],
 					"description": "Each list item MUST be the Path name of a <<object|.IP.Interface.<i>.IPv4Address.>> table or of one of its rows. If the referenced object is deleted, the corresponding item MUST be removed from the list. Specifies the source IPv4 network(s) that MUST be translated for all outgoing traffic associated with the <<param|Interface>> (e.g. Device.IP.Interface.2.IPv4Address. (table) or Device.IP.Interface.2.IPv4Address.1. (row)). The <<param|.IP.Interface.<i>.IPv4Address.<i>.IPAddress>> and <<param|.IP.Interface.<i>.IPv4Address.<i>.SubnetMask>> are used to construct an additional filter rule that specifies which address range needs to be translated.",
+					"default": "[]",
 					"list": {
 						"datatype": "string",
 						"range": [
@@ -97373,12 +97851,13 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "The status of this entry. Enumeration of: Disabled, Enabled, Error_Misconfigured, Error. The <<enum|Error_Misconfigured>> value indicates that a necessary configuration value is undefined or invalid. The <<enum|Error>> value MAY be used by the CPE to indicate a locally defined error condition.",
+					"description": "The status of this entry. Enumeration of: Disabled, Enabled, Inactive, Error_Misconfigured, Error. The <<enum|Error_Misconfigured>> value indicates that a necessary configuration value is undefined or invalid. The <<enum|Error>> value MAY be used by the CPE to indicate a locally defined error condition.",
 					"default": "Disabled",
 					"datatype": "string",
 					"enumerations": [
 						"Disabled",
 						"Enabled",
+						"Inactive",
 						"Error_Misconfigured",
 						"Error"
 					]
@@ -97386,12 +97865,12 @@
 				"Origin": {
 					"type": "string",
 					"read": true,
-					"write": false,
+					"write": true,
 					"protocols": [
 						"cwmp",
 						"usp"
 					],
-					"description": "Indicates the Origin of the <<object>> instance.",
+					"description": "Indicates the Origin of the <<object>> instance. Note: This parameter was changed to writeOnceReadOnly in the Device:2.18 version.",
 					"default": "Controller",
 					"datatype": "string",
 					"enumerations": [
@@ -97410,12 +97889,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. Note: There is no guarantee that the <<param>> value on automatically-created <<object>> instances will be retained. This is because automatically-created <<object>> instances can be transitory.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Interface": {
 					"type": "string",
@@ -97457,6 +97931,18 @@
 					"datatype": "unsignedInt",
 					"unit": "seconds"
 				},
+				"RemainingLeaseTime": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "For a dynamic (non-static) port mapping, when this parameter is read, the value represents the time (in <<units>>) remaining on the port mapping lease. That is, for a dynamic port mapping, the value counts down toward 0. When a dynamic port mapping lease expires, the device MUST automatically terminate that port mapping, and MUST automatically delete the corresponding <<object>> table entry. For a static port mapping, this parameter is irrelevant and should return 0.",
+					"datatype": "unsignedInt",
+					"unit": "seconds"
+				},
 				"RemoteHost": {
 					"type": "string",
 					"read": true,
@@ -97511,7 +97997,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "The port on <<param|InternalClient>> that the gateway SHOULD forward traffic to.",
+					"description": "The port on <<param|InternalClient>> that the gateway SHOULD forward traffic to. When <<param|ExternalPortEndRange>> is utilized, this range will also be applied accordingly, starting from the <<param>> number.",
 					"datatype": "unsignedInt",
 					"range": [
 						{
@@ -97566,6 +98052,20 @@
 							"max": 256
 						}
 					]
+				},
+				"ScheduleRef": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Each reference provides a schedule where time based access can be enabled. When <<param>> is <<empty>> the <<object>> is not scheduled, and the <<param|Enable>> defines the operational state.",
+					"default": "[]",
+					"list": {
+						"datatype": "string"
+					}
 				}
 			},
 			"Device.NAT.PortTrigger.{i}.": {
@@ -97589,12 +98089,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Enable": {
 					"type": "boolean",
@@ -97621,6 +98116,7 @@
 					"enumerations": [
 						"Disabled",
 						"Enabled",
+						"Inactive",
 						"Error_Misconfigured",
 						"Error"
 					]
@@ -97633,7 +98129,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "Indicates the owner of the <<object>> instance.",
+					"description": "Indicates the owner of the <<object>> instance. Note: This parameter was changed to writeOnceReadOnly in the Device:2.18 version.",
 					"default": "Controller",
 					"datatype": "string",
 					"enumerations": [
@@ -97726,12 +98222,12 @@
 				"ActivationDate": {
 					"type": "dateTime",
 					"read": true,
-					"write": true,
+					"write": false,
 					"protocols": [
 						"cwmp",
 						"usp"
 					],
-					"description": "Indicates when the port trigger was enabled. When the port trigger is no longer active.",
+					"description": "Indicates when the port trigger was enabled. When the port trigger is no longer active. Note: This parameter was demoted to readOnly in the Device:2.18 version.",
 					"default": "0001-01-01T00:00:00Z",
 					"datatype": "dateTime"
 				},
@@ -97750,6 +98246,20 @@
 						"UDP"
 					]
 				},
+				"ScheduleRef": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Each reference provides a schedule where time based access can be enabled. When <<param>> is <<empty>> the <<object>> is not scheduled, and the <<param|Enable>> defines the operational state.",
+					"default": "[]",
+					"list": {
+						"datatype": "string"
+					}
+				},
 				"RuleNumberOfEntries": {
 					"type": "unsignedInt",
 					"read": true,
@@ -97782,12 +98292,7 @@
 							"usp"
 						],
 						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"datatype": "_AliasCWMP"
 					},
 					"Port": {
 						"type": "unsignedInt",
@@ -97962,12 +98467,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"WANInterface": {
 					"type": "string",
@@ -98227,12 +98727,7 @@
 							"usp"
 						],
 						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"datatype": "_AliasCWMP"
 					},
 					"Origin": {
 						"type": "string",
@@ -98493,12 +98988,7 @@
 								"usp"
 							],
 							"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-							"datatype": "Alias",
-							"range": [
-								{
-									"max": 64
-								}
-							]
+							"datatype": "_AliasCWMP"
 						},
 						"Origin": {
 							"type": "string",
@@ -98730,12 +99220,7 @@
 									"usp"
 								],
 								"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-								"datatype": "Alias",
-								"range": [
-									{
-										"max": 64
-									}
-								]
+								"datatype": "_AliasCWMP"
 							},
 							"RemoteHostIPAddress": {
 								"type": "string",
@@ -98791,12 +99276,12 @@
 							"RemotePortEndRange": {
 								"type": "unsignedInt",
 								"read": true,
-								"write": false,
+								"write": true,
 								"protocols": [
 									"cwmp",
 									"usp"
 								],
-								"description": "Indicates the last port of the remote port range that starts with <<param|RemotePort>>. If an external port range is specified, then the behavior described for <<param|RemotePort>> applies to all ports within the range. A value of zero (0) indicates that no remote port range is specified, i.e. that the range consists only of <<param|RemotePort>>.",
+								"description": "Indicates the last port of the remote port range that starts with <<param|RemotePort>>. If an external port range is specified, then the behavior described for <<param|RemotePort>> applies to all ports within the range. A value of zero (0) indicates that no remote port range is specified, i.e. that the range consists only of <<param|RemotePort>>. Note: This parameter was promoted to readWrite in the Device:2.18 version.",
 								"default": "0",
 								"datatype": "unsignedInt",
 								"range": [
@@ -98881,12 +99366,7 @@
 								"usp"
 							],
 							"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-							"datatype": "Alias",
-							"range": [
-								{
-									"max": 64
-								}
-							]
+							"datatype": "_AliasCWMP"
 						},
 						"Origin": {
 							"type": "string",
@@ -99141,12 +99621,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Interface": {
 					"type": "string",
@@ -99261,6 +99736,7 @@
 						"usp"
 					],
 					"description": "<<list>> Items represent IP Router IPv4 Address(es) received from the DHCP server. <<empty>> when <<param|Status>> is not equal to <<enum|Bound|DHCPStatus>>. Value is information received via DHCP Options 3, 33 or 121.",
+					"default": "[]",
 					"list": {
 						"datatype": "IPv4Address",
 						"maxsize": 256,
@@ -99284,6 +99760,7 @@
 						"usp"
 					],
 					"description": "<<list>> Items represent DNS Server IPv4 Address(es) received from the DHCP server. <<empty>> when <<param|Status>> is not equal to <<enum|Bound|DHCPStatus>>. Value is information received via DHCP Option 6.",
+					"default": "[]",
 					"list": {
 						"datatype": "IPv4Address",
 						"maxsize": 256,
@@ -99427,12 +99904,7 @@
 							"usp"
 						],
 						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"datatype": "_AliasCWMP"
 					},
 					"Tag": {
 						"type": "unsignedInt",
@@ -99519,12 +99991,7 @@
 							"usp"
 						],
 						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"datatype": "_AliasCWMP"
 					},
 					"Tag": {
 						"type": "unsignedInt",
@@ -99560,6 +100027,107 @@
 							}
 						]
 					}
+				},
+				"Device.DHCPv4.Client.{i}.Retransmission.": {
+					"type": "object",
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "This object enables the configurion of the DHCPv4 retransmission behavior according to the guidelines described in <<bibref|RFC2131|Chapter 4.1>>.",
+					"access": false,
+					"array": false,
+					"DiscoverInitialTimeout": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Initial delay, expressed in <<units>>, before initiating the first DCHCPDISCOVER message.",
+						"default": "4",
+						"datatype": "unsignedInt",
+						"unit": "seconds"
+					},
+					"DiscoverMaxTimeout": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Maximum duration, expressed in <<units>>, between two DHCPDISCOVER message retransmission. According to <<bibref|RFC2131|Chapter 4.1>>, the recommended value for this parameter is 64 <<units>>.",
+						"default": "64",
+						"datatype": "unsignedInt",
+						"unit": "seconds"
+					},
+					"DiscoverMaxDuration": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Maximum duration, expressed in <<units>>, during which the DHCPv4 client is permitted to retransmit DHCPDISCOVER message A value of 0 indicates that no specific maximum duration is set.",
+						"default": "0",
+						"datatype": "unsignedInt",
+						"unit": "seconds"
+					},
+					"RequestInitialTimeout": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Initial delay, expressed in <<units>>, before initiating the first DHCPREQUEST message.",
+						"default": "4",
+						"datatype": "unsignedInt",
+						"unit": "seconds"
+					},
+					"RequestMaxTimeout": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Maximum duration, expressed in <<units>>, between two DHCPREQUEST message retransmission. According to <<bibref|RFC2131|Chapter 4.1>>, the recommended value for this parameter is 64 <<units>>.",
+						"default": "64",
+						"datatype": "unsignedInt",
+						"unit": "seconds"
+					},
+					"RequestMaxDuration": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Maximum duration, expressed in <<units>>, during which the DHCPv4 client is permitted to retransmit DHCPREQUEST message. A value of 0 indicates that no specific maximum duration is set.",
+						"default": "0",
+						"datatype": "unsignedInt",
+						"unit": "seconds"
+					},
+					"TimeoutRandomize": {
+						"type": "int",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "The Randomization factor for the retransmission timeout, in <<units>>, as defined in <<bibref|RFC2131|4.1 Constructing and sending DHCP messages>>. E.g. a timeout of 2000ms with a randomization of 1000 will end up between 1000 and 3000 ms.",
+						"default": "1000",
+						"datatype": "int",
+						"unit": "ms"
+					}
 				}
 			},
 			"Device.DHCPv4.Server.": {
@@ -99645,12 +100213,7 @@
 							"usp"
 						],
 						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"datatype": "_AliasCWMP"
 					},
 					"Order": {
 						"type": "string",
@@ -99903,6 +100466,7 @@
 							"usp"
 						],
 						"description": "<<list>> List items represent addresses marked reserved from the address allocation pool.",
+						"default": "[]",
 						"list": {
 							"datatype": "IPv4Address",
 							"item": {
@@ -100090,12 +100654,7 @@
 								"usp"
 							],
 							"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-							"datatype": "Alias",
-							"range": [
-								{
-									"max": 64
-								}
-							]
+							"datatype": "_AliasCWMP"
 						},
 						"Chaddr": {
 							"type": "string",
@@ -100172,12 +100731,7 @@
 								"usp"
 							],
 							"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-							"datatype": "Alias",
-							"range": [
-								{
-									"max": 64
-								}
-							]
+							"datatype": "_AliasCWMP"
 						},
 						"Tag": {
 							"type": "unsignedInt",
@@ -100236,12 +100790,7 @@
 								"usp"
 							],
 							"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. Note: There is no guarantee that the <<param>> value on automatically-created <<object>> instances will be retained. This is because automatically-created <<object>> instances can be transitory.",
-							"datatype": "Alias",
-							"range": [
-								{
-									"max": 64
-								}
-							]
+							"datatype": "_AliasCWMP"
 						},
 						"Chaddr": {
 							"type": "string",
@@ -100485,12 +101034,7 @@
 							"usp"
 						],
 						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"datatype": "_AliasCWMP"
 					},
 					"Order": {
 						"type": "string",
@@ -100719,7 +101263,7 @@
 				"cwmp",
 				"usp"
 			],
-			"description": "The Dynamic Host Configuration Protocol (DHCP) IPv6 object <<bibref|RFC3315>>. This entire object applies to IPv6 only. It contains the <<object|Client>> and <<object|Server>> objects.",
+			"description": "The Dynamic Host Configuration Protocol (DHCP) IPv6 object <<bibref|RFC8415>>. This entire object applies to IPv6 only. It contains the <<object|Client>> and <<object|Server>> objects.",
 			"access": false,
 			"array": false,
 			"ClientNumberOfEntries": {
@@ -100767,12 +101311,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Interface": {
 					"type": "string",
@@ -100816,7 +101355,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "The clients DHCP Unique Identifier (DUID) <<bibref|RFC3315|Section 9>>. <<param>> is set by the CPE.",
+					"description": "The clients DHCP Unique Identifier (DUID) <<bibref|RFC8415|Section 11>>. <<param>> is set by the CPE.",
 					"datatype": "hexBinary",
 					"range": [
 						{
@@ -100832,7 +101371,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "Enables or disables inclusion of the Identity Association (IA) for Non-Temporary Address option OPTION_IA_NA(3) <<bibref|RFC3315|Section 22.4>> in Solicit messages.",
+					"description": "Enables or disables inclusion of the Identity Association (IA) for Non-Temporary Address option OPTION_IA_NA(3) <<bibref|RFC8415|Section 21.4>> in Solicit messages.",
 					"default": "true",
 					"datatype": "boolean"
 				},
@@ -100844,7 +101383,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "Enables or disables inclusion of the Identity Association (IA) for Prefix Delegation option OPTION_IA_PD(25) <<bibref|RFC3633|Section 10>> in Solicit messages. Note that this is only appropriate for an upstream interface on a requesting router, e.g. for an RG WAN interface.",
+					"description": "Enables or disables inclusion of the Identity Association (IA) for Prefix Delegation option OPTION_IA_PD(25) <<bibref|RFC8415|Section 21.22>> in Solicit messages. Note that this is only appropriate for an upstream interface on a requesting router, e.g. for an RG WAN interface.",
 					"default": "false",
 					"datatype": "boolean"
 				},
@@ -100856,7 +101395,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "Enables or disables inclusion of the Rapid Commit option OPTION_RAPID_COMMIT(14) <<bibref|RFC3315|Section 22.14>> in Solicit messages.",
+					"description": "Enables or disables inclusion of the Rapid Commit option OPTION_RAPID_COMMIT(14) <<bibref|RFC8415|Section 21.14>> in Solicit messages.",
 					"default": "false",
 					"datatype": "boolean"
 				},
@@ -100879,7 +101418,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "T1 value, in <<units>>, that the client SHOULD use when sending IA options, e.g. OPTION_IA_NA <<bibref|RFC3315|Section 22.4>> and OPTION_IA_PD <<bibref|RFC3633|Section 10>>. A value of -1 indicates that no T1 value is specified.",
+					"description": "T1 value, in <<units>>, that the client SHOULD use when sending IA options, e.g. OPTION_IA_NA <<bibref|RFC8415|Section 21.4>> and OPTION_IA_PD <<bibref|RFC8415|Section 10>>. A value of -1 indicates that no T1 value is specified.",
 					"datatype": "int",
 					"range": [
 						{
@@ -100896,7 +101435,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "T2 value, in <<units>>, that the client SHOULD use when sending IA options, e.g. OPTION_IA_NA <<bibref|RFC3315|Section 22.4>> and OPTION_IA_PD <<bibref|RFC3633|Section 10>>. A value of -1 indicates that no T2 value is specified.",
+					"description": "T2 value, in <<units>>, that the client SHOULD use when sending IA options, e.g. OPTION_IA_NA <<bibref|RFC8415|Section 21.4>> and OPTION_IA_PD <<bibref|RFC8415|Section 21.22>>. A value of -1 indicates that no T2 value is specified.",
 					"datatype": "int",
 					"range": [
 						{
@@ -100926,7 +101465,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "<<list>> An ordered list of the top-level options (i.e. not encapsulated options) that the client will explicitly request from the server. This parameter is intended only for options that are not necessary for the basic operation of the protocol, and are not modeled elsewhere. For example, it is appropriate for OPTION_DNS_SERVERS <<bibref|RFC3646>> but is not appropriate for OPTION_SERVERID (which is part of the protocol), OPTION_IA_NA (which is modeled via <<param|RequestAddresses>>) or OPTION_IA_PD (which is modeled via <<param|RequestPrefixes>>). However, the CPE MUST NOT reject an attempt to set this parameter to a value that includes options that it regards as inappropriate; instead, it MUST accept the requested options and handle them as best it can. Loosely speaking, these are the options that the client will include in OPTION_ORO <<bibref|RFC3315>> but the client is free to decide (in accordance with <<bibref|RFC3315>>) in which messages to request which option, whether also to request additional options, whether not to request inappropriate options, and in which order to request any options that are also in <<param|SupportedOptions>>.",
+					"description": "<<list>> An ordered list of the top-level options (i.e. not encapsulated options) that the client will explicitly request from the server. This parameter is intended only for options that are not necessary for the basic operation of the protocol, and are not modeled elsewhere. For example, it is appropriate for OPTION_DNS_SERVERS <<bibref|RFC3646>> but is not appropriate for OPTION_SERVERID (which is part of the protocol), OPTION_IA_NA (which is modeled via <<param|RequestAddresses>>) or OPTION_IA_PD (which is modeled via <<param|RequestPrefixes>>). However, the CPE MUST NOT reject an attempt to set this parameter to a value that includes options that it regards as inappropriate; instead, it MUST accept the requested options and handle them as best it can. Loosely speaking, these are the options that the client will include in OPTION_ORO <<bibref|RFC8415>> but the client is free to decide (in accordance with <<bibref|RFC8415>>) in which messages to request which option, whether also to request additional options, whether not to request inappropriate options, and in which order to request any options that are also in <<param|SupportedOptions>>.",
 					"list": {
 						"datatype": "unsignedInt"
 					}
@@ -101002,7 +101541,7 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "The servers DHCP Unique Identifier (DUID) <<bibref|RFC3315|Section 9>> as received via OPTION_SERVERID.",
+						"description": "The servers DHCP Unique Identifier (DUID) <<bibref|RFC8415|Section 11>> as received via OPTION_SERVERID.",
 						"datatype": "hexBinary",
 						"range": [
 							{
@@ -101056,12 +101595,7 @@
 							"usp"
 						],
 						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"datatype": "_AliasCWMP"
 					},
 					"Tag": {
 						"type": "unsignedInt",
@@ -101071,7 +101605,7 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "Option tag (code) <<bibref|RFC3315|Section 22.1>>.",
+						"description": "Option tag (code) <<bibref|RFC8415|Section 21.1>>.",
 						"datatype": "unsignedInt",
 						"range": [
 							{
@@ -101088,7 +101622,7 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "A hexbinary encoded option data <<bibref|RFC3315|Section 22.1>>. Note: The length of the option data is option-len octets, as specified in <<bibref|RFC3315|Section 22.1>>.",
+						"description": "A hexbinary encoded option data <<bibref|RFC8415|Section 21.1>>. Note: The length of the option data is option-len octets, as specified in <<bibref|RFC8415|Section 21.1>>.",
 						"datatype": "hexBinary",
 						"range": [
 							{
@@ -101115,7 +101649,7 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "Option tag (code) <<bibref|RFC3315|Section 22.1>>.",
+						"description": "Option tag (code) <<bibref|RFC8415|Section 21.1>>.",
 						"datatype": "unsignedInt",
 						"range": [
 							{
@@ -101132,7 +101666,7 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "A hexbinary encoded option data <<bibref|RFC3315|Section 22.1>>.",
+						"description": "A hexbinary encoded option data <<bibref|RFC8415|Section 21.1>>.",
 						"datatype": "hexBinary",
 						"range": [
 							{
@@ -101152,6 +101686,375 @@
 						"description": "<<reference>> This is the server that sent the option to the client. Each <<object>> entry MUST have an associated server.",
 						"datatype": "string"
 					}
+				},
+				"Device.DHCPv6.Client.{i}.Retransmission.": {
+					"type": "object",
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "This object enables the configurion of the DHCPv6 retransmission behavior according to the guidelines described in <<bibref|RFC8415|Section 7.6>>.",
+					"access": false,
+					"array": false,
+					"SolicitMaxDelay": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Maximum delay of first Solicit, expressed in <<units>>.",
+						"default": "1",
+						"datatype": "unsignedInt",
+						"unit": "seconds"
+					},
+					"SolicitInitialTimeout": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Initial solicit, expressed in <<units>>.",
+						"default": "1",
+						"datatype": "unsignedInt",
+						"unit": "seconds"
+					},
+					"SolicitMaxTimeout": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Maximum solicit timeout value, expressed in <<units>>.",
+						"default": "3600",
+						"datatype": "unsignedInt",
+						"unit": "seconds"
+					},
+					"RequestInitialTimeout": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Initial request timeout, expressed in <<units>>.",
+						"default": "1",
+						"datatype": "unsignedInt",
+						"unit": "seconds"
+					},
+					"RequestMaxTimeout": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Maximum request timeout, expressed in <<units>>.",
+						"default": "30",
+						"datatype": "unsignedInt",
+						"unit": "seconds"
+					},
+					"RequestMaxRetry": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Maximum request retry attempts.",
+						"default": "10",
+						"datatype": "unsignedInt"
+					},
+					"ConfirmMaxDelay": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Maximum delay of first confirm, expressed in <<units>>.",
+						"default": "1",
+						"datatype": "unsignedInt",
+						"unit": "seconds"
+					},
+					"ConfirmInitialTimeout": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Initial confirm timeout, expressed in <<units>>.",
+						"default": "1",
+						"datatype": "unsignedInt",
+						"unit": "seconds"
+					},
+					"ConfirmMaxTimeout": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Maximum confirm timeout, expressed in <<units>>.",
+						"default": "4",
+						"datatype": "unsignedInt",
+						"unit": "seconds"
+					},
+					"ConfirmMaxDuration": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Maximum confirm duration, expressed in <<units>>.",
+						"default": "10",
+						"datatype": "unsignedInt",
+						"unit": "seconds"
+					},
+					"RenewInitialTimeout": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Initial renew timeout, expressed in <<units>>.",
+						"default": "10",
+						"datatype": "unsignedInt",
+						"unit": "seconds"
+					},
+					"RenewMaxTimeout": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Maximum renew timeout value, expressed in <<units>>.",
+						"default": "600",
+						"datatype": "unsignedInt",
+						"unit": "seconds"
+					},
+					"RebindInitialTimeout": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Initial rebind timeout, expressed in <<units>>.",
+						"default": "10",
+						"datatype": "unsignedInt",
+						"unit": "seconds"
+					},
+					"RebindMaxTimeout": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Maximum rebind timeout value, expressed in <<units>>.",
+						"default": "600",
+						"datatype": "unsignedInt",
+						"unit": "seconds"
+					},
+					"InformationRequestMaxDelay": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Maximum delay of first information-request, expressed in <<units>>.",
+						"default": "1",
+						"datatype": "unsignedInt",
+						"unit": "seconds"
+					},
+					"InformationRequestInitialTimeout": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Initial information-request timeout, expressed in <<units>>.",
+						"default": "1",
+						"datatype": "unsignedInt",
+						"unit": "seconds"
+					},
+					"InformationRequestMaxTimeout": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Maximum information-request timeout, expressed in <<units>>.",
+						"default": "3600",
+						"datatype": "unsignedInt",
+						"unit": "seconds"
+					},
+					"ReleaseInitialTimeout": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Initial Release timeout, expressed in <<units>>.",
+						"default": "1",
+						"datatype": "unsignedInt",
+						"unit": "seconds"
+					},
+					"ReleaseMaxAttempts": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Maximum release retry attempts.",
+						"default": "4",
+						"datatype": "unsignedInt"
+					},
+					"DeclineInitialTimeout": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Initial Decline timeout, expressed in <<units>>.",
+						"default": "1",
+						"datatype": "unsignedInt",
+						"unit": "seconds"
+					},
+					"DeclineMaxAttempts": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Maximum decline retry attempts.",
+						"default": "4",
+						"datatype": "unsignedInt"
+					},
+					"ReconfigureInitialTimeout": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Initial reconfigure timeout, expressed in <<units>>.",
+						"default": "2",
+						"datatype": "unsignedInt",
+						"unit": "seconds"
+					},
+					"ReconfigureMaxAttempts": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Maximum reconfigure attempts.",
+						"default": "8",
+						"datatype": "unsignedInt"
+					},
+					"HopCountLimit": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Maximum hop count in a relay-forward message.",
+						"default": "32",
+						"datatype": "unsignedInt"
+					},
+					"InformationRefreshTime": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Default information refresh time, expressed in <<units>>.",
+						"default": "86400",
+						"datatype": "unsignedInt",
+						"unit": "seconds"
+					},
+					"MinInformationRefreshTime": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Minimum information refresh time, expressed in <<units>>.",
+						"default": "600",
+						"datatype": "unsignedInt",
+						"unit": "seconds"
+					},
+					"MaxWaitTime": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Maximum required time to wait for a response, expressed in <<units>>.",
+						"default": "60",
+						"datatype": "unsignedInt",
+						"unit": "seconds"
+					},
+					"TimeoutRandomize": {
+						"type": "int",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "The Randomization factor for the retransmission timeout, in <<units>>, as defined in <<bibref|RFC8415|15 Reliability of Client-Initiated Message Exchanges>>. E.g. a timeout of 1000ms with a randomization of 100 will end up between 900 and 1100 ms.",
+						"default": "100",
+						"datatype": "int",
+						"unit": "ms"
+					}
 				}
 			},
 			"Device.DHCPv6.Server.": {
@@ -101237,12 +102140,7 @@
 							"usp"
 						],
 						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"datatype": "_AliasCWMP"
 					},
 					"Order": {
 						"type": "string",
@@ -101284,7 +102182,7 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "Pool association criterion. A hexbinary string used to identify one or more LAN devices, value of the DHCPv6 Client Identifier (Option 1) <<bibref|RFC3315|Section 22.2>>. The option value is binary, so an exact match is REQUIRED. <<empty>> indicates this criterion is not used. Note: DHCPv6 Option 1 (DUID) is sometimes referred to as Client Identifier.",
+						"description": "Pool association criterion. A hexbinary string used to identify one or more LAN devices, value of the DHCPv6 Client Identifier (Option 1) <<bibref|RFC8415|Section 21.2>>. The option value is binary, so an exact match is REQUIRED. <<empty>> indicates this criterion is not used. Note: DHCPv6 Option 1 (DUID) is sometimes referred to as Client Identifier.",
 						"datatype": "hexBinary",
 						"range": [
 							{
@@ -101312,7 +102210,7 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "Pool association criterion. A hexbinary string used to identify one or more LAN devices, value of the DHCPv6 Vendor Class Identifier (Option 16) <<bibref|RFC3315|Section 22.16>>. The option value is binary, so an exact match is REQUIRED. <<empty>> indicates this criterion is not used.",
+						"description": "Pool association criterion. A hexbinary string used to identify one or more LAN devices, value of the DHCPv6 Vendor Class Identifier (Option 16) <<bibref|RFC8415|Section 21.16>>. The option value is binary, so an exact match is REQUIRED. <<empty>> indicates this criterion is not used.",
 						"datatype": "hexBinary",
 						"range": [
 							{
@@ -101340,7 +102238,7 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "Pool association criterion. A hexbinary string used to identify one or more LAN devices, value of the DHCPv6 User Class Identifier (Option 15) <<bibref|RFC3315|Section 22.15>>. <<empty>> indicates this criterion is not used.",
+						"description": "Pool association criterion. A hexbinary string used to identify one or more LAN devices, value of the DHCPv6 User Class Identifier (Option 15) <<bibref|RFC8415|Section 21.15>>. <<empty>> indicates this criterion is not used.",
 						"datatype": "hexBinary",
 						"range": [
 							{
@@ -101414,6 +102312,7 @@
 							"usp"
 						],
 						"description": "<<list>> <<reference>> Manually-configured prefixes from which IA_NA addresses will be assigned. Each referenced prefix MUST have a <<param|###.IP.Interface.<i>.IPv6Prefix.<i>.StaticType>> of <<enum|Static|###.IP.Interface.<i>.IPv6Prefix.<i>.StaticType>> or <<enum|Child|###.IP.Interface.<i>.IPv6Prefix.<i>.StaticType>>. All clients that request IA_NA and match filter criteria on this <<param|Interface>> MUST be offered IA_NA addresses from all of the Valid (<<param|###.IP.Interface.<i>.IPv6Prefix.<i>.ValidLifetime>> is infinite or in the future) /64 prefixes in this list. Prefixes MUST be associated with the interface instance referenced by <<param|Interface>>.",
+						"default": "[]",
 						"list": {
 							"datatype": "string",
 							"item": {
@@ -101457,6 +102356,7 @@
 							"usp"
 						],
 						"description": "<<list>> <<reference>> Manually-configured prefixes from which IA_PD prefixes will be derived. This list can include: * Prefixes with <<param|###.IP.Interface.<i>.IPv6Prefix.<i>.Origin>> = <<enum|Static|###.IP.Interface.<i>.IPv6Prefix.<i>.Origin>> or <<enum|PrefixDelegation|###.IP.Interface.<i>.IPv6Prefix.<i>.Origin>> associated with upstream interfaces (i.e. interfaces for which the physical layer interface object has Upstream = <<true>>). * Prefixes with <<param|###.IP.Interface.<i>.IPv6Prefix.<i>.StaticType>> = <<enum|Static|###.IP.Interface.<i>.IPv6Prefix.<i>.StaticType>> or <<enum|Child|###.IP.Interface.<i>.IPv6Prefix.<i>.StaticType>> associated with with the interface instance referenced by <<param|Interface>>. All clients that request IA_PD and match filter criteria on this <<param|Interface>> MUST be offered IA_PD prefixes derived from all of the Valid (<<param|###.IP.Interface.<i>.IPv6Prefix.<i>.ValidLifetime>> is infinite or in the future) prefixes in this list.",
+						"default": "[]",
 						"list": {
 							"datatype": "string",
 							"item": {
@@ -101540,12 +102440,7 @@
 								"usp"
 							],
 							"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. Note: There is no guarantee that the <<param>> value on automatically-created <<object>> instances will be retained. This is because automatically-created <<object>> instances can be transitory.",
-							"datatype": "Alias",
-							"range": [
-								{
-									"max": 64
-								}
-							]
+							"datatype": "_AliasCWMP"
 						},
 						"SourceAddress": {
 							"type": "string",
@@ -101711,7 +102606,7 @@
 									"cwmp",
 									"usp"
 								],
-								"description": "Option tag (code) <<bibref|RFC3315|Section 22.1>>.",
+								"description": "Option tag (code) <<bibref|RFC8415|Section 21.1>>.",
 								"datatype": "unsignedInt",
 								"range": [
 									{
@@ -101773,12 +102668,7 @@
 								"usp"
 							],
 							"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-							"datatype": "Alias",
-							"range": [
-								{
-									"max": 64
-								}
-							]
+							"datatype": "_AliasCWMP"
 						},
 						"Tag": {
 							"type": "unsignedInt",
@@ -101788,7 +102678,7 @@
 								"cwmp",
 								"usp"
 							],
-							"description": "Option tag (code) <<bibref|RFC3315|Section 22.1>>.",
+							"description": "Option tag (code) <<bibref|RFC8415|Section 21.1>>.",
 							"datatype": "unsignedInt",
 							"range": [
 								{
@@ -101906,12 +102796,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Interface": {
 					"type": "string",
@@ -102270,6 +103155,45 @@
 							"",
 							"([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])"
 						]
+					},
+					"SuccessCount": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Count of the number of successful authentications from the perspective of this supplicant.",
+						"datatype": "StatsCounter32"
+					},
+					"FailureCount": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Count of the number of failed authentications from the perspective of this supplicant.",
+						"datatype": "StatsCounter32"
+					},
+					"Reset": {
+						"type": "boolean",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp"
+						],
+						"description": "Set this to <<true>> to reset this objects statistics counters to zero.",
+						"datatype": "boolean"
+					},
+					"Reset()": {
+						"type": "command",
+						"async": true,
+						"protocols": [
+							"usp"
+						]
 					}
 				},
 				"Device.IEEE8021x.Supplicant.{i}.EAPMD5.": {
@@ -102396,6 +103320,62 @@
 				"description": "<<numentries>>",
 				"datatype": "unsignedInt"
 			},
+			"SupportedCapabilities": {
+				"type": "string",
+				"read": true,
+				"write": false,
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"description": "This parameter contains the supported capabilities on this system. These are privileges that allow precise control for individual processes. Essentially, capabilities can be assigned to processes giving them necessary permissions to perform certain functions. Please refer to Linux man page on capabilities (capabilities(7) - Linux manual page).",
+				"list": {
+					"datatype": "string",
+					"enumerations": [
+						"CAP_AUDIT_CONTROL",
+						"CAP_AUDIT_READ",
+						"CAP_AUDIT_WRITE",
+						"CAP_BLOCK_SUSPEND",
+						"CAP_BPF",
+						"CAP_CHECKPOINT_RESTORE",
+						"CAP_CHOWN",
+						"CAP_DAC_OVERRIDE",
+						"CAP_DAC_READ_SEARCH",
+						"CAP_FOWNER",
+						"CAP_FSETID",
+						"CAP_IPC_LOCK",
+						"CAP_IPC_OWNER",
+						"CAP_KILL",
+						"CAP_LEASE",
+						"CAP_LINUX_IMMUTABLE",
+						"CAP_MAC_ADMIN",
+						"CAP_MAC_OVERRIDE",
+						"CAP_MKNOD",
+						"CAP_NET_ADMIN",
+						"CAP_NET_BIND_SERVICE",
+						"CAP_NET_BROADCAST",
+						"CAP_NET_RAW",
+						"CAP_PERFMON",
+						"CAP_SETGID",
+						"CAP_SETFCAP",
+						"CAP_SETPCAP",
+						"CAP_SETUID",
+						"CAP_SYS_ADMIN",
+						"CAP_SYS_BOOT",
+						"CAP_SYS_CHROOT",
+						"CAP_SYS_MODULE",
+						"CAP_SYS_NICE",
+						"CAP_SYS_PACCT",
+						"CAP_SYS_PTRACE",
+						"CAP_SYS_RAWIO",
+						"CAP_SYS_RESOURCE",
+						"CAP_SYS_TIME",
+						"CAP_SYS_TTY_CONFIG",
+						"CAP_SYSLOG",
+						"CAP_WAKE_ALARM"
+					]
+				}
+			},
 			"CheckCredentialsDiagnostics()": {
 				"type": "command",
 				"async": true,
@@ -102468,12 +103448,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Enable": {
 					"type": "boolean",
@@ -102507,7 +103482,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "Allows this user to remotely access the UserInterface via the mechanism defined in <<object|##.UserInterface.HTTPAccess>> <<deprecated|2.16|due to the introduction of <<object|.UserInterface.HTTPAccess.<i>.>> and <<param|RoleParticipation>>>>",
+					"description": "Allows this user to remotely access the UserInterface via the mechanism defined in <<object|##.UserInterface.HTTPAccess>> <<deprecated|2.16|due to the introduction of <<object|.UserInterface.HTTPAccess.<i>.>> and <<param|RoleParticipation>>>> <<obsoleted|2.18>>",
 					"default": "false",
 					"datatype": "boolean"
 				},
@@ -102552,6 +103527,7 @@
 						"usp"
 					],
 					"description": "The Groups of which this User is a member.",
+					"default": "[]",
 					"list": {
 						"datatype": "string",
 						"maxsize": 1024
@@ -102566,6 +103542,7 @@
 						"usp"
 					],
 					"description": "The Roles which are assigned to this User.",
+					"default": "[]",
 					"list": {
 						"datatype": "string",
 						"maxsize": 1024
@@ -102680,12 +103657,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Enable": {
 					"type": "boolean",
@@ -102735,6 +103707,7 @@
 						"usp"
 					],
 					"description": "These Roles are assigned to any User which is member of this Group, for so long as they remain a member of the Group.",
+					"default": "[]",
 					"list": {
 						"datatype": "string",
 						"maxsize": 1024
@@ -102775,12 +103748,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Enable": {
 					"type": "boolean",
@@ -102834,12 +103802,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Enable": {
 					"type": "boolean",
@@ -102891,6 +103854,19 @@
 					"description": "A static role is a fixed role that is always available in the system. When set to <<true>>, the role cannot be removed.",
 					"default": "false",
 					"datatype": "boolean"
+				},
+				"RequiredCapabilities": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Capabilities that have been assigned to this <<object>>.",
+					"list": {
+						"datatype": "string"
+					}
 				}
 			}
 		},
@@ -102936,12 +103912,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Enable": {
 					"type": "boolean",
@@ -104674,6 +105645,17 @@
 				"description": "<<numentries>>",
 				"datatype": "unsignedInt"
 			},
+			"SetNumberOfEntries": {
+				"type": "unsignedInt",
+				"read": true,
+				"write": false,
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"description": "<<numentries>>",
+				"datatype": "unsignedInt"
+			},
 			"Device.Firewall.Level.{i}.": {
 				"type": "object",
 				"protocols": [
@@ -104696,12 +105678,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Name": {
 					"type": "string",
@@ -104838,12 +105815,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Enable": {
 					"type": "boolean",
@@ -105017,12 +105989,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Name": {
 					"type": "string",
@@ -105138,12 +106105,7 @@
 							"usp"
 						],
 						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"datatype": "_AliasCWMP"
 					},
 					"Description": {
 						"type": "string",
@@ -105368,6 +106330,28 @@
 						"default": "false",
 						"datatype": "boolean"
 					},
+					"DestMatchSet": {
+						"type": "string",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "<<object>> criterion. Destination Match Set, Matches packets if their destination is found in the designated <<object|##.Set.>> reference. <<empty>> indicates this criterion is not used for matching.",
+						"datatype": "string"
+					},
+					"DestMatchSetExclude": {
+						"type": "string",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "<<object>> criterion. Destination Exclude Match Set, Matches packets if their destination is not found in the designated <<object|##.Set.>> reference. <<empty>> indicates this criterion is not used for matching.",
+						"datatype": "string"
+					},
 					"SourceIP": {
 						"type": "string",
 						"read": true,
@@ -105412,6 +106396,28 @@
 						"default": "false",
 						"datatype": "boolean"
 					},
+					"SourceMatchSet": {
+						"type": "string",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "<<object>> criterion. Source Match Set, Matches packets if their source is found in the designated <<object|##.Set.>> reference. <<empty>> indicates this criterion is not used for matching.",
+						"datatype": "string"
+					},
+					"SourceMatchSetExclude": {
+						"type": "string",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "<<object>> criterion. Source Exclude Match Set, Matches packets if their source is not found in the designated <<object|##.Set.>> reference. <<empty>> indicates this criterion is not used for matching.",
+						"datatype": "string"
+					},
 					"Protocol": {
 						"type": "int",
 						"read": true,
@@ -105642,12 +106648,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Enable": {
 					"type": "boolean",
@@ -105674,6 +106675,7 @@
 					"enumerations": [
 						"Disabled",
 						"Enabled",
+						"Inactive",
 						"Error_Misconfigured",
 						"Error"
 					]
@@ -105681,12 +106683,12 @@
 				"Origin": {
 					"type": "string",
 					"read": true,
-					"write": false,
+					"write": true,
 					"protocols": [
 						"cwmp",
 						"usp"
 					],
-					"description": "Indicates the Origin of the <<object>> instance.",
+					"description": "Indicates the Origin of the <<object>> instance. Note: This parameter was changed to writeOnceReadOnly in the Device:2.18 version.",
 					"default": "Controller",
 					"datatype": "string",
 					"enumerations": [
@@ -105770,6 +106772,24 @@
 						}
 					]
 				},
+				"SourcePortRangeMax": {
+					"type": "int",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "If specified, indicates the <<object>> criterion is to include the port range from <<param|SourcePort>> through <<param>> (inclusive). If specified, <<param>> MUST be greater than or equal to <<param|SourcePort>>. A value of -1 indicates that no port range is specified.",
+					"default": "-1",
+					"datatype": "int",
+					"range": [
+						{
+							"min": -1,
+							"max": 65535
+						}
+					]
+				},
 				"DestPort": {
 					"type": "int",
 					"read": true,
@@ -105788,6 +106808,24 @@
 						}
 					]
 				},
+				"DestPortRangeMax": {
+					"type": "int",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "If specified, indicates the <<object>> criterion is to include the port range from <<param|DestPort>> through <<param>> (inclusive). If specified, <<param>> MUST be greater than or equal to <<param|DestPort>>. A value of -1 indicates that no port range is specified.",
+					"default": "-1",
+					"datatype": "int",
+					"range": [
+						{
+							"min": -1,
+							"max": 65535
+						}
+					]
+				},
 				"IPVersion": {
 					"type": "int",
 					"read": true,
@@ -105814,8 +106852,8 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "Protocol number as specified in <<bibref|IANA-protocolnumbers>> For example: * 6 (TCP) * 17(UDP) A value of -1 indicates this criterion is not used for matching.",
-					"default": "-1",
+					"description": "Protocol number as specified in <<bibref|IANA-protocolnumbers>> For example: * 6 (TCP) * 17 (UDP) A value of -1 indicates this criterion is not used for matching.",
+					"default": "[-1]",
 					"list": {
 						"datatype": "int",
 						"range": [
@@ -105879,6 +106917,20 @@
 						"",
 						"([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])"
 					]
+				},
+				"ScheduleRef": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Each reference provides a schedule where time based access can be enabled. When <<param>> is <<empty>> the <<object>> is not scheduled, and the <<param|Enable>> defines the operational state.",
+					"default": "[]",
+					"list": {
+						"datatype": "string"
+					}
 				}
 			},
 			"Device.Firewall.DMZ.{i}.": {
@@ -105887,7 +106939,7 @@
 					"cwmp",
 					"usp"
 				],
-				"description": "Firewall DMZ object that is be used for configuring a demilitarized zone. A DMZ network is a seperate network perimeter that protects the internal network from untrusted traffic. Typically the DMZ is located between two firewalls, the firewall of the internal network and the firewall responsible for handling untrusted traffic. The device MUST forward all received packets that matches the <<param|SourcePrefix>> criteria to the IP address that is specified in <<param|DestIP>>. For enabled table entries, if <<param|DestIP>> is <<empty>>, or if <<param|Interface>> is not a valid reference, then the table entry is inoperable and the device MUST set <<param|Status>> to <<enum|Error_Misconfigured|Status>>.",
+				"description": "Firewall DMZ object that is be used for configuring a demilitarized zone. A DMZ network is a separate network perimeter that protects the internal network from untrusted traffic. Typically the DMZ is located between two firewalls, the firewall of the internal network and the firewall responsible for handling untrusted traffic. The device MUST forward all received packets that matches the <<param|SourcePrefix>> criteria to the IP address that is specified in <<param|DestIP>>. For enabled table entries, if <<param|DestIP>> is <<empty>>, or if <<param|Interface>> is not a valid reference, then the table entry is inoperable and the device MUST set <<param|Status>> to <<enum|Error_Misconfigured|Status>>.",
 				"uniqueKeys": [
 					"Alias",
 					"DestIP",
@@ -105904,12 +106956,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Enable": {
 					"type": "boolean",
@@ -105948,7 +106995,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "Indicates who configured the <<object>> instance.",
+					"description": "Indicates who configured the <<object>> instance. Note: This parameter was changed to writeOnceReadOnly in the Device:2.18 version.",
 					"default": "Controller",
 					"datatype": "string",
 					"enumerations": [
@@ -106080,12 +107127,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Enable": {
 					"type": "boolean",
@@ -106141,7 +107183,7 @@
 						"usp"
 					],
 					"description": "Destination port number. A value of -1 indicates this criterion is not used for matching.",
-					"default": "-1",
+					"default": "[-1]",
 					"list": {
 						"datatype": "int",
 						"range": [
@@ -106178,8 +107220,8 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "Protocol number as specified in <<bibref|IANA-protocolnumbers>> For example: * 6 (TCP) * 17(UDP) A value of -1 indicates this criterion is not used for matching.",
-					"default": "-1",
+					"description": "Protocol number as specified in <<bibref|IANA-protocolnumbers>> For example: * 6 (TCP) * 17 (UDP) A value of -1 indicates this criterion is not used for matching.",
+					"default": "[-1]",
 					"list": {
 						"datatype": "int",
 						"range": [
@@ -106217,6 +107259,7 @@
 						"usp"
 					],
 					"description": "Only allow incoming connections that match one or more of the source IP addresses or prefixes that are specified in <<param>> for the applied service.",
+					"default": "[]",
 					"list": {
 						"datatype": "IPPrefix",
 						"range": [
@@ -106296,12 +107339,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Interface": {
 					"type": "string",
@@ -106363,6 +107401,17 @@
 					"description": "When <<true>> the ICMPv6 echo request packet must be answered with an ICMPv6 echo reply. When <<false>> the ICMPv6 echo request packet must be dropped.",
 					"datatype": "boolean"
 				},
+				"IPv6PassTroughICMPEchoRequest": {
+					"type": "boolean",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "When <<true>> the ICMPv6 echo request packet must be forward to the LAN device. When <<false>> the ICMPv6 echo request packet must be dropped.",
+					"datatype": "boolean"
+				},
 				"StealthMode": {
 					"type": "boolean",
 					"read": true,
@@ -106705,6 +107754,215 @@
 						"datatype": "unsignedInt"
 					}
 				}
+			},
+			"Device.Firewall.Set.{i}.": {
+				"type": "object",
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"description": "This object is used for configuring sets of IP, MAC addresses and/or port numbers which can then be used in conjunction with the firewall. It provides a more efficient way to manage large collections of addresses and ports compared to traditional methods of listing them individually within firewall rules.",
+				"uniqueKeys": [
+					"Alias",
+					"Name"
+				],
+				"access": true,
+				"array": true,
+				"Alias": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
+					"datatype": "_AliasCWMP"
+				},
+				"Enable": {
+					"type": "boolean",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Enables or disables this <<object>> entry.",
+					"default": "false",
+					"datatype": "boolean"
+				},
+				"Origin": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Indicates the Origin of the <<object>> instance.",
+					"default": "Controller",
+					"datatype": "string",
+					"enumerations": [
+						"User",
+						"System",
+						"Controller"
+					]
+				},
+				"Name": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Human-readable name associated with this <<object>> entry.",
+					"datatype": "string",
+					"range": [
+						{
+							"max": 31
+						}
+					]
+				},
+				"Type": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Describes the intention of the <<object|Rule>> entries and what it contains.",
+					"default": "IPAddresses",
+					"datatype": "string",
+					"enumerations": [
+						"IPAddresses",
+						"Ports",
+						"MACAddresses"
+					]
+				},
+				"IPVersion": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "IP Protocol Version as specified in <<bibref|IANA-ipversionnumbers>>. For example: * 4 (IPv4) * 6 (IPv6)",
+					"default": "6",
+					"datatype": "unsignedInt",
+					"range": [
+						{
+							"min": 4,
+							"max": 4
+						},
+						{
+							"min": 6,
+							"max": 6
+						}
+					]
+				},
+				"RuleNumberOfEntries": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "<<numentries>>",
+					"datatype": "unsignedInt"
+				},
+				"Device.Firewall.Set.{i}.Rule.{i}.": {
+					"type": "object",
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Firewall Rule object that is used for configuring the set lists.",
+					"uniqueKeys": [
+						"Alias"
+					],
+					"access": true,
+					"array": true,
+					"Alias": {
+						"type": "string",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
+						"datatype": "_AliasCWMP"
+					},
+					"Exclude": {
+						"type": "boolean",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Specifies if this rule entry should match or not match the configured criteria.",
+						"default": "false",
+						"datatype": "boolean"
+					},
+					"IPAddressList": {
+						"type": "string",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Source IPv4 or IPv6 address or subnet mask. Note: The IP version of the IP address MUST correspond to the IP version set in <<param|#.IPVersion>>. Can not be used in combination with <<param|MACAddressList>> or <<param|PortList>>.",
+						"default": "[]",
+						"list": {
+							"datatype": "IPAddress",
+							"range": [
+								{
+									"max": 45
+								}
+							]
+						}
+					},
+					"MACAddressList": {
+						"type": "string",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Specifies the MACAddress that can be used by the <<object>> entry. Note: Can not be used in combination with <<param|IPAddressList>> or <<param|PortList>>.",
+						"datatype": "MACAddress",
+						"range": [
+							{
+								"max": 17
+							}
+						],
+						"pattern": [
+							"",
+							"([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])"
+						]
+					},
+					"PortList": {
+						"type": "string",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Specifies the Port number or a port range that can be used by the <<object>> entry. Syntax: A single port can be configured as e.g. 80. A port range can be configured as 8000-80010. Note: Can not be used in combination with <<param|MACAddressList>> or <<param|IPAddressList>>.",
+						"default": "[]",
+						"list": {
+							"datatype": "string"
+						}
+					}
+				}
 			}
 		},
 		"Device.PeriodicStatistics.": {
@@ -106772,12 +108030,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Enable": {
 					"type": "boolean",
@@ -106875,6 +108128,7 @@
 						"usp"
 					],
 					"description": "<<list>> Each entry indicates the number of <<units>> during which data was collected during the sample interval. Individual <<param>> values can be less than <<param|SampleInterval>>, for several reasons, including: : <<param|TimeReference>> has been set to a time other than the Unknown Time and the current sample interval started part of the way through a scheduled sample interval. : <<template|PERIODICSTATISTICS-FORCESAMPLE>> has been used to force statistics for the current sample to be calculated and updated in the data model.",
+					"default": "[]",
 					"list": {
 						"datatype": "unsignedInt",
 						"unit": "seconds"
@@ -106995,12 +108249,7 @@
 							"usp"
 						],
 						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"datatype": "_AliasCWMP"
 					},
 					"Enable": {
 						"type": "boolean",
@@ -107054,14 +108303,15 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "Controls how this parameters statistic is calculated from the sampled value(s) of each internal sample interval. Enumeration of: Latest, Minimum, Maximum, Average. Parameters of non-numeric types can only support <<enum|Latest>>. The value of the <<param>> MUST be ignored for such parameters. <<param|SampleMode>> MUST be applied before <<param>>, i.e. the inputs to the calculation will have already accounted for <<param|SampleMode>>.",
+						"description": "Controls how this parameters statistic is calculated from the sampled value(s) of each internal sample interval. Enumeration of: Latest, Minimum, Maximum, Average, Histogram. Parameters of non-numeric types can only support <<enum|Latest>>. The value of the <<param>> MUST be ignored for such parameters. <<param|SampleMode>> MUST be applied before <<param>>, i.e. the inputs to the calculation will have already accounted for <<param|SampleMode>>.",
 						"default": "Latest",
 						"datatype": "string",
 						"enumerations": [
 							"Latest",
 							"Minimum",
 							"Maximum",
-							"Average"
+							"Average",
+							"Histogram"
 						]
 					},
 					"LowThreshold": {
@@ -107097,6 +108347,7 @@
 							"usp"
 						],
 						"description": "<<list>> Each entry indicates the number of <<units>> during which data was collected for this parameter during the sample interval. Individual <<param>> values can be less than <<param|#.SampleInterval>>, for several reasons, including: : Any of the reasons for which <<param|#.SampleSeconds>> values might be less than <<param|#.SampleInterval>>. : The parameter doesnt exist, or was created or deleted during a sample interval.",
+						"default": "[]",
 						"list": {
 							"datatype": "unsignedInt",
 							"unit": "seconds"
@@ -107111,6 +108362,7 @@
 							"usp"
 						],
 						"description": "<<list>> Each entry is 0 if the sampled value is believed to be valid, or 1 if an event that might affect the validity of the sampled value occurred during the sample interval. For example, if the parameter value were to be reset during the sample interval then it would be appropriate to set <<param>> to 1.",
+						"default": "[]",
 						"list": {
 							"datatype": "unsignedInt",
 							"range": [
@@ -107128,7 +108380,22 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "<<list>> Each entry indicates the value of the referenced parameter, as determined by <<param|SampleMode>>, during the sample interval. The statistics values in this comma-separated list MUST be in time order, with the oldest one first and the most recent one last. If the <<param|SampleMode>> parameter is not present, or is inappropriate for the referenced parameter, the statistics values MUST be collected in Current mode.",
+						"description": "<<list>> Each entry indicates the value of the referenced parameter, as determined by <<param|SampleMode>>, during the sample interval. The statistics values in this comma-separated list MUST be in time order, with the oldest one first and the most recent one last. If the <<param|SampleMode>> parameter is not present, or is inappropriate for the referenced parameter, the statistics values MUST be collected in Current mode. if <<param|CalculationMode>> has value Histogram then the values of the referenced parameter are in <<param|ValuesIfHistogram>>.",
+						"default": "[]",
+						"list": {
+							"datatype": "string"
+						}
+					},
+					"ValuesIfHistogram": {
+						"type": "string",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "<<list>> Each entry indicates the value of the referenced parameter, as determined by <<param|SampleMode>>, during the sample interval. The statistics values in this comma-separated list MUST be in time order, with the oldest one first and the most recent one last. If the <<param|SampleMode>> parameter is not present, or is inappropriate for the referenced parameter, the statistics values MUST be collected in Current mode. This parameter applies only if <<param|CalculationMode>> has value Histogram and then this parameter is the values of the sampled histograms, where each histogram bin is the count of the number of samples within the corresponding <<param|HistogramBinBoundaries>>, and this parameter is expressed using square brackets to protect comma separators within nested lists. For example, [12,5,1,0,1],[12,3,2,1,0] represents two histograms.",
+						"default": "[]",
 						"list": {
 							"datatype": "string"
 						}
@@ -107144,6 +108411,19 @@
 						"description": "Counts the number of times (since this object instance was last enabled) that a newly-calculated sample value (accounting for <<param|SampleMode>>) transitioned from the in range state to the out of range state, or between the out of range (low) and out of range (high) states. The states are defined as follows: * in range : current value is greater than <<param|LowThreshold>> and less than <<param|HighThreshold>>. * out of range : current value is less than or equal to <<param|LowThreshold>>, or greater than or equal to <<param|HighThreshold>>. * out of range (low) : current value is less than or equal to <<param|LowThreshold>>. * out of range (high) : current value is greater than or equal to <<param|HighThreshold>>. Note that, if <<param|LowThreshold>> and <<param|HighThreshold>> are both the same, the threshold/failure mechanism is disabled, so the value of this parameter will not increment. This parameter can be incremented at any time during a sample interval, and might be incremented more than once during a single sample interval. For this reason, the CPE SHOULD place a locally specified limit on the frequency at which it will notify the Controller of such changes. Parameters of non-numeric types cannot support the threshold/failure mechanism. The value of this parameter MUST be ignored for such parameters.",
 						"default": "0",
 						"datatype": "unsignedInt"
+					},
+					"HistogramBinBoundaries": {
+						"type": "string",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "<<list>> Definition of the boundaries between histogram bins. Applies if <<param|CalculationMode>> has value Histogram. Each value is the minimum value of this bin, and the next value is just above the maximum value of this bin. For example, \u201c0,1,4,8,\u201d defines the four histogram bins: 0 to 1 but not including values identically equal to 1, 1 to 4 but not including values identically equal to 4, 4 to 8 but not including values identically equal to 8, and greater than or equal to 8. (No value after the last comma means no upper bound.) If this parameter is set to an empty string, then no histogram will be collected.",
+						"list": {
+							"datatype": "string"
+						}
 					}
 				}
 			}
@@ -108770,12 +110050,7 @@
 							"usp"
 						],
 						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"datatype": "_AliasCWMP"
 					},
 					"URL": {
 						"type": "string",
@@ -110192,12 +111467,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Name": {
 					"type": "string",
@@ -111050,6 +112320,28 @@
 							}
 						]
 					},
+					"Privileged": {
+						"type": "boolean",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"usp"
+						],
+						"description": "This parameter indicates whether the Deployment Unit runs in privileged mode. <<false>> - Unprivileged Container. <<true>> - Privileged Container.",
+						"default": "false",
+						"datatype": "boolean"
+					},
+					"NumRequiredUIDs": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"usp"
+						],
+						"description": "Number of UIDs (EU User Identifiers) that this container will need as part of its user namespace. UIDs are unique identifiers associated with each user and system process that is used to determine the allocation and isolation of system resources.",
+						"default": "1",
+						"datatype": "unsignedInt"
+					},
 					"ExecutionEnvRef": {
 						"type": "string",
 						"read": true,
@@ -111080,6 +112372,18 @@
 							}
 						]
 					},
+					"ShutdownDelay": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"usp"
+						],
+						"description": "The delay in <<units>> before which the container is shutdown. This delay ensures that the application has enough time to perform any cleanup before the Execution Unit transitions to idle state. The default value is 10 seconds.",
+						"default": "10",
+						"datatype": "unsignedInt",
+						"unit": "seconds"
+					},
 					"RequiredRoles": {
 						"type": "string",
 						"read": true,
@@ -111114,6 +112418,23 @@
 							]
 						}
 					},
+					"RequiredUserRoles": {
+						"type": "string",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"usp"
+						],
+						"description": "The User Roles which the application installed by this command will need to be assigned in order to be able to function at all. If any of these User Roles are not present in the <<param|#.ExecEnv.<i>.AvailableUserRoles>> of the <<object|#.ExecEnv>> into which the DU is to be installed then the command will fail. Some Agents may apply further filtering for User Roles which are considered security- or privacy-sensitive. Each entry in the list is the Name of a row in <<object|##.Users.Role>>. If there is no such row then the command will fail, as installation requires a User Role which is not available on the Device. If this argument is absent or empty then no User Roles are required in order for the application to function.",
+						"list": {
+							"datatype": "string",
+							"range": [
+								{
+									"max": 256
+								}
+							]
+						}
+					},
 					"ModuleVersion": {
 						"type": "string",
 						"read": true,
@@ -111129,6 +112450,52 @@
 							}
 						]
 					}
+				},
+				"output": {
+					"UUID": {
+						"type": "string",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"usp"
+						],
+						"description": "The Universally Unique Identifier that was either provided by the Controller, or generated by the device, when this Deployment Unit was installed. The format of this value is defined by <<bibref|RFC4122>> Version 5 (Name-Based) and <<bibref|TR-181i2|Annex C>>.",
+						"datatype": "UUID",
+						"range": [
+							{
+								"min": 36,
+								"max": 36
+							}
+						],
+						"pattern": [
+							"[A-Fa-f0-9]{8}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{12}"
+						]
+					},
+					"Version": {
+						"type": "string",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"usp"
+						],
+						"description": "Version of the installed Deployment Unit. The format of this value is Execution Environment specific.",
+						"datatype": "string",
+						"range": [
+							{
+								"max": 32
+							}
+						]
+					},
+					"ExecEnvRef": {
+						"type": "string",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"usp"
+						],
+						"description": "A reference to the <<object|##.ExecEnv>> where the Deployment Unit was installed.",
+						"datatype": "string"
+					}
 				}
 			},
 			"DUStateChange!": {
@@ -111279,12 +112646,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Name": {
 					"type": "string",
@@ -111426,6 +112788,23 @@
 								]
 							}
 						},
+						"AvailableUserRoles": {
+							"type": "string",
+							"read": true,
+							"write": true,
+							"protocols": [
+								"usp"
+							],
+							"description": "The User Roles which are available to Deployment Units installed into the new instance. Only the listed User Roles may be assigned to any DeploymentUnit installed into the instance. If this parameter is missing or <<empty>> then no User Roles may be assigned to any DeploymentUnit installed into the instance. Each entry in the list is the Name of a row in <<object|###.Users.Role>>. If there is no such row then the entry will be ignored.",
+							"list": {
+								"datatype": "string",
+								"range": [
+									{
+										"max": 256
+									}
+								]
+							}
+						},
 						"Enable": {
 							"type": "boolean",
 							"read": true,
@@ -111627,12 +113006,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Name": {
 					"type": "string",
@@ -111899,11 +113273,12 @@
 					"type": "string",
 					"read": true,
 					"write": false,
+					"obsolete": true,
 					"protocols": [
 						"cwmp",
 						"usp"
 					],
-					"description": "Represents the processors that this <<object>> has available to it.",
+					"description": "Represents the processors that this <<object>> has available to it. <<deprecated|2.18|because the referenced object,<<object|##.DeviceInfo.Processor.>>, is deprecated.>>",
 					"list": {
 						"datatype": "string"
 					}
@@ -112012,6 +113387,18 @@
 						"datatype": "string"
 					}
 				},
+				"AvailableUserRoles": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"usp"
+					],
+					"description": "The User Roles which are available to Deployment Units installed into this <<object>>. Only the listed User Roles may be assigned to a DeploymentUnit. If this parameter is missing or <<empty>> then no User Roles will be available to Deployment Units installed into this <<object>>.",
+					"list": {
+						"datatype": "string"
+					}
+				},
 				"SetRunLevel()": {
 					"type": "command",
 					"async": true,
@@ -112134,6 +113521,24 @@
 									}
 								]
 							}
+						},
+						"AvailableUserRoles": {
+							"type": "string",
+							"read": true,
+							"write": true,
+							"mandatory": true,
+							"protocols": [
+								"usp"
+							],
+							"description": "The new list of User Roles which may be assigned to a DeploymentUnit installed into the <<object>>; this list replaces the previous value of <<param|#.AvailableUserRoles>>. If this parameter is <<empty>> then no User Roles can be assigned to a DeploymentUnit installed into the <<object>>. Each entry in the list is the Name of a row in <<object|###.Users.Role>>.",
+							"list": {
+								"datatype": "string",
+								"range": [
+									{
+										"max": 256
+									}
+								]
+							}
 						}
 					}
 				},
@@ -112352,12 +113757,7 @@
 							"usp"
 						],
 						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"datatype": "_AliasCWMP"
 					},
 					"ApplicationUUID": {
 						"type": "string",
@@ -112460,12 +113860,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Name": {
 					"type": "string",
@@ -112682,7 +114077,7 @@
 							"protocols": [
 								"usp"
 							],
-							"description": "The <<datatype>> that specifies the location of the DU to be installed. The URL MUST NOT include the userinfo component, as defined in <<bibref|RFC3986>>. The HTTPS transport MUST be supported, and the HTTP transport MAY be supported. Other optional transports MAY also be supported. If the device receives an Update command with the same source URL as a previous Update or Install comamnd, the device MUST perform each Update as requested, and MUST NOT assume that the content of the file to be downloaded is the same each time.",
+							"description": "The <<datatype>> that specifies the location of the DU to be installed. The URL MUST NOT include the userinfo component, as defined in <<bibref|RFC3986>>. The HTTPS transport MUST be supported, and the HTTP transport MAY be supported. Other optional transports MAY also be supported. If the device receives an Update command with the same source URL as a previous Update or Install command, the device MUST perform each Update as requested, and MUST NOT assume that the content of the file to be downloaded is the same each time.",
 							"datatype": "URL",
 							"range": [
 								{
@@ -112720,6 +114115,28 @@
 								}
 							]
 						},
+						"Privileged": {
+							"type": "boolean",
+							"read": true,
+							"write": true,
+							"protocols": [
+								"usp"
+							],
+							"description": "This parameter determines whether the <<object>> runs in priviled mode. <<false>> - Unprivileged Container. <<true>> - Privileged Container.",
+							"default": "false",
+							"datatype": "boolean"
+						},
+						"NumRequiredUIDs": {
+							"type": "unsignedInt",
+							"read": true,
+							"write": true,
+							"protocols": [
+								"usp"
+							],
+							"description": "Number of UIDs (EU User Identifiers) that this container will need as part of its user namespace. UIDs are unique identifiers associated with each user and system process that is used to determine the allocation and isolation of system resources.",
+							"default": "1",
+							"datatype": "unsignedInt"
+						},
 						"Signature": {
 							"type": "string",
 							"read": true,
@@ -112769,6 +114186,23 @@
 								]
 							}
 						},
+						"RequiredUserRoles": {
+							"type": "string",
+							"read": true,
+							"write": true,
+							"protocols": [
+								"usp"
+							],
+							"description": "If this argument is present, it lists the User Roles which the application will need to be assigned in order to be able to function at all after this update. If it is absent then the required User Roles are unchanged from the previous version. If any of these User Roles are not present in the <<param|##.ExecEnv.<i>.AvailableUserRoles>> of the <<object|###.ExecEnv>> in which the DU is installed then the command will fail. Some Agents may apply further filtering for User Roles which are considered security- or privacy-sensitive. Each entry in the list is the Name of a row in <<object|###.Users.Role>>. If there is no such row then the command will fail, as installation requires a User Role which is not available on the Device. If this argument is <<empty>> then no User Roles are required in order for the application to function.",
+							"list": {
+								"datatype": "string",
+								"range": [
+									{
+										"max": 256
+									}
+								]
+							}
+						},
 						"RetainData": {
 							"type": "boolean",
 							"read": true,
@@ -112856,12 +114290,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Name": {
 					"type": "string",
@@ -113141,6 +114570,86 @@
 					],
 					"unit": "%"
 				},
+				"AllocatedEUUID": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "This parameter is allocated by the host system. This is the user identifier within the execution units environment. This UID is local to the execution unit and is used by the EUs internal processes to manage permissions. By default, processes within the EU execute as root (UID 0) unless otherwise specified.",
+					"datatype": "unsignedInt"
+				},
+				"AllocatedEUGID": {
+					"type": "string",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "This parameter is allocated by the host system. This is the group identifier within the execution units environment. This GID is local to the execution unit and is used by the EUs internal processes to manage permissions.",
+					"datatype": "string"
+				},
+				"AllocatedHostUID": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "This parameter is allocated by the host system. This is the user identifier on the host system where this EU is running. This UID is system wide and is managed by the kernel.",
+					"datatype": "unsignedInt"
+				},
+				"AllocatedHostGID": {
+					"type": "string",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "This parameter is allocated by the host system. This is the group identifier on the host system where this EU is running. This GID is system wide and is managed by the kernel.",
+					"datatype": "string"
+				},
+				"CreationTime": {
+					"type": "dateTime",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "The date and time when the EU was created.",
+					"datatype": "dateTime"
+				},
+				"Uptime": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "The amount of time in <<units>> that this EU has been up and running since it was activated.",
+					"datatype": "unsignedInt",
+					"unit": "seconds"
+				},
+				"ShutdownDelay": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "The delay in <<units>> before which the container is shutdown. This delay ensures that the application has enough time to perform any cleanup before the Execution Unit transitions to idle state.",
+					"default": "10",
+					"datatype": "unsignedInt",
+					"unit": "seconds"
+				},
 				"References": {
 					"type": "string",
 					"read": true,
@@ -113288,7 +114797,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "Configures the parameters of the auto-restart algorithm for this EU. An auto-restart may be triggered if the Agent determines that the EU has terminated abnormally. An exponential backoff algorithm is applied (increasing each time the delay before the EU is re-launched) in order to prevent continual re-starting of the EU. The retry interval range is controlled by two Parameters, <<param|RetryMinimumWaitInterval>> and <<param|RetryIntervalMultiplier>>. Let m be the value of <<param|RetryMinimumWaitInterval>>, k the value of <<param|RetryIntervalMultiplier>>, and n the current value of <<param|RetryCount>>. Then on the next occasion that the Agent determines that the EU has terminated abnormally, the delay before re-starting the EU must lie between m * (k/1000)^n and m * (k/1000)^(n+1) seconds, so long as m * (k/1000)^n evaluates to a value less than <<param|RetryMaximumWaitInterval>>. Once this point has been reached, on all subsequent occasion that the Agent determines that the EU has terminated abnormally the delay before re-starting the EU must lie between <<param|RetryMaximumWaitInterval>> * (1000/k) and <<param|RetryMaximumWaitInterval>> seconds.",
+					"description": "Configures the parameters of the auto-restart algorithm for this EU. An auto-restart may be triggered if the Agent determines that the EU has terminated abnormally. An exponential backoff algorithm is applied (increasing each time the delay before the EU is re-launched) in order to prevent continual re-starting of the EU. The retry interval range is controlled by two Parameters, <<param|RetryMinimumWaitInterval>> and <<param|RetryIntervalMultiplier>>. Let m be the value of <<param|RetryMinimumWaitInterval>>, k the value of <<param|RetryIntervalMultiplier>>, and n the current value of <<param|RetryCount>>. Then on the next occasion that the Agent determines that the EU has terminated abnormally, the delay before re-starting the EU must lie between m * (k/1000)^n^ and m * (k/1000)^(n+1)^ seconds, so long as m * (k/1000)^n^ evaluates to a value less than <<param|RetryMaximumWaitInterval>>. Once this point has been reached, on all subsequent occasion that the Agent determines that the EU has terminated abnormally the delay before re-starting the EU must lie between <<param|RetryMaximumWaitInterval>> * (1000/k) and <<param|RetryMaximumWaitInterval>> seconds.",
 					"access": false,
 					"array": false,
 					"Enable": {
@@ -113391,7 +114900,7 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "The time at which the next restart of the <<object|#>> is scheduled to occur. The Infinte Time (9999-12-31T23:59:59Z) is used to indicate that no restart is currently scheduled.",
+						"description": "The time at which the next restart of the <<object|#>> is scheduled to occur. The Infinite Time (9999-12-31T23:59:59Z) is used to indicate that no restart is currently scheduled.",
 						"datatype": "dateTime"
 					}
 				},
@@ -113501,12 +115010,7 @@
 							"usp"
 						],
 						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"datatype": "_AliasCWMP"
 					}
 				},
 				"Device.SoftwareModules.ExecutionUnit.{i}.EnvVariable.{i}.": {
@@ -113563,12 +115067,7 @@
 							"usp"
 						],
 						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"datatype": "_AliasCWMP"
 					}
 				},
 				"Device.SoftwareModules.ExecutionUnit.{i}.Extensions.": {
@@ -113658,12 +115157,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Username": {
 					"type": "string",
@@ -113737,7 +115231,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "The complete Jabber ID as determined by the first-hop XMPP server at time of connection establishment. This Jabber ID will usually be the standard concatentation of the local-part (Username), domain-part (Domain), and resource-part (Resource) as defined in <<bibref|RFC6120|Section 2.1>> (local-part@domain-part/resource-part), but since the Jabber ID is owned by the first-hop XMPP Server there are cases where the value will be different.",
+					"description": "The complete Jabber ID as determined by the first-hop XMPP server at time of connection establishment. This Jabber ID will usually be the standard concatenation of the local-part (Username), domain-part (Domain), and resource-part (Resource) as defined in <<bibref|RFC6120|Section 2.1>> (local-part@domain-part/resource-part), but since the Jabber ID is owned by the first-hop XMPP Server there are cases where the value will be different.",
 					"datatype": "string"
 				},
 				"Status": {
@@ -113939,12 +115433,7 @@
 							"usp"
 						],
 						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"datatype": "_AliasCWMP"
 					},
 					"Priority": {
 						"type": "unsignedInt",
@@ -113988,7 +115477,7 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "Fully Qualified Domain Name (FQDN) or IP address of the XMPP server for this <<object|##.Connection>>. If the value of this Parameter is a FQDN that resolves to multiple addresses then each address SHOULD be attemtped (in an implemnetation-specific order) until a connection can be made or all addresses are exhausted, in which case the next <<object>> instance (based on <<param|Priority>> and <<param|Weight>>) SHOULD be used.",
+						"description": "Fully Qualified Domain Name (FQDN) or IP address of the XMPP server for this <<object|##.Connection>>. If the value of this Parameter is a FQDN that resolves to multiple addresses then each address SHOULD be attempted (in an implementation-specific order) until a connection can be made or all addresses are exhausted, in which case the next <<object>> instance (based on <<param|Priority>> and <<param|Weight>>) SHOULD be used.",
 						"datatype": "string",
 						"range": [
 							{
@@ -114764,7 +116253,7 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "The 1905 fowarding rule for the ALME-SET-FWD-RULE.request and ALME-GET-FWD-RULES.response with classification criteria as defined in <<bibref|IEEE1905.1a|Table 5-9: ClassificationSet elements>>.",
+						"description": "The 1905 forwarding rule for the ALME-SET-FWD-RULE.request and ALME-GET-FWD-RULES.response with classification criteria as defined in <<bibref|IEEE1905.1a|Table 5-9: ClassificationSet elements>>.",
 						"access": true,
 						"array": true,
 						"InterfaceList": {
@@ -114776,6 +116265,7 @@
 								"usp"
 							],
 							"description": "The list of interfaces to which a frame satisfying the following classification criteria should be forwarded (intfAddressList parameter as defined in <<bibref|IEEE1905.1a|Table 5-8: ALME-SET-FWD-RULE.request parameters and Table 5-12: fwdRuleList elements>>). <<list>> Each list item MUST be the path name of an object, which MUST be a row of an <<object|##.Interface>> object. If the referenced item is deleted, the corresponding item MUST be removed from the list. <<noreference>>",
+							"default": "[]",
 							"list": {
 								"datatype": "string",
 								"range": [
@@ -115266,7 +116756,7 @@
 								"cwmp",
 								"usp"
 							],
-							"description": "<<reference||obsoleted>><<param>> is a reference to a MultiAP.Device or Wi-Fi Network Data Elements Device. Since IEEE 1905.1 is the protocol used by the Wi-Fi Alliances EasyMesh specification for communications, this parameter allows the IEEE 1905.1 portion of the data model to reference the associated EasyMesh portion of the data model.",
+							"description": "<<param>> is a reference to a Wi-Fi Network Data Elements Device. Since IEEE 1905.1 is the protocol used by the Wi-Fi Alliances EasyMesh specification for communications, this parameter allows the IEEE 1905.1 portion of the data model to reference the associated EasyMesh portion of the data model.",
 							"datatype": "string"
 						},
 						"VendorPropertiesNumberOfEntries": {
@@ -116412,12 +117902,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Name": {
 					"type": "string",
@@ -116501,7 +117986,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "When <<true>>, encryption MUST be used for this MQTT <<object>> instance. <<deprecated|2.15|because it duplicates the functionality already handled by the <<param|TransportProtocol>> parameter>> <<obsoleted|2.17>>",
+					"description": "When <<true>>, encryption MUST be used for this MQTT <<object>> instance. <<deprecated|2.15|because it duplicates the functionality already handled by the <<param|TransportProtocol>> parameter>> <<obsoleted|2.17>> <<deleted|2.18>>",
 					"default": "true",
 					"datatype": "boolean"
 				},
@@ -116908,7 +118393,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "Connect retry time in <<units>> defines the wait time before a failed MQTT broker connection is retried. A failure can either be on the connection level (the TCP/IP or TLS can not be established) or on the Protocol level, the MQTT client does not receive a MQTT CONNACK packet on a MQTT CONNECT packet sent. If the parameter <<param|ConnectRetryIntervalMultiplier>> is defined, the MQTT client MUST use a random value between <<param>>*(<<param|ConnectRetryIntervalMultiplier>>/1000)^(n-1) and <<param>>*(<<param|ConnectRetryIntervalMultiplier>>/1000)^n for the connect retry time, with n equals the current retry number. The max number of n is 10, starting with the 11th retry always the value n = 10 is used. If the parameters <<param|ConnectRetryIntervalMultiplier>> and <<param|ConnectRetryMaxInterval>> are defined, the MQTT client MUST use the value of <<param|ConnectRetryMaxInterval>> if the calculated random value exceeds the value of <<param|ConnectRetryMaxInterval>>.",
+					"description": "Connect retry time in <<units>> defines the wait time before a failed MQTT broker connection is retried. A failure can either be on the connection level (the TCP/IP or TLS can not be established) or on the Protocol level, the MQTT client does not receive a MQTT CONNACK packet on a MQTT CONNECT packet sent. If the parameter <<param|ConnectRetryIntervalMultiplier>> is defined, the MQTT client MUST use a random value between <<param>>*(<<param|ConnectRetryIntervalMultiplier>>/1000)^(n-1)^ and <<param>>*(<<param|ConnectRetryIntervalMultiplier>>/1000)^n^ for the connect retry time, with n equals the current retry number. The max number of n is 10, starting with the 11th retry always the value n = 10 is used. If the parameters <<param|ConnectRetryIntervalMultiplier>> and <<param|ConnectRetryMaxInterval>> are defined, the MQTT client MUST use the value of <<param|ConnectRetryMaxInterval>> if the calculated random value exceeds the value of <<param|ConnectRetryMaxInterval>>.",
 					"default": "5",
 					"datatype": "unsignedInt",
 					"range": [
@@ -117021,12 +118506,7 @@
 							"usp"
 						],
 						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"datatype": "_AliasCWMP"
 					},
 					"Enable": {
 						"type": "boolean",
@@ -117113,12 +118593,7 @@
 							"usp"
 						],
 						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"datatype": "_AliasCWMP"
 					},
 					"Enable": {
 						"type": "boolean",
@@ -117344,12 +118819,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Name": {
 					"type": "string",
@@ -117494,12 +118964,7 @@
 							"usp"
 						],
 						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"datatype": "_AliasCWMP"
 					},
 					"Name": {
 						"type": "string",
@@ -117799,12 +119264,7 @@
 								"usp"
 							],
 							"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-							"datatype": "Alias",
-							"range": [
-								{
-									"max": 64
-								}
-							]
+							"datatype": "_AliasCWMP"
 						},
 						"Priority": {
 							"type": "unsignedInt",
@@ -117898,12 +119358,7 @@
 								"usp"
 							],
 							"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-							"datatype": "Alias",
-							"range": [
-								{
-									"max": 64
-								}
-							]
+							"datatype": "_AliasCWMP"
 						},
 						"Enable": {
 							"type": "boolean",
@@ -118235,12 +119690,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"LastError": {
 					"type": "string",
@@ -118456,12 +119906,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"ServiceName": {
 					"type": "string",
@@ -118619,12 +120064,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Name": {
 					"type": "string",
@@ -118755,12 +120195,7 @@
 							"usp"
 						],
 						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"datatype": "_AliasCWMP"
 					},
 					"Enable": {
 						"type": "boolean",
@@ -118925,12 +120360,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Enable": {
 					"type": "boolean",
@@ -119162,12 +120592,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Enable": {
 					"type": "boolean",
@@ -119588,12 +121013,7 @@
 							"usp"
 						],
 						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"datatype": "_AliasCWMP"
 					},
 					"Name": {
 						"type": "string",
@@ -119826,12 +121246,7 @@
 								"usp"
 							],
 							"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-							"datatype": "Alias",
-							"range": [
-								{
-									"max": 64
-								}
-							]
+							"datatype": "_AliasCWMP"
 						},
 						"State": {
 							"type": "string",
@@ -120098,12 +121513,7 @@
 									"usp"
 								],
 								"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-								"datatype": "Alias",
-								"range": [
-									{
-										"max": 64
-									}
-								]
+								"datatype": "_AliasCWMP"
 							},
 							"Order": {
 								"type": "unsignedInt",
@@ -120179,12 +121589,7 @@
 							"usp"
 						],
 						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"datatype": "_AliasCWMP"
 					},
 					"Name": {
 						"type": "string",
@@ -120270,12 +121675,7 @@
 								"usp"
 							],
 							"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-							"datatype": "Alias",
-							"range": [
-								{
-									"max": 64
-								}
-							]
+							"datatype": "_AliasCWMP"
 						},
 						"RegistryEntry": {
 							"type": "string",
@@ -120340,12 +121740,7 @@
 								"usp"
 							],
 							"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-							"datatype": "Alias",
-							"range": [
-								{
-									"max": 64
-								}
-							]
+							"datatype": "_AliasCWMP"
 						},
 						"Order": {
 							"type": "unsignedInt",
@@ -120420,12 +121815,7 @@
 							"usp"
 						],
 						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"datatype": "_AliasCWMP"
 					},
 					"Name": {
 						"type": "string",
@@ -120531,12 +121921,7 @@
 							"usp"
 						],
 						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"datatype": "_AliasCWMP"
 					},
 					"LastChange": {
 						"type": "dateTime",
@@ -120632,12 +122017,7 @@
 								"usp"
 							],
 							"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-							"datatype": "Alias",
-							"range": [
-								{
-									"max": 64
-								}
-							]
+							"datatype": "_AliasCWMP"
 						},
 						"Name": {
 							"type": "string",
@@ -120727,7 +122107,7 @@
 					"cwmp",
 					"usp"
 				],
-				"description": "This <<object>> object instance represents a report that is generated by a reporting task where the reporting task is defined as a <<object|#.MeasurementAgent.<i>.Task.<i>>> and executed as a scheduled action (<<object|#.MeasurementAgent.<i>.Schedule.<i>.Action.<i>>>). The <<object>> replicates the <<object|#.MeasurementAgent.<i>>> object instances data at the time of the action exection. When a <<object|##.BulkData.Profile.<i>>> object instance is used to communicate a <<object>> instance, the CPE adds a <<object|##.BulkData.Profile.<i>.Parameter.<i>>> object instance referring to this <<object>> object instance.",
+				"description": "This <<object>> object instance represents a report that is generated by a reporting task where the reporting task is defined as a <<object|#.MeasurementAgent.<i>.Task.<i>>> and executed as a scheduled action (<<object|#.MeasurementAgent.<i>.Schedule.<i>.Action.<i>>>). The <<object>> replicates the <<object|#.MeasurementAgent.<i>>> object instances data at the time of the action execution. When a <<object|##.BulkData.Profile.<i>>> object instance is used to communicate a <<object>> instance, the CPE adds a <<object|##.BulkData.Profile.<i>.Parameter.<i>>> object instance referring to this <<object>> object instance.",
 				"access": false,
 				"array": true,
 				"ReportDate": {
@@ -121219,12 +122599,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Name": {
 					"type": "string",
@@ -121603,12 +122978,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Name": {
 					"type": "string",
@@ -121709,7 +123079,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "A 5G Globally Unique Temparary Identity (GUTI) securely identifes an CPE by keeping the permanent User Equipment (UE identifier (IMSI) hidden. This identity is globally unique and assigned by the AMF at the time of registration. See <<bibref|3GPP-TS.23.003|.Clause 2.10>>.",
+					"description": "A 5G Globally Unique Temporary Identity (GUTI) securely identifes an CPE by keeping the permanent User Equipment (UE identifier (IMSI) hidden. This identity is globally unique and assigned by the AMF at the time of registration. See <<bibref|3GPP-TS.23.003|.Clause 2.10>>.",
 					"access": false,
 					"array": false,
 					"PLMN": {
@@ -121753,7 +123123,7 @@
 					"cwmp",
 					"usp"
 				],
-				"description": "User equipment Router Selection Policy (URSP) is a table of rules used to determine which network slice and data network to route a PDU over. Typically a 5G-RG would search the URSP table in precedence order matching the traffic descriptor types against the service it was setting up. For example a 5G-RG would search for connection capabilities matching ims in order to establish a dedicated PDU session for telephony. See <<bibref|3GPP-TS.24.526|Clause 5.2>> for a full descrption of the URSP data elements.",
+				"description": "User equipment Router Selection Policy (URSP) is a table of rules used to determine which network slice and data network to route a PDU over. Typically a 5G-RG would search the URSP table in precedence order matching the traffic descriptor types against the service it was setting up. For example a 5G-RG would search for connection capabilities matching ims in order to establish a dedicated PDU session for telephony. See <<bibref|3GPP-TS.24.526|Clause 5.2>> for a full description of the URSP data elements.",
 				"uniqueKeys": [
 					"Alias",
 					"Precedence"
@@ -121769,12 +123139,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Precedence": {
 					"type": "unsignedInt",
@@ -121825,12 +123190,7 @@
 							"usp"
 						],
 						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"datatype": "_AliasCWMP"
 					},
 					"Type": {
 						"type": "unsignedInt",
@@ -121892,12 +123252,7 @@
 								"usp"
 							],
 							"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-							"datatype": "Alias",
-							"range": [
-								{
-									"max": 64
-								}
-							]
+							"datatype": "_AliasCWMP"
 						},
 						"Precedence": {
 							"type": "unsignedInt",
@@ -122065,12 +123420,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Interface": {
 					"type": "string",
@@ -122253,7 +123603,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "The Data Network Name used by the PDU. The DNN value may be from the optional S-NSSAI specified at the time of PDU establishment or a default determined by the 5G core. A DNN is analagous to an LTE APN used the same format defined in <<bibref|3GPP-TS.24.501|clause 9.11.2.1A>>.",
+					"description": "The Data Network Name used by the PDU. The DNN value may be from the optional S-NSSAI specified at the time of PDU establishment or a default determined by the 5G core. A DNN is analogous to an LTE APN used the same format defined in <<bibref|3GPP-TS.24.501|clause 9.11.2.1A>>.",
 					"datatype": "string",
 					"range": [
 						{
@@ -122404,7 +123754,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "This object describes the PDU QoS Rule table. The purpose of the QoS Rule table is to assign a QFI to mark traffic based on a set of classification rules. The rules are set by the netowrk operator and are specific for each PDU. For example: * A QoS Rule with a default used for general traffic has the following parameters. * QFI=1 * DQR=1 - Default rule * Filter 1 for rule * Direction=bidirectional * Type=1 - Match all * A QoS Rule matchihg a voice service. * QFI=32 * DQR=0 * Filter 1 for rule * Direction=bidirectional * Type=33 - Destination IPv6 range * Value=2001:8000/48 - Destination IPv6 range * Filter 2 for rule * Direction=bidirectional * Type=16 - Destination IPv4 address with netmask * Value=203.1.0.0 255.255.255.0 - Destination IPv4 address with netmask A full description can be found at <<bibref|3GPP-TS.24.501|clause 9.11.4.13>> QoS Rules",
+					"description": "This object describes the PDU QoS Rule table. The purpose of the QoS Rule table is to assign a QFI to mark traffic based on a set of classification rules. The rules are set by the network operator and are specific for each PDU. For example: * A QoS Rule with a default used for general traffic has the following parameters. * QFI=1 * DQR=1 - Default rule * Filter 1 for rule * Direction=bidirectional * Type=1 - Match all * A QoS Rule matchihg a voice service. * QFI=32 * DQR=0 * Filter 1 for rule * Direction=bidirectional * Type=33 - Destination IPv6 range * Value=2001:8000/48 - Destination IPv6 range * Filter 2 for rule * Direction=bidirectional * Type=16 - Destination IPv4 address with netmask * Value=203.1.0.0 255.255.255.0 - Destination IPv4 address with netmask A full description can be found at <<bibref|3GPP-TS.24.501|clause 9.11.4.13>> QoS Rules",
 					"uniqueKeys": [
 						"Alias",
 						"Identifier"
@@ -122420,12 +123770,7 @@
 							"usp"
 						],
 						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"datatype": "_AliasCWMP"
 					},
 					"Identifier": {
 						"type": "unsignedInt",
@@ -122532,12 +123877,7 @@
 								"usp"
 							],
 							"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-							"datatype": "Alias",
-							"range": [
-								{
-									"max": 64
-								}
-							]
+							"datatype": "_AliasCWMP"
 						},
 						"Direction": {
 							"type": "string",
@@ -122606,12 +123946,7 @@
 							"usp"
 						],
 						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"datatype": "_AliasCWMP"
 					},
 					"QFI": {
 						"type": "unsignedInt",
@@ -122783,12 +124118,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Name": {
 					"type": "string",
@@ -123085,12 +124415,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Name": {
 					"type": "string",
@@ -123140,7 +124465,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "Throughput statistics for this interface. The CPE MUST reset the interfaces Stats parameters (unless otherwise stated in individual object or parameter descriptions) either when the interface becomes operationally down due to a previous administrative down (i.e. the interfaces <<param|#.Status>> parameter transitions to a down state after the interface is disabled) or when the interface becomes administratively up (i.e. the interfaces <<param|#.Enable>> parameter transitions from <<false>> to <<true>>). Administrative and operational interface status is discussed in <<bibref|TR-181i2|section 4.2.2>>. This information SHOULD be mirrored or aggregated from the active underlaying interfaces.",
+					"description": "Throughput statistics for this interface. The CPE MUST reset the interfaces Stats parameters (unless otherwise stated in individual object or parameter descriptions) either when the interface becomes operationally down due to a previous administrative down (i.e. the interfaces <<param|#.Status>> parameter transitions to a down state after the interface is disabled) or when the interface becomes administratively up (i.e. the interfaces <<param|#.Enable>> parameter transitions from <<false>> to <<true>>). Administrative and operational interface status is discussed in <<bibref|TR-181i2|section 4.2.2>>. This information SHOULD be mirrored or aggregated from the active underlying interfaces.",
 					"access": false,
 					"array": false,
 					"BytesSent": {
@@ -123567,12 +124892,7 @@
 							"usp"
 						],
 						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"datatype": "_AliasCWMP"
 					},
 					"Name": {
 						"type": "string",
@@ -123890,12 +125210,7 @@
 							"usp"
 						],
 						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"datatype": "_AliasCWMP"
 					},
 					"Name": {
 						"type": "string",
@@ -124637,7 +125952,7 @@
 									"cwmp",
 									"usp"
 								],
-								"description": "Signal fail (SF) threshold. This parameter specifies the downstream bit error rate (BER) threshold to detect the SF alarm. When this value is y, the BER threshold is 10^\u2013y. This parameter is based on Signal fail (SF) threshold from <<bibref|G.988|Section 9.2.1>>.",
+								"description": "Signal fail (SF) threshold. This parameter specifies the downstream bit error rate (BER) threshold to detect the SF alarm. When this value is y, the BER threshold is 10^-y^. This parameter is based on Signal fail (SF) threshold from <<bibref|G.988|Section 9.2.1>>.",
 								"datatype": "unsignedInt",
 								"range": [
 									{
@@ -124654,7 +125969,7 @@
 									"cwmp",
 									"usp"
 								],
-								"description": "Signal degrade (SD) threshold. This parameter specifies the downstream BER threshold to detect the SD alarm. When this value is x, the BER threshold for SD is 10^\u2013x . The SD threshold must be lower than the SF threshold; i.e., x > y. This parameter is based on Signal degrade (SD) threshold from <<bibref|G.988|Section 9.2.1>>.",
+								"description": "Signal degrade (SD) threshold. This parameter specifies the downstream BER threshold to detect the SD alarm. When this value is x, the BER threshold for SD is 10^-x^. The SD threshold must be lower than the SF threshold; i.e., x > y. This parameter is based on Signal degrade (SD) threshold from <<bibref|G.988|Section 9.2.1>>.",
 								"datatype": "unsignedInt",
 								"range": [
 									{
@@ -124824,7 +126139,7 @@
 									"cwmp",
 									"usp"
 								],
-								"description": "Loss of downstream syncronization. See <<bibref|G.9807.1|>>.",
+								"description": "Loss of downstream synchronization. See <<bibref|G.9807.1|>>.",
 								"datatype": "boolean"
 							},
 							"ROGUE": {
@@ -125171,12 +126486,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Interface": {
 					"type": "string",
@@ -125186,7 +126496,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "The IP Interface associated with the <<object>> entry. If <<empty>> is specified, the CPE MUST use its bridging or routing policy to determine the appropriate interface.",
+					"description": "The IP Interface associated with the <<object>> entry. If <<empty>> is specified, the service should listen on all interfaces.",
 					"datatype": "string",
 					"range": [
 						{
@@ -125365,12 +126675,12 @@
 				"PID": {
 					"type": "unsignedInt",
 					"read": true,
-					"write": true,
+					"write": false,
 					"protocols": [
 						"cwmp",
 						"usp"
 					],
-					"description": "Current PID of the SSH server instance.",
+					"description": "Current Process Identifier of the SSH server instance. Note: This parameter was demoted to readOnly in the Device:2.18 version.",
 					"default": "0",
 					"datatype": "unsignedInt"
 				},
@@ -125395,7 +126705,7 @@
 					"uniqueKeys": [
 						"Alias"
 					],
-					"access": true,
+					"access": false,
 					"array": true,
 					"Alias": {
 						"type": "string",
@@ -125406,22 +126716,17 @@
 							"usp"
 						],
 						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"datatype": "_AliasCWMP"
 					},
 					"User": {
 						"type": "string",
 						"read": true,
-						"write": true,
+						"write": false,
 						"protocols": [
 							"cwmp",
 							"usp"
 						],
-						"description": "The user to whom the session belongs to.",
+						"description": "The user to whom the session belongs to. Note: This parameter was demoted to readOnly in the Device:2.18 version.",
 						"datatype": "string",
 						"range": [
 							{
@@ -125486,12 +126791,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"User": {
 					"type": "string",
@@ -125564,12 +126864,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Mode": {
 					"type": "string",
@@ -125689,7 +126984,20 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "<<reference|the <<object|##.SoftwareModules.DeploymentUnit.>> object instance that this USP Service is part off.>> <<empty>> means that USP service doesnt have a corresponding software module.",
+					"description": "<<reference|the <<object|##.SoftwareModules.DeploymentUnit.>> object instance that this USP Service is part of.>> <<empty>> means that USP service doesnt have a corresponding software module.",
+					"list": {
+						"datatype": "string"
+					}
+				},
+				"ExecutionUnitRef": {
+					"type": "string",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "<<reference|the <<object|##.SoftwareModules.ExecutionUnit.>> object instance that this USP Service is part of.>> <<empty>> means that USP service doesnt have a corresponding software module.",
 					"list": {
 						"datatype": "string"
 					}
@@ -125808,12 +127116,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"FacilityLevel": {
 					"type": "string",
@@ -125824,7 +127127,7 @@
 						"usp"
 					],
 					"description": "Only the log messages with following Facility levels must be logged.",
-					"default": "All",
+					"default": "[All]",
 					"list": {
 						"datatype": "string",
 						"enumerations": [
@@ -125945,12 +127248,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"KernelMessages": {
 					"type": "boolean",
@@ -126066,7 +127364,7 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "The IP or Logical Interface on which the syslog information will be received. When <<empty>> is specified the syslog service will listen to all available network interfaces. Example: * Device.IP.Interface.1. * Device.Logical.Interface.1. <<template|INTERFACE-ROUTING>>",
+						"description": "The IP or Logical Interface on which the syslog information will be received. When <<empty>> is specified the syslog service will listen to all available network interfaces. Example: * Device.IP.Interface.1 * Device.Logical.Interface.1 <<template|INTERFACE-ROUTING>>",
 						"datatype": "string",
 						"range": [
 							{
@@ -126132,12 +127430,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Expression": {
 					"type": "string",
@@ -126184,12 +127477,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"SourceRef": {
 					"type": "string",
@@ -126200,6 +127488,7 @@
 						"usp"
 					],
 					"description": "Mandatory parameter. Specifies one or multiple sources from where the log messages originate.",
+					"default": "[]",
 					"list": {
 						"datatype": "string",
 						"range": [
@@ -126218,6 +127507,7 @@
 						"usp"
 					],
 					"description": "The Filter associated with the <<object>> entry. When referencing multiple Filter rules, it is mandatory to execute them in the order listed within the parameter. Example: FilterRef=.Syslog.Filter.3,.Syslog.Filter.1 First filter rule 3 must be executed and then filter rule 1. When no Filter is specified the log message will not be filtered.",
+					"default": "[]",
 					"list": {
 						"datatype": "string",
 						"range": [
@@ -126350,12 +127640,12 @@
 					"Protocol": {
 						"type": "string",
 						"read": true,
-						"write": false,
+						"write": true,
 						"protocols": [
 							"cwmp",
 							"usp"
 						],
-						"description": "Protocol to be used to deliver the syslog messages to the remote server.",
+						"description": "Protocol to be used to deliver the syslog messages to the remote server. Note: This parameter was promoted to readWrite in the Device:2.18 version.",
 						"datatype": "string",
 						"enumerations": [
 							"TCP",
@@ -126407,6 +127697,191 @@
 				}
 			}
 		},
+		"Device.Schedules.": {
+			"type": "object",
+			"protocols": [
+				"cwmp",
+				"usp"
+			],
+			"description": "This object is responsible for managing the schedules that are embedded within the Device.",
+			"access": false,
+			"array": false,
+			"Enable": {
+				"type": "boolean",
+				"read": true,
+				"write": true,
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"description": "Enables or disables the scheduling. If the scheduling is disabled then the status of any enabled <<object|Schedule>> entries will change to <<enum|StackDisabled|Schedule.<i>.Status>>.",
+				"default": "true",
+				"datatype": "boolean"
+			},
+			"ScheduleNumberOfEntries": {
+				"type": "unsignedInt",
+				"read": true,
+				"write": false,
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"description": "<<numentries>>",
+				"datatype": "unsignedInt"
+			},
+			"Device.Schedules.Schedule.{i}.": {
+				"type": "object",
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"description": "Each instance of this object provides a schedule where access is enabled.",
+				"uniqueKeys": [
+					"Alias"
+				],
+				"access": true,
+				"array": true,
+				"Alias": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
+					"datatype": "_AliasCWMP"
+				},
+				"Enable": {
+					"type": "boolean",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Enables or disables this <<object>> entry.",
+					"default": "false",
+					"datatype": "boolean"
+				},
+				"Status": {
+					"type": "string",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Status of the schedule.",
+					"datatype": "string",
+					"enumerations": [
+						"Active",
+						"Inactive",
+						"StackDisabled",
+						"Error"
+					]
+				},
+				"Description": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "A description of the schedule (human readable string).",
+					"datatype": "string",
+					"range": [
+						{
+							"max": 256
+						}
+					]
+				},
+				"Day": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "<<list|the days for which access is enabled>> Enumeration of: Monday, Tuesday, Wednesday, Thursday, Friday, Saturday, Sunday.",
+					"list": {
+						"datatype": "string",
+						"enumerations": [
+							"Monday",
+							"Tuesday",
+							"Wednesday",
+							"Thursday",
+							"Friday",
+							"Saturday",
+							"Sunday"
+						]
+					}
+				},
+				"StartTime": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Start time of the enable schedule in hh:mm format. [hh] refers to a zero-padded hour between 00 and 23. [mm] refers to a zero-padded minute between 00 and 59. Start time is in local time zone.",
+					"datatype": "string",
+					"range": [
+						{
+							"max": 5
+						}
+					],
+					"pattern": [
+						"",
+						"([01][0-9]|2[0-3]):[0-5][0-9]"
+					]
+				},
+				"Duration": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "The duration, in <<units>>, which the access is enabled. If the <<param|StartTime>> is not defined, duration is the total time access is allowed during a calendar day. If a <<param|StartTime>> is defined, access is allowed for the <<param>> period starting from <<param|StartTime>>.",
+					"datatype": "unsignedInt",
+					"range": [
+						{
+							"min": 1
+						}
+					],
+					"unit": "seconds"
+				},
+				"InverseMode": {
+					"type": "boolean",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "When enabled, the Inverse Mode reverses the default behavior of the schedule, creating a dynamic where actions that are typically activated are now deactivated, and vice versa.",
+					"default": "false",
+					"datatype": "boolean"
+				},
+				"TimeLeft": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "The number of <<units>> remaining before the next state change will occur. 0 means that schedule is disabled.",
+					"datatype": "unsignedInt",
+					"unit": "seconds"
+				}
+			}
+		},
 		"Device.GatewayInfo.": {
 			"type": "object",
 			"protocols": [
@@ -126998,12 +128473,7 @@
 						"cwmp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Enable": {
 					"type": "boolean",
@@ -127048,7 +128518,7 @@
 					"protocols": [
 						"cwmp"
 					],
-					"description": "This parameter, when <<true>>, enables the advertisement of DNS-SD services defined for this <<object>> instance using mDNS as defined in <<bibref|RFC6762>>. This parameter cannot be set to <<true>> if there are multiple <<object>> instances with the same value of the <<param|Protocol>> parameter. When <<true>>, the hostname advertised in the SRV record MUST be a Fully Qualified Domain Name (FQDN). The interfaces that advertise these DNS-SD services are restriced to the set of interfaces associated with this <<object>> instance and the interfaces defined by the <<param|.DNS.SD.Advertise.<i>.Interface>> parameter.",
+					"description": "This parameter, when <<true>>, enables the advertisement of DNS-SD services defined for this <<object>> instance using mDNS as defined in <<bibref|RFC6762>>. This parameter cannot be set to <<true>> if there are multiple <<object>> instances with the same value of the <<param|Protocol>> parameter. When <<true>>, the hostname advertised in the SRV record MUST be a Fully Qualified Domain Name (FQDN). The interfaces that advertise these DNS-SD services are restricted to the set of interfaces associated with this <<object>> instance and the interfaces defined by the <<param|.DNS.SD.Advertise.<i>.Interface>> parameter.",
 					"default": "true",
 					"datatype": "boolean"
 				},
@@ -127058,7 +128528,7 @@
 					"protocols": [
 						"cwmp"
 					],
-					"description": "If the USP Endpoint uses the CoAP Message Transfer Protocol (MTP), then this object contains CoAP specific configuration parameters. <<deprecated|2.15|because the CoAP MTP was deprecated in USP 1.2>> <<obsoleted|2.17>>",
+					"description": "If the USP Endpoint uses the CoAP Message Transfer Protocol (MTP), then this object contains CoAP specific configuration parameters. <<deprecated|2.15|because the CoAP MTP was deprecated in USP 1.2>> <<obsoleted|2.17>> <<deleted|2.18>>",
 					"access": false,
 					"array": false,
 					"Interfaces": {
@@ -127347,12 +128817,7 @@
 						"cwmp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"EndpointID": {
 					"type": "string",
@@ -127542,12 +129007,7 @@
 							"cwmp"
 						],
 						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"datatype": "_AliasCWMP"
 					},
 					"Enable": {
 						"type": "boolean",
@@ -127591,7 +129051,7 @@
 						"protocols": [
 							"cwmp"
 						],
-						"description": "If the USP Endpoint uses the CoAP Message Transfer Protocol (MTP), then this object contains CoAP specific configuration parameters. <<deprecated|2.15|because the CoAP MTP was deprecated in USP 1.2>> <<obsoleted|2.17>>",
+						"description": "If the USP Endpoint uses the CoAP Message Transfer Protocol (MTP), then this object contains CoAP specific configuration parameters. <<deprecated|2.15|because the CoAP MTP was deprecated in USP 1.2>> <<obsoleted|2.17>> <<deleted|2.18>>",
 						"access": false,
 						"array": false,
 						"Host": {
@@ -127849,7 +129309,7 @@
 							"protocols": [
 								"cwmp"
 							],
-							"description": "A reference to the MQTT Client used by this Controller when communicating via the MQTT MTP. <<deprecated|2.16|because <<param|AgentMTPReference>> was added>>",
+							"description": "A reference to the MQTT Client used by this Controller when communicating via the MQTT MTP. <<deprecated|2.16|because <<param|AgentMTPReference>> was added>> <<obsoleted|2.18>>",
 							"datatype": "string"
 						},
 						"Topic": {
@@ -127962,12 +129422,7 @@
 						"cwmp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Enable": {
 					"type": "boolean",
@@ -128126,12 +129581,7 @@
 							"cwmp"
 						],
 						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"datatype": "_AliasCWMP"
 					},
 					"Enable": {
 						"type": "boolean",
@@ -128184,12 +129634,7 @@
 								"cwmp"
 							],
 							"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-							"datatype": "Alias",
-							"range": [
-								{
-									"max": 64
-								}
-							]
+							"datatype": "_AliasCWMP"
 						},
 						"Enable": {
 							"type": "boolean",
@@ -128221,6 +129666,7 @@
 								"cwmp"
 							],
 							"description": "<<list|each entry is a target to which the value of the permissions parameters are assigned>> When an entry is a value of a Partial Path, the permissions are associated to that Object and any child Object/Parameter. When the value of an entry is an Object instance then the permissions are associated to all Parameters of the Object instance. When an entry is a value of a Search Path as defined in <<bibref|TR-369>> that resolves to zero or more Parameter Paths, then all Parameter Paths that result from the evaluation of the Search Path are subject to the permissions assigned by this <<object>> instance.",
+							"default": "[]",
 							"list": {
 								"datatype": "string"
 							}
@@ -128232,7 +129678,7 @@
 							"protocols": [
 								"cwmp"
 							],
-							"description": "The permissions of a Role for the specified Targets. A string of 4 characters where each character represents a permission (r for Read, w for Write, x for Execute, and n for Notify). The string is always in the same order (rwxn) and the lack of a permission is signified by a - character (e.g., r--n). The following describes the meaning of the permissions for Parameter type of Targets: # Read: Grants the capability to read the value of the Parameter via Get and read the meta-information of the Parameter via GetSupportedDM. # Write: Grants the capability to update the value of the Parameter via Add or Set. # Execute: Grants no capabilities; Parameters can not be executed. # Notify: Grants the capability to receive Notify Messages of type ValueChange for this Parameter.",
+							"description": "The permissions of a Role for the specified Targets. A string of 4 characters where each character represents a permission (`r` for Read, `w` for Write, `x` for Execute, and `n` for Notify). The string is always in the same order (`rwxn`) and the lack of a permission is signified by a `-` character (e.g., `r--n`). The following describes the meaning of the permissions for Parameter type of Targets: # Read: Grants the capability to read the value of the Parameter via Get and read the meta-information of the Parameter via GetSupportedDM. # Write: Grants the capability to update the value of the Parameter via Add or Set. # Execute: Grants no capabilities; Parameters can not be executed. # Notify: Grants the capability to receive Notify Messages of type ValueChange for this Parameter.",
 							"default": "----",
 							"datatype": "string",
 							"range": [
@@ -128249,7 +129695,7 @@
 							"protocols": [
 								"cwmp"
 							],
-							"description": "The permissions of a Role for the specified Targets. A string of 4 characters where each character represents a permission (r for Read, w for Write, x for Execute, and n for Notify). The string is always in the same order (rwxn) and the lack of a permission is signified by a - character (e.g., r--n). The following describes the meaning of the permissions for Object type of Targets: # Read: Grants the capability to read the meta-information of the Object via GetSupportedDM. # Write: Grants no capabilities for Static Objects. Grants the capability to create a new instance of a Multi-Instanced Object via Add (e.g. Device.LocalAgent.Controller.). # Execute: Grants no capabilities; Objects are not executable and Commands are controlled by the CommandEventPermissions. # Notify: Grants the capability to receive Notify Messages of type ObjectCreation for this Object (multi-instance objects only).",
+							"description": "The permissions of a Role for the specified Targets. A string of 4 characters where each character represents a permission (`r` for Read, `w` for Write, `x` for Execute, and `n` for Notify). The string is always in the same order (`rwxn`) and the lack of a permission is signified by a `-` character (e.g., `r--n`). The following describes the meaning of the permissions for Object type of Targets: # Read: Grants the capability to read the meta-information of the Object via GetSupportedDM. # Write: Grants no capabilities for Static Objects. Grants the capability to create a new instance of a Multi-Instanced Object via Add (e.g. Device.LocalAgent.Controller.). # Execute: Grants no capabilities; Objects are not executable and Commands are controlled by the CommandEventPermissions. # Notify: Grants the capability to receive Notify Messages of type ObjectCreation for this Object (multi-instance objects only).",
 							"default": "----",
 							"datatype": "string",
 							"range": [
@@ -128266,7 +129712,7 @@
 							"protocols": [
 								"cwmp"
 							],
-							"description": "The permissions of a Role for the specified Targets. A string of 4 characters where each character represents a permission (r for Read, w for Write, x for Execute, and n for Notify). The string is always in the same order (rwxn) and the lack of a permission is signified by a - character (e.g., r--n). The following describes the meaning of the permissions for Instantiated Object type of Targets: # Read: Grants the capability to read the instance numbers and unique keys of the Instantiated Object via GetInstances and read the value of Parameters related to the Instantiated Object via a Get containing a search expression or wildcard in place of the instance identifier. # Write: Grants the capability to remove an existing instance of an Instantiated Object via Delete (e.g. Device.LocalAgent.Controller.1.). # Execute: Grants no capabilities; Object Instances are not executable and Commands are controlled by the CommandEventPermissions. # Notify: Grants the capability to receive Notify Messages of type ObjectDeletion for this Instantiated Object.",
+							"description": "The permissions of a Role for the specified Targets. A string of 4 characters where each character represents a permission (`r` for Read, `w` for Write, `x` for Execute, and `n` for Notify). The string is always in the same order (`rwxn`) and the lack of a permission is signified by a `-` character (e.g., `r--n`). The following describes the meaning of the permissions for Instantiated Object type of Targets: # Read: Grants the capability to read the instance numbers and unique keys of the Instantiated Object via GetInstances and read the value of Parameters related to the Instantiated Object via a Get containing a search expression or wildcard in place of the instance identifier. # Write: Grants the capability to remove an existing instance of an Instantiated Object via Delete (e.g. Device.LocalAgent.Controller.1.). # Execute: Grants no capabilities; Object Instances are not executable and Commands are controlled by the CommandEventPermissions. # Notify: Grants the capability to receive Notify Messages of type ObjectDeletion for this Instantiated Object.",
 							"default": "----",
 							"datatype": "string",
 							"range": [
@@ -128283,7 +129729,7 @@
 							"protocols": [
 								"cwmp"
 							],
-							"description": "The permissions of a Role for the specified Targets. A string of 4 characters where each character represents a permission (r for Read, w for Write, x for Execute, and n for Notify). The string is always in the same order (rwxn) and the lack of a permission is signified by a - character (e.g., r--n). The following describes the meaning of the permissions for Command and Event type of Targets: # Read: Grants the capability to read the meta-information of the Command (including input and output arguments) and Event (including arguments) via GetSupportedDM. # Write: Grants no capabilities; Commands are executed instead of written to and Events are read only. # Execute: Grants the capability to execute the Command via Operate, but grants no capabilities to an Event. # Notify: Grants the capability to receive Notify Messages of type OperationComplete for this Event or Command.",
+							"description": "The permissions of a Role for the specified Targets. A string of 4 characters where each character represents a permission (`r` for Read, `w` for Write, `x` for Execute, and `n` for Notify). The string is always in the same order (`rwxn`) and the lack of a permission is signified by a `-` character (e.g., `r--n`). The following describes the meaning of the permissions for Command and Event type of Targets: # Read: Grants the capability to read the meta-information of the Command (including input and output arguments) and Event (including arguments) via GetSupportedDM. # Write: Grants no capabilities; Commands are executed instead of written to and Events are read only. # Execute: Grants the capability to execute the Command via Operate, but grants no capabilities to an Event. # Notify: Grants the capability to receive Notify Messages of type OperationComplete for this Event or Command.",
 							"default": "----",
 							"datatype": "string",
 							"range": [
@@ -128300,7 +129746,7 @@
 					"protocols": [
 						"cwmp"
 					],
-					"description": "Each instance of this table represents a trusted credential. The credential can be that of a certificate authority (CA) for a Controller whose EndpointID is unknown. When a credential is supplied to the Agent by a Controller during authentication, the credentials in this table are used to determine if any of the supplied certificates (including those in the chain of trust) are considered trusted. If the Controller authenticated via an entry in this table is not previously known to the Agent, the associated Role entry is automatically applied to the Controller.",
+					"description": "Each instance of this table represents a trusted credential. The credential can be that of a certificate authority (CA) for a Controller whose EndpointID is unknown. When a credential is supplied to the Agent by a Controller during authentication, the credentials in this table are used to determine if any of the supplied certificates (including those in the chain of trust) are considered trusted. If the Controller authenticated via an entry in this table is not previously known to the Agent, the Roles specified in the <<param|Role>> parameter might be automatically applied, depending on the value of the <<param|AllowedUses>> parameter.",
 					"uniqueKeys": [
 						"Credential",
 						"Alias"
@@ -128315,12 +129761,7 @@
 							"cwmp"
 						],
 						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"datatype": "_AliasCWMP"
 					},
 					"Enable": {
 						"type": "boolean",
@@ -128390,12 +129831,7 @@
 							"cwmp"
 						],
 						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"datatype": "_AliasCWMP"
 					},
 					"Description": {
 						"type": "string",
@@ -128570,12 +130006,7 @@
 						"cwmp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"AnnouncedToSCLList": {
 					"type": "string",
@@ -128783,12 +130214,7 @@
 							"cwmp"
 						],
 						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"datatype": "_AliasCWMP"
 					},
 					"PolicyScope": {
 						"type": "string",
@@ -128798,6 +130224,7 @@
 							"cwmp"
 						],
 						"description": "The parameter defines the scope of the policies contained in this instance of a <<object|#.SAFPolicySet>>. The parameter value is: *a list of unordered set of URIs <<bibref|RFC3986>> that represents an M2M application id (APP-ID) *the value of default *<<empty>> When this parameter is set to a list of application id (APP-ID) URIs <<bibref|RFC3986>>, the scope indicates that the policies are applicable to requests coming from any specific application on that list. When this parameter is set to a string with the value default, the scope indicates that the policies are the default policies for this <<object|##.SCL>> instance. When this parameter is set to <<empty>>, the value represents an unknown <<object|#.SAFPolicySet>> and the <<object|#.SAFPolicySet>> is not to be used.",
+						"default": "[]",
 						"list": {
 							"datatype": "string"
 						}
@@ -128843,12 +130270,7 @@
 								"cwmp"
 							],
 							"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-							"datatype": "Alias",
-							"range": [
-								{
-									"max": 64
-								}
-							]
+							"datatype": "_AliasCWMP"
 						},
 						"ANName": {
 							"type": "string",
@@ -128911,12 +130333,7 @@
 									"cwmp"
 								],
 								"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-								"datatype": "Alias",
-								"range": [
-									{
-										"max": 64
-									}
-								]
+								"datatype": "_AliasCWMP"
 							},
 							"FailedAttempts": {
 								"type": "unsignedInt",
@@ -128973,12 +130390,7 @@
 									"cwmp"
 								],
 								"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-								"datatype": "Alias",
-								"range": [
-									{
-										"max": 64
-									}
-								]
+								"datatype": "_AliasCWMP"
 							},
 							"RCAT": {
 								"type": "string",
@@ -129030,12 +130442,7 @@
 										"cwmp"
 									],
 									"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-									"datatype": "Alias",
-									"range": [
-										{
-											"max": 64
-										}
-									]
+									"datatype": "_AliasCWMP"
 								},
 								"Schedules": {
 									"type": "string",
@@ -129045,6 +130452,7 @@
 										"cwmp"
 									],
 									"description": "The list is a set of schedule strings. A schedule string is formatted according to the date and time fields defined CRONTAB input file definition in <<bibref|POSIXBase>>. The <<param>> parameter is used to set the recurrence of the schedule. The timezone used for this parameter is dependent upon the existence of instances of <<object|AbsTimeSpan>> for this <<object>>. If instances of <<object|AbsTimeSpan>> exist, then the timezone of the <<object|AbsTimeSpan>> is used otherwise the UTC timezone is used for this <<param>> parameter. Note the command field is not used in this definition and any whitespace or comma characters within a Schedule string MUST be escaped using percent as defined in <<bibref|TR-106|section 3.2.3>> Example of CRONTAB string: ** 0-6 * * 1-5 would mean every minute for the period from 0:00h to 6:00h (inclusive) on any week day (Monday through Friday) and would be represented as *%200-6%20*%20*%201-5 **/15 22-23,0-4 * * 1-5 would mean every 15 minutes for the period from 22:00h to 04:00h on any week day (Monday through Friday) and would be represented as */15%2022-23%2C0-4%20*%20*%201-5",
+									"default": "[]",
 									"list": {
 										"datatype": "string"
 									}
@@ -129089,12 +130497,7 @@
 											"cwmp"
 										],
 										"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-										"datatype": "Alias",
-										"range": [
-											{
-												"max": 64
-											}
-										]
+										"datatype": "_AliasCWMP"
 									},
 									"StartTime": {
 										"type": "dateTime",
@@ -129181,12 +130584,7 @@
 									"cwmp"
 								],
 								"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-								"datatype": "Alias",
-								"range": [
-									{
-										"max": 64
-									}
-								]
+								"datatype": "_AliasCWMP"
 							},
 							"RCAT": {
 								"type": "string",
@@ -129247,6 +130645,7 @@
 									"cwmp"
 								],
 								"description": "The list is a prioritized set of Access Networks where the preference of using an Access Network is based on order of the list items with the lowest order list item as the most preferred Access Network.",
+								"default": "[]",
 								"list": {
 									"datatype": "string"
 								}
@@ -129523,12 +130922,7 @@
 						"usp"
 					],
 					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"datatype": "_AliasCWMP"
 				},
 				"Enable": {
 					"type": "boolean",
@@ -130153,6 +131547,16 @@
 					}
 				}
 			},
+			"WatchdogNumberOfEntries": {
+				"type": "unsignedInt",
+				"read": true,
+				"write": false,
+				"protocols": [
+					"usp"
+				],
+				"description": "<<numentries>>",
+				"datatype": "unsignedInt"
+			},
 			"SubscriptionNumberOfEntries": {
 				"type": "unsignedInt",
 				"read": true,
@@ -130212,13 +131616,8 @@
 					"protocols": [
 						"usp"
 					],
-					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"description": "A non-volatile unique key used to reference this instance. Alias provides a mechanism for a Controller to label this instance for future reference. The following mandatory constraints MUST be enforced: * The value MUST NOT be empty. * The value MUST start with a letter. * If the value is not assigned by the Controller at creation time, the Agent MUST assign a value with an cpe- prefix. | A non-volatile unique key used to reference this instance. Alias provides a mechanism for a Controller to label this instance for future reference. The following mandatory constraints MUST be enforced: * The value MUST NOT be empty. * The value MUST start with a letter. * If the value is not assigned by the Controller at creation time, the Agent MUST assign a value with an cpe- prefix.",
+					"datatype": "_AliasUSP"
 				},
 				"Enable": {
 					"type": "boolean",
@@ -130263,7 +131662,7 @@
 					"protocols": [
 						"usp"
 					],
-					"description": "This parameter, when <<true>>, enables the advertisement of DNS-SD services defined for this <<object>> instance using mDNS as defined in <<bibref|RFC6762>>. This parameter cannot be set to <<true>> if there are multiple <<object>> instances with the same value of the <<param|Protocol>> parameter. When <<true>>, the hostname advertised in the SRV record MUST be a Fully Qualified Domain Name (FQDN). The interfaces that advertise these DNS-SD services are restriced to the set of interfaces associated with this <<object>> instance and the interfaces defined by the <<param|.DNS.SD.Advertise.<i>.Interface>> parameter.",
+					"description": "This parameter, when <<true>>, enables the advertisement of DNS-SD services defined for this <<object>> instance using mDNS as defined in <<bibref|RFC6762>>. This parameter cannot be set to <<true>> if there are multiple <<object>> instances with the same value of the <<param|Protocol>> parameter. When <<true>>, the hostname advertised in the SRV record MUST be a Fully Qualified Domain Name (FQDN). The interfaces that advertise these DNS-SD services are restricted to the set of interfaces associated with this <<object>> instance and the interfaces defined by the <<param|.DNS.SD.Advertise.<i>.Interface>> parameter.",
 					"default": "true",
 					"datatype": "boolean"
 				},
@@ -130273,7 +131672,7 @@
 					"protocols": [
 						"usp"
 					],
-					"description": "If the USP Endpoint uses the CoAP Message Transfer Protocol (MTP), then this object contains CoAP specific configuration parameters. <<deprecated|2.15|because the CoAP MTP was deprecated in USP 1.2>> <<obsoleted|2.17>>",
+					"description": "If the USP Endpoint uses the CoAP Message Transfer Protocol (MTP), then this object contains CoAP specific configuration parameters. <<deprecated|2.15|because the CoAP MTP was deprecated in USP 1.2>> <<obsoleted|2.17>> <<deleted|2.18>>",
 					"access": false,
 					"array": false,
 					"Interfaces": {
@@ -130560,13 +131959,8 @@
 					"protocols": [
 						"usp"
 					],
-					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"description": "A non-volatile unique key used to reference this instance. Alias provides a mechanism for a Controller to label this instance for future reference. The following mandatory constraints MUST be enforced: * The value MUST NOT be empty. * The value MUST start with a letter. * If the value is not assigned by the Controller at creation time, the Agent MUST assign a value with an cpe- prefix. | A non-volatile unique key used to reference this instance. Alias provides a mechanism for a Controller to label this instance for future reference. The following mandatory constraints MUST be enforced: * The value MUST NOT be empty. * The value MUST start with a letter. * If the value is not assigned by the Controller at creation time, the Agent MUST assign a value with an cpe- prefix.",
+					"datatype": "_AliasUSP"
 				},
 				"Enable": {
 					"type": "boolean",
@@ -130692,13 +132086,8 @@
 					"protocols": [
 						"usp"
 					],
-					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"description": "A non-volatile unique key used to reference this instance. Alias provides a mechanism for a Controller to label this instance for future reference. The following mandatory constraints MUST be enforced: * The value MUST NOT be empty. * The value MUST start with a letter. * If the value is not assigned by the Controller at creation time, the Agent MUST assign a value with an cpe- prefix. | A non-volatile unique key used to reference this instance. Alias provides a mechanism for a Controller to label this instance for future reference. The following mandatory constraints MUST be enforced: * The value MUST NOT be empty. * The value MUST start with a letter. * If the value is not assigned by the Controller at creation time, the Agent MUST assign a value with an cpe- prefix.",
+					"datatype": "_AliasUSP"
 				},
 				"Enable": {
 					"type": "boolean",
@@ -130756,6 +132145,165 @@
 					]
 				}
 			},
+			"Device.LocalAgent.Watchdog.{i}.": {
+				"type": "object",
+				"protocols": [
+					"usp"
+				],
+				"description": "Each <<object>> instance of this table represents a Watchdog Event. A <<object>> instance is used to detect the lack of an expected update of a parameter value within a certain time window <<param|ReloadTimerValue>>. In case this timer expires, meaning <<param|RemainingTimerValue>> becomes 0, a notification event <<event|Watchdog!>>, will be sent to the <<param|Controller>>. This is because timely parameter updates are required, e.g. for SLA or security reasons.",
+				"uniqueKeys": [
+					"Alias"
+				],
+				"access": true,
+				"array": true,
+				"Alias": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"usp"
+					],
+					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
+					"datatype": "Alias",
+					"range": [
+						{
+							"max": 64
+						}
+					]
+				},
+				"Enable": {
+					"type": "boolean",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"usp"
+					],
+					"description": "Enable/Disable this <<object>> instance. If the <<object>> instance is disabled, the <<event|Watchdog!>> will not be invoked, even if there is a <<object|#.Subscription>> instance that references it. The <<param|RemainingTimerValue>> will be set to 0. If the <<object>> instance is set to enabled, the <<param|RemainingTimerValue>> will be set to the value of <<param|ReloadTimerValue>>.",
+					"default": "false",
+					"datatype": "boolean"
+				},
+				"ReloadTimerValue": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"usp"
+					],
+					"description": "Watchdog timer reload value in <<units>>. Every time the <<param|Reference>> value is updated, this <<param>> is used to reload the <<param|RemainingTimerValue>>.",
+					"datatype": "unsignedInt",
+					"unit": "seconds"
+				},
+				"RemainingTimerValue": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"usp"
+					],
+					"description": "This value is decreased every <<units>>. When 0, the <<object>> timer expires, an <<event|Watchdog!>> event will be generated.",
+					"datatype": "unsignedInt",
+					"unit": "seconds"
+				},
+				"Status": {
+					"type": "string",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"usp"
+					],
+					"description": "The operational status of the <<object>> instance. When the value of <<param|RemainingTimerValue>> becomes 0, this <<param>> will become <<enum|Expired>> and a <<event|Watchdog!>> event will be triggered. <<object>> will not be restarted, meaning that the <<param|RemainingTimerValue>> will stay at 0 until the <<command|Reset()>> command is invoked.",
+					"default": "Inactive",
+					"datatype": "string",
+					"enumerations": [
+						"Inactive",
+						"Active",
+						"Expired"
+					]
+				},
+				"Reference": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"usp"
+					],
+					"description": "The <<param>> consists of a Path Name or Search Path that determines the element(s) of the data model that the <<object>> is applicable to. When more than one <<param>> is used, the Watchdog timer will only be stopped if all Parameters, referenced by <<param>> are updated. If one of the referenced Parameters is not updated, either with the same or different value, an <<event|Watchdog!>> will be generated. If all parameters, referenced by <<param>>, are updated, the <<param|RemainingTimerValue>> is set to the value of the <<param|ReloadTimerValue>>.",
+					"datatype": "string"
+				},
+				"SeverityIndication": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"usp"
+					],
+					"description": "Provides an indication of the severity which will be included in the generated <<event|Watchdog!>> event when the <<object>> instance expires.",
+					"default": "Info",
+					"datatype": "string",
+					"enumerations": [
+						"Info",
+						"Minor",
+						"Major",
+						"Critical"
+					]
+				},
+				"Controller": {
+					"type": "string",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"usp"
+					],
+					"description": "<<reference|the <<object|#.Controller>> instance that created <<object>>|delete>> The value of this parameter is automatically populated by the USP Agent upon <<object>> creation using the reference to the USP Controller that created the instance. The USP Controller referenced by this parameter also defines the set of permissions to use when evaluating the Watchdog. Furthermore, only the USP Controller referenced by this parameter will receive a <<event|Watchdog!>> Event (assuming it has an associated Subscription), even if another USP Controller has an associated Subscription.",
+					"datatype": "string"
+				},
+				"Reset()": {
+					"type": "command",
+					"async": true,
+					"protocols": [
+						"usp"
+					]
+				},
+				"Watchdog!": {
+					"type": "event",
+					"protocols": [
+						"usp"
+					],
+					"output": {
+						"Reference": {
+							"type": "string",
+							"read": true,
+							"write": true,
+							"protocols": [
+								"usp"
+							],
+							"description": "The parameter <<param|#.Reference>> for which the Watchdog has been triggered.",
+							"datatype": "string"
+						},
+						"ReloadTimerValue": {
+							"type": "unsignedInt",
+							"read": true,
+							"write": true,
+							"protocols": [
+								"usp"
+							],
+							"description": "The <<param|#.ReloadTimerValue>> Value in <<units>>.",
+							"datatype": "unsignedInt",
+							"unit": "seconds"
+						},
+						"SeverityIndication": {
+							"type": "string",
+							"read": true,
+							"write": true,
+							"protocols": [
+								"usp"
+							],
+							"description": "The <<param|#.SeverityIndication>> Value.",
+							"datatype": "string"
+						}
+					}
+				}
+			},
 			"Device.LocalAgent.Controller.{i}.": {
 				"type": "object",
 				"protocols": [
@@ -130775,13 +132323,8 @@
 					"protocols": [
 						"usp"
 					],
-					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"description": "A non-volatile unique key used to reference this instance. Alias provides a mechanism for a Controller to label this instance for future reference. The following mandatory constraints MUST be enforced: * The value MUST NOT be empty. * The value MUST start with a letter. * If the value is not assigned by the Controller at creation time, the Agent MUST assign a value with an cpe- prefix. | A non-volatile unique key used to reference this instance. Alias provides a mechanism for a Controller to label this instance for future reference. The following mandatory constraints MUST be enforced: * The value MUST NOT be empty. * The value MUST start with a letter. * If the value is not assigned by the Controller at creation time, the Agent MUST assign a value with an cpe- prefix.",
+					"datatype": "_AliasUSP"
 				},
 				"EndpointID": {
 					"type": "string",
@@ -131084,13 +132627,8 @@
 						"protocols": [
 							"usp"
 						],
-						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"description": "A non-volatile unique key used to reference this instance. Alias provides a mechanism for a Controller to label this instance for future reference. The following mandatory constraints MUST be enforced: * The value MUST NOT be empty. * The value MUST start with a letter. * If the value is not assigned by the Controller at creation time, the Agent MUST assign a value with an cpe- prefix. | A non-volatile unique key used to reference this instance. Alias provides a mechanism for a Controller to label this instance for future reference. The following mandatory constraints MUST be enforced: * The value MUST NOT be empty. * The value MUST start with a letter. * If the value is not assigned by the Controller at creation time, the Agent MUST assign a value with an cpe- prefix.",
+						"datatype": "_AliasUSP"
 					},
 					"Enable": {
 						"type": "boolean",
@@ -131134,7 +132672,7 @@
 						"protocols": [
 							"usp"
 						],
-						"description": "If the USP Endpoint uses the CoAP Message Transfer Protocol (MTP), then this object contains CoAP specific configuration parameters. <<deprecated|2.15|because the CoAP MTP was deprecated in USP 1.2>> <<obsoleted|2.17>>",
+						"description": "If the USP Endpoint uses the CoAP Message Transfer Protocol (MTP), then this object contains CoAP specific configuration parameters. <<deprecated|2.15|because the CoAP MTP was deprecated in USP 1.2>> <<obsoleted|2.17>> <<deleted|2.18>>",
 						"access": false,
 						"array": false,
 						"Host": {
@@ -131399,7 +132937,7 @@
 							"protocols": [
 								"usp"
 							],
-							"description": "A reference to the MQTT Client used by this Controller when communicating via the MQTT MTP. <<deprecated|2.16|because <<param|AgentMTPReference>> was added>>",
+							"description": "A reference to the MQTT Client used by this Controller when communicating via the MQTT MTP. <<deprecated|2.16|because <<param|AgentMTPReference>> was added>> <<obsoleted|2.18>>",
 							"datatype": "string"
 						},
 						"Topic": {
@@ -131533,13 +133071,8 @@
 						"protocols": [
 							"usp"
 						],
-						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"description": "A non-volatile unique key used to reference this instance. Alias provides a mechanism for a Controller to label this instance for future reference. The following mandatory constraints MUST be enforced: * The value MUST NOT be empty. * The value MUST start with a letter. * If the value is not assigned by the Controller at creation time, the Agent MUST assign a value with an cpe- prefix. | A non-volatile unique key used to reference this instance. Alias provides a mechanism for a Controller to label this instance for future reference. The following mandatory constraints MUST be enforced: * The value MUST NOT be empty. * The value MUST start with a letter. * If the value is not assigned by the Controller at creation time, the Agent MUST assign a value with an cpe- prefix.",
+						"datatype": "_AliasUSP"
 					},
 					"Enable": {
 						"type": "boolean",
@@ -131584,7 +133117,7 @@
 						"protocols": [
 							"usp"
 						],
-						"description": "Enable/Disable this <<object>> instance. When <<true>>, Session Context is used when exchanging USP Records with the remote endpoint represented by this <<object|##.Controller.<i>>> object instance. When <<false>>, Session Context is not used when exchanging USP Records with the remote endpoint represented by this <<object|##.Controller.<i>>> object instance. <<deprecated|2.15|because it is replaced by <<param|SessionMode>>>> <<obsoleted|2.17>>",
+						"description": "Enable/Disable this <<object>> instance. When <<true>>, Session Context is used when exchanging USP Records with the remote endpoint represented by this <<object|##.Controller.<i>>> object instance. When <<false>>, Session Context is not used when exchanging USP Records with the remote endpoint represented by this <<object|##.Controller.<i>>> object instance. <<deprecated|2.15|because it is replaced by <<param|SessionMode>>>> <<obsoleted|2.17>> <<deleted|2.18>>",
 						"default": "false",
 						"datatype": "boolean"
 					},
@@ -131688,7 +133221,7 @@
 						"protocols": [
 							"usp"
 						],
-						"description": "The maximum size, in <<units>>, of the Record (payload(s) and headers) that can be transmitted to the remote endpoint. The smallest size, which can be configured is 512 bytes. A value of 0 means that the segmentation function is effectively disabled. <<deprecated|2.16|because it is replaced by <<param|MaxUSPRecordSize>>>>",
+						"description": "The maximum size, in <<units>>, of the Record (payload(s) and headers) that can be transmitted to the remote endpoint. The smallest size, which can be configured is 512 bytes. A value of 0 means that the segmentation function is effectively disabled. <<deprecated|2.16|because it is replaced by <<param|MaxUSPRecordSize>>>> <<obsoleted|2.18>>",
 						"default": "0",
 						"datatype": "unsignedInt",
 						"range": [
@@ -131784,13 +133317,8 @@
 					"protocols": [
 						"usp"
 					],
-					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"description": "A non-volatile unique key used to reference this instance. Alias provides a mechanism for a Controller to label this instance for future reference. The following mandatory constraints MUST be enforced: * The value MUST NOT be empty. * The value MUST start with a letter. * If the value is not assigned by the Controller at creation time, the Agent MUST assign a value with an cpe- prefix. | A non-volatile unique key used to reference this instance. Alias provides a mechanism for a Controller to label this instance for future reference. The following mandatory constraints MUST be enforced: * The value MUST NOT be empty. * The value MUST start with a letter. * If the value is not assigned by the Controller at creation time, the Agent MUST assign a value with an cpe- prefix.",
+					"datatype": "_AliasUSP"
 				},
 				"Enable": {
 					"type": "boolean",
@@ -132108,13 +133636,8 @@
 						"protocols": [
 							"usp"
 						],
-						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"description": "A non-volatile unique key used to reference this instance. Alias provides a mechanism for a Controller to label this instance for future reference. The following mandatory constraints MUST be enforced: * The value MUST NOT be empty. * The value MUST start with a letter. * If the value is not assigned by the Controller at creation time, the Agent MUST assign a value with an cpe- prefix. | A non-volatile unique key used to reference this instance. Alias provides a mechanism for a Controller to label this instance for future reference. The following mandatory constraints MUST be enforced: * The value MUST NOT be empty. * The value MUST start with a letter. * If the value is not assigned by the Controller at creation time, the Agent MUST assign a value with an cpe- prefix.",
+						"datatype": "_AliasUSP"
 					},
 					"Enable": {
 						"type": "boolean",
@@ -132166,13 +133689,8 @@
 							"protocols": [
 								"usp"
 							],
-							"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-							"datatype": "Alias",
-							"range": [
-								{
-									"max": 64
-								}
-							]
+							"description": "A non-volatile unique key used to reference this instance. Alias provides a mechanism for a Controller to label this instance for future reference. The following mandatory constraints MUST be enforced: * The value MUST NOT be empty. * The value MUST start with a letter. * If the value is not assigned by the Controller at creation time, the Agent MUST assign a value with an cpe- prefix. | A non-volatile unique key used to reference this instance. Alias provides a mechanism for a Controller to label this instance for future reference. The following mandatory constraints MUST be enforced: * The value MUST NOT be empty. * The value MUST start with a letter. * If the value is not assigned by the Controller at creation time, the Agent MUST assign a value with an cpe- prefix.",
+							"datatype": "_AliasUSP"
 						},
 						"Enable": {
 							"type": "boolean",
@@ -132204,6 +133722,7 @@
 								"usp"
 							],
 							"description": "<<list|each entry is a target to which the value of the permissions parameters are assigned>> When an entry is a value of a Partial Path, the permissions are associated to that Object and any child Object/Parameter. When the value of an entry is an Object instance then the permissions are associated to all Parameters of the Object instance. When an entry is a value of a Search Path as defined in <<bibref|TR-369>> that resolves to zero or more Parameter Paths, then all Parameter Paths that result from the evaluation of the Search Path are subject to the permissions assigned by this <<object>> instance.",
+							"default": "[]",
 							"list": {
 								"datatype": "string"
 							}
@@ -132215,7 +133734,7 @@
 							"protocols": [
 								"usp"
 							],
-							"description": "The permissions of a Role for the specified Targets. A string of 4 characters where each character represents a permission (r for Read, w for Write, x for Execute, and n for Notify). The string is always in the same order (rwxn) and the lack of a permission is signified by a - character (e.g., r--n). The following describes the meaning of the permissions for Parameter type of Targets: # Read: Grants the capability to read the value of the Parameter via Get and read the meta-information of the Parameter via GetSupportedDM. # Write: Grants the capability to update the value of the Parameter via Add or Set. # Execute: Grants no capabilities; Parameters can not be executed. # Notify: Grants the capability to receive Notify Messages of type ValueChange for this Parameter.",
+							"description": "The permissions of a Role for the specified Targets. A string of 4 characters where each character represents a permission (`r` for Read, `w` for Write, `x` for Execute, and `n` for Notify). The string is always in the same order (`rwxn`) and the lack of a permission is signified by a `-` character (e.g., `r--n`). The following describes the meaning of the permissions for Parameter type of Targets: # Read: Grants the capability to read the value of the Parameter via Get and read the meta-information of the Parameter via GetSupportedDM. # Write: Grants the capability to update the value of the Parameter via Add or Set. # Execute: Grants no capabilities; Parameters can not be executed. # Notify: Grants the capability to receive Notify Messages of type ValueChange for this Parameter.",
 							"default": "----",
 							"datatype": "string",
 							"range": [
@@ -132232,7 +133751,7 @@
 							"protocols": [
 								"usp"
 							],
-							"description": "The permissions of a Role for the specified Targets. A string of 4 characters where each character represents a permission (r for Read, w for Write, x for Execute, and n for Notify). The string is always in the same order (rwxn) and the lack of a permission is signified by a - character (e.g., r--n). The following describes the meaning of the permissions for Object type of Targets: # Read: Grants the capability to read the meta-information of the Object via GetSupportedDM. # Write: Grants no capabilities for Static Objects. Grants the capability to create a new instance of a Multi-Instanced Object via Add (e.g. Device.LocalAgent.Controller.). # Execute: Grants no capabilities; Objects are not executable and Commands are controlled by the CommandEventPermissions. # Notify: Grants the capability to receive Notify Messages of type ObjectCreation for this Object (multi-instance objects only).",
+							"description": "The permissions of a Role for the specified Targets. A string of 4 characters where each character represents a permission (`r` for Read, `w` for Write, `x` for Execute, and `n` for Notify). The string is always in the same order (`rwxn`) and the lack of a permission is signified by a `-` character (e.g., `r--n`). The following describes the meaning of the permissions for Object type of Targets: # Read: Grants the capability to read the meta-information of the Object via GetSupportedDM. # Write: Grants no capabilities for Static Objects. Grants the capability to create a new instance of a Multi-Instanced Object via Add (e.g. Device.LocalAgent.Controller.). # Execute: Grants no capabilities; Objects are not executable and Commands are controlled by the CommandEventPermissions. # Notify: Grants the capability to receive Notify Messages of type ObjectCreation for this Object (multi-instance objects only).",
 							"default": "----",
 							"datatype": "string",
 							"range": [
@@ -132249,7 +133768,7 @@
 							"protocols": [
 								"usp"
 							],
-							"description": "The permissions of a Role for the specified Targets. A string of 4 characters where each character represents a permission (r for Read, w for Write, x for Execute, and n for Notify). The string is always in the same order (rwxn) and the lack of a permission is signified by a - character (e.g., r--n). The following describes the meaning of the permissions for Instantiated Object type of Targets: # Read: Grants the capability to read the instance numbers and unique keys of the Instantiated Object via GetInstances and read the value of Parameters related to the Instantiated Object via a Get containing a search expression or wildcard in place of the instance identifier. # Write: Grants the capability to remove an existing instance of an Instantiated Object via Delete (e.g. Device.LocalAgent.Controller.1.). # Execute: Grants no capabilities; Object Instances are not executable and Commands are controlled by the CommandEventPermissions. # Notify: Grants the capability to receive Notify Messages of type ObjectDeletion for this Instantiated Object.",
+							"description": "The permissions of a Role for the specified Targets. A string of 4 characters where each character represents a permission (`r` for Read, `w` for Write, `x` for Execute, and `n` for Notify). The string is always in the same order (`rwxn`) and the lack of a permission is signified by a `-` character (e.g., `r--n`). The following describes the meaning of the permissions for Instantiated Object type of Targets: # Read: Grants the capability to read the instance numbers and unique keys of the Instantiated Object via GetInstances and read the value of Parameters related to the Instantiated Object via a Get containing a search expression or wildcard in place of the instance identifier. # Write: Grants the capability to remove an existing instance of an Instantiated Object via Delete (e.g. Device.LocalAgent.Controller.1.). # Execute: Grants no capabilities; Object Instances are not executable and Commands are controlled by the CommandEventPermissions. # Notify: Grants the capability to receive Notify Messages of type ObjectDeletion for this Instantiated Object.",
 							"default": "----",
 							"datatype": "string",
 							"range": [
@@ -132266,7 +133785,7 @@
 							"protocols": [
 								"usp"
 							],
-							"description": "The permissions of a Role for the specified Targets. A string of 4 characters where each character represents a permission (r for Read, w for Write, x for Execute, and n for Notify). The string is always in the same order (rwxn) and the lack of a permission is signified by a - character (e.g., r--n). The following describes the meaning of the permissions for Command and Event type of Targets: # Read: Grants the capability to read the meta-information of the Command (including input and output arguments) and Event (including arguments) via GetSupportedDM. # Write: Grants no capabilities; Commands are executed instead of written to and Events are read only. # Execute: Grants the capability to execute the Command via Operate, but grants no capabilities to an Event. # Notify: Grants the capability to receive Notify Messages of type OperationComplete for this Event or Command.",
+							"description": "The permissions of a Role for the specified Targets. A string of 4 characters where each character represents a permission (`r` for Read, `w` for Write, `x` for Execute, and `n` for Notify). The string is always in the same order (`rwxn`) and the lack of a permission is signified by a `-` character (e.g., `r--n`). The following describes the meaning of the permissions for Command and Event type of Targets: # Read: Grants the capability to read the meta-information of the Command (including input and output arguments) and Event (including arguments) via GetSupportedDM. # Write: Grants no capabilities; Commands are executed instead of written to and Events are read only. # Execute: Grants the capability to execute the Command via Operate, but grants no capabilities to an Event. # Notify: Grants the capability to receive Notify Messages of type OperationComplete for this Event or Command.",
 							"default": "----",
 							"datatype": "string",
 							"range": [
@@ -132283,7 +133802,7 @@
 					"protocols": [
 						"usp"
 					],
-					"description": "Each instance of this table represents a trusted credential. The credential can be that of a certificate authority (CA) for a Controller whose EndpointID is unknown. When a credential is supplied to the Agent by a Controller during authentication, the credentials in this table are used to determine if any of the supplied certificates (including those in the chain of trust) are considered trusted. If the Controller authenticated via an entry in this table is not previously known to the Agent, the associated Role entry is automatically applied to the Controller.",
+					"description": "Each instance of this table represents a trusted credential. The credential can be that of a certificate authority (CA) for a Controller whose EndpointID is unknown. When a credential is supplied to the Agent by a Controller during authentication, the credentials in this table are used to determine if any of the supplied certificates (including those in the chain of trust) are considered trusted. If the Controller authenticated via an entry in this table is not previously known to the Agent, the Roles specified in the <<param|Role>> parameter might be automatically applied, depending on the value of the <<param|AllowedUses>> parameter.",
 					"uniqueKeys": [
 						"Credential",
 						"Alias"
@@ -132297,13 +133816,8 @@
 						"protocols": [
 							"usp"
 						],
-						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"description": "A non-volatile unique key used to reference this instance. Alias provides a mechanism for a Controller to label this instance for future reference. The following mandatory constraints MUST be enforced: * The value MUST NOT be empty. * The value MUST start with a letter. * If the value is not assigned by the Controller at creation time, the Agent MUST assign a value with an cpe- prefix. | A non-volatile unique key used to reference this instance. Alias provides a mechanism for a Controller to label this instance for future reference. The following mandatory constraints MUST be enforced: * The value MUST NOT be empty. * The value MUST start with a letter. * If the value is not assigned by the Controller at creation time, the Agent MUST assign a value with an cpe- prefix.",
+						"datatype": "_AliasUSP"
 					},
 					"Enable": {
 						"type": "boolean",
@@ -132372,13 +133886,8 @@
 						"protocols": [
 							"usp"
 						],
-						"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-						"datatype": "Alias",
-						"range": [
-							{
-								"max": 64
-							}
-						]
+						"description": "A non-volatile unique key used to reference this instance. Alias provides a mechanism for a Controller to label this instance for future reference. The following mandatory constraints MUST be enforced: * The value MUST NOT be empty. * The value MUST start with a letter. * If the value is not assigned by the Controller at creation time, the Agent MUST assign a value with an cpe- prefix. | A non-volatile unique key used to reference this instance. Alias provides a mechanism for a Controller to label this instance for future reference. The following mandatory constraints MUST be enforced: * The value MUST NOT be empty. * The value MUST start with a letter. * If the value is not assigned by the Controller at creation time, the Agent MUST assign a value with an cpe- prefix.",
+						"datatype": "_AliasUSP"
 					},
 					"Description": {
 						"type": "string",
@@ -132524,13 +134033,8 @@
 					"protocols": [
 						"usp"
 					],
-					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"description": "A non-volatile unique key used to reference this instance. Alias provides a mechanism for a Controller to label this instance for future reference. The following mandatory constraints MUST be enforced: * The value MUST NOT be empty. * The value MUST start with a letter. * If the value is not assigned by the Controller at creation time, the Agent MUST assign a value with an cpe- prefix. | A non-volatile unique key used to reference this instance. Alias provides a mechanism for a Controller to label this instance for future reference. The following mandatory constraints MUST be enforced: * The value MUST NOT be empty. * The value MUST start with a letter. * If the value is not assigned by the Controller at creation time, the Agent MUST assign a value with an cpe- prefix.",
+					"datatype": "_AliasUSP"
 				},
 				"Enable": {
 					"type": "boolean",
@@ -132572,7 +134076,7 @@
 				"TriggerConfigSettings": {
 					"type": "string",
 					"read": true,
-					"write": false,
+					"write": true,
 					"protocols": [
 						"usp"
 					],
@@ -132712,13 +134216,8 @@
 					"protocols": [
 						"usp"
 					],
-					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"description": "A non-volatile unique key used to reference this instance. Alias provides a mechanism for a Controller to label this instance for future reference. The following mandatory constraints MUST be enforced: * The value MUST NOT be empty. * The value MUST start with a letter. * If the value is not assigned by the Controller at creation time, the Agent MUST assign a value with an cpe- prefix. | A non-volatile unique key used to reference this instance. Alias provides a mechanism for a Controller to label this instance for future reference. The following mandatory constraints MUST be enforced: * The value MUST NOT be empty. * The value MUST start with a letter. * If the value is not assigned by the Controller at creation time, the Agent MUST assign a value with an cpe- prefix.",
+					"datatype": "_AliasUSP"
 				},
 				"Originator": {
 					"type": "string",
@@ -132824,13 +134323,8 @@
 				"protocols": [
 					"usp"
 				],
-				"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-				"datatype": "Alias",
-				"range": [
-					{
-						"max": 64
-					}
-				]
+				"description": "A non-volatile unique key used to reference this instance. Alias provides a mechanism for a Controller to label this instance for future reference. The following mandatory constraints MUST be enforced: * The value MUST NOT be empty. * The value MUST start with a letter. * If the value is not assigned by the Controller at creation time, the Agent MUST assign a value with an cpe- prefix. | A non-volatile unique key used to reference this instance. Alias provides a mechanism for a Controller to label this instance for future reference. The following mandatory constraints MUST be enforced: * The value MUST NOT be empty. * The value MUST start with a letter. * If the value is not assigned by the Controller at creation time, the Agent MUST assign a value with an cpe- prefix.",
+				"datatype": "_AliasUSP"
 			},
 			"IsNativeDevice": {
 				"type": "boolean",
@@ -132995,13 +134489,8 @@
 				"protocols": [
 					"usp"
 				],
-				"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-				"datatype": "Alias",
-				"range": [
-					{
-						"max": 64
-					}
-				]
+				"description": "A non-volatile unique key used to reference this instance. Alias provides a mechanism for a Controller to label this instance for future reference. The following mandatory constraints MUST be enforced: * The value MUST NOT be empty. * The value MUST start with a letter. * If the value is not assigned by the Controller at creation time, the Agent MUST assign a value with an cpe- prefix. | A non-volatile unique key used to reference this instance. Alias provides a mechanism for a Controller to label this instance for future reference. The following mandatory constraints MUST be enforced: * The value MUST NOT be empty. * The value MUST start with a letter. * If the value is not assigned by the Controller at creation time, the Agent MUST assign a value with an cpe- prefix.",
+				"datatype": "_AliasUSP"
 			},
 			"Type": {
 				"type": "string",
@@ -133136,13 +134625,8 @@
 					"protocols": [
 						"usp"
 					],
-					"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-					"datatype": "Alias",
-					"range": [
-						{
-							"max": 64
-						}
-					]
+					"description": "A non-volatile unique key used to reference this instance. Alias provides a mechanism for a Controller to label this instance for future reference. The following mandatory constraints MUST be enforced: * The value MUST NOT be empty. * The value MUST start with a letter. * If the value is not assigned by the Controller at creation time, the Agent MUST assign a value with an cpe- prefix. | A non-volatile unique key used to reference this instance. Alias provides a mechanism for a Controller to label this instance for future reference. The following mandatory constraints MUST be enforced: * The value MUST NOT be empty. * The value MUST start with a letter. * If the value is not assigned by the Controller at creation time, the Agent MUST assign a value with an cpe- prefix.",
+					"datatype": "_AliasUSP"
 				},
 				"Type": {
 					"type": "string",
@@ -133230,13 +134714,8 @@
 				"protocols": [
 					"usp"
 				],
-				"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-				"datatype": "Alias",
-				"range": [
-					{
-						"max": 64
-					}
-				]
+				"description": "A non-volatile unique key used to reference this instance. Alias provides a mechanism for a Controller to label this instance for future reference. The following mandatory constraints MUST be enforced: * The value MUST NOT be empty. * The value MUST start with a letter. * If the value is not assigned by the Controller at creation time, the Agent MUST assign a value with an cpe- prefix. | A non-volatile unique key used to reference this instance. Alias provides a mechanism for a Controller to label this instance for future reference. The following mandatory constraints MUST be enforced: * The value MUST NOT be empty. * The value MUST start with a letter. * If the value is not assigned by the Controller at creation time, the Agent MUST assign a value with an cpe- prefix.",
+				"datatype": "_AliasUSP"
 			},
 			"Name": {
 				"type": "string",
@@ -133342,7 +134821,7 @@
 					"protocols": [
 						"usp"
 					],
-					"description": "Describes the type of IoT Level Controller or Sensor that the <<object>> instance is representing. Enumeration of: Acceleration, Area, Battery, Brightness, Concentration, Conductivity, Distance, Energy, Flow, Humidity, Intensity, Luminance, Meter, Motion, Position, Power, Pressure, Radiation, Speed, Temperature, Volume, Weight. | Describes the type of IoT Level Controller or Sensor that the <<object>> instance is representing. Enumeration of: Acceleration, Area, Battery, Brightness, Concentration, Conductivity, Distance, Energy, Flow, Humidity, Intensity, Luminance, Meter, Motion, Position, Power, Pressure, Radiation, Speed, Temperature, Volume, Weight.",
+					"description": "Describes the type of IoT Level Controller or Sensor that the <<object>> instance is representing. Enumeration of: Acceleration, Area, Battery, Brightness, Concentration, Conductivity, Distance, Energy, Flow, Humidity, Intensity, Luminance, Meter, Motion, Position, Power, Pressure, Radiation, Speed, Temperature, Volume, Weight, Depth, Counter. | Describes the type of IoT Level Controller or Sensor that the <<object>> instance is representing. Enumeration of: Acceleration, Area, Battery, Brightness, Concentration, Conductivity, Distance, Energy, Flow, Humidity, Intensity, Luminance, Meter, Motion, Position, Power, Pressure, Radiation, Speed, Temperature, Volume, Weight, Depth, Counter.",
 					"datatype": "IoTLevelType",
 					"enumerations": [
 						"Acceleration",
@@ -133366,7 +134845,9 @@
 						"Speed",
 						"Temperature",
 						"Volume",
-						"Weight"
+						"Weight",
+						"Depth",
+						"Counter"
 					]
 				},
 				"Description": {
@@ -133401,7 +134882,7 @@
 					"protocols": [
 						"usp"
 					],
-					"description": "Units in which <<param|Value>>, <<param|Value>>, <<param|MinValue>>, <<param|MaxValue>> and <<param|StepValue>> are expressed. Possible Unit types used for decimal values. Enumeration of: -, %, deg, degC, degF, K, km, m, cm, mm, h, min, s, ms, sq-km, sq-m, sq-cm, cu-m, l, cl, ml, kg, g, mg, Wh, kWh, W, A, Hz, V, N, Pa, C, F, ohm, S, Wb, T, H, lm, lx, mps, cd, mol, UV, RGB, ppm, Sv, J. | Possible Unit types used for decimal values. Enumeration of: -, %, deg, degC, degF, K, km, m, cm, mm, h, min, s, ms, sq-km, sq-m, sq-cm, cu-m, l, cl, ml, kg, g, mg, Wh, kWh, W, A, Hz, V, N, Pa, C, F, ohm, S, Wb, T, H, lm, lx, mps, cd, mol, UV, RGB, ppm, Sv, J. .",
+					"description": "Units in which <<param|Value>>, <<param|Value>>, <<param|MinValue>>, <<param|MaxValue>> and <<param|StepValue>> are expressed. Possible Unit types used for decimal values. Enumeration of: -, %, deg, degC, degF, K, km, m, cm, mm, h, min, s, ms, sq-km, sq-m, sq-cm, cu-m, l, cl, ml, kg, g, mg, Wh, kWh, W, A, Hz, V, N, Pa, C, F, ohm, S, Wb, T, H, lm, lx, mps, cd, mol, UV, RGB, ppm, Sv, J, rpm, pps, cu-m/s, liter/s. | Possible Unit types used for decimal values. Enumeration of: -, %, deg, degC, degF, K, km, m, cm, mm, h, min, s, ms, sq-km, sq-m, sq-cm, cu-m, l, cl, ml, kg, g, mg, Wh, kWh, W, A, Hz, V, N, Pa, C, F, ohm, S, Wb, T, H, lm, lx, mps, cd, mol, UV, RGB, ppm, Sv, J, rpm, pps, cu-m/s, liter/s. .",
 					"datatype": "IoTUnitType",
 					"enumerations": [
 						"-",
@@ -133452,7 +134933,11 @@
 						"RGB",
 						"ppm",
 						"Sv",
-						"J"
+						"J",
+						"rpm",
+						"pps",
+						"cu-m/s",
+						"liter/s"
 					]
 				},
 				"MinValue": {
@@ -133646,6 +135131,16 @@
 					"description": "The date and time in UTC when <<param|Value>> has been changed to the current value.",
 					"datatype": "dateTime"
 				},
+				"LastContactTime": {
+					"type": "dateTime",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"usp"
+					],
+					"description": "The date and time in UTC when the <<object>> has received data.",
+					"datatype": "dateTime"
+				},
 				"Sensitivity": {
 					"type": "unsignedInt",
 					"read": true,
@@ -133699,7 +135194,7 @@
 					"protocols": [
 						"usp"
 					],
-					"description": "Describes the type of IoT Level Controller or Sensor that the <<object>> instance is representing. Enumeration of: Acceleration, Area, Battery, Brightness, Concentration, Conductivity, Distance, Energy, Flow, Humidity, Intensity, Luminance, Meter, Motion, Position, Power, Pressure, Radiation, Speed, Temperature, Volume, Weight. | Describes the type of IoT Level Controller or Sensor that the <<object>> instance is representing. Enumeration of: Acceleration, Area, Battery, Brightness, Concentration, Conductivity, Distance, Energy, Flow, Humidity, Intensity, Luminance, Meter, Motion, Position, Power, Pressure, Radiation, Speed, Temperature, Volume, Weight.",
+					"description": "Describes the type of IoT Level Controller or Sensor that the <<object>> instance is representing. Enumeration of: Acceleration, Area, Battery, Brightness, Concentration, Conductivity, Distance, Energy, Flow, Humidity, Intensity, Luminance, Meter, Motion, Position, Power, Pressure, Radiation, Speed, Temperature, Volume, Weight, Depth, Counter. | Describes the type of IoT Level Controller or Sensor that the <<object>> instance is representing. Enumeration of: Acceleration, Area, Battery, Brightness, Concentration, Conductivity, Distance, Energy, Flow, Humidity, Intensity, Luminance, Meter, Motion, Position, Power, Pressure, Radiation, Speed, Temperature, Volume, Weight, Depth, Counter.",
 					"datatype": "IoTLevelType",
 					"enumerations": [
 						"Acceleration",
@@ -133723,7 +135218,9 @@
 						"Speed",
 						"Temperature",
 						"Volume",
-						"Weight"
+						"Weight",
+						"Depth",
+						"Counter"
 					]
 				},
 				"Description": {
@@ -133761,6 +135258,16 @@
 					"description": "The date and time in UTC when <<param|Value>> has been changed to the current value.",
 					"datatype": "dateTime"
 				},
+				"LastContactTime": {
+					"type": "dateTime",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"usp"
+					],
+					"description": "The date and time in UTC when the <<object>> has received data.",
+					"datatype": "dateTime"
+				},
 				"Unit": {
 					"type": "string",
 					"read": true,
@@ -133768,7 +135275,7 @@
 					"protocols": [
 						"usp"
 					],
-					"description": "Possible Unit types used for decimal values. Enumeration of: -, %, deg, degC, degF, K, km, m, cm, mm, h, min, s, ms, sq-km, sq-m, sq-cm, cu-m, l, cl, ml, kg, g, mg, Wh, kWh, W, A, Hz, V, N, Pa, C, F, ohm, S, Wb, T, H, lm, lx, mps, cd, mol, UV, RGB, ppm, Sv, J. | Possible Unit types used for decimal values. Enumeration of: -, %, deg, degC, degF, K, km, m, cm, mm, h, min, s, ms, sq-km, sq-m, sq-cm, cu-m, l, cl, ml, kg, g, mg, Wh, kWh, W, A, Hz, V, N, Pa, C, F, ohm, S, Wb, T, H, lm, lx, mps, cd, mol, UV, RGB, ppm, Sv, J. Unit in which <<param|Value>> is expressed.",
+					"description": "Possible Unit types used for decimal values. Enumeration of: -, %, deg, degC, degF, K, km, m, cm, mm, h, min, s, ms, sq-km, sq-m, sq-cm, cu-m, l, cl, ml, kg, g, mg, Wh, kWh, W, A, Hz, V, N, Pa, C, F, ohm, S, Wb, T, H, lm, lx, mps, cd, mol, UV, RGB, ppm, Sv, J, rpm, pps, cu-m/s, liter/s. | Possible Unit types used for decimal values. Enumeration of: -, %, deg, degC, degF, K, km, m, cm, mm, h, min, s, ms, sq-km, sq-m, sq-cm, cu-m, l, cl, ml, kg, g, mg, Wh, kWh, W, A, Hz, V, N, Pa, C, F, ohm, S, Wb, T, H, lm, lx, mps, cd, mol, UV, RGB, ppm, Sv, J, rpm, pps, cu-m/s, liter/s. Unit in which <<param|Value>> is expressed.",
 					"datatype": "IoTUnitType",
 					"enumerations": [
 						"-",
@@ -133819,7 +135326,11 @@
 						"RGB",
 						"ppm",
 						"Sv",
-						"J"
+						"J",
+						"rpm",
+						"pps",
+						"cu-m/s",
+						"liter/s"
 					]
 				},
 				"LowLevel": {
@@ -133940,6 +135451,16 @@
 					"description": "The date and time when <<param|Values>> has been changed to the current values.",
 					"datatype": "dateTime"
 				},
+				"LastContactTime": {
+					"type": "dateTime",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"usp"
+					],
+					"description": "The date and time in UTC when the <<object>> has received data.",
+					"datatype": "dateTime"
+				},
 				"Unit": {
 					"type": "string",
 					"read": true,
@@ -133947,7 +135468,7 @@
 					"protocols": [
 						"usp"
 					],
-					"description": "Possible Unit types used for decimal values. Enumeration of: -, %, deg, degC, degF, K, km, m, cm, mm, h, min, s, ms, sq-km, sq-m, sq-cm, cu-m, l, cl, ml, kg, g, mg, Wh, kWh, W, A, Hz, V, N, Pa, C, F, ohm, S, Wb, T, H, lm, lx, mps, cd, mol, UV, RGB, ppm, Sv, J. | Possible Unit types used for decimal values. Enumeration of: -, %, deg, degC, degF, K, km, m, cm, mm, h, min, s, ms, sq-km, sq-m, sq-cm, cu-m, l, cl, ml, kg, g, mg, Wh, kWh, W, A, Hz, V, N, Pa, C, F, ohm, S, Wb, T, H, lm, lx, mps, cd, mol, UV, RGB, ppm, Sv, J. Unit in which <<param|Values>> are expressed.",
+					"description": "Possible Unit types used for decimal values. Enumeration of: -, %, deg, degC, degF, K, km, m, cm, mm, h, min, s, ms, sq-km, sq-m, sq-cm, cu-m, l, cl, ml, kg, g, mg, Wh, kWh, W, A, Hz, V, N, Pa, C, F, ohm, S, Wb, T, H, lm, lx, mps, cd, mol, UV, RGB, ppm, Sv, J, rpm, pps, cu-m/s, liter/s. | Possible Unit types used for decimal values. Enumeration of: -, %, deg, degC, degF, K, km, m, cm, mm, h, min, s, ms, sq-km, sq-m, sq-cm, cu-m, l, cl, ml, kg, g, mg, Wh, kWh, W, A, Hz, V, N, Pa, C, F, ohm, S, Wb, T, H, lm, lx, mps, cd, mol, UV, RGB, ppm, Sv, J, rpm, pps, cu-m/s, liter/s. Unit in which <<param|Values>> are expressed.",
 					"datatype": "IoTUnitType",
 					"enumerations": [
 						"-",
@@ -133998,7 +135519,11 @@
 						"RGB",
 						"ppm",
 						"Sv",
-						"J"
+						"J",
+						"rpm",
+						"pps",
+						"cu-m/s",
+						"liter/s"
 					]
 				}
 			},
@@ -134064,6 +135589,16 @@
 					"description": "The date and time when <<param|Value>> has been changed to the current value.",
 					"datatype": "dateTime"
 				},
+				"LastContactTime": {
+					"type": "dateTime",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"usp"
+					],
+					"description": "The date and time in UTC when the <<object>> has received data.",
+					"datatype": "dateTime"
+				},
 				"ValidValues": {
 					"type": "string",
 					"read": true,
@@ -134101,13 +135636,8 @@
 				"protocols": [
 					"usp"
 				],
-				"description": "A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value. | A non-volatile handle used to reference this instance. Alias provides a mechanism for an ACS to label this instance for future reference. If the CPE supports the Alias-based Addressing feature as defined in <<bibref|TR-069|3.6.1>> and described in <<bibref|TR-069|Appendix II>>, the following mandatory constraints MUST be enforced: * Its value MUST NOT be empty. * Its value MUST start with a letter. * If its value is not assigned by the ACS, it MUST start with a cpe- prefix. * The CPE MUST NOT change the parameter value.",
-				"datatype": "Alias",
-				"range": [
-					{
-						"max": 64
-					}
-				]
+				"description": "A non-volatile unique key used to reference this instance. Alias provides a mechanism for a Controller to label this instance for future reference. The following mandatory constraints MUST be enforced: * The value MUST NOT be empty. * The value MUST start with a letter. * If the value is not assigned by the Controller at creation time, the Agent MUST assign a value with an cpe- prefix. | A non-volatile unique key used to reference this instance. Alias provides a mechanism for a Controller to label this instance for future reference. The following mandatory constraints MUST be enforced: * The value MUST NOT be empty. * The value MUST start with a letter. * If the value is not assigned by the Controller at creation time, the Agent MUST assign a value with an cpe- prefix.",
+				"datatype": "_AliasUSP"
 			},
 			"Type": {
 				"type": "string",
diff --git a/test/tools/00-tr-181-2-17-0-cwmp-full.xml b/test/tools/00-tr-181-2-18-0-cwmp-full.xml
similarity index 94%
rename from test/tools/00-tr-181-2-17-0-cwmp-full.xml
rename to test/tools/00-tr-181-2-18-0-cwmp-full.xml
index ba1d5a35..4be800bf 100644
--- a/test/tools/00-tr-181-2-17-0-cwmp-full.xml
+++ b/test/tools/00-tr-181-2-18-0-cwmp-full.xml
@@ -2,7 +2,7 @@
 <!--
   Device:2 Root Data Model definition [CWMP]
 
-  Copyright (c) 2010-2023, Broadband Forum
+  Copyright (c) 2010-2024, Broadband Forum
 
   The undersigned members have elected to grant the copyright to
   their contributed material used in this software:
@@ -51,16 +51,16 @@
 -->
 
 <dm:document
-    xmlns:dm="urn:broadband-forum-org:cwmp:datamodel-1-10"
+    xmlns:dm="urn:broadband-forum-org:cwmp:datamodel-1-14"
     xmlns:dmr="urn:broadband-forum-org:cwmp:datamodel-report-1-0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="
-      urn:broadband-forum-org:cwmp:datamodel-1-10
-        https://www.broadband-forum.org/cwmp/cwmp-datamodel-1-10.xsd
+      urn:broadband-forum-org:cwmp:datamodel-1-14
+        https://www.broadband-forum.org/cwmp/cwmp-datamodel-1-14.xsd
       urn:broadband-forum-org:cwmp:datamodel-report-1-0
         https://www.broadband-forum.org/cwmp/cwmp-datamodel-report-1-0.xsd"
-    spec="urn:broadband-forum-org:tr-181-2-17-0-cwmp"
-    file="tr-181-2-17-0-cwmp.xml">
+    spec="urn:broadband-forum-org:tr-181-2-18-0-cwmp"
+    file="tr-181-2-18-0-cwmp.xml">
 
   <dataType name="_AliasCommon">
     <description>
@@ -74,6 +74,26 @@
     </string>
   </dataType>
 
+  <dataType name="_AliasCWMP" base="_AliasCommon">
+    <description action="replace">
+      A non-volatile handle used to reference this instance. Alias provides a
+      mechanism for an ACS to label this instance for future reference.
+
+      If the CPE supports the Alias-based Addressing feature as defined in
+      {{bibref|TR-069|3.6.1}} and described in {{bibref|TR-069|Appendix II}},
+      the following mandatory constraints MUST be enforced:
+
+      * Its value MUST NOT be empty.
+
+      * Its value MUST start with a letter.
+
+      * If its value is not assigned by the ACS, it MUST start with a "cpe-"
+        prefix.
+
+      * The CPE MUST NOT change the parameter value.
+    </description>
+  </dataType>
+
   <dataType name="Alias" base="_AliasCommon">
     <description action="replace">
       A non-volatile handle used to reference this instance. Alias provides a
@@ -103,6 +123,71 @@
     <int/>
   </dataType>
 
+  <dataType name="DiagnosticsState">
+    <description>
+      Indicates the availability of diagnostics data. Enumeration of:
+
+      {{enum}}
+
+      If the ACS sets the value of this parameter to {{enum|Requested}}, the
+      CPE MUST initiate the corresponding diagnostic test. When writing, the
+      only allowed values are {{enum|Requested}} and {{enum|Canceled}}. To
+      ensure the use of the proper test parameters (the writable parameters in
+      this object), the test parameters MUST be set, and any errors or
+      inconsistencies in the test parameters MUST be detected, either prior to
+      or at the same time as (in the same SetParameterValues) setting this
+      parameter to {{enum|Requested}}.
+
+      When requested, the CPE SHOULD wait until after completion of the
+      communication session with the ACS before starting the diagnostic test.
+
+      When the test is completed, the value of this parameter MUST be either
+      {{enum|Complete}} (if the test completed successfully), or one of the
+      ''Error'' values listed above.
+
+      If the value of this parameter is anything other than {{enum|Complete}},
+      the values of the results parameters for this test are indeterminate.
+
+      When the diagnostic initiated by the ACS is completed (successfully or
+      not), but not if it is canceled for any reason, the CPE MUST establish a
+      new connection to the ACS to allow the ACS to view the results,
+      indicating the Event code ''8 DIAGNOSTICS COMPLETE'' in the Inform
+      message.
+
+      After the diagnostic is complete, the value of all result parameters (all
+      read-only parameters in this object) MUST be retained by the CPE until
+      either this diagnostic is run again, or the CPE reboots. After a reboot,
+      if the CPE has not retained the result parameters from the most recent
+      test, it MUST set the value of this parameter to {{enum|None}}.
+
+      Modifying any of the writable parameters in this object except for this
+      one MUST result in the value of this parameter being set to
+      {{enum|None}}.
+
+      While the test is in progress, modifying any of the writable parameters
+      in this object except for this one MUST result in the test being
+      terminated and the value of this parameter being set to {{enum|None}}.
+
+      While the test is in progress, setting this parameter to
+      {{enum|Requested}} (and possibly modifying other writable parameters in
+      this object) MUST result in the test being terminated and then restarted
+      using the current values of the test parameters.
+
+      While the test is in progress, setting this parameter to
+      {{enum|Canceled}} MUST result in the test being canceled and the value of
+      this parameter being set to {{enum|None}}. If the CPE does not support
+      the {{enum|Canceled}} value, it MUST return a SPV error with "Invalid
+      Parameter value" (9007) to the ACS instead.
+    </description>
+    <string>
+      <enumeration value="None" access="readOnly"/>
+      <enumeration value="Requested"/>
+      <enumeration value="Canceled" optional="true"/>
+      <enumeration value="Complete" access="readOnly"/>
+      <enumeration value="Error" access="readOnly" optional="true"/>
+    </string>
+  </dataType>
+
   <dataType name="IEEE_EUI64">
     <description>
       The IEEE EUI 64-bit identifier as defined in {{bibref|IEEE_EUI64}}. The
@@ -266,93 +351,6 @@
     </unsignedInt>
   </dataType>
 
-  <dataType name="URI">
-    <description>
-      Uniform Resource Identifier. See {{bibref|RFC3986}}.
-    </description>
-    <string>
-      <size maxLength="2048"/>
-    </string>
-  </dataType>
-
-  <dataType name="ZigBeeNetworkAddress">
-    <description>
-      The ZigBee 16-bit network address (NWK) as defined in
-      {{bibref|ZigBee2007}}. The address is assigned to a device by the network
-      layer and used by the network layer for routing messages between devices.
-    </description>
-    <string>
-      <size maxLength="4"/>
-      <pattern value=""/>
-      <pattern value="([0-9A-Fa-f]){4}"/>
-    </string>
-  </dataType>
-
-  <dataType name="DiagnosticsState">
-    <description>
-      Indicates the availability of diagnostics data. Enumeration of:
-
-      {{enum}}
-
-      If the ACS sets the value of this parameter to {{enum|Requested}}, the
-      CPE MUST initiate the corresponding diagnostic test. When writing, the
-      only allowed values are {{enum|Requested}} and {{enum|Canceled}}. To
-      ensure the use of the proper test parameters (the writable parameters in
-      this object), the test parameters MUST be set, and any errors or
-      inconsistencies in the test parameters MUST be detected, either prior to
-      or at the same time as (in the same SetParameterValues) setting this
-      parameter to {{enum|Requested}}.
-
-      When requested, the CPE SHOULD wait until after completion of the
-      communication session with the ACS before starting the diagnostic test.
-
-      When the test is completed, the value of this parameter MUST be either
-      {{enum|Complete}} (if the test completed successfully), or one of the
-      ''Error'' values listed above.
-
-      If the value of this parameter is anything other than {{enum|Complete}},
-      the values of the results parameters for this test are indeterminate.
-
-      When the diagnostic initiated by the ACS is completed (successfully or
-      not), but not if it is canceled for any reason, the CPE MUST establish a
-      new connection to the ACS to allow the ACS to view the results,
-      indicating the Event code ''8 DIAGNOSTICS COMPLETE'' in the Inform
-      message.
-
-      After the diagnostic is complete, the value of all result parameters (all
-      read-only parameters in this object) MUST be retained by the CPE until
-      either this diagnostic is run again, or the CPE reboots. After a reboot,
-      if the CPE has not retained the result parameters from the most recent
-      test, it MUST set the value of this parameter to {{enum|None}}.
-
-      Modifying any of the writable parameters in this object except for this
-      one MUST result in the value of this parameter being set to
-      {{enum|None}}.
-
-      While the test is in progress, modifying any of the writable parameters
-      in this object except for this one MUST result in the test being
-      terminated and the value of this parameter being set to {{enum|None}}.
-
-      While the test is in progress, setting this parameter to
-      {{enum|Requested}} (and possibly modifying other writable parameters in
-      this object) MUST result in the test being terminated and then restarted
-      using the current values of the test parameters.
-
-      While the test is in progress, setting this parameter to
-      {{enum|Canceled}} MUST result in the test being canceled and the value of
-      this parameter being set to {{enum|None}}. If the CPE does not support
-      the {{enum|Canceled}} value, it MUST return a SPV error with "Invalid
-      Parameter value" (9007) to the ACS instead.
-    </description>
-    <string>
-      <enumeration value="None" access="readOnly"/>
-      <enumeration value="Requested"/>
-      <enumeration value="Canceled" optional="true"/>
-      <enumeration value="Complete" access="readOnly"/>
-      <enumeration value="Error" access="readOnly" optional="true"/>
-    </string>
-  </dataType>
-
   <dataType name="StatsCounter32">
     <description>
       A 32-bit statistics parameter, e.g. a byte counter.
@@ -395,6 +393,26 @@
     <unsignedLong/>
   </dataType>
 
+  <dataType name="UUID">
+    <description>
+      Universally Unique Identifier. See {{bibref|RFC4122}}.
+    </description>
+    <string>
+      <size minLength="36" maxLength="36"/>
+      <pattern
+          value="[A-Fa-f0-9]{8}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{12}"/>
+    </string>
+  </dataType>
+
+  <dataType name="URI">
+    <description>
+      Uniform Resource Identifier. See {{bibref|RFC3986}}.
+    </description>
+    <string>
+      <size maxLength="2048"/>
+    </string>
+  </dataType>
+
   <dataType name="URL" base="URI">
     <description>
       Uniform Resource Locator. See {{bibref|RFC3986}} (URI),
@@ -404,14 +422,16 @@
     </description>
   </dataType>
 
-  <dataType name="UUID">
+  <dataType name="ZigBeeNetworkAddress">
     <description>
-      Universally Unique Identifier. See {{bibref|RFC4122}}.
+      The ZigBee 16-bit network address (NWK) as defined in
+      {{bibref|ZigBee2007}}. The address is assigned to a device by the network
+      layer and used by the network layer for routing messages between devices.
     </description>
     <string>
-      <size minLength="36" maxLength="36"/>
-      <pattern
-          value="[A-Fa-f0-9]{8}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{12}"/>
+      <size maxLength="4"/>
+      <pattern value=""/>
+      <pattern value="([0-9A-Fa-f]){4}"/>
     </string>
   </dataType>
 
@@ -887,10 +907,10 @@
       Represents a measure of power in mW expressed in decibels, and calculated
       as follows:
 
-       power = 10*log10( Vrms^2 / R * 1000 )
+          power = 10*log10( Vrms^2 / R * 1000 )
 
-       where Vrms is the root-mean-square Voltage of the received waveform and
-       R is 75 ohms.
+      where Vrms is the root-mean-square Voltage of the received waveform and R
+      is 75 ohms.
     </description>
     <int/>
   </dataType>
@@ -1134,6 +1154,13 @@
       <organization>3GPP RAN WG4</organization>
       <hyperlink>https://www.3gpp.org/ftp/Specs/html-info/25171.htm</hyperlink>
     </reference>
+    <reference id="3GPP-TS.27.007">
+      <name>3GPP TS 24.007</name>
+      <title>AT command set for User Equipment (UE)</title>
+      <organization>3GPP CT WG1</organization>
+      <category>Technical specification</category>
+      <hyperlink>https://www.3gpp.org/ftp/Specs/html-info/24007.htm</hyperlink>
+    </reference>
     <reference id="CM-SP-RFIv2.0">
       <name>CM-SP-RFIv2.0</name>
       <title>
@@ -2118,14 +2145,6 @@
       <date>2002</date>
       <hyperlink>https://www.rfc-editor.org/rfc/rfc3232</hyperlink>
     </reference>
-    <reference id="RFC3315">
-      <name>RFC 3315</name>
-      <title>Dynamic Host Configuration Protocol for IPv6 (DHCPv6)</title>
-      <organization>IETF</organization>
-      <category>RFC</category>
-      <date>2003</date>
-      <hyperlink>https://www.rfc-editor.org/rfc/rfc3315</hyperlink>
-    </reference>
     <reference id="RFC3339">
       <name>RFC 3339</name>
       <title>Date and Time on the Internet: Timestamps</title>
@@ -2152,17 +2171,6 @@
       <date>2003</date>
       <hyperlink>https://www.rfc-editor.org/rfc/rfc3596</hyperlink>
     </reference>
-    <reference id="RFC3633">
-      <name>RFC 3633</name>
-      <title>
-        IPv6 Prefix Options for Dynamic Host Configuration Protocol (DHCP)
-        version 6
-      </title>
-      <organization>IETF</organization>
-      <category>RFC</category>
-      <date>2003</date>
-      <hyperlink>https://www.rfc-editor.org/rfc/rfc3633</hyperlink>
-    </reference>
     <reference id="RFC3646">
       <name>RFC 3646</name>
       <title>
@@ -2799,6 +2807,14 @@
       <date>March 2018</date>
       <hyperlink>https://www.rfc-editor.org/rfc/rfc8349</hyperlink>
     </reference>
+    <reference id="RFC8415">
+      <name>RFC 8415</name>
+      <title>Dynamic Host Configuration Protocol for IPv6 (DHCPv6)</title>
+      <organization>IETF</organization>
+      <category>RFC</category>
+      <date>November 2018</date>
+      <hyperlink>https://www.rfc-editor.org/rfc/rfc8415</hyperlink>
+    </reference>
     <reference id="RFC8822">
       <name>RFC 8822</name>
       <title>
@@ -3115,25 +3131,25 @@
       <name>IPDR File Transfer Protocol</name>
       <title>IPDR/File Transfer Protocol</title>
       <organization>TM Forum</organization>
-      <hyperlink>https://www.ipdr.org/public/</hyperlink>
+      <hyperlink>https://www.tmforum.org/ipdr/</hyperlink>
     </reference>
     <reference id="IPDR-SP">
       <name>IPDR Streaming Protocol</name>
       <title>IPDR Streaming Protocol (IPDR/SP) Specification</title>
       <organization>TM Forum</organization>
-      <hyperlink>https://www.ipdr.org/public/</hyperlink>
+      <hyperlink>https://www.tmforum.org/ipdr/</hyperlink>
     </reference>
     <reference id="IPDR-XDR">
       <name>IPDR XDR Encoding Format</name>
       <title>IPDR/XDR Encoding Format</title>
       <organization>TM Forum</organization>
-      <hyperlink>https://www.ipdr.org/public/</hyperlink>
+      <hyperlink>https://www.tmforum.org/ipdr/</hyperlink>
     </reference>
     <reference id="IPDR-XML">
       <name>IPDR XML File Encoding Format</name>
       <title>IPDR/XML File Encoding Format</title>
       <organization>TM Forum</organization>
-      <hyperlink>https://www.ipdr.org/public/</hyperlink>
+      <hyperlink>https://www.tmforum.org/ipdr/</hyperlink>
     </reference>
     <reference id="JJ-300.00">
       <name>JJ-300.00</name>
@@ -3483,7 +3499,7 @@
     configuration file.
   </template>
 
-  <model name="Device:2.17">
+  <model name="Device:2.18">
 
     <object name="Device." access="readOnly" minEntries="1" maxEntries="1"
         version="2.0">
@@ -3492,7 +3508,7 @@
       </description>
 
       <parameter name="RootDataModelVersion" access="readOnly"
-          forcedInform="true">
+          forcedInform="true" version="2.4">
         <description>
           Root data model version, e.g. ''2.4''. For a vendor-defined root data
           model, this is the standard Broadband Forum model on which the
@@ -3529,7 +3545,7 @@
         This object contains general device information.
       </description>
 
-      <parameter name="DeviceCategory" access="readOnly">
+      <parameter name="DeviceCategory" access="readOnly" version="2.8">
         <description>
           Each list item is a device category (e.g. "AV_TV" and "AV_Recorder"),
           or the value is {{empty}} if no such element is provided by the
@@ -3592,7 +3608,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ModelNumber" access="readOnly">
+      <parameter name="ModelNumber" access="readOnly" version="2.8">
         <description>
           The model number of the device (human readable string), or {{empty}}
           if no model number is provided by the device.
@@ -3681,7 +3697,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ActiveFirmwareImage" access="readOnly">
+      <parameter name="ActiveFirmwareImage" access="readOnly" version="2.12">
         <description>
           {{noreference}}A full path reference to the row in the
           {{object|FirmwareImage}} table representing the currently running
@@ -3695,7 +3711,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="BootFirmwareImage" access="readWrite">
+      <parameter name="BootFirmwareImage" access="readWrite" version="2.12">
         <description>
           {{noreference}}A full path reference to the row in the
           {{object|FirmwareImage}} table of the firmware image that is to be
@@ -3793,7 +3809,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="HostName" access="readWrite">
+      <parameter name="HostName" access="readWrite" version="2.16">
         <description>
           The hostname of the device {{bibref|RFC1123|Section 2 General
           issues}}. This can be either a Fully Qualified Domain Name (FQDN) or
@@ -3807,7 +3823,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="FirmwareImageNumberOfEntries" access="readOnly">
+      <parameter name="FirmwareImageNumberOfEntries" access="readOnly"
+          version="2.12">
         <description>
           {{numentries}}
         </description>
@@ -3825,7 +3842,22 @@
         </syntax>
       </parameter>
 
-      <parameter name="ProcessorNumberOfEntries" access="readOnly">
+      <parameter name="ProcessorNumberOfEntries" access="readOnly"
+          version="2.1" status="deprecated">
+        <description>
+          {{numentries}}
+
+          {{deprecated|2.18|because the only contained parameter,
+          {{param|Processor.{i}.Architecture}}, is no longer relevant for
+          modern devices.}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="LogRotateNumberOfEntries" access="readOnly"
+          version="2.17">
         <description>
           {{numentries}}
         </description>
@@ -3834,7 +3866,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="LogRotateNumberOfEntries" access="readOnly">
+      <parameter name="VendorLogFileNumberOfEntries" access="readOnly"
+          version="2.1">
         <description>
           {{numentries}}
         </description>
@@ -3843,16 +3876,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="VendorLogFileNumberOfEntries" access="readOnly">
-        <description>
-          {{numentries}}
-        </description>
-        <syntax>
-          <unsignedInt/>
-        </syntax>
-      </parameter>
-
-      <parameter name="LocationNumberOfEntries" access="readOnly">
+      <parameter name="LocationNumberOfEntries" access="readOnly"
+          version="2.4">
         <description>
           {{numentries}}
         </description>
@@ -3862,7 +3887,7 @@
       </parameter>
 
       <parameter name="DeviceImageNumberOfEntries" access="readOnly"
-          dmr:customNumEntriesParameter="true">
+          version="2.11" dmr:customNumEntriesParameter="true">
         <description>
           {{numentries}}
         </description>
@@ -3966,7 +3991,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ScheduleReboot" access="readWrite">
+      <parameter name="ScheduleReboot" access="readWrite" version="2.10">
         <description>
           An absolute date and time in UTC at which time the CPE will perform a
           reboot.
@@ -3982,7 +4007,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="DelayReboot" access="readWrite">
+      <parameter name="DelayReboot" access="readWrite" version="2.10">
         <description>
           The number of {{units}} from the time the CWMP session in which this
           parameter value is set is ended until the CPE performs a reboot.
@@ -4246,7 +4271,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="HTTPConnectionRequestEnable" access="readWrite">
+      <parameter name="HTTPConnectionRequestEnable" access="readWrite"
+          version="2.11">
         <description>
           Enables or disables HTTP connection request handling on the CPE.
 
@@ -4420,7 +4446,7 @@
       </parameter>
 
       <parameter name="AliasBasedAddressing" access="readOnly"
-          forcedInform="true">
+          forcedInform="true" version="2.3">
         <description>
           Indicates whether or not the Alias-Based Addressing Mechanism is
           supported.
@@ -4434,7 +4460,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="InstanceMode" access="readWrite">
+      <parameter name="InstanceMode" access="readWrite" version="2.3">
         <description>
           Instance identification mode as defined in {{bibref|TR-069|3.6.1}}.
           When {{param|AliasBasedAddressing}} is {{true}}, {{param}} is used by
@@ -4453,7 +4479,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="AutoCreateInstances" access="readWrite">
+      <parameter name="AutoCreateInstances" access="readWrite" version="2.3">
         <description>
           Enable or disable the Auto-Create Instance Mechanism. When
           {{param|AliasBasedAddressing}} is {{true}}, {{param}} indicates
@@ -4487,7 +4513,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="ManageableDeviceNotificationLimit" access="readWrite">
+      <parameter name="ManageableDeviceNotificationLimit" access="readWrite"
+          version="2.7">
         <description>
           The minimum time, in seconds, between Active Notifications resulting
           from changes to the {{param|ManageableDeviceNumberOfEntries}} (if
@@ -4498,7 +4525,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="EmbeddedDeviceNumberOfEntries" access="readOnly">
+      <parameter name="EmbeddedDeviceNumberOfEntries" access="readOnly"
+          version="2.3">
         <description>
           {{numentries}}
         </description>
@@ -4507,7 +4535,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="VirtualDeviceNumberOfEntries" access="readOnly">
+      <parameter name="VirtualDeviceNumberOfEntries" access="readOnly"
+          version="2.3">
         <description>
           {{numentries}}
         </description>
@@ -4516,7 +4545,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="SupportedConnReqMethods" access="readOnly">
+      <parameter name="SupportedConnReqMethods" access="readOnly"
+          version="2.7">
         <description>
           The connection request methods supported by this {{object}}. {{enum}}
         </description>
@@ -4546,7 +4576,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ConnReqXMPPConnection" access="readWrite">
+      <parameter name="ConnReqXMPPConnection" access="readWrite" version="2.7">
         <description>
           {{reference|the {{object|#.XMPP.Connection}} instance that is used
           for connection requests to this {{object}}}}
@@ -4559,10 +4589,11 @@
         </syntax>
       </parameter>
 
-      <parameter name="ConnReqAllowedJabberIDs" access="readWrite">
+      <parameter name="ConnReqAllowedJabberIDs" access="readWrite"
+          version="2.7">
         <description>
           When an XMPP Connection Request is sent to a CPE the XMPP IQ Stanza
-          will contian a "from" address that contains the Jabber ID of the
+          will contain a "from" address that contains the Jabber ID of the
           initiating entity.
 
           This parameter is a {{list}} Each entry represents a Jabber ID, or
@@ -4609,7 +4640,7 @@
       </parameter>
 
       <parameter name="ConnReqJabberID" access="readOnly"
-          activeNotify="forceDefaultEnabled">
+          activeNotify="forceDefaultEnabled" version="2.7">
         <description>
           The value MUST be the value of the
           {{param|#.XMPP.Connection.{i}.JabberID}} contained in the
@@ -4635,7 +4666,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="HTTPCompressionSupported" access="readOnly">
+      <parameter name="HTTPCompressionSupported" access="readOnly"
+          version="2.7">
         <description>
           Indicates the HTTP Compression mechanism(s) supported by this CPE.
           Requirements for the use of HTTP Compression for CWMP can be found in
@@ -4667,7 +4699,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="HTTPCompression" access="readWrite">
+      <parameter name="HTTPCompression" access="readWrite" version="2.7">
         <description>
           The value of this parameter represents the HTTP Compression mechanism
           to be used by the CPE when communicating with the ACS.
@@ -4682,7 +4714,7 @@
       </parameter>
 
       <parameter name="LightweightNotificationProtocolsSupported"
-          access="readOnly">
+          access="readOnly" version="2.7">
         <description>
           Indicates the Lightweight Notification Protocol(s) supported by this
           CPE. {{enum}}
@@ -4704,7 +4736,7 @@
       </parameter>
 
       <parameter name="LightweightNotificationProtocolsUsed"
-          access="readWrite">
+          access="readWrite" version="2.7">
         <description>
           The value of this parameter represents the protocol(s) that will be
           used by the CPE when sending Lightweight Notifications.
@@ -4724,7 +4756,7 @@
       </parameter>
 
       <parameter name="LightweightNotificationTriggerInterval"
-          access="readWrite">
+          access="readWrite" version="2.12">
         <description>
           The duration in {{units}} of the interval for which the CPE MUST
           attempt to deliver any pending Passive Lightweight Notifications.
@@ -4741,7 +4773,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="LightweightNotificationTriggerTime" access="readWrite">
+      <parameter name="LightweightNotificationTriggerTime" access="readWrite"
+          version="2.12">
         <description>
           An absolute time reference in UTC to determine when the CPE will
           initiate the Lightweight Notification (in the case that there are
@@ -4773,7 +4806,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="UDPLightweightNotificationHost" access="readWrite">
+      <parameter name="UDPLightweightNotificationHost" access="readWrite"
+          version="2.7">
         <description>
           Host name or address to be used when sending the UDP Lightweight
           Notifications.
@@ -4793,7 +4827,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="UDPLightweightNotificationPort" access="readWrite">
+      <parameter name="UDPLightweightNotificationPort" access="readWrite"
+          version="2.7">
         <description>
           The port number to be used when sending UDP Lightweight
           Notifications.
@@ -4810,7 +4845,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="InstanceWildcardsSupported" access="readOnly">
+      <parameter name="InstanceWildcardsSupported" access="readOnly"
+          version="2.12">
         <description>
           Indicates whether or not instance wildcards are supported.
 
@@ -4822,7 +4858,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="InformParameterNumberOfEntries" access="readOnly">
+      <parameter name="InformParameterNumberOfEntries" access="readOnly"
+          version="2.8">
         <description>
           {{numentries}}
         </description>
@@ -5128,12 +5165,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.3">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -5476,7 +5513,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ProxyProtocolReference" access="readOnly">
+      <parameter name="ProxyProtocolReference" access="readOnly" version="2.6">
         <description>
           {{reference|a protocol object that uses the {{param|ProxyProtocol}}}}
         </description>
@@ -5487,7 +5524,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="DiscoveryProtocol" access="readOnly">
+      <parameter name="DiscoveryProtocol" access="readOnly" version="2.6">
         <description>
           {{list|that represents the discovery protocol(s) for this proxied
           device}}
@@ -5517,7 +5554,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="DiscoveryProtocolReference" access="readOnly">
+      <parameter name="DiscoveryProtocolReference" access="readOnly"
+          version="2.6">
         <description>
           {{list}} {{reference|an object discovered using one or more protocols
           listed in {{param|DiscoveryProtocol}}}}
@@ -5685,7 +5723,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ProxyProtocolReference" access="readOnly">
+      <parameter name="ProxyProtocolReference" access="readOnly" version="2.6">
         <description>
           {{reference|a protocol object that uses the {{param|ProxyProtocol}}}}
         </description>
@@ -5696,7 +5734,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="DiscoveryProtocol" access="readOnly">
+      <parameter name="DiscoveryProtocol" access="readOnly" version="2.6">
         <description>
           {{list|that represents the discovery protocol(s) for this proxied
           device}}
@@ -5726,7 +5764,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="DiscoveryProtocolReference" access="readOnly">
+      <parameter name="DiscoveryProtocolReference" access="readOnly"
+          version="2.6">
         <description>
           {{list}} {{reference|an object discovered using one or more protocols
           listed in {{param|DiscoveryProtocol}}}}
@@ -5908,12 +5947,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.8">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -5953,7 +5992,7 @@
         <syntax>
           <list/>
           <string/>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
     </object>
@@ -6043,12 +6082,12 @@
         <parameter ref="Name"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -6113,15 +6152,15 @@
         </syntax>
       </parameter>
 
-      <parameter name="UseForBackupRestore" access="readOnly">
+      <parameter name="UseForBackupRestore" access="readOnly" version="2.7">
         <description>
           When {{true}}, this parameter indicates that this {{object}} instance
           is to be used for backup and restoration purposes.
 
           Note: The backup and restore operations may require the use of
           multiple {{object}} instances. In this scenario the mechanism for
-          detemining the order and combination of {{object}} instances used for
-          backup and restoration purposes is implementation specific.
+          determining the order and combination of {{object}} instances used
+          for backup and restoration purposes is implementation specific.
         </description>
         <syntax>
           <boolean/>
@@ -6159,7 +6198,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="TotalPersistent" access="readOnly">
+      <parameter name="TotalPersistent" access="readOnly" version="2.15">
         <description>
           The sum total physical Non-Volatile Memory (NVM), in {{units}},
           installed on the device. This memory persists across reboots and can
@@ -6173,7 +6212,7 @@
       </parameter>
 
       <parameter name="FreePersistent" access="readOnly"
-          activeNotify="canDeny">
+          activeNotify="canDeny" version="2.15">
         <description>
           The sum total free physical Non-Volatile Memory (NVM), in {{units}},
           currently available on the device. This memory persists across
@@ -6188,6 +6227,175 @@
       </parameter>
     </object>
 
+    <object name="Device.DeviceInfo.MemoryStatus.MemoryMonitor."
+        access="readOnly" minEntries="1" maxEntries="1" version="2.18">
+      <description>
+        This object specifies information that the device has obtained via
+        sampling the memory utilization (RAM) on the device.
+      </description>
+
+      <parameter name="Enable" access="readWrite" version="2.18">
+        <description>
+          Indicates whether or not memory monitoring is enabled.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="implementation" value="false"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="MemUtilization" access="readOnly" version="2.18">
+        <description>
+          Memory utilization, in {{units}}, rounded to the nearest whole
+          {{units}}, is the percentage of memory used by the system which
+          cannot be spontaneously reclaimed or repurposed by the system in case
+          it is required. This metric is collected at the
+          {{param|PollingInterval}}. This value is used to determine if a
+          critical condition is reached i.e., the memory utilization exceeds
+          {{param|CriticalRiseThreshold}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range maxInclusive="100"/>
+            <units value="percent"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="PollingInterval" access="readWrite" version="2.18">
+        <description>
+          The interval, measured in {{units}}, in which the device polls the
+          memory utilization.
+
+          If the value is 0 then the device selects its own polling interval.
+
+          If the value is greater than 0 then the device MUST use this value as
+          the polling interval.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="CriticalRiseThreshold" access="readWrite"
+          version="2.18">
+        <description>
+          Memory utilization rise threshold {{units}} value. If the
+          {{param|MemUtilization}} exceeds the rise threshold value, and the
+          {{param|CriticalFallTimeStamp}} is greater than
+          {{param|CriticalRiseTimeStamp}} (indicating that critical condition
+          is reached), the following takes place:
+
+          * The {{param|CriticalRiseTimeStamp}} is updated to the current time.
+
+          * A log is generated into the vendor log file referenced by
+            {{param|VendorLogFileRef}} indicating critical condition is reached
+            if the {{param|EnableCriticalLog}} is {{true}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range maxInclusive="100"/>
+            <units value="percent"/>
+          </unsignedInt>
+          <default type="implementation" value="80"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="CriticalFallThreshold" access="readWrite"
+          version="2.18">
+        <description>
+          Memory utilization fall threshold {{units}} value. If the
+          {{param|MemUtilization}} falls below the fall threshold value and
+          {{param|CriticalRiseTimeStamp}} is greater than
+          {{param|CriticalFallTimeStamp}} (indicating that the critical
+          condition is no longer present), the following takes place:
+
+          * The {{param|CriticalFallTimeStamp}} is updated to current time.
+
+          * A log is generated into the vendor log file referenced by
+            {{object|.DeviceInfo.VendorLogFile}} indicating that the critical
+            condition is no longer present if the {{param|EnableCriticalLog}}
+            is {{true}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range maxInclusive="100"/>
+            <units value="percent"/>
+          </unsignedInt>
+          <default type="implementation" value="60"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="CriticalRiseTimeStamp" access="readOnly" version="2.18">
+        <description>
+          Last date and time when the critical condition was reached. See
+          {{param|CriticalRiseThreshold}} description for more details.
+        </description>
+        <syntax>
+          <dateTime/>
+        </syntax>
+      </parameter>
+
+      <parameter name="CriticalFallTimeStamp" access="readOnly" version="2.18">
+        <description>
+          Last date and time when the critical condition was no longer present.
+          See {{param|CriticalFallThreshold}} description for more details.
+        </description>
+        <syntax>
+          <dateTime/>
+        </syntax>
+      </parameter>
+
+      <parameter name="EnableCriticalLog" access="readWrite" version="2.18">
+        <description>
+          This parameter indicates whether a critical log needs to be generated
+          in the vendor log file.
+
+          * If the value of {{param}} is {{true}}, then a critical log is
+            generated in the vendor log file.
+
+          * If the value of {{param}} is {{false}}, then no critical log is
+            generated in the vendor log file.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="implementation" value="false"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="VendorLogFileRef" access="readOnly" version="2.18">
+        <description>
+          The reference to {{object|.DeviceInfo.VendorLogFile}} is
+          automatically constructed and the
+          {{object|.DeviceInfo.VendorLogFile}} is populated with the
+          information based on {{param|FilePath}}.
+
+          E.g. When {{param|FilePath}} = ''file:///var/log/messages''. The
+          following entry is automatically added to
+          {{object|.DeviceInfo.VendorLogFile}}: ''file:///var/log/messages''.
+        </description>
+        <syntax>
+          <string>
+            <pathRef refType="strong"
+                targetParent=".DeviceInfo.VendorLogFile." targetType="row"/>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="FilePath" access="readWrite" version="2.18">
+        <description>
+          Destination path and filename of where to create and keep the log
+          files which MUST use the file URI scheme {{bibref|RFC8089|The file
+          URI Scheme}}. This file is related to {{param|EnableCriticalLog}}.
+        </description>
+        <syntax>
+          <string/>
+        </syntax>
+      </parameter>
+    </object>
+
     <object name="Device.DeviceInfo.ProcessStatus." access="readOnly"
         minEntries="1" maxEntries="1" version="2.0">
       <description>
@@ -6196,7 +6404,7 @@
 
       <parameter name="CPUUsage" access="readOnly" activeNotify="canDeny">
         <description>
-          The total amount of the CPU, in {{units}}, rounded up to the nearest
+          The total amount of the CPU, in {{units}}, rounded to the nearest
           whole {{units}}. In the case that multiple CPU are present, this
           value represents the average of all CPU.
         </description>
@@ -6221,6 +6429,302 @@
           <unsignedInt/>
         </syntax>
       </parameter>
+
+      <parameter name="CPUNumberOfEntries" access="readOnly" version="2.18">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object name="Device.DeviceInfo.ProcessStatus.CPU.{i}." access="readOnly"
+        numEntriesParameter="CPUNumberOfEntries" minEntries="0"
+        maxEntries="unbounded" dmr:fixedObject="true" version="2.18">
+      <description>
+        Each instance in the table represents a CPU on this device. Here CPU
+        can imply main CPU (where system software is executed) or
+        hardware/network acceleration CPU (responsible for data plane traffic).
+      </description>
+      <uniqueKey functional="true">
+        <parameter ref="Name"/>
+      </uniqueKey>
+      <uniqueKey functional="false">
+        <parameter ref="Alias"/>
+      </uniqueKey>
+
+      <parameter name="Alias" access="readWrite" version="2.18">
+        <description>
+          {{datatype|expand}}
+        </description>
+        <syntax>
+          <dataType ref="_AliasCWMP"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Name" access="readOnly" version="2.18">
+        <description>
+          Name of this CPU. This text MUST be sufficient to distinguish this
+          CPU from other CPUs.
+        </description>
+        <syntax>
+          <string>
+            <size maxLength="256"/>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="Enable" access="readWrite" version="2.18">
+        <description>
+          Enables or disables the CPU utilization monitoring.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="implementation" value="false"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="UpTime" access="readOnly" version="2.18">
+        <description>
+          Time in {{units}} since the CPU was last restarted.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="UserModeUtilization" access="readOnly" version="2.18">
+        <description>
+          CPU utilization, in {{units}}, rounded to the nearest whole
+          {{units}}, while executing at the user level. This includes
+          utilization across all cores.
+
+          This value is calculated the same way as {{param|CPUUtilization}}.
+          See {{param|CPUUtilization}} description for more details.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range maxInclusive="100"/>
+            <units value="percent"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="SystemModeUtilization" access="readOnly" version="2.18">
+        <description>
+          CPU utilization, in {{units}}, rounded to the nearest whole
+          {{units}}, while executing at the system/kernel level. Note that this
+          includes the time spent servicing interrupts as well. This includes
+          utilization across all cores.
+
+          This value is calculated the same way as {{param|CPUUtilization}}.
+          See {{param|CPUUtilization}} description for more details.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range maxInclusive="100"/>
+            <units value="percent"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="IdleModeUtilization" access="readOnly" version="2.18">
+        <description>
+          CPU utilization, in {{units}}, rounded to the nearest whole
+          {{units}}, while the CPU was idle.
+
+          This value is calculated the same way as {{param|CPUUtilization}}.
+          See {{param|CPUUtilization}} description for more details.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range maxInclusive="100"/>
+            <units value="percent"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="CPUUtilization" access="readOnly" version="2.18">
+        <description>
+          CPU utilization, in {{units}}, rounded to the nearest whole
+          {{units}}. The CPU Utilization is calculated as a moving window
+          average of {{param|NumSamples}} CPU utilization samples collected at
+          the {{param|PollInterval}}.
+
+          For example, the CPU utilization is calculated as follows: CPU
+          Utilization = (sample1 + sample2 + ... + sampleN)/N where N is the
+          number of CPU usage samples as represented by {{param|NumSamples}}
+          and sample1, sample2, ..., sampleN are CPU usage samples collected at
+          every {{param|PollInterval}} seconds.
+
+          This parameter, which reflects system and user mode CPU utilization,
+          is used to determine if the CPU is in critical condition. This value
+          includes system mode and user mode utilization i.e., everything
+          except idle mode utilization.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range maxInclusive="100"/>
+            <units value="percent"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="PollInterval" access="readWrite" version="2.18">
+        <description>
+          The interval, measured in {{units}}, over which the CPU usage is
+          polled.
+
+          If the value is 0 then the device selects its own polling interval.
+
+          If the value is greater than 0 then the device MUST use this value as
+          the poll interval.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+          <default type="implementation" value="5"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="NumSamples" access="readWrite" version="2.18">
+        <description>
+          This parameter indicates the number of CPU usage samples that is
+          needed to calculate the average CPU utilization and populate the
+          {{param|CPUUtilization}}
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range minInclusive="1" maxInclusive="300"/>
+          </unsignedInt>
+          <default type="implementation" value="30"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="CriticalRiseThreshold" access="readWrite"
+          version="2.18">
+        <description>
+          CPU utilization rise threshold {{units}} value. If the
+          {{param|CPUUtilization}} exceeds the rise threshold value and the
+          {{param|CriticalFallTimeStamp}} is greater than
+          {{param|CriticalRiseTimeStamp}} (indicating that critical condition
+          is reached), the following takes place:
+
+          * The {{param|CriticalRiseTimeStamp}} is updated to the current time
+
+          * A log is generated into the vendor log file referenced by
+            {{object|###.DeviceInfo.VendorLogFile}} indicating critical
+            condition is reached if the {{param|EnableCriticalLog}} is
+            {{true}}. The logs generated should indicate the {{param|Name}} as
+            well as the {{param|CriticalRiseTimeStamp}} of the CPU.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range maxInclusive="100"/>
+            <units value="percent"/>
+          </unsignedInt>
+          <default type="implementation" value="80"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="CriticalFallThreshold" access="readWrite"
+          version="2.18">
+        <description>
+          CPU utilization fall threshold {{units}} value. If the
+          {{param|CPUUtilization}} falls below fall threshold value and
+          {{param|CriticalRiseTimeStamp}} is greater than
+          {{param|CriticalFallTimeStamp}} (indicating that critical condition
+          is no longer present), the following takes place:
+
+          * The {{param|CriticalFallTimeStamp}} is updated to current time
+
+          * A log is generated into the vendor log file referenced by
+            {{object|###.DeviceInfo.VendorLogFile}} indicating the clearing of
+            critical condition if the {{param|EnableCriticalLog}} is {{true}}.
+            The logs generated should indicate the {{param|Name}} as well as
+            the {{param|CriticalFallTimeStamp}} of the CPU.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range maxInclusive="100"/>
+            <units value="percent"/>
+          </unsignedInt>
+          <default type="implementation" value="60"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="CriticalRiseTimeStamp" access="readOnly" version="2.18">
+        <description>
+          Last date and time when the critical condition was reached. See
+          {{param|CriticalRiseThreshold}} description for more details.
+        </description>
+        <syntax>
+          <dateTime/>
+        </syntax>
+      </parameter>
+
+      <parameter name="CriticalFallTimeStamp" access="readOnly" version="2.18">
+        <description>
+          Last date and time when the critical condition is no longer present.
+          See {{param|CriticalFallThreshold}} description for more details.
+        </description>
+        <syntax>
+          <dateTime/>
+        </syntax>
+      </parameter>
+
+      <parameter name="EnableCriticalLog" access="readWrite" version="2.18">
+        <description>
+          This parameter indicates whether a critical log needs to be generated
+          in the vendor log file.
+
+          * If the value of {{param}} is {{true}}, then a critical log is
+            generated in the vendor log file.
+
+          * If the value of {{param}} is {{false}}, then no critical log is
+            generated in the vendor log file.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="implementation" value="false"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="VendorLogFileRef" access="readOnly" version="2.18">
+        <description>
+          The reference to {{object|###.DeviceInfo.VendorLogFile}} is
+          automatically constructed and the
+          {{object|###.DeviceInfo.VendorLogFile}} is populated with the
+          information based on {{param|FilePath}}.
+
+          E.g. When {{param|FilePath}} = ''file:///var/log/messages''. The
+          following entry is automatically added to
+          {{object|###.DeviceInfo.VendorLogFile}}:
+          ''file:///var/log/messages''.
+        </description>
+        <syntax>
+          <string>
+            <pathRef refType="strong"
+                targetParent=".DeviceInfo.VendorLogFile." targetType="row"/>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="FilePath" access="readWrite" version="2.18">
+        <description>
+          Destination path and filename of where to create and keep the log
+          files which MUST use the uri scheme file {{bibref|RFC8089|The file
+          URI Scheme}}. This file is related to {{param|EnableCriticalLog}}.
+        </description>
+        <syntax>
+          <string/>
+        </syntax>
+      </parameter>
     </object>
 
     <object name="Device.DeviceInfo.ProcessStatus.Process.{i}."
@@ -6335,12 +6839,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.3">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -6558,7 +7062,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="PollingInterval" access="readWrite">
+      <parameter name="PollingInterval" access="readWrite" version="2.1">
         <description>
           The interval, measured in {{units}}, in which the device polls this
           {{object}}.
@@ -6653,21 +7157,24 @@
 
     <object name="Device.DeviceInfo.Processor.{i}." access="readOnly"
         numEntriesParameter="ProcessorNumberOfEntries" minEntries="0"
-        maxEntries="unbounded" dmr:noUniqueKeys="true" version="2.1">
+        maxEntries="unbounded" version="2.1" status="deprecated">
       <description>
         Each table entry represents a hardware or virtual processor that
         resides on this device.
+
+        {{deprecated|2.18|because the only contained parameter,
+        {{param|Architecture}}, is no longer relevant for modern devices.}}
       </description>
       <uniqueKey functional="false">
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.3">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -6722,12 +7229,12 @@
         <parameter ref="Name"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.17">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -6850,12 +7357,12 @@
         <parameter ref="Name"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.17">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -6910,12 +7417,12 @@
         <parameter ref="Name"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.1">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -7027,7 +7534,7 @@
               <description>{{empty}}</description>
             </enumeration>
             <enumeration value="CWMP"/>
-            <enumeration value="USP"/>
+            <enumeration value="USP" version="2.13"/>
             <enumeration value="OMA-DM"/>
             <enumeration value="SNMP"/>
             <enumeration value="UPnP"/>
@@ -7092,12 +7599,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.11">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -7142,12 +7649,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.12">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -7228,7 +7735,7 @@
                 firmware images, but only has a single image installed.
               </description>
             </enumeration>
-            <enumeration value="Active">
+            <enumeration value="Active" version="2.14">
               <description>
                 This Firmware Image instance is the currently active image.
               </description>
@@ -7321,7 +7828,7 @@
 
       <parameter name="LastUpgradeCount" access="readOnly">
         <description>
-          Total number of Kernel faults which occured since last firmware
+          Total number of Kernel faults which occurred since last firmware
           upgrade.
         </description>
         <syntax>
@@ -7385,8 +7892,7 @@
 
     <object name="Device.DeviceInfo.KernelFaults.KernelFault.{i}."
         access="readOnly" numEntriesParameter="KernelFaultNumberOfEntries"
-        minEntries="0" maxEntries="unbounded" dmr:noUniqueKeys="true"
-        version="2.17">
+        minEntries="0" maxEntries="unbounded" version="2.17">
       <description>
         Each table entry represents a Kernel fault that is stored on the
         device.
@@ -7395,12 +7901,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="readWrite" version="2.17">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -7435,7 +7941,7 @@
 
       <parameter name="FirmwareVersion" access="readOnly">
         <description>
-          The firmeware version that triggered the Kernel fault.
+          The firmware version that triggered the Kernel fault.
         </description>
         <syntax>
           <string/>
@@ -7481,7 +7987,7 @@
 
       <parameter name="LastUpgradeCount" access="readOnly">
         <description>
-          Total number of process faults which occured since last firmware
+          Total number of process faults which occurred since last firmware
           upgrade.
         </description>
         <syntax>
@@ -7545,8 +8051,7 @@
 
     <object name="Device.DeviceInfo.ProcessFaults.ProcessFault.{i}."
         access="readOnly" numEntriesParameter="ProcessFaultNumberOfEntries"
-        minEntries="0" maxEntries="unbounded" dmr:noUniqueKeys="true"
-        version="2.17">
+        minEntries="0" maxEntries="unbounded" version="2.17">
       <description>
         Each table entry represents a process fault that is stored on the
         device.
@@ -7555,12 +8060,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="readWrite" version="2.17">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -7595,7 +8100,7 @@
 
       <parameter name="TimeStamp" access="readOnly">
         <description>
-          The time when the process fault occured.
+          The time when the process fault occurred.
         </description>
         <syntax>
           <dateTime/>
@@ -7604,7 +8109,7 @@
 
       <parameter name="FirmwareVersion" access="readOnly">
         <description>
-          The firmware version that triggered the the process fault.
+          The firmware version that triggered the process fault.
         </description>
         <syntax>
           <string/>
@@ -7658,12 +8163,12 @@
         <parameter ref="UUID"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.3">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -7699,7 +8204,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="UUID" access="readOnly">
+      <parameter name="UUID" access="readOnly" version="2.6">
         <description>
           UUID ({{bibref|RFC4122}}) that is the value of the uuid attribute in
           the DT Instance referenced by {{param|URL}}.
@@ -7882,10 +8387,12 @@
                 configure the time of the CPE.
               </description>
             </enumeration>
-            <enumeration value="Error_FailedToSynchronize" status="deprecated">
+            <enumeration value="Error_FailedToSynchronize" status="obsoleted">
               <description>
                 {{deprecated|2.16|due to the introduction of
                 {{object|Client}}}}
+
+                {{obsoleted|2.18}}
               </description>
             </enumeration>
             <enumeration value="Error" optional="true">
@@ -7899,11 +8406,13 @@
         </syntax>
       </parameter>
 
-      <parameter name="NTPServer1" access="readWrite" status="deprecated">
+      <parameter name="NTPServer1" access="readWrite" status="obsoleted">
         <description>
           First NTP timeserver. Either a host name or IP address.
 
           {{deprecated|2.16|due to the introduction of {{object|Client}}}}
+
+          {{obsoleted|2.18}}
         </description>
         <syntax>
           <string>
@@ -7912,11 +8421,13 @@
         </syntax>
       </parameter>
 
-      <parameter name="NTPServer2" access="readWrite" status="deprecated">
+      <parameter name="NTPServer2" access="readWrite" status="obsoleted">
         <description>
           Second NTP timeserver. Either a host name or IP address.
 
           {{deprecated|2.16|due to the introduction of {{object|Client}}}}
+
+          {{obsoleted|2.18}}
         </description>
         <syntax>
           <string>
@@ -7925,11 +8436,13 @@
         </syntax>
       </parameter>
 
-      <parameter name="NTPServer3" access="readWrite" status="deprecated">
+      <parameter name="NTPServer3" access="readWrite" status="obsoleted">
         <description>
           Third NTP timeserver. Either a host name or IP address.
 
           {{deprecated|2.16|due to the introduction of {{object|Client}}}}
+
+          {{obsoleted|2.18}}
         </description>
         <syntax>
           <string>
@@ -7938,11 +8451,13 @@
         </syntax>
       </parameter>
 
-      <parameter name="NTPServer4" access="readWrite" status="deprecated">
+      <parameter name="NTPServer4" access="readWrite" status="obsoleted">
         <description>
           Fourth NTP timeserver. Either a host name or IP address.
 
           {{deprecated|2.16|due to the introduction of {{object|Client}}}}
+
+          {{obsoleted|2.18}}
         </description>
         <syntax>
           <string>
@@ -7951,11 +8466,13 @@
         </syntax>
       </parameter>
 
-      <parameter name="NTPServer5" access="readWrite" status="deprecated">
+      <parameter name="NTPServer5" access="readWrite" status="obsoleted">
         <description>
           Fifth NTP timeserver. Either a host name or IP address.
 
           {{deprecated|2.16|due to the introduction of {{object|Client}}}}
+
+          {{obsoleted|2.18}}
         </description>
         <syntax>
           <string>
@@ -7988,7 +8505,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ClientNumberOfEntries" access="readOnly">
+      <parameter name="ClientNumberOfEntries" access="readOnly" version="2.16">
         <description>
           {{numentries}}
         </description>
@@ -7997,7 +8514,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ServerNumberOfEntries" access="readOnly">
+      <parameter name="ServerNumberOfEntries" access="readOnly" version="2.16">
         <description>
           {{numentries}}
         </description>
@@ -8059,12 +8576,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.16">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -8133,7 +8650,7 @@
         <syntax>
           <list/>
           <string/>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
@@ -8152,7 +8669,7 @@
       <parameter name="ResolveMaxAddresses" access="readWrite">
         <description>
           When {{param|ResolveAddresses}} is enabled, This parameter specifies
-          the maxium number of IP addresses that the NTP client can resolve. 0
+          the maximum number of IP addresses that the NTP client can resolve. 0
           means that all addresses must be resolved.
         </description>
         <syntax>
@@ -8400,12 +8917,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.16">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -8576,13 +9093,13 @@
           Points to a CSV list of NTP servers. A NTP server can either be
           specified as an IP address or a host name. When used the NTS-KE
           server will tell the remote NTS-KE client the NTP hostname or address
-          of the NTP server(s) that should be used. This allows to seperate the
+          of the NTP server(s) that should be used. This allows to separate the
           NTP server and NTS-KE server implementation.
         </description>
         <syntax>
           <list/>
           <string/>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
     </object>
@@ -8643,7 +9160,7 @@
         CPE.
       </description>
 
-      <parameter name="Enable" access="readWrite">
+      <parameter name="Enable" access="readWrite" version="2.11">
         <description>
           Enables and disables the CPE's user interface.
         </description>
@@ -8908,7 +9425,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="HTTPAccessSupportedProtocols" access="readOnly">
+      <parameter name="HTTPAccessSupportedProtocols" access="readOnly"
+          version="2.16">
         <description>
           Indicates the protocols that are supported by the CPE for the purpose
           of remotely accessing the user interface.
@@ -8926,7 +9444,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="HTTPAccessNumberOfEntries" access="readOnly">
+      <parameter name="HTTPAccessNumberOfEntries" access="readOnly"
+          version="2.16">
         <description>
           {{numentries}}
         </description>
@@ -8942,7 +9461,7 @@
         maxEntries="unbounded" version="2.16">
       <description>
         HTTPAccess is used for modeling the different web interfaces that may
-        be either localy or remotely available in the device. For example with
+        be either locally or remotely available in the device. For example with
         Software Modules it is possible to install multiple services that embed
         a web interface like a ''Video service'' or ''Photo service''.
 
@@ -8968,12 +9487,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.16">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -9054,7 +9573,7 @@
             <pathRef refType="strong" targetParent=".Users.Role."
                 targetType="row"/>
           </string>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
@@ -9157,7 +9676,63 @@
         <syntax>
           <list/>
           <string/>
-          <default type="object" value="/"/>
+          <default type="object" value="[/]"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="AllowAllIPv4" access="readWrite" version="2.18">
+        <description>
+          Allow access from any IPv4 address. The source prefixes defined in
+          {{param|IPv4AllowedSourcePrefix}} will be ignored.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="object" value="false"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="IPv4AllowedSourcePrefix" access="readWrite"
+          version="2.18">
+        <description>
+          Allow only access from the provided list of IPv4 prefixes.
+
+          When {{param}} is set to {{empty}} and {{param|AllowAllIPv4}} is set
+          to ''false'', no incoming connections are allowed. When
+          {{param|AllowAllIPv4}} is set ''true'', {{param}} is ignored.
+        </description>
+        <syntax>
+          <list>
+            <size/>
+          </list>
+          <string/>
+        </syntax>
+      </parameter>
+
+      <parameter name="AllowAllIPv6" access="readWrite" version="2.18">
+        <description>
+          Allow access from any IPv6 address. The source prefixes defined in
+          {{param|IPv6AllowedSourcePrefix}} will be ignored.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="object" value="false"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="IPv6AllowedSourcePrefix" access="readWrite"
+          version="2.18">
+        <description>
+          Allow only access from the provided list of IPv6 prefixes.
+
+          When {{param}} is set to {{empty}} and {{param|AllowAllIPv6}} is set
+          to ''false'', no incoming connections are allowed. When
+          {{param|AllowAllIPv6}} is set ''true'', {{param}} is ignored.
+        </description>
+        <syntax>
+          <list>
+            <size/>
+          </list>
+          <string/>
         </syntax>
       </parameter>
 
@@ -9253,7 +9828,6 @@
             <pathRef refType="strong" targetParent=".Users.User."
                 targetType="row"/>
           </string>
-          <default type="object" value=""/>
         </syntax>
       </parameter>
 
@@ -9300,7 +9874,7 @@
     </object>
 
     <object name="Device.UserInterface.RemoteAccess." access="readOnly"
-        minEntries="1" maxEntries="1" version="2.0" status="deprecated">
+        minEntries="1" maxEntries="1" version="2.0" status="obsoleted">
       <description>
         This object contains parameters relating to remotely accessing the
         CPE's user interface.
@@ -9313,6 +9887,8 @@
         instance that has "RemoteAccessCapable" set to {{true}}.
 
         {{deprecated|2.16|due to the introduction of {{object|#.HTTPAccess}}}}
+
+        {{obsoleted|2.18}}
       </description>
 
       <parameter name="Enable" access="readWrite">
@@ -9621,12 +10197,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.3">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -9759,7 +10335,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="EnableDataGathering" access="readWrite">
+      <parameter name="EnableDataGathering" access="readWrite" version="2.8">
         <description>
           Enables or disables data gathering on the DSL line.
         </description>
@@ -9808,12 +10384,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -9965,7 +10541,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="XTSE" access="readOnly">
+      <parameter name="XTSE" access="readOnly" version="2.8">
         <description>
           This configuration parameter defines the transmission system types to
           be allowed by the xTU on this {{object}} instance. Each bit is 0 if
@@ -10006,7 +10582,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="XTSUsed" access="readOnly">
+      <parameter name="XTSUsed" access="readOnly" version="2.8">
         <description>
           This parameter indicates which DSL standard and recommendation are
           currently in use by the {{object}} instance. Only one bit is set, as
@@ -10148,7 +10724,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="UPBOKLER" access="readOnly">
+      <parameter name="UPBOKLER" access="readOnly" version="2.8">
         <description>
           This parameter contains the estimated electrical loop length
           estimated by the VTU-R expressed in {{units}} at 1MHz (see O-UPDATE
@@ -10167,7 +10743,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="UPBOKLEPb" access="readOnly">
+      <parameter name="UPBOKLEPb" access="readOnly" version="2.8">
         <description>
           VTU-O estimated upstream power back-off electrical length per band.
 
@@ -10193,7 +10769,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="UPBOKLERPb" access="readOnly">
+      <parameter name="UPBOKLERPb" access="readOnly" version="2.8">
         <description>
           VTU-R estimated upstream power back-off electrical length per band.
 
@@ -10223,7 +10799,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="RXTHRSHds" access="readOnly">
+      <parameter name="RXTHRSHds" access="readOnly" version="2.8">
         <description>
           UPBO downstream receiver signal level threshold.
 
@@ -10245,7 +10821,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ACTRAMODEds" access="readOnly">
+      <parameter name="ACTRAMODEds" access="readOnly" version="2.8">
         <description>
           This parameter indicates the actual active rate adaptation mode in
           the downstream direction.
@@ -10271,7 +10847,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ACTRAMODEus" access="readOnly">
+      <parameter name="ACTRAMODEus" access="readOnly" version="2.8">
         <description>
           This parameter indicates the actual active rate adaptation mode in
           the upstream direction.
@@ -10297,7 +10873,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ACTINPROCds" access="readOnly">
+      <parameter name="ACTINPROCds" access="readOnly" version="2.8">
         <description>
           This parameter reports the actual impulse noise protection (INP) of
           the robust overhead channel (ROC) in the downstream direction. The
@@ -10312,7 +10888,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ACTINPROCus" access="readOnly">
+      <parameter name="ACTINPROCus" access="readOnly" version="2.8">
         <description>
           This parameter reports the actual impulse noise protection (INP) of
           the robust overhead channel (ROC) in the upstream direction. The
@@ -10327,7 +10903,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SNRMROCds" access="readOnly">
+      <parameter name="SNRMROCds" access="readOnly" version="2.8">
         <description>
           This parameter reports the actual signal-to-noise margin of the
           robust overhead channel (ROC) in the downstream direction (expressed
@@ -10344,7 +10920,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SNRMROCus" access="readOnly">
+      <parameter name="SNRMROCus" access="readOnly" version="2.8">
         <description>
           This parameter reports the actual signal-to-noise margin of the
           robust overhead channel (ROC) in the upstream direction (expressed in
@@ -10822,7 +11398,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="XTURVersion" access="readOnly">
+      <parameter name="XTURVersion" access="readOnly" version="2.17">
         <description>
           xTU-R version field as defined in {{bibref|G.997.1|Section 7.4.6}}.
           It shall contain the xTU-R firmware version and the xTU-R model,
@@ -10836,7 +11412,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="XTURSerial" access="readOnly">
+      <parameter name="XTURSerial" access="readOnly" version="2.17">
         <description>
           xTU-R serial number as defined in {{bibref|G.997.1|Section 7.4.8}}.
           It shall contain the equipment serial number, the equipment model and
@@ -10871,7 +11447,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="XTURVendorSpecific" access="readOnly">
+      <parameter name="XTURVendorSpecific" access="readOnly" version="2.17">
         <description>
           xTU-R vendor-specific information as defined in {{bibref|G.994.1}}.
           This corresponds to the two-octet vendor-specific information, which
@@ -10911,7 +11487,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="XTURSystemVendor" access="readOnly">
+      <parameter name="XTURSystemVendor" access="readOnly" version="2.17">
         <description>
           xTU-R system vendor identifier as defined in {{bibref|G.997.1|Section
           7.4.4}}. This corresponds to the four-octet provider code, which MUST
@@ -10925,7 +11501,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="XTURSystemVendorSpecific" access="readOnly">
+      <parameter name="XTURSystemVendorSpecific" access="readOnly"
+          version="2.17">
         <description>
           xTU-R system vendor-specific information as defined in
           {{bibref|G.997.1|Section 7.4.4}}. This corresponds to the two-octet
@@ -10942,7 +11519,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="XTURSystemCountry" access="readOnly">
+      <parameter name="XTURSystemCountry" access="readOnly" version="2.17">
         <description>
           T.35 country code of the xTU-R system vendor as defined in
           {{bibref|G.997.1|Section 7.4.4}}, where the two-octet value defined
@@ -10979,7 +11556,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="XTUCVersion" access="readOnly">
+      <parameter name="XTUCVersion" access="readOnly" version="2.17">
         <description>
           The xTU-C version number is the version number as inserted by the
           xTU-C in the overhead messages ({{bibref|G.992.3}},
@@ -10994,7 +11571,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="XTUCSerial" access="readOnly">
+      <parameter name="XTUCSerial" access="readOnly" version="2.17">
         <description>
           xTU-C serial number as defined in {{bibref|G.997.1|Section 7.4.7}}.
           This corresponds to the equipment serial number.
@@ -11023,7 +11600,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="XTUCVendorSpecific" access="readOnly">
+      <parameter name="XTUCVendorSpecific" access="readOnly" version="2.17">
         <description>
           xTU-C vendor-specific information as defined in
           {{bibref|G.997.1|Section 7.4.3}}. This corresponds to the two-octet
@@ -11054,7 +11631,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="XTUCSystemVendor" access="readOnly">
+      <parameter name="XTUCSystemVendor" access="readOnly" version="2.17">
         <description>
           xTU-C system vendor identifier as defined in {{bibref|G.997.1|Section
           7.4.3}}. This corresponds to the four-octet provider code, which MUST
@@ -11068,7 +11645,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="XTUCSystemVendorSpecific" access="readOnly">
+      <parameter name="XTUCSystemVendorSpecific" access="readOnly"
+          version="2.17">
         <description>
           xTU-C system vendor-specific information as defined in
           {{bibref|G.997.1|Section 7.4.4}}. This corresponds to the two-octet
@@ -11085,7 +11663,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="XTUCSystemCountry" access="readOnly">
+      <parameter name="XTUCSystemCountry" access="readOnly" version="2.17">
         <description>
           T.35 country code of the xTU-C system vendor as defined in
           {{bibref|G.997.1|Section 7.4.4}}, where the two-octet value defined
@@ -12088,12 +12666,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -12340,7 +12918,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ACTNDR" access="readOnly">
+      <parameter name="ACTNDR" access="readOnly" version="2.8">
         <description>
           Actual net data rate expressed in {{units}}. Independent whether
           retransmission is used or not in a given transmit direction:
@@ -12362,7 +12940,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ACTINPREIN" access="readOnly">
+      <parameter name="ACTINPREIN" access="readOnly" version="2.8">
         <description>
           Actual impulse noise protection against REIN, expressed in {{units}}.
 
@@ -13128,12 +13706,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -13402,12 +13980,12 @@
         <parameter ref="Channel"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -14488,7 +15066,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Interface" access="readWrite">
+      <parameter name="Interface" access="readWrite" version="2.0">
         <description>
           {{reference}} This is the interface over which the test is to be
           performed.
@@ -14502,7 +15080,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="ACTPSDds" access="readOnly" activeNotify="canDeny">
+      <parameter name="ACTPSDds" access="readOnly" activeNotify="canDeny"
+          version="2.0">
         <description>
           Downstream actual power spectral density. Interpretation of the value
           is as defined in ITU-T Rec. G.997.1.
@@ -14514,7 +15093,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="ACTPSDus" access="readOnly" activeNotify="canDeny">
+      <parameter name="ACTPSDus" access="readOnly" activeNotify="canDeny"
+          version="2.0">
         <description>
           Upstream actual power spectral density. Interpretation of the value
           is as defined in ITU-T Rec. G.997.1.
@@ -14526,7 +15106,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="ACTATPds" access="readOnly" activeNotify="canDeny">
+      <parameter name="ACTATPds" access="readOnly" activeNotify="canDeny"
+          version="2.0">
         <description>
           Downstream actual aggregate transmitter power. Interpretation of the
           value is as defined in ITU-T Rec. G.997.1.
@@ -14538,7 +15119,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="ACTATPus" access="readOnly" activeNotify="canDeny">
+      <parameter name="ACTATPus" access="readOnly" activeNotify="canDeny"
+          version="2.0">
         <description>
           Upstream actual aggregate transmitter power. Interpretation of the
           value is as defined in ITU-T Rec. G.997.1.
@@ -14550,7 +15132,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="HLINSCds" access="readOnly" activeNotify="canDeny">
+      <parameter name="HLINSCds" access="readOnly" activeNotify="canDeny"
+          version="2.0">
         <description>
           Downstream linear representation scale. Interpretation of the value
           is as defined in ITU-T Rec. G.997.1.
@@ -14564,7 +15147,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="HLINSCus" access="readOnly" activeNotify="canDeny">
+      <parameter name="HLINSCus" access="readOnly" activeNotify="canDeny"
+          version="2.0">
         <description>
           Scaling used to represent the upstream linear channel
           characteristics. Interpretation of the value is as defined in ITU-T
@@ -14579,7 +15163,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="HLINGds" access="readOnly" activeNotify="canDeny">
+      <parameter name="HLINGds" access="readOnly" activeNotify="canDeny"
+          version="2.0">
         <description>
           Number of sub-carriers per sub-carrier group in the downstream
           direction for {{param|HLINpsds}}. Valid values are 1, 2, 4, and 8.
@@ -14593,7 +15178,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="HLINGus" access="readOnly" activeNotify="canDeny">
+      <parameter name="HLINGus" access="readOnly" activeNotify="canDeny"
+          version="2.0">
         <description>
           Number of sub-carriers per sub-carrier group in the downstream
           direction for {{param|HLINpsus}}. Valid values are 1, 2, 4, and 8.
@@ -14607,7 +15193,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="HLOGGds" access="readOnly" activeNotify="canDeny">
+      <parameter name="HLOGGds" access="readOnly" activeNotify="canDeny"
+          version="2.0">
         <description>
           Number of sub-carriers per sub-carrier group in the downstream
           direction for {{param|HLOGpsds}}. Valid values are 1, 2, 4, and 8.
@@ -14621,7 +15208,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="HLOGGus" access="readOnly" activeNotify="canDeny">
+      <parameter name="HLOGGus" access="readOnly" activeNotify="canDeny"
+          version="2.0">
         <description>
           Number of sub-carriers per sub-carrier group in the upstream
           direction for {{param|HLOGpsus}}. Valid values are 1, 2, 4, and 8.
@@ -14635,7 +15223,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="HLOGpsds" access="readOnly" activeNotify="canDeny">
+      <parameter name="HLOGpsds" access="readOnly" activeNotify="canDeny"
+          version="2.0">
         <description>
           {{list}} List items represent downstream logarithmic channel
           characteristics per sub-carrier group. The maximum number of elements
@@ -14659,7 +15248,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="HLOGpsus" access="readOnly" activeNotify="canDeny">
+      <parameter name="HLOGpsus" access="readOnly" activeNotify="canDeny"
+          version="2.0">
         <description>
           {{list}} List items represent upstream logarithmic channel
           characteristics per sub-carrier group. The maximum number of elements
@@ -14683,7 +15273,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="HLOGMTds" access="readOnly" activeNotify="canDeny">
+      <parameter name="HLOGMTds" access="readOnly" activeNotify="canDeny"
+          version="2.0">
         <description>
           Indicates the number of symbols over which {{param|HLOGpsds}} was
           measured.
@@ -14697,7 +15288,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="HLOGMTus" access="readOnly" activeNotify="canDeny">
+      <parameter name="HLOGMTus" access="readOnly" activeNotify="canDeny"
+          version="2.0">
         <description>
           Indicates the number of symbols over which {{param|HLOGpsus}} was
           measured.
@@ -14711,7 +15303,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="LATNpbds" access="readOnly" activeNotify="canDeny">
+      <parameter name="LATNpbds" access="readOnly" activeNotify="canDeny"
+          version="2.0">
         <description>
           {{list}} List items represent downstream line attenuation per usable
           band, as computed during initialization. Number of elements is
@@ -14729,7 +15322,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="LATNpbus" access="readOnly" activeNotify="canDeny">
+      <parameter name="LATNpbus" access="readOnly" activeNotify="canDeny"
+          version="2.0">
         <description>
           {{list}} List items represent upstream line attenuation per usable
           band, as computed during initialization. Number of elements is
@@ -14747,7 +15341,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="SATNds" access="readOnly" activeNotify="canDeny">
+      <parameter name="SATNds" access="readOnly" activeNotify="canDeny"
+          version="2.0">
         <description>
           {{list}} List items represent downstream signal attenuation per
           usable band, as computed during the L0 (i.e., Showtime) state. Number
@@ -14765,7 +15360,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="SATNus" access="readOnly" activeNotify="canDeny">
+      <parameter name="SATNus" access="readOnly" activeNotify="canDeny"
+          version="2.0">
         <description>
           {{list}} List items represent upstream signal attenuation per usable
           band, as computed during the L0 (i.e., Showtime) state. Number of
@@ -14783,7 +15379,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="HLINpsds" access="readOnly" activeNotify="canDeny">
+      <parameter name="HLINpsds" access="readOnly" activeNotify="canDeny"
+          version="2.0">
         <description>
           {{list}} List items represent downstream linear channel
           characteristics per subcarrier group. Maximum number of complex pairs
@@ -14806,7 +15403,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="HLINpsus" access="readOnly" activeNotify="canDeny">
+      <parameter name="HLINpsus" access="readOnly" activeNotify="canDeny"
+          version="2.0">
         <description>
           {{list}} List items represent upstream linear channel characteristics
           per sub-carrier group. Maximum number of complex pairs is 64 for
@@ -14828,7 +15426,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="QLNGds" access="readOnly" activeNotify="canDeny">
+      <parameter name="QLNGds" access="readOnly" activeNotify="canDeny"
+          version="2.0">
         <description>
           Number of sub-carriers per sub-carrier group in the downstream
           direction for {{param|QLNpsds}}. Valid values are 1, 2, 4, and 8.
@@ -14842,7 +15441,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="QLNGus" access="readOnly" activeNotify="canDeny">
+      <parameter name="QLNGus" access="readOnly" activeNotify="canDeny"
+          version="2.0">
         <description>
           Number of sub-carriers per sub-carrier group in the upstream
           direction for {{param|QLNpsus}}. Valid values are 1, 2, 4, and 8.
@@ -14856,7 +15456,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="QLNpsds" access="readOnly" activeNotify="canDeny">
+      <parameter name="QLNpsds" access="readOnly" activeNotify="canDeny"
+          version="2.0">
         <description>
           {{list}} List items represent downstream quiet line noise per
           subcarrier group. Maximum number of elements is 256 for G.992.3, 512
@@ -14878,7 +15479,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="QLNpsus" access="readOnly" activeNotify="canDeny">
+      <parameter name="QLNpsus" access="readOnly" activeNotify="canDeny"
+          version="2.0">
         <description>
           {{list}} List items represent upstream quiet line noise per
           subcarrier group. The maximum number of elements is 64 for G.992.3,
@@ -14900,7 +15502,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="QLNMTds" access="readOnly" activeNotify="canDeny">
+      <parameter name="QLNMTds" access="readOnly" activeNotify="canDeny"
+          version="2.0">
         <description>
           Indicates the number of symbols over which {{param|QLNpsds}} was
           measured.
@@ -14914,7 +15517,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="QLNMTus" access="readOnly" activeNotify="canDeny">
+      <parameter name="QLNMTus" access="readOnly" activeNotify="canDeny"
+          version="2.0">
         <description>
           Indicates the number of symbols over which {{param|QLNpsus}} was
           measured.
@@ -14928,7 +15532,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="SNRGds" access="readOnly" activeNotify="canDeny">
+      <parameter name="SNRGds" access="readOnly" activeNotify="canDeny"
+          version="2.0">
         <description>
           Number of sub-carriers per sub-carrier group in the downstream
           direction for {{param|SNRpsds}}. Valid values are 1, 2, 4, and 8.
@@ -14942,7 +15547,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="SNRGus" access="readOnly" activeNotify="canDeny">
+      <parameter name="SNRGus" access="readOnly" activeNotify="canDeny"
+          version="2.0">
         <description>
           Number of sub-carriers per sub-carrier group in the upstream
           direction for {{param|SNRpsus}}. Valid values are 1, 2, 4, and 8.
@@ -14956,7 +15562,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="SNRpsds" access="readOnly" activeNotify="canDeny">
+      <parameter name="SNRpsds" access="readOnly" activeNotify="canDeny"
+          version="2.0">
         <description>
           {{list}} List items represent downstream SNR per subcarrier group.
           Maximum number of elements is 256 for G.992.3, 512 for G.992.5. For
@@ -14979,7 +15586,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="SNRpsus" access="readOnly" activeNotify="canDeny">
+      <parameter name="SNRpsus" access="readOnly" activeNotify="canDeny"
+          version="2.0">
         <description>
           {{list}} List items represent upstream SNR per subcarrier group. The
           maximum number of elements is 64 for G.992.3, and G.992.5. For
@@ -15001,7 +15609,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="SNRMTds" access="readOnly" activeNotify="canDeny">
+      <parameter name="SNRMTds" access="readOnly" activeNotify="canDeny"
+          version="2.0">
         <description>
           Indicates the number of symbols over which {{param|SNRpsds}} was
           measured.
@@ -15015,7 +15624,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="SNRMTus" access="readOnly" activeNotify="canDeny">
+      <parameter name="SNRMTus" access="readOnly" activeNotify="canDeny"
+          version="2.0">
         <description>
           Indicates the number of symbols over which {{param|SNRpsus}} was
           measured.
@@ -15029,7 +15639,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="BITSpsds" access="readOnly" activeNotify="canDeny">
+      <parameter name="BITSpsds" access="readOnly" activeNotify="canDeny"
+          version="2.0">
         <description>
           {{list}} List items represent downstream bit allocation per
           subcarrier group. Maximum number of elements is 256 for G.992.3, 512
@@ -15044,7 +15655,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="BITSpsus" access="readOnly" activeNotify="canDeny">
+      <parameter name="BITSpsus" access="readOnly" activeNotify="canDeny"
+          version="2.0">
         <description>
           {{list}} List items represent upstream bit allocation per subcarrier
           group. Maximum number of elements is 256 for G.992.3, 512 for
@@ -15089,7 +15701,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Interface" access="readWrite">
+      <parameter name="Interface" access="readWrite" version="2.13">
         <description>
           {{reference}} This is the interface over which the test is to be
           performed.
@@ -15102,7 +15714,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="UERMaxMeasurementDuration" access="readWrite">
+      <parameter name="UERMaxMeasurementDuration" access="readWrite"
+          version="2.13">
         <description>
           This parameter is the SELT UER maximum measurement duration (MMD)
           measured in {{units}}.
@@ -15118,7 +15731,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="ExtendedBandwidthOperation" access="readOnly">
+      <parameter name="ExtendedBandwidthOperation" access="readOnly"
+          version="2.13">
         <description>
           This parameter indicates if the option for extended bandwidth SELT is
           applied ({{true}}) or not applied ({{false}}).
@@ -15138,7 +15752,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="UER" access="readOnly">
+      <parameter name="UER" access="readOnly" version="2.13">
         <description>
           The Uncalibrated Echo Response (UER) [a(0),b(0)], [a(1),b(1)], ...
 
@@ -15147,7 +15761,7 @@
           {{datatype|expand}}
 
           The value of UER at frequency i*{{param|UERGroupSize}}*Df =
-          ({{param|UERScaleFactor}}/(2^31))*(a(i)+j*b(i))/(2^31) where Df =
+          ({{param|UERScaleFactor}}/(2^31^))*(a(i)+j*b(i))/(2^31^) where Df =
           4.3125 kHz.
 
           This parameter is defined as CPE SELT uncalibrated echo response
@@ -15160,7 +15774,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="UERScaleFactor" access="readOnly">
+      <parameter name="UERScaleFactor" access="readOnly" version="2.13">
         <description>
           The Uncalibrated Echo Response (UER) scale factor.
 
@@ -15169,7 +15783,7 @@
           A.2.2.1}}.
 
           Note that the scale factor is chosen such that max(abs(a(i)),
-          abs(b(i))) over all i is equal to 2^31 - 1, which doesn't allow
+          abs(b(i))) over all i is equal to 2^31^ - 1, which doesn't allow
           {{param}} to be zero.
         </description>
         <syntax>
@@ -15177,7 +15791,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="UERGroupSize" access="readOnly">
+      <parameter name="UERGroupSize" access="readOnly" version="2.13">
         <description>
           The Uncalibrated Echo Response (UER) group size, UER_G. In units of
           {{units}}.
@@ -15195,7 +15809,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="UERVar" access="readOnly">
+      <parameter name="UERVar" access="readOnly" version="2.13">
         <description>
           This parameter represents the variance of the {{param|UER}}. List
           items represent v(i), for values of i starting at i=0. The variance
@@ -15241,7 +15855,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Interface" access="readWrite">
+      <parameter name="Interface" access="readWrite" version="2.13">
         <description>
           {{reference}} This is the interface over which the test is to be
           performed.
@@ -15254,7 +15868,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="QLNMaxMeasurementDuration" access="readWrite">
+      <parameter name="QLNMaxMeasurementDuration" access="readWrite"
+          version="2.13">
         <description>
           This parameter is the SELT QLN maximum measurement duration (MMD)
           measured in {{units}}.
@@ -15270,7 +15885,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="ExtendedBandwidthOperation" access="readOnly">
+      <parameter name="ExtendedBandwidthOperation" access="readOnly"
+          version="2.13">
         <description>
           This parameter indicates if the option for extended bandwidth SELT is
           applied ({{true}}) or not applied ({{false}}).
@@ -15290,7 +15906,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="QLN" access="readOnly">
+      <parameter name="QLN" access="readOnly" version="2.13">
         <description>
           {{list}} List items represent SELT quiet line noise (QLN) per
           subcarrier group.
@@ -15312,7 +15928,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="QLNGroupSize" access="readOnly">
+      <parameter name="QLNGroupSize" access="readOnly" version="2.13">
         <description>
           This parameter represents the Quiet Line Noise (QLN) group size. In
           units of {{units}}.
@@ -15357,7 +15973,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Interface" access="readWrite">
+      <parameter name="Interface" access="readWrite" version="2.13">
         <description>
           {{reference}} This is the interface over which the test is to be
           performed.
@@ -15370,7 +15986,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="CapacityEstimateEnabling" access="readWrite">
+      <parameter name="CapacityEstimateEnabling" access="readWrite"
+          version="2.13">
         <description>
           Capacity estimate calculation enabling: This parameter is expressed
           as a boolean and takes the value {{false}} if xDSL performance
@@ -15384,7 +16001,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="CapacitySignalPSD" access="readWrite">
+      <parameter name="CapacitySignalPSD" access="readWrite" version="2.13">
         <description>
           The capacity estimate signal Power Spectral Density (PSD):
 
@@ -15401,7 +16018,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="CapacityNoisePSD" access="readWrite">
+      <parameter name="CapacityNoisePSD" access="readWrite" version="2.13">
         <description>
           The capacity estimate noise Power Spectral Density (PSD):
 
@@ -15418,7 +16035,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="CapacityTargetMargin" access="readWrite">
+      <parameter name="CapacityTargetMargin" access="readWrite" version="2.13">
         <description>
           The capacity estimate target noise margin. The range of valid values
           is 0 to 31 dB, in steps of {{units}}.
@@ -15434,7 +16051,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="LoopTermination" access="readOnly">
+      <parameter name="LoopTermination" access="readOnly" version="2.13">
         <description>
           Loop termination indicator. {{enum}}
 
@@ -15459,7 +16076,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="LoopLength" access="readOnly">
+      <parameter name="LoopLength" access="readOnly" version="2.13">
         <description>
           This parameter is the loop length with units of {{units}}.
 
@@ -15474,7 +16091,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="LoopTopology" access="readOnly">
+      <parameter name="LoopTopology" access="readOnly" version="2.13">
         <description>
           {{list}} List items represent paired parameters [LOOP_SEG_LEN,
           LOOP_SEG_BTAP] representing a concatenation of loop segment types,
@@ -15498,7 +16115,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="AttenuationCharacteristics" access="readOnly">
+      <parameter name="AttenuationCharacteristics" access="readOnly"
+          version="2.13">
         <description>
           Specifies the list of attenuation characteristics.
 
@@ -15521,7 +16139,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="TFlogGroupSize" access="readOnly">
+      <parameter name="TFlogGroupSize" access="readOnly" version="2.14">
         <description>
           This parameter represents the Transfer Function Log (TFlog) group
           size. In units of {{units}}.
@@ -15539,7 +16157,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="MissingFilter" access="readOnly">
+      <parameter name="MissingFilter" access="readOnly" version="2.13">
         <description>
           Missing micro-filter or splitter: This parameter is a binary
           indication of a missing or incorrectly installed splitter or
@@ -15554,7 +16172,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="CapacityEstimate" access="readOnly">
+      <parameter name="CapacityEstimate" access="readOnly" version="2.13">
         <description>
           Capacity Estimate: {{list}} This parameter represents the downstream
           and/or upstream capacity estimates in {{units}}.
@@ -15660,12 +16278,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.11">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -17421,7 +18039,7 @@
 
       <parameter name="Status" access="readOnly">
         <description>
-          The current operational state of the optical interface (see
+          The current operational state of the interface (see
           {{bibref|TR-181i2|Section 4.2.2}}). {{enum}}
 
           When {{param|Enable}} is {{false}} then {{param}} SHOULD normally be
@@ -17459,18 +18077,18 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.4">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
       <parameter name="Name" access="readOnly">
         <description>
-          The textual name of the optical interface as assigned by the CPE.
+          The textual name of the interface as assigned by the CPE.
         </description>
         <syntax>
           <string>
@@ -17481,8 +18099,8 @@
 
       <parameter name="LastChange" access="readOnly" activeNotify="canDeny">
         <description>
-          The accumulated time in {{units}} since the optical interface entered
-          its current operational state.
+          The accumulated time in {{units}} since the interface entered its
+          current operational state.
         </description>
         <syntax>
           <unsignedInt>
@@ -17530,6 +18148,21 @@
         </syntax>
       </parameter>
 
+      <parameter name="MaxBitRate" access="readWrite" version="2.18">
+        <description>
+          The maximum upstream and downstream PHY bit rate supported by this
+          interface (expressed in {{units}}).
+
+          A value of -1 indicates automatic selection of the maximum bit rate.
+        </description>
+        <syntax>
+          <int>
+            <range minInclusive="-1"/>
+            <units value="Mbps"/>
+          </int>
+        </syntax>
+      </parameter>
+
       <parameter name="OpticalSignalLevel" access="readOnly">
         <description>
           Current measurement of total downstream optical signal level.
@@ -17550,7 +18183,7 @@
       </parameter>
 
       <parameter name="LowerOpticalThreshold" access="readOnly"
-          status="obsoleted">
+          status="deleted">
         <description>
           Optical level that is used to declare the downstream low received
           optical power alarm.
@@ -17568,6 +18201,8 @@
           an optical power alarm.}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <dataType ref="Dbm1000">
@@ -17577,7 +18212,7 @@
       </parameter>
 
       <parameter name="UpperOpticalThreshold" access="readOnly"
-          status="obsoleted">
+          status="deleted">
         <description>
           Optical level that is used to declare the downstream high received
           optical power alarm.
@@ -17595,6 +18230,8 @@
           an optical power alarm.}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <dataType ref="Dbm1000">
@@ -17623,7 +18260,7 @@
       </parameter>
 
       <parameter name="LowerTransmitPowerThreshold" access="readOnly"
-          status="obsoleted">
+          status="deleted">
         <description>
           Minimum mean optical launch power that is used to declare the low
           transmit optical power alarm.
@@ -17641,6 +18278,8 @@
           an optical power alarm.}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <dataType ref="Dbm1000">
@@ -17650,7 +18289,7 @@
       </parameter>
 
       <parameter name="UpperTransmitPowerThreshold" access="readOnly"
-          status="obsoleted">
+          status="deleted">
         <description>
           Maximum mean optical launch power that is used to declare the high
           transmit optical power alarm.
@@ -17668,6 +18307,8 @@
           an optical power alarm.}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <dataType ref="Dbm1000">
@@ -17693,13 +18334,23 @@
         4.2.2}}.
       </description>
 
+      <parameter name="Reset" access="readWrite" version="2.18">
+        <description>
+          Set this to {{true}} to reset all this object's statistics counters
+          to zero.
+        </description>
+        <syntax command="true">
+          <boolean/>
+        </syntax>
+      </parameter>
+
       <parameter name="BytesSent" access="readOnly" activeNotify="canDeny">
         <description>
           The total number of bytes transmitted out of the interface, including
           framing characters.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
@@ -17709,7 +18360,7 @@
           framing characters.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
@@ -17718,7 +18369,7 @@
           The total number of packets transmitted out of the interface.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
@@ -17728,7 +18379,7 @@
           The total number of packets received on the interface.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
@@ -17738,7 +18389,7 @@
           because of errors.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="StatsCounter32"/>
         </syntax>
       </parameter>
 
@@ -17749,7 +18400,7 @@
           them from being delivered to a higher-layer protocol.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="StatsCounter32"/>
         </syntax>
       </parameter>
 
@@ -17762,7 +18413,7 @@
           could be to free up buffer space.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="StatsCounter32"/>
         </syntax>
       </parameter>
 
@@ -17775,7 +18426,7 @@
           to free up buffer space.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="StatsCounter32"/>
         </syntax>
       </parameter>
     </object>
@@ -17909,12 +18560,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.8">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -18015,7 +18666,7 @@
             <enumeration value="CDMA2000OneX"/>
             <enumeration value="CDMA2000HRPD"/>
             <enumeration value="LTE"/>
-            <enumeration value="NR">
+            <enumeration value="NR" version="2.14">
               <description>5G New Radio</description>
             </enumeration>
           </string>
@@ -18112,7 +18763,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="RSRP" access="readOnly" activeNotify="canDeny">
+      <parameter name="RSRP" access="readOnly" activeNotify="canDeny"
+          version="2.14">
         <description>
           The Reference Signal Received Power in {{units}} for
           {{enum|LTE|SupportedAccessTechnologies}},
@@ -18129,7 +18781,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="RSRQ" access="readOnly" activeNotify="canDeny">
+      <parameter name="RSRQ" access="readOnly" activeNotify="canDeny"
+          version="2.14">
         <description>
           The Reference Signal Received Quality in {{units}} for
           {{enum|LTE|SupportedAccessTechnologies}},
@@ -18524,12 +19177,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.8">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -18642,7 +19295,7 @@
 
       <parameter name="Enable" access="readWrite">
         <description>
-          Enables or disables the link.
+          Enables or disables the interface.
 
           This parameter is based on ''ifAdminStatus'' from {{bibref|RFC2863}}.
         </description>
@@ -18654,7 +19307,7 @@
 
       <parameter name="Status" access="readOnly">
         <description>
-          The current operational state of the link (see
+          The current operational state of the interface (see
           {{bibref|TR-181i2|Section 4.2.2}}). {{enum}}
 
           When {{param|Enable}} is {{false}} then {{param}} SHOULD normally be
@@ -18693,18 +19346,18 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
       <parameter name="Name" access="readOnly">
         <description>
-          The textual name of the link as assigned by the CPE.
+          The textual name of the interface as assigned by the CPE.
         </description>
         <syntax>
           <string>
@@ -18715,8 +19368,8 @@
 
       <parameter name="LastChange" access="readOnly" activeNotify="canDeny">
         <description>
-          The accumulated time in {{units}} since the link entered its current
-          operational state.
+          The accumulated time in {{units}} since the interface entered its
+          current operational state.
         </description>
         <syntax>
           <unsignedInt>
@@ -18737,7 +19390,7 @@
           <string>
             <pathRef refType="strong" targetType="row"/>
           </string>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
@@ -18872,13 +19525,23 @@
         4.2.2}}.
       </description>
 
+      <parameter name="Reset" access="readWrite" version="2.18">
+        <description>
+          Set this to {{true}} to reset all this object's statistics counters
+          to zero.
+        </description>
+        <syntax command="true">
+          <boolean/>
+        </syntax>
+      </parameter>
+
       <parameter name="BytesSent" access="readOnly" activeNotify="canDeny">
         <description>
           The total number of bytes transmitted out of the interface, including
           framing characters.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
@@ -18888,7 +19551,7 @@
           framing characters.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
@@ -18897,7 +19560,7 @@
           The total number of packets transmitted out of the interface.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
@@ -18907,7 +19570,7 @@
           The total number of packets received on the interface.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
@@ -18917,7 +19580,7 @@
           because of errors.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="StatsCounter32"/>
         </syntax>
       </parameter>
 
@@ -18928,31 +19591,19 @@
           them from being delivered to a higher-layer protocol.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="StatsCounter32"/>
         </syntax>
       </parameter>
 
       <parameter name="UnicastPacketsSent" access="readOnly"
-          activeNotify="canDeny">
+          activeNotify="canDeny" dmr:previousParameter="ErrorsReceived">
         <description>
           The total number of packets requested for transmission which were not
           addressed to a multicast or broadcast address at this layer,
           including those that were discarded or not sent.
         </description>
         <syntax>
-          <unsignedLong/>
-        </syntax>
-      </parameter>
-
-      <parameter name="UnicastPacketsReceived" access="readOnly"
-          activeNotify="canDeny">
-        <description>
-          The total number of received packets, delivered by this layer to a
-          higher layer, which were not addressed to a multicast or broadcast
-          address at this layer.
-        </description>
-        <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
@@ -18965,7 +19616,7 @@
           could be to free up buffer space.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="StatsCounter32"/>
         </syntax>
       </parameter>
 
@@ -18978,19 +19629,31 @@
           to free up buffer space.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="StatsCounter32"/>
         </syntax>
       </parameter>
 
       <parameter name="MulticastPacketsSent" access="readOnly"
-          activeNotify="canDeny">
+          activeNotify="canDeny" dmr:previousParameter="DiscardPacketsReceived">
         <description>
           The total number of packets that higher-level protocols requested for
           transmission and which were addressed to a multicast address at this
           layer, including those that were discarded or not sent.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="UnicastPacketsReceived" access="readOnly"
+          activeNotify="canDeny">
+        <description>
+          The total number of received packets, delivered by this layer to a
+          higher layer, which were not addressed to a multicast or broadcast
+          address at this layer.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
@@ -19002,31 +19665,29 @@
           layer.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
-      <parameter name="BroadcastPacketsSent" access="readOnly"
-          activeNotify="canDeny">
+      <parameter name="BroadcastPacketsSent" access="readOnly">
         <description>
           The total number of packets that higher-level protocols requested for
           transmission and which were addressed to a broadcast address at this
           layer, including those that were discarded or not sent.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
-      <parameter name="BroadcastPacketsReceived" access="readOnly"
-          activeNotify="canDeny">
+      <parameter name="BroadcastPacketsReceived" access="readOnly">
         <description>
           The total number of received packets, delivered by this layer to a
           higher layer, which were addressed to a broadcast address at this
           layer.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
@@ -19037,7 +19698,7 @@
           discarded because of an unknown or unsupported protocol.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="StatsCounter32"/>
         </syntax>
       </parameter>
 
@@ -19172,7 +19833,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Interface" access="readWrite">
+      <parameter name="Interface" access="readWrite" version="2.0">
         <description>
           {{reference}} This is the interface over which the test is to be
           performed.
@@ -19185,7 +19846,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="NumberOfRepetitions" access="readWrite">
+      <parameter name="NumberOfRepetitions" access="readWrite" version="2.0">
         <description>
           Number of repetitions of the ping test to perform before reporting
           the results.
@@ -19197,7 +19858,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Timeout" access="readWrite">
+      <parameter name="Timeout" access="readWrite" version="2.0">
         <description>
           Timeout in {{units}} for the ping test.
         </description>
@@ -19209,7 +19870,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="SuccessCount" access="readOnly" activeNotify="canDeny">
+      <parameter name="SuccessCount" access="readOnly" activeNotify="canDeny"
+          version="2.0">
         <description>
           Result parameter indicating the number of successful pings (those in
           which a successful response was received prior to the timeout) in the
@@ -19220,7 +19882,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="FailureCount" access="readOnly" activeNotify="canDeny">
+      <parameter name="FailureCount" access="readOnly" activeNotify="canDeny"
+          version="2.0">
         <description>
           Result parameter indicating the number of failed pings in the most
           recent ping test.
@@ -19231,7 +19894,7 @@
       </parameter>
 
       <parameter name="AverageResponseTime" access="readOnly"
-          activeNotify="canDeny">
+          activeNotify="canDeny" version="2.0">
         <description>
           Result parameter indicating the average response time in {{units}}
           over all repetitions with successful responses of the most recent
@@ -19246,7 +19909,7 @@
       </parameter>
 
       <parameter name="MinimumResponseTime" access="readOnly"
-          activeNotify="canDeny">
+          activeNotify="canDeny" version="2.0">
         <description>
           Result parameter indicating the minimum response time in {{units}}
           over all repetitions with successful responses of the most recent
@@ -19260,7 +19923,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="MaximumResponseTime" access="readOnly">
+      <parameter name="MaximumResponseTime" access="readOnly" version="2.0">
         <description>
           Result parameter indicating the maximum response time in {{units}}
           over all repetitions with successful responses of the most recent
@@ -19424,12 +20087,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.15">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -19793,12 +20456,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.15">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -20111,12 +20774,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.15">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -20491,12 +21154,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.15">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -20864,12 +21527,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.15">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -21835,12 +22498,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -21879,7 +22542,7 @@
           <string>
             <pathRef refType="strong" targetType="row"/>
           </string>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
@@ -22098,7 +22761,7 @@
         receive and send frames with a configured VLANID.
       </description>
 
-      <parameter name="WoLSupported" access="readOnly">
+      <parameter name="WoLSupported" access="readOnly" version="2.13">
         <description>
           Indicates that WoL (Wake on LAN) over Ethernet is supported.
         </description>
@@ -22107,7 +22770,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="FlowControlSupported" access="readOnly">
+      <parameter name="FlowControlSupported" access="readOnly" version="2.14">
         <description>
           Indicates that Flow Control over Ethernet is supported, as per
           {{bibref|802.3-2015}}.
@@ -22144,7 +22807,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="RMONStatsNumberOfEntries" access="readOnly">
+      <parameter name="LAGNumberOfEntries" access="readOnly" version="2.12">
         <description>
           {{numentries}}
         </description>
@@ -22153,7 +22816,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="LAGNumberOfEntries" access="readOnly">
+      <parameter name="RMONStatsNumberOfEntries" access="readOnly"
+          version="2.4">
         <description>
           {{numentries}}
         </description>
@@ -22231,12 +22895,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -22302,6 +22966,21 @@
         </syntax>
       </parameter>
 
+      <parameter name="MaxBitRate" access="readWrite">
+        <description>
+          The maximum upstream and downstream PHY bit rate supported by this
+          interface (expressed in {{units}}).
+
+          A value of -1 indicates automatic selection of the maximum bit rate.
+        </description>
+        <syntax>
+          <int>
+            <range minInclusive="-1"/>
+            <units value="Mbps"/>
+          </int>
+        </syntax>
+      </parameter>
+
       <parameter name="MACAddress" access="readOnly">
         <description>
           The unique manufacturer-assigned Ethernet hardware address of the
@@ -22318,19 +22997,23 @@
         </syntax>
       </parameter>
 
-      <parameter name="SupportedLinkModes" access="readOnly">
+      <parameter name="SupportedLinkModes" access="readOnly" version="2.16">
         <description>
           Reports the supported link modes. MUST be reported in a compliant way
           as defined in {{bibref|IANAMauMIB|IANAifMauTypeListBits}}. For
           example, IANAifMauTypeListBits defines the following link mode types:
 
-          * ''11'' (10BASE-T full duplex mode)
-
-          * ''14'' (100BASE-T4)
-
-          * ''15'' (100BASE-TX half duplex mode)
-
           * ''16'' (100BASE-TX full duplex mode)
+
+          * ''26'' (1000BASE-SX full duplex mode)
+
+          * ''30'' (1000BASE-T full duplex mode)
+
+          * ''54'' (10GBASE-T)
+
+          * ''103'' (2.5GBASE-T)
+
+          * ''104'' (5GBASE-T)
         </description>
         <syntax>
           <list/>
@@ -22338,23 +23021,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="MaxBitRate" access="readWrite">
-        <description>
-          The maximum upstream and downstream PHY bit rate supported by this
-          interface (expressed in {{units}}).
-
-          A value of -1 indicates automatic selection of the maximum bit rate.
-        </description>
-        <syntax>
-          <int>
-            <range minInclusive="-1"/>
-            <units value="Mbps"/>
-          </int>
-        </syntax>
-      </parameter>
-
       <parameter name="CurrentBitRate" access="readOnly"
-          activeNotify="canDeny">
+          activeNotify="canDeny" version="2.7">
         <description>
           The current upstream and downstream PHY bit rate on this interface
           (expressed in {{units}}).
@@ -22370,7 +23038,7 @@
 
       <parameter name="DuplexMode" access="readWrite">
         <description>
-          The duplex mode available to this connection.
+          The duplex mode requested for this connection.
         </description>
         <syntax>
           <string>
@@ -22381,7 +23049,20 @@
         </syntax>
       </parameter>
 
-      <parameter name="EEECapability" access="readOnly">
+      <parameter name="CurrentDuplexMode" access="readOnly" version="2.18">
+        <description>
+          The duplex mode currently in use by this connection.
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="Unknown"/>
+            <enumeration value="Half"/>
+            <enumeration value="Full"/>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="EEECapability" access="readOnly" version="2.8">
         <description>
           Indicates whether this physical ethernet port supports Energy
           Efficient Ethernet as specified in
@@ -22392,7 +23073,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="EEEEnable" access="readWrite">
+      <parameter name="EEEEnable" access="readWrite" version="2.8">
         <description>
           Whether Energy Efficient Ethernet
           {{bibref|802.3-2012_section6|Section 78}} support is currently
@@ -22404,7 +23085,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="EEEStatus" access="readOnly">
+      <parameter name="EEEStatus" access="readOnly" version="2.17">
         <description>
           Indicates the active state of Energy Efficient Ethernet
           {{bibref|802.3-2012_section6|Section 78}}.
@@ -22434,6 +23115,36 @@
           </string>
         </syntax>
       </parameter>
+
+      <parameter name="MDIX" access="readWrite" version="2.18">
+        <description>
+          Configure the Medium Dependent Interface crossover functionality on
+          the interface.
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="Auto"/>
+            <enumeration value="On"/>
+            <enumeration value="Off"/>
+          </string>
+          <default type="factory" value="Auto"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="CurrentMDIX" access="readOnly" version="2.18">
+        <description>
+          The current Medium Dependent Interface crossover setting in use on
+          the interface.
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="Unsupported"/>
+            <enumeration value="Unknown"/>
+            <enumeration value="On"/>
+            <enumeration value="Off"/>
+          </string>
+        </syntax>
+      </parameter>
     </object>
 
     <object name="Device.Ethernet.Interface.{i}.Stats." access="readOnly"
@@ -22452,13 +23163,23 @@
         4.2.2}}.
       </description>
 
+      <parameter name="Reset" access="readWrite" version="2.18">
+        <description>
+          Set this to {{true}} to reset all this object's statistics counters
+          to zero.
+        </description>
+        <syntax command="true">
+          <boolean/>
+        </syntax>
+      </parameter>
+
       <parameter name="BytesSent" access="readOnly" activeNotify="canDeny">
         <description>
           The total number of bytes transmitted out of the interface, including
           framing characters.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
@@ -22468,158 +23189,164 @@
           framing characters.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
       <parameter name="PacketsSent" access="readOnly" activeNotify="canDeny">
         <description>
-          The total number of Ethernet frames transmitted out of the interface.
+          The total number of packets transmitted out of the interface.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
       <parameter name="PacketsReceived" access="readOnly"
           activeNotify="canDeny">
         <description>
-          The total number of Ethernet frames received on the interface.
+          The total number of packets received on the interface.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
       <parameter name="ErrorsSent" access="readOnly" activeNotify="canDeny">
         <description>
-          The total number of outbound Ethernet frames that could not be
-          transmitted because of errors.
+          The total number of outbound packets that could not be transmitted
+          because of errors.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="StatsCounter32"/>
         </syntax>
       </parameter>
 
       <parameter name="ErrorsReceived" access="readOnly"
           activeNotify="canDeny">
         <description>
-          The total number of inbound Ethernet frames that contained errors
-          preventing them from being delivered to a higher-layer protocol.
+          The total number of inbound packets that contained errors preventing
+          them from being delivered to a higher-layer protocol.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="StatsCounter32"/>
         </syntax>
       </parameter>
 
       <parameter name="UnicastPacketsSent" access="readOnly"
-          activeNotify="canDeny">
+          activeNotify="canDeny" dmr:previousParameter="ErrorsReceived">
         <description>
-          The total number of Ethernet frames requested for transmission which
-          were not addressed to a multicast or broadcast address at this layer,
+          The total number of packets requested for transmission which were not
+          addressed to a multicast or broadcast address at this layer,
           including those that were discarded or not sent.
         </description>
         <syntax>
-          <unsignedLong/>
-        </syntax>
-      </parameter>
-
-      <parameter name="UnicastPacketsReceived" access="readOnly"
-          activeNotify="canDeny">
-        <description>
-          The total number of Ethernet frames packets, delivered by this layer
-          to a higher layer, which were not addressed to a multicast or
-          broadcast address at this layer.
-        </description>
-        <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
       <parameter name="DiscardPacketsSent" access="readOnly"
           activeNotify="canDeny">
         <description>
-          The total number of outbound Ethernet frames which were chosen to be
+          The total number of outbound packets which were chosen to be
           discarded even though no errors had been detected to prevent their
           being transmitted. One possible reason for discarding such a packet
           could be to free up buffer space.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="StatsCounter32"/>
         </syntax>
       </parameter>
 
       <parameter name="DiscardPacketsReceived" access="readOnly"
           activeNotify="canDeny">
         <description>
-          The total number of inbound Ethernet frames which were chosen to be
-          discarded even though no errors had been detected to prevent their
-          being delivered. One possible reason for discarding such a packet
-          could be to free up buffer space.
+          The total number of inbound packets which were chosen to be discarded
+          even though no errors had been detected to prevent their being
+          delivered. One possible reason for discarding such a packet could be
+          to free up buffer space.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="StatsCounter32"/>
         </syntax>
       </parameter>
 
       <parameter name="MulticastPacketsSent" access="readOnly"
-          activeNotify="canDeny">
+          activeNotify="canDeny" dmr:previousParameter="DiscardPacketsReceived">
         <description>
-          The total number of Ethernet frames that higher-level protocols
-          requested for transmission and which were addressed to a multicast
-          address at this layer, including those that were discarded or not
-          sent.
+          The total number of packets that higher-level protocols requested for
+          transmission and which were addressed to a multicast address at this
+          layer, including those that were discarded or not sent.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="UnicastPacketsReceived" access="readOnly"
+          activeNotify="canDeny">
+        <description>
+          The total number of received packets, delivered by this layer to a
+          higher layer, which were not addressed to a multicast or broadcast
+          address at this layer.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
       <parameter name="MulticastPacketsReceived" access="readOnly"
           activeNotify="canDeny">
         <description>
-          The total number of received Ethernet frames, delivered by this layer
-          to a higher layer, which were addressed to a multicast address at
-          this layer.
+          The total number of received packets, delivered by this layer to a
+          higher layer, which were addressed to a multicast address at this
+          layer.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
-      <parameter name="BroadcastPacketsSent" access="readOnly"
-          activeNotify="canDeny">
+      <parameter name="BroadcastPacketsSent" access="readOnly">
         <description>
-          The total number of Ethernet frames that higher-level protocols
-          requested for transmission and which were addressed to a broadcast
-          address at this layer, including those that were discarded or not
-          sent.
+          The total number of packets that higher-level protocols requested for
+          transmission and which were addressed to a broadcast address at this
+          layer, including those that were discarded or not sent.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
-      <parameter name="BroadcastPacketsReceived" access="readOnly"
-          activeNotify="canDeny">
+      <parameter name="BroadcastPacketsReceived" access="readOnly">
         <description>
-          The total number of received Ethernet frames, delivered by this layer
-          to a higher layer, which were addressed to a broadcast address at
-          this layer.
+          The total number of received packets, delivered by this layer to a
+          higher layer, which were addressed to a broadcast address at this
+          layer.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
       <parameter name="UnknownProtoPacketsReceived" access="readOnly"
           activeNotify="canDeny">
         <description>
-          The total number of Ethernet frames received via the interface which
-          were discarded because of an unknown or unsupported protocol.
+          The total number of packets received via the interface which were
+          discarded because of an unknown or unsupported protocol.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Collisions" access="readOnly" activeNotify="canDeny"
+          version="2.18">
+        <description>
+          The total number of collisions on the interface.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
     </object>
@@ -22646,7 +23373,7 @@
 
       <parameter name="Enable" access="readWrite">
         <description>
-          Enables or disables the link.
+          Enables or disables the interface.
 
           This parameter is based on ''ifAdminStatus'' from {{bibref|RFC2863}}.
         </description>
@@ -22658,7 +23385,7 @@
 
       <parameter name="Status" access="readOnly">
         <description>
-          The current operational state of the link (see
+          The current operational state of the interface (see
           {{bibref|TR-181i2|Section 4.2.2}}). {{enum}}
 
           When {{param|Enable}} is {{false}} then {{param}} SHOULD normally be
@@ -22697,18 +23424,18 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
       <parameter name="Name" access="readOnly">
         <description>
-          The textual name of the link as assigned by the CPE.
+          The textual name of the interface as assigned by the CPE.
         </description>
         <syntax>
           <string>
@@ -22719,8 +23446,8 @@
 
       <parameter name="LastChange" access="readOnly" activeNotify="canDeny">
         <description>
-          The accumulated time in {{units}} since the link entered its current
-          operational state.
+          The accumulated time in {{units}} since the interface entered its
+          current operational state.
         </description>
         <syntax>
           <unsignedInt>
@@ -22741,7 +23468,20 @@
           <string>
             <pathRef refType="strong" targetType="row"/>
           </string>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="MTU" access="readWrite" version="2.18"
+          dmr:previousParameter="LowerLayers">
+        <description>
+          Maximum Transmission Unit for this interface (expressed in
+          {{units}}).
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="bytes"/>
+          </unsignedInt>
         </syntax>
       </parameter>
 
@@ -22777,7 +23517,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="FlowControl" access="readWrite">
+      <parameter name="FlowControl" access="readWrite" version="2.14">
         <description>
           Configures Flow Control on given Ethernet port. When set to {{true}},
           it activates the exchange of pause-resume flow control frames.
@@ -22787,191 +23527,230 @@
           <default type="object" value="false"/>
         </syntax>
       </parameter>
+
+      <parameter name="NoARP" access="readWrite" version="2.18">
+        <description>
+          Disables or enables sending of ARP messages on the Ethernet link. If
+          {{true}}, the kernel will not send ARP requests and won't send ARP
+          replies.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="object" value="false"/>
+        </syntax>
+      </parameter>
     </object>
 
     <object name="Device.Ethernet.Link.{i}.Stats." access="readOnly"
         minEntries="1" maxEntries="1" version="2.0">
       <description>
-        Throughput statistics for this link.
+        Throughput statistics for this interface.
 
-        The CPE MUST reset the link's Stats parameters (unless otherwise stated
-        in individual object or parameter descriptions) either when the link
-        becomes operationally down due to a previous administrative down (i.e.
-        the link's {{param|#.Status}} parameter transitions to a down state
-        after the link is disabled) or when the link becomes administratively
-        up (i.e. the link's {{param|#.Enable}} parameter transitions from
-        {{false}} to {{true}}). Administrative and operational link status is
-        discussed in {{bibref|TR-181i2|section 4.2.2}}.
+        The CPE MUST reset the interface's Stats parameters (unless otherwise
+        stated in individual object or parameter descriptions) either when the
+        interface becomes operationally down due to a previous administrative
+        down (i.e. the interface's {{param|#.Status}} parameter transitions to
+        a down state after the interface is disabled) or when the interface
+        becomes administratively up (i.e. the interface's {{param|#.Enable}}
+        parameter transitions from {{false}} to {{true}}). Administrative and
+        operational interface status is discussed in {{bibref|TR-181i2|section
+        4.2.2}}.
       </description>
 
+      <parameter name="Reset" access="readWrite" version="2.18">
+        <description>
+          Set this to {{true}} to reset all this object's statistics counters
+          to zero.
+        </description>
+        <syntax command="true">
+          <boolean/>
+        </syntax>
+      </parameter>
+
       <parameter name="BytesSent" access="readOnly" activeNotify="canDeny">
         <description>
-          The total number of bytes transmitted out of the link, including
+          The total number of bytes transmitted out of the interface, including
           framing characters.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
       <parameter name="BytesReceived" access="readOnly" activeNotify="canDeny">
         <description>
-          The total number of bytes received on the link, including framing
-          characters.
+          The total number of bytes received on the interface, including
+          framing characters.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
       <parameter name="PacketsSent" access="readOnly" activeNotify="canDeny">
         <description>
-          The total number of Ethernet frames transmitted out of the link.
+          The total number of packets transmitted out of the interface.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
       <parameter name="PacketsReceived" access="readOnly"
           activeNotify="canDeny">
         <description>
-          The total number of Ethernet frames received on the link.
+          The total number of packets received on the interface.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
       <parameter name="ErrorsSent" access="readOnly" activeNotify="canDeny">
         <description>
-          The total number of outbound Ethernet frames that could not be
-          transmitted because of errors.
+          The total number of outbound packets that could not be transmitted
+          because of errors.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="StatsCounter32"/>
         </syntax>
       </parameter>
 
       <parameter name="ErrorsReceived" access="readOnly"
           activeNotify="canDeny">
         <description>
-          The total number of inbound Ethernet frames that contained errors
-          preventing them from being delivered to a higher-layer protocol.
+          The total number of inbound packets that contained errors preventing
+          them from being delivered to a higher-layer protocol.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="StatsCounter32"/>
         </syntax>
       </parameter>
 
       <parameter name="UnicastPacketsSent" access="readOnly"
-          activeNotify="canDeny">
+          activeNotify="canDeny" dmr:previousParameter="ErrorsReceived">
         <description>
-          The total number of Ethernet frames requested for transmission which
-          were not addressed to a multicast or broadcast address at this layer,
+          The total number of packets requested for transmission which were not
+          addressed to a multicast or broadcast address at this layer,
           including those that were discarded or not sent.
         </description>
         <syntax>
-          <unsignedLong/>
-        </syntax>
-      </parameter>
-
-      <parameter name="UnicastPacketsReceived" access="readOnly"
-          activeNotify="canDeny">
-        <description>
-          The total number of received Ethernet frames, delivered by this layer
-          to a higher layer, which were not addressed to a multicast or
-          broadcast address at this layer.
-        </description>
-        <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
       <parameter name="DiscardPacketsSent" access="readOnly"
           activeNotify="canDeny">
         <description>
-          The total number of outbound Ethernet frames which were chosen to be
+          The total number of outbound packets which were chosen to be
           discarded even though no errors had been detected to prevent their
           being transmitted. One possible reason for discarding such a packet
           could be to free up buffer space.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="StatsCounter32"/>
         </syntax>
       </parameter>
 
       <parameter name="DiscardPacketsReceived" access="readOnly"
           activeNotify="canDeny">
         <description>
-          The total number of inbound Ethernet frames which were chosen to be
-          discarded even though no errors had been detected to prevent their
-          being delivered. One possible reason for discarding such a packet
-          could be to free up buffer space.
+          The total number of inbound packets which were chosen to be discarded
+          even though no errors had been detected to prevent their being
+          delivered. One possible reason for discarding such a packet could be
+          to free up buffer space.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="StatsCounter32"/>
         </syntax>
       </parameter>
 
       <parameter name="MulticastPacketsSent" access="readOnly"
-          activeNotify="canDeny">
+          activeNotify="canDeny" dmr:previousParameter="DiscardPacketsReceived">
         <description>
-          The total number of Ethernet frames that higher-level protocols
-          requested for transmission and which were addressed to a multicast
-          address at this layer, including those that were discarded or not
-          sent.
+          The total number of packets that higher-level protocols requested for
+          transmission and which were addressed to a multicast address at this
+          layer, including those that were discarded or not sent.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="UnicastPacketsReceived" access="readOnly"
+          activeNotify="canDeny">
+        <description>
+          The total number of received packets, delivered by this layer to a
+          higher layer, which were not addressed to a multicast or broadcast
+          address at this layer.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
       <parameter name="MulticastPacketsReceived" access="readOnly"
           activeNotify="canDeny">
         <description>
-          The total number of received Ethernet frames, delivered by this layer
-          to a higher layer, which were addressed to a multicast address at
-          this layer.
+          The total number of received packets, delivered by this layer to a
+          higher layer, which were addressed to a multicast address at this
+          layer.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
-      <parameter name="BroadcastPacketsSent" access="readOnly"
-          activeNotify="canDeny">
+      <parameter name="BroadcastPacketsSent" access="readOnly">
         <description>
-          The total number of Ethernet frames that higher-level protocols
-          requested for transmission and which were addressed to a broadcast
-          address at this layer, including those that were discarded or not
-          sent.
+          The total number of packets that higher-level protocols requested for
+          transmission and which were addressed to a broadcast address at this
+          layer, including those that were discarded or not sent.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
-      <parameter name="BroadcastPacketsReceived" access="readOnly"
-          activeNotify="canDeny">
+      <parameter name="BroadcastPacketsReceived" access="readOnly">
         <description>
-          The total number of received Ethernet frames, delivered by this layer
-          to a higher layer, which were addressed to a broadcast address at
-          this layer.
+          The total number of received packets, delivered by this layer to a
+          higher layer, which were addressed to a broadcast address at this
+          layer.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
       <parameter name="UnknownProtoPacketsReceived" access="readOnly"
           activeNotify="canDeny">
         <description>
-          The total number of Ethernet frames received via the link which were
+          The total number of packets received via the interface which were
           discarded because of an unknown or unsupported protocol.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="PausePacketsSent" access="readOnly"
+          activeNotify="canDeny" version="2.18">
+        <description>
+          The total number of Ethernet pause frames sent on the link.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter64"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="PausePacketsReceived" access="readOnly"
+          activeNotify="canDeny" version="2.18">
+        <description>
+          The total number of Ethernet pause frames received on the link.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
     </object>
@@ -22995,7 +23774,7 @@
 
       <parameter name="Enable" access="readWrite">
         <description>
-          Enables or disables the VLANTermination entry.
+          Enables or disables the interface.
 
           This parameter is based on ''ifAdminStatus'' from {{bibref|RFC2863}}.
         </description>
@@ -23007,7 +23786,7 @@
 
       <parameter name="Status" access="readOnly">
         <description>
-          The current operational state of the VLANTermination entry (see
+          The current operational state of the interface (see
           {{bibref|TR-181i2|Section 4.2.2}}). {{enum}}
 
           When {{param|Enable}} is {{false}} then {{param}} SHOULD normally be
@@ -23046,18 +23825,18 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
       <parameter name="Name" access="readOnly">
         <description>
-          The textual name of the VLANTermination entry as assigned by the CPE.
+          The textual name of the interface as assigned by the CPE.
         </description>
         <syntax>
           <string>
@@ -23068,8 +23847,8 @@
 
       <parameter name="LastChange" access="readOnly" activeNotify="canDeny">
         <description>
-          The accumulated time in {{units}} since the VLANTermination entered
-          its current operational state.
+          The accumulated time in {{units}} since the interface entered its
+          current operational state.
         </description>
         <syntax>
           <unsignedInt>
@@ -23090,7 +23869,7 @@
           <string>
             <pathRef refType="strong" targetType="row"/>
           </string>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
@@ -23108,7 +23887,23 @@
         </syntax>
       </parameter>
 
-      <parameter name="TPID" access="readWrite">
+      <parameter name="VLANPriority" access="readWrite" version="2.18">
+        <description>
+          The VLAN Priority for this {{object}} entry, also known as 802.1p
+          Priority, is a 3-bit field used to indicate the priority of network
+          traffic within a VLAN.
+
+          A value of ''-1'' indicates that the VLAN priority should not be
+          changed for this {{object}}.
+        </description>
+        <syntax>
+          <int>
+            <range minInclusive="-1" maxInclusive="7"/>
+          </int>
+        </syntax>
+      </parameter>
+
+      <parameter name="TPID" access="readWrite" version="2.7">
         <description>
           The Tag Protocol Identifier (TPID) assigned to this {{object}}. The
           TPID is an EtherType value used to identify the frame as a tagged
@@ -23147,13 +23942,23 @@
         4.2.2}}.
       </description>
 
+      <parameter name="Reset" access="readWrite" version="2.18">
+        <description>
+          Set this to {{true}} to reset all this object's statistics counters
+          to zero.
+        </description>
+        <syntax command="true">
+          <boolean/>
+        </syntax>
+      </parameter>
+
       <parameter name="BytesSent" access="readOnly" activeNotify="canDeny">
         <description>
           The total number of bytes transmitted out of the interface, including
           framing characters.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
@@ -23163,7 +23968,7 @@
           framing characters.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
@@ -23172,7 +23977,7 @@
           The total number of packets transmitted out of the interface.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
@@ -23182,7 +23987,7 @@
           The total number of packets received on the interface.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
@@ -23192,7 +23997,7 @@
           because of errors.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="StatsCounter32"/>
         </syntax>
       </parameter>
 
@@ -23203,31 +24008,19 @@
           them from being delivered to a higher-layer protocol.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="StatsCounter32"/>
         </syntax>
       </parameter>
 
       <parameter name="UnicastPacketsSent" access="readOnly"
-          activeNotify="canDeny">
+          activeNotify="canDeny" dmr:previousParameter="ErrorsReceived">
         <description>
           The total number of packets requested for transmission which were not
           addressed to a multicast or broadcast address at this layer,
           including those that were discarded or not sent.
         </description>
         <syntax>
-          <unsignedLong/>
-        </syntax>
-      </parameter>
-
-      <parameter name="UnicastPacketsReceived" access="readOnly"
-          activeNotify="canDeny">
-        <description>
-          The total number of received packets, delivered by this layer to a
-          higher layer, which were not addressed to a multicast or broadcast
-          address at this layer.
-        </description>
-        <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
@@ -23240,7 +24033,7 @@
           could be to free up buffer space.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="StatsCounter32"/>
         </syntax>
       </parameter>
 
@@ -23253,19 +24046,31 @@
           to free up buffer space.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="StatsCounter32"/>
         </syntax>
       </parameter>
 
       <parameter name="MulticastPacketsSent" access="readOnly"
-          activeNotify="canDeny">
+          activeNotify="canDeny" dmr:previousParameter="DiscardPacketsReceived">
         <description>
           The total number of packets that higher-level protocols requested for
           transmission and which were addressed to a multicast address at this
           layer, including those that were discarded or not sent.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="UnicastPacketsReceived" access="readOnly"
+          activeNotify="canDeny">
+        <description>
+          The total number of received packets, delivered by this layer to a
+          higher layer, which were not addressed to a multicast or broadcast
+          address at this layer.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
@@ -23277,31 +24082,29 @@
           layer.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
-      <parameter name="BroadcastPacketsSent" access="readOnly"
-          activeNotify="canDeny">
+      <parameter name="BroadcastPacketsSent" access="readOnly">
         <description>
           The total number of packets that higher-level protocols requested for
           transmission and which were addressed to a broadcast address at this
           layer, including those that were discarded or not sent.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
-      <parameter name="BroadcastPacketsReceived" access="readOnly"
-          activeNotify="canDeny">
+      <parameter name="BroadcastPacketsReceived" access="readOnly">
         <description>
           The total number of received packets, delivered by this layer to a
           higher layer, which were addressed to a broadcast address at this
           layer.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
@@ -23312,7 +24115,340 @@
           discarded because of an unknown or unsupported protocol.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object name="Device.Ethernet.LAG.{i}." access="readWrite"
+        numEntriesParameter="LAGNumberOfEntries" enableParameter="Enable"
+        minEntries="0" maxEntries="unbounded" version="2.12">
+      <description>
+        Ethernet Link Aggregation Group (LAG) table (a stackable interface
+        object as described in {{bibref|TR-181i2|Section 4.2}}). Table entries
+        model the Link Aggregation Sub-Layer as defined in
+        {{bibref|802.3-2015}} and {{bibref|802.1AX-2014}}. It is expected that
+        a {{object}} interface can only be stacked above {{object|#.Interface}}
+        interfaces. The CPE can reject creation of additional LAG instances if
+        this would exceed its capabilities.
+      </description>
+      <uniqueKey functional="false">
+        <parameter ref="Alias"/>
+      </uniqueKey>
+      <uniqueKey functional="false">
+        <parameter ref="Name"/>
+      </uniqueKey>
+      <uniqueKey functional="true">
+        <parameter ref="MACAddress"/>
+      </uniqueKey>
+
+      <parameter name="Enable" access="readWrite">
+        <description>
+          Enables or disables the interface.
+
+          This parameter is based on ''ifAdminStatus'' from {{bibref|RFC2863}}.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="object" value="false"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Status" access="readOnly">
+        <description>
+          The current operational state of the interface (see
+          {{bibref|TR-181i2|Section 4.2.2}}). {{enum}}
+
+          When {{param|Enable}} is {{false}} then {{param}} SHOULD normally be
+          {{enum|Down}} (or {{enum|NotPresent}} or {{enum|Error}} if there is a
+          fault condition on the interface).
+
+          When {{param|Enable}} is changed to {{true}} then {{param}} SHOULD
+          change to {{enum|Up}} if and only if the interface is able to
+          transmit and receive network traffic; it SHOULD change to
+          {{enum|Dormant}} if and only if the interface is operable but is
+          waiting for external actions before it can transmit and receive
+          network traffic (and subsequently change to {{enum|Up}} if still
+          operable when the expected actions have completed); it SHOULD change
+          to {{enum|LowerLayerDown}} if and only if the interface is prevented
+          from entering the {{enum|Up}} state because one or more of the
+          interfaces beneath it is down; it SHOULD remain in the {{enum|Error}}
+          state if there is an error or other fault condition detected on the
+          interface; it SHOULD remain in the {{enum|NotPresent}} state if the
+          interface has missing (typically hardware) components; it SHOULD
+          change to {{enum|Unknown}} if the state of the interface can not be
+          determined for some reason.
+
+          This parameter is based on ''ifOperStatus'' from {{bibref|RFC2863}}.
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="Up"/>
+            <enumeration value="Down"/>
+            <enumeration value="Unknown"/>
+            <enumeration value="Dormant"/>
+            <enumeration value="NotPresent"/>
+            <enumeration value="LowerLayerDown"/>
+            <enumeration value="Error" optional="true"/>
+          </string>
+          <default type="object" value="Down"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Alias" access="readWrite" version="2.12">
+        <description>
+          {{datatype|expand}}
+        </description>
+        <syntax>
+          <dataType ref="_AliasCWMP"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Name" access="readOnly">
+        <description>
+          The textual name of the interface as assigned by the CPE.
+        </description>
+        <syntax>
+          <string>
+            <size maxLength="64"/>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="LastChange" access="readOnly" activeNotify="canDeny">
+        <description>
+          The accumulated time in {{units}} since the interface entered its
+          current operational state.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="LowerLayers" access="readWrite">
+        <description>
+          {{list}} {{reference|an interface object that is stacked immediately
+          below this interface object}} See {{bibref|TR-181i2|Section 4.2.1}}.
+
+          {{param}} must reference to Device.Ethernet.Interface instances where
+          Link Aggregation Group is configured by the CPE.
+
+          For example, "Device.Ethernet.Interface.1,
+          Device.Ethernet.Interface.2"
+        </description>
+        <syntax>
+          <list>
+            <size maxLength="1024"/>
+          </list>
+          <string>
+            <pathRef refType="strong" targetType="row"/>
+          </string>
+          <default type="object" value="[]"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="MACAddress" access="readWrite">
+        <description>
+          MAC address of the Link Aggregation Interface.
+        </description>
+        <syntax>
+          <dataType ref="MACAddress"/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object name="Device.Ethernet.LAG.{i}.Stats." access="readOnly"
+        minEntries="1" maxEntries="1" version="2.12">
+      <description>
+        Throughput statistics for this interface.
+
+        The CPE MUST reset the interface's Stats parameters (unless otherwise
+        stated in individual object or parameter descriptions) either when the
+        interface becomes operationally down due to a previous administrative
+        down (i.e. the interface's {{param|#.Status}} parameter transitions to
+        a down state after the interface is disabled) or when the interface
+        becomes administratively up (i.e. the interface's {{param|#.Enable}}
+        parameter transitions from {{false}} to {{true}}). Administrative and
+        operational interface status is discussed in {{bibref|TR-181i2|section
+        4.2.2}}.
+      </description>
+
+      <parameter name="Reset" access="readWrite" version="2.18">
+        <description>
+          Set this to {{true}} to reset all this object's statistics counters
+          to zero.
+        </description>
+        <syntax command="true">
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="BytesSent" access="readOnly" activeNotify="canDeny">
+        <description>
+          The total number of bytes transmitted out of the interface, including
+          framing characters.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter64"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="BytesReceived" access="readOnly" activeNotify="canDeny">
+        <description>
+          The total number of bytes received on the interface, including
+          framing characters.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter64"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="PacketsSent" access="readOnly" activeNotify="canDeny">
+        <description>
+          The total number of packets transmitted out of the interface.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter64"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="PacketsReceived" access="readOnly"
+          activeNotify="canDeny">
+        <description>
+          The total number of packets received on the interface.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter64"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ErrorsSent" access="readOnly" activeNotify="canDeny">
+        <description>
+          The total number of outbound packets that could not be transmitted
+          because of errors.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ErrorsReceived" access="readOnly"
+          activeNotify="canDeny">
+        <description>
+          The total number of inbound packets that contained errors preventing
+          them from being delivered to a higher-layer protocol.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="UnicastPacketsSent" access="readOnly"
+          activeNotify="canDeny" dmr:previousParameter="ErrorsReceived">
+        <description>
+          The total number of packets requested for transmission which were not
+          addressed to a multicast or broadcast address at this layer,
+          including those that were discarded or not sent.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter64"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="DiscardPacketsSent" access="readOnly"
+          activeNotify="canDeny">
+        <description>
+          The total number of outbound packets which were chosen to be
+          discarded even though no errors had been detected to prevent their
+          being transmitted. One possible reason for discarding such a packet
+          could be to free up buffer space.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="DiscardPacketsReceived" access="readOnly"
+          activeNotify="canDeny">
+        <description>
+          The total number of inbound packets which were chosen to be discarded
+          even though no errors had been detected to prevent their being
+          delivered. One possible reason for discarding such a packet could be
+          to free up buffer space.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="MulticastPacketsSent" access="readOnly"
+          activeNotify="canDeny" dmr:previousParameter="DiscardPacketsReceived">
+        <description>
+          The total number of packets that higher-level protocols requested for
+          transmission and which were addressed to a multicast address at this
+          layer, including those that were discarded or not sent.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter64"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="UnicastPacketsReceived" access="readOnly"
+          activeNotify="canDeny">
+        <description>
+          The total number of received packets, delivered by this layer to a
+          higher layer, which were not addressed to a multicast or broadcast
+          address at this layer.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter64"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="MulticastPacketsReceived" access="readOnly"
+          activeNotify="canDeny">
+        <description>
+          The total number of received packets, delivered by this layer to a
+          higher layer, which were addressed to a multicast address at this
+          layer.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter64"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="BroadcastPacketsSent" access="readOnly">
+        <description>
+          The total number of packets that higher-level protocols requested for
+          transmission and which were addressed to a broadcast address at this
+          layer, including those that were discarded or not sent.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter64"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="BroadcastPacketsReceived" access="readOnly">
+        <description>
+          The total number of received packets, delivered by this layer to a
+          higher layer, which were addressed to a broadcast address at this
+          layer.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter64"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="UnknownProtoPacketsReceived" access="readOnly"
+          activeNotify="canDeny">
+        <description>
+          The total number of packets received via the interface which were
+          discarded because of an unknown or unsupported protocol.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
         </syntax>
       </parameter>
     </object>
@@ -23416,12 +24552,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.4">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -23755,7 +24891,7 @@
     <object name="Device.Ethernet.WoL." access="readOnly" minEntries="1"
         maxEntries="1" version="2.13">
       <description>
-        This object provides access to the WoL (Wake on LAN) funtionality.
+        This object provides access to the WoL (Wake on LAN) functionality.
       </description>
 
       <parameter name="SendMagicPacket" access="readWrite">
@@ -23768,7 +24904,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="MACAddress" access="readWrite">
+      <parameter name="MACAddress" access="readWrite" version="2.13">
         <description>
           MAC address target of the magic packet.
         </description>
@@ -23777,7 +24913,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Password" access="readWrite">
+      <parameter name="Password" access="readWrite" version="2.13">
         <description>
           The SecureOn password. The parameter value can be empty or, if
           present, can contain either 4 bytes or 6 bytes.
@@ -23788,328 +24924,6 @@
       </parameter>
     </object>
 
-    <object name="Device.Ethernet.LAG.{i}." access="readWrite"
-        numEntriesParameter="LAGNumberOfEntries" enableParameter="Enable"
-        minEntries="0" maxEntries="unbounded" version="2.12">
-      <description>
-        Ethernet Link Aggregation Group (LAG) table (a stackable interface
-        object as described in {{bibref|TR-181i2|Section 4.2}}). Table entries
-        model the Link Aggregation Sub-Layer as defined in
-        {{bibref|802.3-2015}} and {{bibref|802.1AX-2014}}. It is expected that
-        a {{object}} interface can only be stacked above {{object|#.Interface}}
-        interfaces. The CPE can reject creation of additional LAG instances if
-        this would exceed its capabilities.
-      </description>
-      <uniqueKey functional="false">
-        <parameter ref="Alias"/>
-      </uniqueKey>
-      <uniqueKey functional="false">
-        <parameter ref="Name"/>
-      </uniqueKey>
-      <uniqueKey functional="true">
-        <parameter ref="MACAddress"/>
-      </uniqueKey>
-
-      <parameter name="Enable" access="readWrite">
-        <description>
-          Enables or disables the interface.
-
-          This parameter is based on ''ifAdminStatus'' from {{bibref|RFC2863}}.
-        </description>
-        <syntax>
-          <boolean/>
-        </syntax>
-      </parameter>
-
-      <parameter name="Status" access="readOnly">
-        <description>
-          The current operational state of the interface (see
-          {{bibref|TR-181i2|Section 4.2.2}}). {{enum}}
-
-          When {{param|Enable}} is {{false}} then {{param}} SHOULD normally be
-          {{enum|Down}} (or {{enum|NotPresent}} or {{enum|Error}} if there is a
-          fault condition on the interface).
-
-          When {{param|Enable}} is changed to {{true}} then {{param}} SHOULD
-          change to {{enum|Up}} if and only if the interface is able to
-          transmit and receive network traffic; it SHOULD change to
-          {{enum|Dormant}} if and only if the interface is operable but is
-          waiting for external actions before it can transmit and receive
-          network traffic (and subsequently change to {{enum|Up}} if still
-          operable when the expected actions have completed); it SHOULD change
-          to {{enum|LowerLayerDown}} if and only if the interface is prevented
-          from entering the {{enum|Up}} state because one or more of the
-          interfaces beneath it is down; it SHOULD remain in the {{enum|Error}}
-          state if there is an error or other fault condition detected on the
-          interface; it SHOULD remain in the {{enum|NotPresent}} state if the
-          interface has missing (typically hardware) components; it SHOULD
-          change to {{enum|Unknown}} if the state of the interface can not be
-          determined for some reason.
-
-          This parameter is based on ''ifOperStatus'' from {{bibref|RFC2863}}.
-        </description>
-        <syntax>
-          <string>
-            <enumeration value="Up"/>
-            <enumeration value="Down"/>
-            <enumeration value="Unknown"/>
-            <enumeration value="Dormant"/>
-            <enumeration value="NotPresent"/>
-            <enumeration value="LowerLayerDown"/>
-            <enumeration value="Error" optional="true"/>
-          </string>
-        </syntax>
-      </parameter>
-
-      <parameter name="Alias" access="writeOnceReadOnly">
-        <description>
-          {{datatype|expand}}
-        </description>
-        <syntax>
-          <dataType ref="Alias"/>
-        </syntax>
-      </parameter>
-
-      <parameter name="Name" access="readOnly">
-        <description>
-          The textual name of the LAG interface as assigned by the CPE.
-        </description>
-        <syntax>
-          <string>
-            <size maxLength="64"/>
-          </string>
-        </syntax>
-      </parameter>
-
-      <parameter name="LastChange" access="readOnly" activeNotify="canDeny">
-        <description>
-          The accumulated time in {{units}} since the interface entered its
-          current operational state.
-        </description>
-        <syntax>
-          <unsignedInt>
-            <units value="seconds"/>
-          </unsignedInt>
-        </syntax>
-      </parameter>
-
-      <parameter name="LowerLayers" access="readWrite">
-        <description>
-          {{list}} {{reference|an interface object that is stacked immediately
-          below this interface object}}. See {{bibref|TR-181i2|Section 4.2.1}}.
-
-          {{param}} must reference to Device.Ethernet.Interface instances where
-          Link Aggregation Group is configured by the CPE.
-
-          For example, "Device.Ethernet.Interface.1,
-          Device.Ethernet.Interface.2"
-        </description>
-        <syntax>
-          <list>
-            <size maxLength="1024"/>
-          </list>
-          <string>
-            <pathRef refType="strong" targetType="row"/>
-          </string>
-        </syntax>
-      </parameter>
-
-      <parameter name="MACAddress" access="readWrite">
-        <description>
-          MAC address of the Link Aggregation Interface.
-        </description>
-        <syntax>
-          <dataType ref="MACAddress"/>
-        </syntax>
-      </parameter>
-    </object>
-
-    <object name="Device.Ethernet.LAG.{i}.Stats." access="readOnly"
-        minEntries="1" maxEntries="1" version="2.12">
-      <description>
-        Throughput statistics for this interface.
-
-        The CPE MUST reset the interface's Stats parameters (unless otherwise
-        stated in individual object or parameter descriptions) either when the
-        interface becomes operationally down due to a previous administrative
-        down (i.e. the interface's {{param|#.Status}} parameter transitions to
-        a down state after the interface is disabled) or when the interface
-        becomes administratively up (i.e. the interface's {{param|#.Enable}}
-        parameter transitions from {{false}} to {{true}}). Administrative and
-        operational interface status is discussed in {{bibref|TR-181i2|section
-        4.2.2}}.
-      </description>
-
-      <parameter name="BytesSent" access="readOnly" activeNotify="canDeny">
-        <description>
-          The total number of bytes transmitted out of the interface, including
-          framing characters.
-        </description>
-        <syntax>
-          <dataType ref="StatsCounter64"/>
-        </syntax>
-      </parameter>
-
-      <parameter name="BytesReceived" access="readOnly" activeNotify="canDeny">
-        <description>
-          The total number of bytes received on the interface, including
-          framing characters.
-        </description>
-        <syntax>
-          <dataType ref="StatsCounter64"/>
-        </syntax>
-      </parameter>
-
-      <parameter name="PacketsSent" access="readOnly" activeNotify="canDeny">
-        <description>
-          The total number of packets transmitted out of the interface.
-        </description>
-        <syntax>
-          <dataType ref="StatsCounter64"/>
-        </syntax>
-      </parameter>
-
-      <parameter name="PacketsReceived" access="readOnly"
-          activeNotify="canDeny">
-        <description>
-          The total number of packets received on the interface.
-        </description>
-        <syntax>
-          <dataType ref="StatsCounter64"/>
-        </syntax>
-      </parameter>
-
-      <parameter name="ErrorsSent" access="readOnly" activeNotify="canDeny">
-        <description>
-          The total number of outbound packets that could not be transmitted
-          because of errors.
-        </description>
-        <syntax>
-          <dataType ref="StatsCounter32"/>
-        </syntax>
-      </parameter>
-
-      <parameter name="ErrorsReceived" access="readOnly"
-          activeNotify="canDeny">
-        <description>
-          The total number of inbound packets that contained errors preventing
-          them from being delivered to a higher-layer protocol.
-        </description>
-        <syntax>
-          <dataType ref="StatsCounter32"/>
-        </syntax>
-      </parameter>
-
-      <parameter name="UnicastPacketsSent" access="readOnly"
-          activeNotify="canDeny">
-        <description>
-          The total number of packets requested for transmission which were not
-          addressed to a multicast or broadcast address at this layer,
-          including those that were discarded or not sent.
-        </description>
-        <syntax>
-          <dataType ref="StatsCounter64"/>
-        </syntax>
-      </parameter>
-
-      <parameter name="UnicastPacketsReceived" access="readOnly"
-          activeNotify="canDeny">
-        <description>
-          The total number of received packets, delivered by this layer to a
-          higher layer, which were not addressed to a multicast or broadcast
-          address at this layer.
-        </description>
-        <syntax>
-          <dataType ref="StatsCounter64"/>
-        </syntax>
-      </parameter>
-
-      <parameter name="DiscardPacketsSent" access="readOnly"
-          activeNotify="canDeny">
-        <description>
-          The total number of outbound packets which were chosen to be
-          discarded even though no errors had been detected to prevent their
-          being transmitted. One possible reason for discarding such a packet
-          could be to free up buffer space.
-        </description>
-        <syntax>
-          <dataType ref="StatsCounter32"/>
-        </syntax>
-      </parameter>
-
-      <parameter name="DiscardPacketsReceived" access="readOnly"
-          activeNotify="canDeny">
-        <description>
-          The total number of inbound packets which were chosen to be discarded
-          even though no errors had been detected to prevent their being
-          delivered. One possible reason for discarding such a packet could be
-          to free up buffer space.
-        </description>
-        <syntax>
-          <dataType ref="StatsCounter32"/>
-        </syntax>
-      </parameter>
-
-      <parameter name="MulticastPacketsSent" access="readOnly"
-          activeNotify="canDeny">
-        <description>
-          The total number of packets that higher-level protocols requested for
-          transmission and which were addressed to a multicast address at this
-          layer, including those that were discarded or not sent.
-        </description>
-        <syntax>
-          <dataType ref="StatsCounter64"/>
-        </syntax>
-      </parameter>
-
-      <parameter name="MulticastPacketsReceived" access="readOnly"
-          activeNotify="canDeny">
-        <description>
-          The total number of received packets, delivered by this layer to a
-          higher layer, which were addressed to a multicast address at this
-          layer.
-        </description>
-        <syntax>
-          <dataType ref="StatsCounter64"/>
-        </syntax>
-      </parameter>
-
-      <parameter name="BroadcastPacketsSent" access="readOnly"
-          activeNotify="canDeny">
-        <description>
-          The total number of packets that higher-level protocols requested for
-          transmission and which were addressed to a broadcast address at this
-          layer, including those that were discarded or not sent.
-        </description>
-        <syntax>
-          <dataType ref="StatsCounter64"/>
-        </syntax>
-      </parameter>
-
-      <parameter name="BroadcastPacketsReceived" access="readOnly"
-          activeNotify="canDeny">
-        <description>
-          The total number of received packets, delivered by this layer to a
-          higher layer, which were addressed to a broadcast address at this
-          layer.
-        </description>
-        <syntax>
-          <dataType ref="StatsCounter64"/>
-        </syntax>
-      </parameter>
-
-      <parameter name="UnknownProtoPacketsReceived" access="readOnly"
-          activeNotify="canDeny">
-        <description>
-          The total number of packets received via the interface which were
-          discarded because of an unknown or unsupported protocol.
-        </description>
-        <syntax>
-          <dataType ref="StatsCounter32"/>
-        </syntax>
-      </parameter>
-    </object>
-
     <object name="Device.USB." access="readOnly" minEntries="1" maxEntries="1"
         version="2.0">
       <description>
@@ -24204,12 +25018,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -24515,12 +25329,12 @@
         <parameter ref="Name"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -24652,12 +25466,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.3">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -25183,12 +25997,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -25764,12 +26578,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -25783,7 +26597,7 @@
             <size maxLength="256"/>
           </list>
           <unsignedInt/>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
@@ -26071,7 +26885,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Interface" access="readWrite">
+      <parameter name="Interface" access="readWrite" version="2.0">
         <description>
           {{reference}} This is the interface over which the test is to be
           performed.
@@ -26085,7 +26899,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="NumPacketsInBurst" access="readWrite">
+      <parameter name="NumPacketsInBurst" access="readWrite" version="2.0">
         <description>
           Number of test packet in burst to be send during PHY diagnostics test
           from each HPNA device to other HPNA device in the HPNA network.
@@ -26095,7 +26909,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="BurstInterval" access="readWrite">
+      <parameter name="BurstInterval" access="readWrite" version="2.0">
         <description>
           Test packet burst interval length (expressed in {{units}}).
         </description>
@@ -26106,7 +26920,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="TestPacketPayloadLength" access="readWrite">
+      <parameter name="TestPacketPayloadLength" access="readWrite"
+          version="2.0">
         <description>
           Payload length in the test packets.
         </description>
@@ -26117,7 +26932,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="PayloadEncoding" access="readWrite">
+      <parameter name="PayloadEncoding" access="readWrite" version="2.0">
         <description>
           HPNA payload encoding in PHY diagnostics. 0 is used for negotiated
           payload between devices according to line conditions.
@@ -26127,7 +26942,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="PayloadDataGen" access="readWrite">
+      <parameter name="PayloadDataGen" access="readWrite" version="2.0">
         <description>
           Test packets payload data generator value.
         </description>
@@ -26136,7 +26951,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="PayloadType" access="readWrite">
+      <parameter name="PayloadType" access="readWrite" version="2.0">
         <description>
           Test packets payload type. {{enum}}
 
@@ -26154,7 +26969,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="PriorityLevel" access="readWrite">
+      <parameter name="PriorityLevel" access="readWrite" version="2.0">
         <description>
           Priority level of PHY diagnostics packets (0 lowest -7 highest).
         </description>
@@ -26290,7 +27105,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Interface" access="readWrite">
+      <parameter name="Interface" access="readWrite" version="2.0">
         <description>
           {{reference}} This is the interface over which the test is to be
           performed.
@@ -26304,7 +27119,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SampleInterval" access="readWrite">
+      <parameter name="SampleInterval" access="readWrite" version="2.0">
         <description>
           Time in {{units}} between automatic collection of performance
           monitoring data. A value of zero disables automatic collection of
@@ -26850,7 +27665,8 @@
         <parameter ref="Name"/>
       </uniqueKey>
 
-      <parameter name="AccessControlNumberOfEntries" access="readOnly">
+      <parameter name="AccessControlNumberOfEntries" access="readOnly"
+          version="2.17">
         <description>
           {{numentries}}
         </description>
@@ -26859,7 +27675,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="RlapmNumberOfEntries" access="readOnly">
+      <parameter name="RlapmNumberOfEntries" access="readOnly" version="2.17">
         <description>
           {{numentries}}
         </description>
@@ -26868,7 +27684,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SapmNumberOfEntries" access="readOnly">
+      <parameter name="SapmNumberOfEntries" access="readOnly" version="2.17">
         <description>
           {{numentries}}
         </description>
@@ -26877,7 +27693,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="MeshNumberOfEntries" access="readOnly">
+      <parameter name="MeshNumberOfEntries" access="readOnly" version="2.17">
         <description>
           {{numentries}}
         </description>
@@ -26886,7 +27702,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="BridgeNumberOfEntries" access="readOnly">
+      <parameter name="BridgeNumberOfEntries" access="readOnly" version="2.17">
         <description>
           {{numentries}}
         </description>
@@ -26895,7 +27711,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="MeshScModNumberOfEntries" access="readOnly">
+      <parameter name="MeshScModNumberOfEntries" access="readOnly"
+          version="2.17">
         <description>
           {{numentries}}
         </description>
@@ -26958,12 +27775,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -27187,7 +28004,7 @@
       </parameter>
 
       <parameter name="NumNodes" access="readOnly"
-          id="mocaIfNumNodes/1.3.6.1.4.1.31621.1.2.1.7.1.9">
+          id="mocaIfNumNodes/1.3.6.1.4.1.31621.1.2.1.7.1.9" version="2.17">
         <description>
           The numbers of 1's in the GCD_BITMASK field reported in Type I Probe
           Reports. This value corresponds to the number of MoCA Nodes that this
@@ -27264,7 +28081,7 @@
       </parameter>
 
       <parameter name="AccessControlEnable" access="readWrite"
-          id="mocaIfAccessEnable/1.3.6.1.4.1.31621.1.2.1.1.1.10">
+          id="mocaIfAccessEnable/1.3.6.1.4.1.31621.1.2.1.1.1.10" version="2.17">
         <description>
           Enable MAC address access control on the MoCA interface if this value
           is {{true}}. Disable MAC address access control on the MoCA interface
@@ -27279,7 +28096,7 @@
       </parameter>
 
       <parameter name="PhyThreshold" access="readWrite"
-          id="mocaIfPhyThreshold/1.3.6.1.4.1.31621.1.2.1.1.1.11"
+          id="mocaIfPhyThreshold/1.3.6.1.4.1.31621.1.2.1.1.1.11" version="2.17"
           dmr:previousParameter="PacketAggregationCapability">
         <description>
           The minimum PHY rate.
@@ -27305,7 +28122,8 @@
       </parameter>
 
       <parameter name="PhyThresholdTrapEnable" access="readWrite"
-          id="mocaIfPhyThresholdEnable/1.3.6.1.4.1.31621.1.2.1.1.1.12">
+          id="mocaIfPhyThresholdEnable/1.3.6.1.4.1.31621.1.2.1.1.1.12"
+          version="2.17">
         <description>
           If transmit PHY rate between all pairs of MoCA Nodes are greater than
           or equal to {{param|PhyThreshold}}, and subsequently the transmit PHY
@@ -27333,7 +28151,8 @@
       </parameter>
 
       <parameter name="StatusChangeEnable" access="readWrite"
-          id="mocaIfStatusChangeEnable/1.3.6.1.4.1.31621.1.2.1.1.1.13">
+          id="mocaIfStatusChangeEnable/1.3.6.1.4.1.31621.1.2.1.1.1.13"
+          version="2.17">
         <description>
           If {{param}} is {{true}} and {{param|Status}} changes, then the trap
           {{param|StatusChangeTrap}} is sent.
@@ -27345,7 +28164,8 @@
       </parameter>
 
       <parameter name="NumNodesChangeEnable" access="readWrite"
-          id="mocaIfNumNodesChangeEnable/1.3.6.1.4.1.31621.1.2.1.1.1.14">
+          id="mocaIfNumNodesChangeEnable/1.3.6.1.4.1.31621.1.2.1.1.1.14"
+          version="2.17">
         <description>
           If {{param}} is {{true}} and {{param|NumNodes}} changes, then the
           trap {{param|NumNodesChangeTrap}} is sent.
@@ -27360,7 +28180,8 @@
       </parameter>
 
       <parameter name="TpcTargetRateNper" access="readWrite"
-          id="mocaIfTpcTargetRateNper/1.3.6.1.4.1.31621.1.2.1.1.1.15">
+          id="mocaIfTpcTargetRateNper/1.3.6.1.4.1.31621.1.2.1.1.1.15"
+          version="2.17">
         <description>
           The Target PHY Rate of the receiving MoCA 2.0 Node in order to
           optimize the long-term PHY rate and transmit power level between the
@@ -27373,7 +28194,7 @@
       </parameter>
 
       <parameter name="Band" access="readWrite"
-          id="mocaIfBand/1.3.6.1.4.1.31621.1.2.1.1.1.16">
+          id="mocaIfBand/1.3.6.1.4.1.31621.1.2.1.1.1.16" version="2.17">
         <description>
           Configure the band or sub-band for the MoCA Node to operate in (BND
           Managed Parameter). See {{bibref|MoCAv2.0|section 15}}.
@@ -27384,7 +28205,8 @@
       </parameter>
 
       <parameter name="LastOperFreqUpdateEnable" access="readWrite"
-          id="mocaIfLofUpdateEnable/1.3.6.1.4.1.31621.1.2.1.1.1.17">
+          id="mocaIfLofUpdateEnable/1.3.6.1.4.1.31621.1.2.1.1.1.17"
+          version="2.17">
         <description>
           Controls whether the LOF is updated when joining a network
           (LOF_UPDATE_EN Managed Parameter). See {{bibref|MoCAv2.0|section
@@ -27468,7 +28290,7 @@
       </parameter>
 
       <parameter name="TpcEnable" access="readWrite"
-          id="mocaIfTpcEnable/1.3.6.1.4.1.31621.1.2.1.1.1.3">
+          id="mocaIfTpcEnable/1.3.6.1.4.1.31621.1.2.1.1.1.3" version="2.17">
         <description>
           Enable automatic power control if this value is {{true}}. Use a fixed
           transmit power level if this value is {{false}}.
@@ -27499,7 +28321,7 @@
       </parameter>
 
       <parameter name="PerMode" access="readWrite"
-          id="mocaIfPerMode/1.3.6.1.4.1.31621.1.2.1.1.1.20">
+          id="mocaIfPerMode/1.3.6.1.4.1.31621.1.2.1.1.1.20" version="2.17">
         <description>
           Controls which transmission PER mode the MoCA Node uses for MPDUs not
           belonging to PQoS Flows, where a value of 0 indicates NPER and 1
@@ -27514,7 +28336,8 @@
       </parameter>
 
       <parameter name="TurboModeEnable" access="readWrite"
-          id="mocaIfTurboModeEnable/1.3.6.1.4.1.31621.1.2.1.1.1.21">
+          id="mocaIfTurboModeEnable/1.3.6.1.4.1.31621.1.2.1.1.1.21"
+          version="2.17">
         <description>
           Controls whether the MoCA Node operates in point-to-point Turbo Mode
           or not.
@@ -27531,7 +28354,8 @@
       </parameter>
 
       <parameter name="PolicingEnable" access="readWrite"
-          id="mocaIfPolicingEnable/1.3.6.1.4.1.31621.1.2.1.1.1.22">
+          id="mocaIfPolicingEnable/1.3.6.1.4.1.31621.1.2.1.1.1.22"
+          version="2.17">
         <description>
           Controls whether policing of PQoS Flows is enabled or disabled. When
           {{false}} the policy is disabled, and when {{true}} the policy is
@@ -27546,7 +28370,7 @@
       </parameter>
 
       <parameter name="TlpMin" access="readWrite"
-          id="mocaIfTlpMin/1.3.6.1.4.1.31621.1.2.1.1.1.23">
+          id="mocaIfTlpMin/1.3.6.1.4.1.31621.1.2.1.1.1.23" version="2.17">
         <description>
           The minimum time (in milliseconds) a MoCA Node is required to stay in
           the Listening Phase of the Network Search (TLP_MIN Managed
@@ -27561,7 +28385,7 @@
       </parameter>
 
       <parameter name="TlpMax" access="readWrite"
-          id="mocaIfTlpMax/1.3.6.1.4.1.31621.1.2.1.1.1.24">
+          id="mocaIfTlpMax/1.3.6.1.4.1.31621.1.2.1.1.1.24" version="2.17">
         <description>
           The maximum time (in milliseconds) a MoCA Node is required to stay in
           the Listening Phase of the Network Search (TLP_MAX Managed
@@ -27588,7 +28412,7 @@
       </parameter>
 
       <parameter name="RlapmEnable" access="readWrite"
-          id="mocaIfRlapmEnable/1.3.6.1.4.1.31621.1.2.1.1.1.25">
+          id="mocaIfRlapmEnable/1.3.6.1.4.1.31621.1.2.1.1.1.25" version="2.17">
         <description>
           Controls whether the RLAPM (Receive Level Added PHY Margin) function
           is enabled and the MoCA Node needs to apply it, or disabled and the
@@ -27610,7 +28434,8 @@
       </parameter>
 
       <parameter name="RlapmProfileSelect" access="readWrite"
-          id="mocaIfRlapmProfileSelect/1.3.6.1.4.1.31621.1.2.1.1.1.26">
+          id="mocaIfRlapmProfileSelect/1.3.6.1.4.1.31621.1.2.1.1.1.26"
+          version="2.17">
         <description>
           Controls which RLAPM (Receive Level Added PHY Margin) profile is
           Active.
@@ -27623,7 +28448,7 @@
       </parameter>
 
       <parameter name="SapmEnable" access="readWrite"
-          id="mocaIfSapmEnable/1.3.6.1.4.1.31621.1.2.1.1.1.27">
+          id="mocaIfSapmEnable/1.3.6.1.4.1.31621.1.2.1.1.1.27" version="2.17">
         <description>
           Controls whether the SAPM (Subcarrier Added PHY Margin) function is
           enabled and the MoCA Node needs to apply it, or disabled and the MoCA
@@ -27646,7 +28471,8 @@
       </parameter>
 
       <parameter name="SapmProfileSelect" access="readWrite"
-          id="mocaIfSapmProfileSelect/1.3.6.1.4.1.31621.1.2.1.1.1.28">
+          id="mocaIfSapmProfileSelect/1.3.6.1.4.1.31621.1.2.1.1.1.28"
+          version="2.17">
         <description>
           Controls which SAPM (Subcarrier Added PHY Margin) profile is Active.
 
@@ -27658,7 +28484,8 @@
       </parameter>
 
       <parameter name="PowerStateRequest" access="readWrite"
-          id="mocaIfPowerStateRequest/1.3.6.1.4.1.31621.1.2.1.1.1.29">
+          id="mocaIfPowerStateRequest/1.3.6.1.4.1.31621.1.2.1.1.1.29"
+          version="2.17">
         <description>
           Carries a request to the MoCA Node to transition into a specified
           Power State (POWER_STATE_REQ Managed Parameter).
@@ -27672,7 +28499,7 @@
       </parameter>
 
       <parameter name="SeqNumMr" access="readWrite"
-          id="mocaIfSeqNumMr/1.3.6.1.4.1.31621.1.2.1.1.1.30">
+          id="mocaIfSeqNumMr/1.3.6.1.4.1.31621.1.2.1.1.1.30" version="2.17">
         <description>
           Sequence Number used by the MR Transaction (SEQ_NUM_MR Managed
           Parameter).
@@ -27688,7 +28515,8 @@
       </parameter>
 
       <parameter name="PowerStateTrapEnable" access="readWrite"
-          id="mocaIfPowerStateTrapEnable/1.3.6.1.4.1.31621.1.2.1.1.1.31">
+          id="mocaIfPowerStateTrapEnable/1.3.6.1.4.1.31621.1.2.1.1.1.31"
+          version="2.17">
         <description>
           Used for power state message trap.
 
@@ -27707,7 +28535,8 @@
       </parameter>
 
       <parameter name="LmoTrapEnable" access="readWrite"
-          id="mocaIfLmoTrapEnable/1.3.6.1.4.1.31621.1.2.1.1.1.32">
+          id="mocaIfLmoTrapEnable/1.3.6.1.4.1.31621.1.2.1.1.1.32"
+          version="2.17">
         <description>
           Used for LMO (Link Maintenance Operation) message trap.
 
@@ -27726,7 +28555,8 @@
       </parameter>
 
       <parameter name="PrimaryOffset" access="readWrite"
-          id="mocaIfPrimaryOffset/1.3.6.1.4.1.31621.1.2.1.1.1.33">
+          id="mocaIfPrimaryOffset/1.3.6.1.4.1.31621.1.2.1.1.1.33"
+          version="2.17">
         <description>
           The offset in {{units}} of the primary channel relative to the beacon
           channel (PRIMARY_OFFSET Managed Parameter).
@@ -27740,7 +28570,8 @@
       </parameter>
 
       <parameter name="SecondaryOffset" access="readWrite"
-          id="mocaIfSecondaryOffset/1.3.6.1.4.1.31621.1.2.1.1.1.34">
+          id="mocaIfSecondaryOffset/1.3.6.1.4.1.31621.1.2.1.1.1.34"
+          version="2.17">
         <description>
           The offset in {{units}} of the secondary channel relative to the
           beacon channel (SECONDARY_OFFSET Managed Parameter).
@@ -27756,7 +28587,8 @@
       </parameter>
 
       <parameter name="BeaconPowerDistributed" access="readWrite"
-          id="moca25IfBeaconPowerDistributed/1.3.6.1.4.1.31621.1.3.1.1.1.1">
+          id="moca25IfBeaconPowerDistributed/1.3.6.1.4.1.31621.1.3.1.1.1.1"
+          version="2.17">
         <description>
           The networkwide (see {{param|BeaconPowerMePie}}) value of Beacon
           transmit power in {{units}} sent by the NC (Network Coordinator) in
@@ -27776,7 +28608,8 @@
       </parameter>
 
       <parameter name="BeaconPowerLocal" access="readWrite"
-          id="moca25IfBeaconPowerLocal/1.3.6.1.4.1.31621.1.3.1.1.1.2">
+          id="moca25IfBeaconPowerLocal/1.3.6.1.4.1.31621.1.3.1.1.1.2"
+          version="2.17">
         <description>
           The value of Beacon transmit power in {{units}} used by the Node when
           it transmits beacons.
@@ -27790,7 +28623,8 @@
       </parameter>
 
       <parameter name="BeaconPowerMePie" access="readWrite"
-          id="moca25IfBeaconPowerMePie/1.3.6.1.4.1.31621.1.3.1.1.1.3">
+          id="moca25IfBeaconPowerMePie/1.3.6.1.4.1.31621.1.3.1.1.1.3"
+          version="2.17">
         <description>
           The Beacon Power PIE (Power Information Element) that the ME
           (Management Entity) wants the NC (Network Coordinator) to send to
@@ -27811,7 +28645,8 @@
       </parameter>
 
       <parameter name="BeaconPowerMePieSend" access="readWrite"
-          id="moca25IfBeaconPowerMePieSend/1.3.6.1.4.1.31621.1.3.1.1.1.4">
+          id="moca25IfBeaconPowerMePieSend/1.3.6.1.4.1.31621.1.3.1.1.1.4"
+          version="2.17">
         <description>
           When this parameter is written, instructs the Node (in case of
           Network Coordinator) to send a set of Beacon Power PIEs (Power
@@ -27826,7 +28661,8 @@
       </parameter>
 
       <parameter name="BeaconPowerNetConfig" access="readWrite"
-          id="moca25IfBeaconPowerNetConfig/1.3.6.1.4.1.31621.1.3.1.1.1.5">
+          id="moca25IfBeaconPowerNetConfig/1.3.6.1.4.1.31621.1.3.1.1.1.5"
+          version="2.17">
         <description>
           Controls whether the Node is allowed to configure its Beacon power
           (both Beacon Power Distributed and Beacon Power Local) according to
@@ -27846,7 +28682,8 @@
       </parameter>
 
       <parameter name="EnhancedPassword" access="readWrite"
-          id="moca25IfEnhancedPassword/1.3.6.1.4.1.31621.1.3.1.1.1.6">
+          id="moca25IfEnhancedPassword/1.3.6.1.4.1.31621.1.3.1.1.1.6"
+          version="2.17">
         <description>
           The MoCA Enhanced Password using an ASCII printable character.
 
@@ -27863,7 +28700,7 @@
 
           See {{bibref|MoCAv2.5|section 11.3.1}}.
         </description>
-        <syntax hidden="true">
+        <syntax secured="true">
           <string>
             <size minLength="12" maxLength="64"/>
             <size minLength="0" maxLength="0"/>
@@ -27873,7 +28710,7 @@
       </parameter>
 
       <parameter name="FirstOffset" access="readWrite"
-          id="moca25IfFirstOffset/1.3.6.1.4.1.31621.1.3.1.1.1.7">
+          id="moca25IfFirstOffset/1.3.6.1.4.1.31621.1.3.1.1.1.7" version="2.17">
         <description>
           The offset of the First Channel's center frequency below the center
           frequency of the Primary Channel. Valid values are -4 to 0.
@@ -27888,7 +28725,8 @@
       </parameter>
 
       <parameter name="HandoffToLowerVersionEnable" access="readWrite"
-          id="moca25IfHandoffToLowerVersionEnable/1.3.6.1.4.1.31621.1.3.1.1.1.8">
+          id="moca25IfHandoffToLowerVersionEnable/1.3.6.1.4.1.31621.1.3.1.1.1.8"
+          version="2.17">
         <description>
           Enable handoff to a MoCA 2 or MoCA 1 Node if this value is {{true}}.
           Disable handoff to a MoCA 2 or MoCA 1 Node if this value is
@@ -27903,7 +28741,8 @@
       </parameter>
 
       <parameter name="MgntEntityNetIePayloadRespTimeout" access="readWrite"
-          id="moca25IfMgntEntityNetIePayloadRespTimeout/1.3.6.1.4.1.31621.1.3.1.1.1.9">
+          id="moca25IfMgntEntityNetIePayloadRespTimeout/1.3.6.1.4.1.31621.1.3.1.1.1.9"
+          version="2.17">
         <description>
           The number of Discovery Request transmission opportunities a NN has
           to wait for a response to a Management Entity Response Network IE
@@ -27918,7 +28757,8 @@
       </parameter>
 
       <parameter name="MgntEntityNetIePayloadTx" access="readWrite"
-          id="moca25IfMgntEntityNetIePayloadTx/1.3.6.1.4.1.31621.1.3.1.1.1.10">
+          id="moca25IfMgntEntityNetIePayloadTx/1.3.6.1.4.1.31621.1.3.1.1.1.10"
+          version="2.17">
         <description>
           The payload of the Management Entity Request Network IE (when the
           Node is trying to join the network), or of the Management Entity
@@ -27926,9 +28766,9 @@
 
           See {{bibref|MoCAv2.5|section 8.3.3 and Table 17-1}}.
 
-           struct moca25IfMgntEntityNetIePayload { short vendorId; // 2 octets
-           (MoCA Vendor ID) char information[60]; // 60 octets (Up to 60 bytes
-           of vendor specific information) }
+              struct moca25IfMgntEntityNetIePayload { short vendorId; // 2
+              octets (MoCA Vendor ID) char information[60]; // 60 octets (Up to
+              60 bytes of vendor specific information) }
         </description>
         <syntax>
           <hexBinary>
@@ -27938,7 +28778,8 @@
       </parameter>
 
       <parameter name="MpsPrivacyDown" access="readWrite"
-          id="moca25IfMpsPrivacyDown/1.3.6.1.4.1.31621.1.3.1.1.1.11">
+          id="moca25IfMpsPrivacyDown/1.3.6.1.4.1.31621.1.3.1.1.1.11"
+          version="2.17">
         <description>
           Controls whether the Node, during its MPS (MoCA Protected Setup)
           session, is allowed to accept privacy setting of Privacy Disabled
@@ -27955,7 +28796,8 @@
       </parameter>
 
       <parameter name="MpsPrivacyReceive" access="readWrite"
-          id="moca25IfMpsPrivacyReceive/1.3.6.1.4.1.31621.1.3.1.1.1.12">
+          id="moca25IfMpsPrivacyReceive/1.3.6.1.4.1.31621.1.3.1.1.1.12"
+          version="2.17">
         <description>
           Controls whether the Node, during its MPS (MoCA Protected Setup)
           session, is allowed to accept privacy settings (Privacy Enabled /
@@ -27971,7 +28813,7 @@
       </parameter>
 
       <parameter name="MpsReset" access="readWrite"
-          id="moca25IfMpsReset/1.3.6.1.4.1.31621.1.3.1.1.1.13">
+          id="moca25IfMpsReset/1.3.6.1.4.1.31621.1.3.1.1.1.13" version="2.17">
         <description>
           Resets the MPS (MoCA Protected Setup) state of the Node
           {{param|MpsState}} to un-Paired and reinitializes MPS local variables
@@ -27985,7 +28827,8 @@
       </parameter>
 
       <parameter name="MpsTriggered" access="readWrite"
-          id="moca25IfMpsTriggered/1.3.6.1.4.1.31621.1.3.1.1.1.14">
+          id="moca25IfMpsTriggered/1.3.6.1.4.1.31621.1.3.1.1.1.14"
+          version="2.17">
         <description>
           Signals the Node in Power State M0 (Active) or M1 (Low Power Idle)
           that MPS (MoCA Protected Setup) was triggered when this parameter is
@@ -27999,7 +28842,8 @@
       </parameter>
 
       <parameter name="MpsUnpairedTime" access="readWrite"
-          id="moca25IfMpsUnpairedTime/1.3.6.1.4.1.31621.1.3.1.1.1.15">
+          id="moca25IfMpsUnpairedTime/1.3.6.1.4.1.31621.1.3.1.1.1.15"
+          version="2.17">
         <description>
           The minimum time in {{units}} the Node is required to stay in the
           un-Paired state after it starts network search if the Node creates or
@@ -28016,7 +28860,8 @@
       </parameter>
 
       <parameter name="MpsWalkTime" access="readWrite"
-          id="moca25IfMpsWalkTime/1.3.6.1.4.1.31621.1.3.1.1.1.16">
+          id="moca25IfMpsWalkTime/1.3.6.1.4.1.31621.1.3.1.1.1.16"
+          version="2.17">
         <description>
           The allowed time interval in {{units}} to trigger MPS (MoCA Protected
           Setup) on two Nodes.
@@ -28033,7 +28878,8 @@
       </parameter>
 
       <parameter name="NetworkJoin" access="readWrite"
-          id="moca25IfNetworkJoin/1.3.6.1.4.1.31621.1.3.1.1.1.17">
+          id="moca25IfNetworkJoin/1.3.6.1.4.1.31621.1.3.1.1.1.17"
+          version="2.17">
         <description>
           Instructs the NN to join the latest network from which the NN
           forwarded a Management Entity Response Network IE: Yes if this value
@@ -28047,7 +28893,8 @@
       </parameter>
 
       <parameter name="NetworkNameAdmissionRule" access="readWrite"
-          id="moca25IfNetworkNameAdmissionRule/1.3.6.1.4.1.31621.1.3.1.1.1.18">
+          id="moca25IfNetworkNameAdmissionRule/1.3.6.1.4.1.31621.1.3.1.1.1.18"
+          version="2.17">
         <description>
           Controls which Admission rule to follow.
 
@@ -28079,7 +28926,8 @@
       </parameter>
 
       <parameter name="NetworkNameNcNn" access="readWrite"
-          id="moca25IfNetworkNameNcNn/1.3.6.1.4.1.31621.1.3.1.1.1.19">
+          id="moca25IfNetworkNameNcNn/1.3.6.1.4.1.31621.1.3.1.1.1.19"
+          version="2.17">
         <description>
           The Network Name the Node is to use for any MoCA network it creates.
 
@@ -28095,7 +28943,8 @@
       </parameter>
 
       <parameter name="NumChannels" access="readWrite"
-          id="moca25IfNumChannels/1.3.6.1.4.1.31621.1.3.1.1.1.20">
+          id="moca25IfNumChannels/1.3.6.1.4.1.31621.1.3.1.1.1.20"
+          version="2.17">
         <description>
           The maximum number of 100MHz channels the Node uses when the Node
           forms the network.
@@ -28111,7 +28960,7 @@
       </parameter>
 
       <parameter name="Per25Mode" access="readWrite"
-          id="moca25IfPer25Mode/1.3.6.1.4.1.31621.1.3.1.1.1.21">
+          id="moca25IfPer25Mode/1.3.6.1.4.1.31621.1.3.1.1.1.21" version="2.17">
         <description>
           Controls which PER mode the receiver Node uses for calculating the
           bitloading of MoCA 2.5 Unicast profiles, where a value of 0 indicates
@@ -28126,7 +28975,8 @@
       </parameter>
 
       <parameter name="PrivacySupported" access="readWrite"
-          id="moca25IfPrivacySupported/1.3.6.1.4.1.31621.1.3.1.1.1.22">
+          id="moca25IfPrivacySupported/1.3.6.1.4.1.31621.1.3.1.1.1.22"
+          version="2.17">
         <description>
           Controls whether MoCA 2 Enhanced Privacy, MoCA 2.0 privacy, and MoCA
           1 privacy are supported when privacy is enabled.
@@ -28137,12 +28987,13 @@
           <list/>
           <dataType ref="MocaPrivacy"/>
           <default type="factory"
-              value="moca1Privacy,moca20Privacy,moca2EnhancedPrivacy"/>
+              value="[moca1Privacy,moca20Privacy,moca2EnhancedPrivacy]"/>
         </syntax>
       </parameter>
 
       <parameter name="TrafficPermissionEthertype" access="readWrite"
-          id="moca25IfTrafficPermissionEthertype/1.3.6.1.4.1.31621.1.3.1.1.1.23">
+          id="moca25IfTrafficPermissionEthertype/1.3.6.1.4.1.31621.1.3.1.1.1.23"
+          version="2.17">
         <description>
           The EtherType value of MSDUs that are allowed to transmit/receive
           to/from a Non-Secured Admitted Node.
@@ -28158,7 +29009,8 @@
       </parameter>
 
       <parameter name="TrafficPermissionLink" access="readWrite"
-          id="moca25IfTrafficPermissionLink/1.3.6.1.4.1.31621.1.3.1.1.1.24">
+          id="moca25IfTrafficPermissionLink/1.3.6.1.4.1.31621.1.3.1.1.1.24"
+          version="2.17">
         <description>
           Up to 15 pairs of {Node ID, SOURCE_NODE_BITMASK} where
           SOURCE_NODE_BITMASK is the value for SOURCE_NODE_BITMASK for the Node
@@ -28169,12 +29021,12 @@
 
           See {{bibref|MoCAv2.5|Section 11.7 and Table 17-1}}.
 
-           struct moca25IfTrafficPermissionLink { long nodeIdVector; // 8
-           octets; Bit value in the ith bit position indicates NodeID=(i)
-           (LSB=bit0) int numNodes; // 4 octets (Number of Node IDs indicated
-           in the NodeIdVector) struct { short SrcNodeBitmask; // 2 octets
-           (SOURCE_NODE_BITMASK in the latest Authorized Link PIE) }[numNodes];
-           };
+              struct moca25IfTrafficPermissionLink { long nodeIdVector; // 8
+              octets; Bit value in the ith bit position indicates NodeID=(i)
+              (LSB=bit0) int numNodes; // 4 octets (Number of Node IDs
+              indicated in the NodeIdVector) struct { short SrcNodeBitmask; //
+              2 octets (SOURCE_NODE_BITMASK in the latest Authorized Link PIE)
+              }[numNodes]; };
         </description>
         <syntax>
           <hexBinary/>
@@ -28182,7 +29034,8 @@
       </parameter>
 
       <parameter name="ConnectedNodesChangeTrapEn" access="readWrite"
-          id="moca25IfConnectedNodesChangeTrapEn/1.3.6.1.4.1.31621.1.3.1.1.1.25">
+          id="moca25IfConnectedNodesChangeTrapEn/1.3.6.1.4.1.31621.1.3.1.1.1.25"
+          version="2.17">
         <description>
           Used to enable {{param|ConnectedNodesChangeTrap}}.
 
@@ -28199,7 +29052,8 @@
       </parameter>
 
       <parameter name="MgntEntityNetwIePayloadRecTrapEn" access="readWrite"
-          id="moca25IfMgntEntityNetwIePayloadRecTrapEn/1.3.6.1.4.1.31621.1.3.1.1.1.26">
+          id="moca25IfMgntEntityNetwIePayloadRecTrapEn/1.3.6.1.4.1.31621.1.3.1.1.1.26"
+          version="2.17">
         <description>
           Used to enable {{param|MgntEntityNetwIePayloadRecTrap}}.
 
@@ -28216,7 +29070,7 @@
       </parameter>
 
       <parameter name="MpsTrapEn" access="readWrite"
-          id="moca25IfMpsTrapEn/1.3.6.1.4.1.31621.1.3.1.1.1.27">
+          id="moca25IfMpsTrapEn/1.3.6.1.4.1.31621.1.3.1.1.1.27" version="2.17">
         <description>
           Used to enable the MPS-related traps: {{param|MpsInitScanRecTrap}},
           {{param|MpsPairFailTrap}}, and {{param|MpsPrivacyChangedTrap}}.
@@ -28228,7 +29082,8 @@
       </parameter>
 
       <parameter name="NcPrivSupportedRecTrapEn" access="readWrite"
-          id="moca25IfNcPrivSupportedRecTrapEn/1.3.6.1.4.1.31621.1.3.1.1.1.28">
+          id="moca25IfNcPrivSupportedRecTrapEn/1.3.6.1.4.1.31621.1.3.1.1.1.28"
+          version="2.17">
         <description>
           Used to enable {{param|NcPrivacySupportedRecTrap}}.
 
@@ -28245,7 +29100,8 @@
       </parameter>
 
       <parameter name="NetworkNameRecTrapEn" access="readWrite"
-          id="moca25IfNetworkNameRecTrapEn/1.3.6.1.4.1.31621.1.3.1.1.1.29">
+          id="moca25IfNetworkNameRecTrapEn/1.3.6.1.4.1.31621.1.3.1.1.1.29"
+          version="2.17">
         <description>
           Used to enable {{param|NetworkNameRecTrap}}.
 
@@ -28262,7 +29118,8 @@
       </parameter>
 
       <parameter name="NodeDropTrapEn" access="readWrite"
-          id="moca25IfNodeDropTrapEn/1.3.6.1.4.1.31621.1.3.1.1.1.30">
+          id="moca25IfNodeDropTrapEn/1.3.6.1.4.1.31621.1.3.1.1.1.30"
+          version="2.17">
         <description>
           Used to enable {{param|NodeDropAdmFailureTrap}},
           {{param|NodeDropNcTrap}}, {{param|NodeDropMpsTriggeredTrap}}, and
@@ -28361,7 +29218,8 @@
       </parameter>
 
       <parameter name="SupportedBands" access="readOnly"
-          id="mocaIfSupportedBands/1.3.6.1.4.1.31621.1.2.1.7.1.15">
+          id="mocaIfSupportedBands/1.3.6.1.4.1.31621.1.2.1.7.1.15"
+          version="2.17">
         <description>
           Lists all the supported bands and sub-bands by this device.
         </description>
@@ -28444,7 +29302,7 @@
       </parameter>
 
       <parameter name="PasswordHash" access="readOnly"
-          id="mocaIfPasswordHash/1.3.6.1.4.1.31621.1.2.1.7.1.21">
+          id="mocaIfPasswordHash/1.3.6.1.4.1.31621.1.2.1.7.1.21" version="2.17">
         <description>
           The 16 LSBs of a SHA1 performed on a 0-extended password
           ({{param|KeyPassphrase}}) concatenated with the SALT string
@@ -28460,7 +29318,8 @@
       </parameter>
 
       <parameter name="AggregationSize" access="readOnly"
-          id="mocaIfAggregationSize/1.3.6.1.4.1.31621.1.2.1.7.1.23">
+          id="mocaIfAggregationSize/1.3.6.1.4.1.31621.1.2.1.7.1.23"
+          version="2.17">
         <description>
           The maximum number of bytes in one aggregate which can be received by
           the MoCA Node.
@@ -28471,7 +29330,7 @@
       </parameter>
 
       <parameter name="AeNumber" access="readOnly"
-          id="mocaIfAeNumber/1.3.6.1.4.1.31621.1.2.1.7.1.24">
+          id="mocaIfAeNumber/1.3.6.1.4.1.31621.1.2.1.7.1.24" version="2.17">
         <description>
           Maximum number of allocation elements, excluding the TAUs and the
           Dummy DAUs, in one MAP the MoCA Node can process.
@@ -28482,7 +29341,8 @@
       </parameter>
 
       <parameter name="SupportedIngressPqosFlows" access="readOnly"
-          id="mocaIfSupportedIngressPqosFlows/1.3.6.1.4.1.31621.1.2.1.7.1.25">
+          id="mocaIfSupportedIngressPqosFlows/1.3.6.1.4.1.31621.1.2.1.7.1.25"
+          version="2.17">
         <description>
           Maximum number of Ingress PQoS Flows supported by the MoCA Node.
         </description>
@@ -28492,7 +29352,8 @@
       </parameter>
 
       <parameter name="SupportedEgressPqosFlows" access="readOnly"
-          id="mocaIfSupportedEgressPqosFlows/1.3.6.1.4.1.31621.1.2.1.7.1.26">
+          id="mocaIfSupportedEgressPqosFlows/1.3.6.1.4.1.31621.1.2.1.7.1.26"
+          version="2.17">
         <description>
           Maximum number of Egress PQoS Flows supported by the MoCA Node.
         </description>
@@ -28502,7 +29363,8 @@
       </parameter>
 
       <parameter name="PowerStateCap" access="readOnly"
-          id="mocaIfPowerStateCap/1.3.6.1.4.1.31621.1.2.1.7.1.27">
+          id="mocaIfPowerStateCap/1.3.6.1.4.1.31621.1.2.1.7.1.27"
+          version="2.17">
         <description>
           The Power State capabilities of the MoCA Node (e.g., which Power
           States it can transition to) (POWER_STATE_CAP Managed Parameter).
@@ -28515,7 +29377,7 @@
       </parameter>
 
       <parameter name="AvbSupport" access="readOnly"
-          id="mocaIfAvbSupport/1.3.6.1.4.1.31621.1.2.1.7.1.28">
+          id="mocaIfAvbSupport/1.3.6.1.4.1.31621.1.2.1.7.1.28" version="2.17">
         <description>
           The support of the MoCA Node for the IEEE 802.1 Audio Video Bridge
           specification. AVB is supported if this value is {{true}}. AVB is not
@@ -28527,7 +29389,7 @@
       </parameter>
 
       <parameter name="ResetCount" access="readOnly"
-          id="mocaIfResetCount/1.3.6.1.4.1.31621.1.2.1.7.1.29">
+          id="mocaIfResetCount/1.3.6.1.4.1.31621.1.2.1.7.1.29" version="2.17">
         <description>
           Count of MoCA resets since the interface was enabled for this MoCA
           Node.
@@ -28538,7 +29400,8 @@
       </parameter>
 
       <parameter name="LinkDownCount" access="readOnly"
-          id="mocaIfLinkDownCount/1.3.6.1.4.1.31621.1.2.1.7.1.30">
+          id="mocaIfLinkDownCount/1.3.6.1.4.1.31621.1.2.1.7.1.30"
+          version="2.17">
         <description>
           The number of times that this MoCA Node has lost link with the MoCA
           network since the interface was enabled.
@@ -28549,7 +29412,7 @@
       </parameter>
 
       <parameter name="LmoNodeID" access="readOnly"
-          id="mocaIfLmoNodeID/1.3.6.1.4.1.31621.1.2.1.7.1.31">
+          id="mocaIfLmoNodeID/1.3.6.1.4.1.31621.1.2.1.7.1.31" version="2.17">
         <description>
           The ID of the MoCA Node currently undergoing LMO (Link Maintenance
           Operation), i.e. the LMO node.
@@ -28560,97 +29423,207 @@
       </parameter>
 
       <parameter name="NetworkState" access="readOnly"
-          id="mocaIfNetworkState/1.3.6.1.4.1.31621.1.2.1.7.1.32">
+          id="mocaIfNetworkState/1.3.6.1.4.1.31621.1.2.1.7.1.32" version="2.17">
         <description>
-          The current MoCA network state of the MoCA Node.
+          The current Link control state in the MoCA network for the MoCA Node.
+          This network state is a MAC parameter determined by the NC (Network
+          Coordinator) and broadcasted in the MAP to the rest of nodes.
 
           {{enum|beginNodeAdmissionState}},
           {{enum|newNodeTypeOneProbeTxState}},
           {{enum|newNodeTypeOneProbeRxState}},
           {{enum|newGcdDistributionState}}, {{enum|beginPhyProfileState}},
           {{enum|steadyState}} refer to the Node Admission (see
-          {{bibref|MoCAv2.0|Section 8.3}}).
+          {{bibref|MoCAv2.5|Section 8.3}}). The admission process of a new MoCA
+          node depends on the operation mode of the MoCA Network that it is
+          going to join (MoCA 1 mode, MoCA 2.0 mode or Mixed Mode). The Node
+          Admission process is completed when the NC (Network Controller)
+          changes the network state to Steady State ({{enum|steadyState}}) at
+          the end of the Node Admission process.
 
           {{enum|typeThreeProbeState}}, {{enum|lmoTypeOneProbeState}},
           {{enum|lmoNodeGcdDistributionState}},
           {{enum|beginLmoPhyProfileState}},
-          {{enum|lmoGcdTypeOneProbeLinkState}} refer to the Regular Link
-          Maintenance Operation (see {{bibref|MoCAv2.0|Section 8.9.1}}).
+          {{enum|lmoGcdTypeOneProbeLinkState}}, {{enum|steadyState}} refer to
+          the Regular Link Maintenance Operation (see {{bibref|MoCAv2.5|Section
+          8.9.1}}).
 
           {{enum|alternateChannelQuietLineState}},
           {{enum|alternateChannelEvmProbeState}},
           {{enum|unsolicitedProbeReportState}},
           {{enum|beginUnsolicitedPhyProfileState}},
           {{enum|rxDeterminedProbeState}}, {{enum|steadyState}} refer to the
-          On-Demand Link Maintenance Operation (see {{bibref|MoCAv2.0|Section
+          On-Demand Link Maintenance Operation (see {{bibref|MoCAv2.5|Section
           8.9.2}}).
 
-          {{enum|calibrationState}} refer to the Network Operation after a
-          Network Coordinator handoff or failover (see
-          {{bibref|MoCAv2.0|Section 8.14}}).
+          {{enum|calibrationState}} refer to the Network Operation after a NC
+          handoff or failover (see {{bibref|MoCAv2.5|Section 8.14}}).
         </description>
         <syntax>
           <string>
             <enumeration value="beginNodeAdmissionState">
-              <description>{{bibref|MoCAv2.0|Section 8.3.3}}</description>
+              <description>
+                "Begin Node Admission State" starts after completing the
+                pre-admission discovery message exchange with the NC, then the
+                joining node sends an admission request frame to the NC. During
+                this state, the EVM (Error Vector Magnitude) probes and link
+                acknowledgments are exchanged between the new node, the NC and
+                the existing nodes in the network. Refer to
+                {{bibref|MoCAv2.5|Section 8.3.4}} for details.
+              </description>
             </enumeration>
             <enumeration value="newNodeTypeOneProbeTxState">
-              <description>{{bibref|MoCAv2.0|Section 8.3.4}}</description>
+              <description>
+                The NC advances the network state to "New Node Type I Probe Tx
+                State" after receiving next link state indication from all the
+                nodes. During this state, the Beacon Channel (in the presence
+                of MoCA 1 nodes) from the MoCA 2 new nodes to all other
+                existing nodes (including the NC) is characterized and the
+                modulation used on this channel is optimized. The Primary
+                Channel, MoCA 2.x bonded channels from the MoCA 2 new nodes to
+                all other MoCA 2 Nodes (including NC) are characterized and the
+                modulation on these channels is optimized. Refer to
+                {{bibref|MoCAv2.5|Section 8.3.5}} for details.
+              </description>
             </enumeration>
             <enumeration value="newNodeTypeOneProbeRxState">
-              <description>{{bibref|MoCAv2.0|Section 8.3.5}}</description>
+              <description>
+                The NC advances the network state to "New Node Type I Probe Rx
+                State" after relaying Type I Probe Reports of all nodes, and
+                after it has received next state indication from each node.
+                Refer to {{bibref|MoCAv2.5|Section 8.3.6}} for details.
+              </description>
             </enumeration>
             <enumeration value="newGcdDistributionState">
-              <description>{{bibref|MoCAv2.0|Section 8.3.6}}</description>
+              <description>
+                The NC advances the network state to "New Node GCD Distribution
+                State" once it has received the next state indication from each
+                node to "New Node GCD Distribution State". In this state, the
+                GCD (Greater Common Denominator) Distribution Reports are
+                distributed. Refer to {{bibref|MoCAv2.5|Section 8.3.7}} for
+                details.
+              </description>
             </enumeration>
             <enumeration value="beginPhyProfileState">
-              <description>{{bibref|MoCAv2.0|Section 8.3.7}}</description>
+              <description>
+                The NC advances the network state to "Begin PHY Profile State"
+                when all nodes indicate “Begin PHY Profile State” in their RR
+                (Reservation Request). Upon reception of this state, the node
+                (new or existing) activates the new computed PHY profiles.
+                Refer to {{bibref|MoCAv2.5|Section 8.3.8}} for details.
+              </description>
             </enumeration>
             <enumeration value="steadyState">
               <description>
-                {{bibref|MoCAv2.0|Section 8.3.8}} {{bibref|MoCAv2.0|Section
-                8.9.2.2.3}}
+                The node advances to "Steady State" after waiting for T15 or
+                T16 (NC) in {{enum|beginPhyProfileState}}. Refer to
+                {{bibref|MoCAv2.5|Section 8.3.9}} for details.
+
+                The node advances to "Steady State" after waiting for T15 in
+                {{enum|beginUnsolicitedPhyProfileState}} or, in case of NC,
+                after receiving “Steady State” indication from each node. Refer
+                to {{bibref|MoCAv2.5|Section 8.9.2.2.3}}.
+
+                The node advances to "Steady State" after waiting for T15 or
+                T16 (NC) in {{enum|beginLmoPhyProfileState}}. Refer to [Section
+                8.9.1.7/MoCAv2.5] for details.
               </description>
             </enumeration>
             <enumeration value="typeThreeProbeState">
-              <description>{{bibref|MoCAv2.0|Section 8.9.1.2}}</description>
+              <description>
+                During this first state of the Regular LMO, Type III Probes are
+                exchanged between the LMO node and the rest of nodes. Refer to
+                {{bibref|MoCAv2.5|Section 8.9.1.2}} for details.
+              </description>
             </enumeration>
             <enumeration value="lmoTypeOneProbeState">
-              <description>{{bibref|MoCAv2.0|Section 8.9.1.3}}</description>
+              <description>
+                After the exchange of the EVM Reports during the state
+                {{enum|typeThreeProbeState}}, Type I Probes are exchanged
+                between the LMO node and and all other 1.x nodes. This state
+                finalizes after the LMO node receives the Composite OFDMA
+                Probes from the MoCA 2 Nodes. Refer to
+                {{bibref|MoCAv2.5|Section 8.9.1.3}} for details.
+              </description>
             </enumeration>
             <enumeration value="lmoNodeGcdDistributionState">
-              <description>{{bibref|MoCAv2.0|Section 8.9.1.5}}</description>
+              <description>
+                After state {{enum|lmoGcdTypeOneProbeLinkState}}, the LMO node
+                distributes the new GCD Report to all nodes. Refer to
+                {{bibref|MoCAv2.5|Section 8.9.1.5}} for details.
+              </description>
             </enumeration>
             <enumeration value="beginLmoPhyProfileState">
-              <description>{{bibref|MoCAv2.0|Section 8.9.1.6}}</description>
+              <description>
+                The NC advances the network state to "Begin LMO PHY Profile
+                State". When a node receives the "Begin LMO PHY Profile" Link
+                Control state notification, it can start using the newly
+                computed PHY profiles. Refer to {{bibref|MoCAv2.5|Section
+                8.9.1.6}} for details.
+              </description>
             </enumeration>
             <enumeration value="lmoGcdTypeOneProbeLinkState">
-              <description>{{bibref|MoCAv2.0|Section 8.9.1.4}}</description>
+              <description>
+                The NC advances the network state to "GCD Type I Probe Link
+                State". In this state, the LMO node broadcasts GCD Type I
+                Probes to all nodes. For details, refer to
+                {{bibref|MoCAv2.5|Section 8.9.1.4}}.
+              </description>
             </enumeration>
             <enumeration value="alternateChannelQuietLineState">
-              <description>{{bibref|MoCAv2.0|Section 8.9.2.5}}</description>
+              <description>
+                The node moves into the "Alternate Channel Quite Line State" to
+                measure quiet line noise and interference levels in the
+                alternate MoCA channel. Refer to {{bibref|MoCAv2.5|Section
+                8.9.2.5}} for details.
+              </description>
             </enumeration>
             <enumeration value="alternateChannelEvmProbeState">
-              <description>{{bibref|MoCAv2.0|Section 8.9.2.5}}</description>
+              <description>
+                The node moves into the "Alternate Channel EVM Probe State" to
+                measure EVM Probe signal level in the alternate MoCA channel.
+                Refer to {{bibref|MoCAv2.5|Section 8.9.2.5}} for details.
+              </description>
             </enumeration>
             <enumeration value="unsolicitedProbeReportState">
-              <description>{{bibref|MoCAv2.0|Section 8.9.2.2.1}}</description>
+              <description>
+                The NC sets the network state to "Unsolicited Probe Report
+                State" after a node request to move to this state in order to
+                update a PHY Profile. Refer to {{bibref|MoCAv2.5|Section
+                8.9.2.2.1}} for details.
+              </description>
             </enumeration>
             <enumeration value="beginUnsolicitedPhyProfileState">
-              <description>{{bibref|MoCAv2.0|Section 8.9.2.2.2}}</description>
+              <description>
+                After state {{enum|unsolicitedProbeReportState}}, a node can
+                begin using the new PHY profiles once the NC sets the network
+                state to "Begin Unsolicited PHY
+                Profile".{{bibref|MoCAv2.5|Section 8.9.2.2.2}}
+              </description>
             </enumeration>
             <enumeration value="rxDeterminedProbeState">
-              <description>{{bibref|MoCAv2.0|Section 8.9.2.1}}</description>
+              <description>
+                In order to use Receiver-Determined probes, the receiver must
+                move from {{enum|steadyState}} to "Rx Determined Probe State".
+                Refer to {{bibref|MoCAv2.5|Section 8.9.2.1}} for details.
+              </description>
             </enumeration>
             <enumeration value="calibrationState">
-              <description>{{bibref|MoCAv2.0|Section 8.14.1}}</description>
+              <description>
+                During network operations after switching to a new NC, the NC
+                node sets the network state to "Calibration State". During this
+                state, any node can request time to perform calibration by
+                sending probes. Refer to {{bibref|MoCAv2.5|Section 8.14.1}} and
+                {{bibref|MoCAv2.5|Section 8.14.2}}.
+              </description>
             </enumeration>
           </string>
         </syntax>
       </parameter>
 
       <parameter name="PrimaryChannelOffset" access="readOnly"
-          id="mocaIfPrimaryChannelOffset/1.3.6.1.4.1.31621.1.2.1.7.1.33">
+          id="mocaIfPrimaryChannelOffset/1.3.6.1.4.1.31621.1.2.1.7.1.33"
+          version="2.17">
         <description>
           The offset in MHz of the primary channel relative to the beacon
           channel. The allowed values are -25, 0, and +25.
@@ -28661,7 +29634,8 @@
       </parameter>
 
       <parameter name="SecondaryChannelOffset" access="readOnly"
-          id="mocaIfSecondaryChannelOffset/1.3.6.1.4.1.31621.1.2.1.7.1.34">
+          id="mocaIfSecondaryChannelOffset/1.3.6.1.4.1.31621.1.2.1.7.1.34"
+          version="2.17">
         <description>
           The offset in MHz of the secondary channel relative to the beacon
           channel. The allowed values are -125 and +125. A value of 0 indicates
@@ -28673,7 +29647,7 @@
       </parameter>
 
       <parameter name="ResetReason" access="readOnly"
-          id="mocaIfResetReason/1.3.6.1.4.1.31621.1.2.1.7.1.35">
+          id="mocaIfResetReason/1.3.6.1.4.1.31621.1.2.1.7.1.35" version="2.17">
         <description>
           Describes the reason for a MoCA link reset or failure to join a
           network.
@@ -28686,7 +29660,7 @@
       </parameter>
 
       <parameter name="NcVersion" access="readOnly"
-          id="mocaIfNcVersion/1.3.6.1.4.1.31621.1.2.1.7.1.36">
+          id="mocaIfNcVersion/1.3.6.1.4.1.31621.1.2.1.7.1.36" version="2.17">
         <description>
           Indicates the MoCA version of the NC.
 
@@ -28705,17 +29679,17 @@
       </parameter>
 
       <parameter name="LinkState" access="readOnly"
-          id="mocaIfLinkState/1.3.6.1.4.1.31621.1.2.1.7.1.37">
+          id="mocaIfLinkState/1.3.6.1.4.1.31621.1.2.1.7.1.37" version="2.17">
         <description>
           This parameter is meaningful only after a Link Failure to indicate
           the state of the network the at the time of the Link failure. Each of
           the three chars (bytes) is represented as two hexadecimal digits.
 
-           struct mocaLinkState { char LINK_STATE; // LINK_STATE_II from the
-           Tx/Rx MAP at the // time of the Link Failure char ACF_TYPE; //
-           ACF_TYPE from the Tx/Rx BEACON // at the time of the Link Failure
-           char ADD_ACF_TYPE; // ADDITIONAL_ACF_TYPE from the Tx/Rx // BEACON
-           at the time of the Link Failure };
+              struct mocaLinkState { char LINK_STATE; // LINK_STATE_II from the
+              Tx/Rx MAP at the // time of the Link Failure char ACF_TYPE; //
+              ACF_TYPE from the Tx/Rx BEACON // at the time of the Link Failure
+              char ADD_ACF_TYPE; // ADDITIONAL_ACF_TYPE from the Tx/Rx //
+              BEACON at the time of the Link Failure };
         </description>
         <syntax>
           <hexBinary>
@@ -28725,18 +29699,20 @@
       </parameter>
 
       <parameter name="ConnectedNodesInfo" access="readOnly"
-          id="moca25IfConnectedNodesInfo/1.3.6.1.4.1.31621.1.3.1.2.1.1">
+          id="moca25IfConnectedNodesInfo/1.3.6.1.4.1.31621.1.3.1.2.1.1"
+          version="2.17">
         <description>
           Indicates the information for each node connected in the network for
           up to 16 nodes.
 
           See {{bibref|MoCAv2.5|Table 17-1}}.
 
-           struct moca25ConnectedNodesInfo { long nodeIdVector; // 8 octets;
-           Bit value in the ith bit position indicates NodeID=(i) (LSB=bit0)
-           int numNodes; // 4 octets (Number of Node IDs indicated in the
-           NodeIdVector) struct { char guid[8]; // 8 octets (Node GUID MAC
-           Address) char mocaVersion; // 1 octet (MoCA Version) }[numNodes]; };
+              struct moca25ConnectedNodesInfo { long nodeIdVector; // 8 octets;
+              Bit value in the ith bit position indicates NodeID=(i) (LSB=bit0)
+              int numNodes; // 4 octets (Number of Node IDs indicated in the
+              NodeIdVector) struct { char guid[8]; // 8 octets (Node GUID MAC
+              Address) char mocaVersion; // 1 octet (MoCA Version) }[numNodes];
+              };
         </description>
         <syntax>
           <hexBinary>
@@ -28746,16 +29722,17 @@
       </parameter>
 
       <parameter name="MgntEntityNetIePayloadRx" access="readOnly"
-          id="moca25IfMgntEntityNetIePayloadRx/1.3.6.1.4.1.31621.1.3.1.2.1.2">
+          id="moca25IfMgntEntityNetIePayloadRx/1.3.6.1.4.1.31621.1.3.1.2.1.2"
+          version="2.17">
         <description>
           Indicates the payload of the latest received Management Entity
           Request Network IE, or Management Entity Response Network IE.
 
           See {{bibref|MoCAv2.5|Table 17-1}}.
 
-           struct moca25IfMgntEntityNetIePayload { short vendorId; // 2 octets
-           (MoCA Vendor ID) char information[60]; // 60 octets (Up to 60 bytes
-           of vendor specific information) };
+              struct moca25IfMgntEntityNetIePayload { short vendorId; // 2
+              octets (MoCA Vendor ID) char information[60]; // 60 octets (Up to
+              60 bytes of vendor specific information) };
         </description>
         <syntax>
           <hexBinary>
@@ -28765,7 +29742,8 @@
       </parameter>
 
       <parameter name="Moca25PhyCapable" access="readOnly"
-          id="moca25IfMoca25PhyCapable/1.3.6.1.4.1.31621.1.3.1.2.1.3">
+          id="moca25IfMoca25PhyCapable/1.3.6.1.4.1.31621.1.3.1.2.1.3"
+          version="2.17">
         <description>
           Indicate the MoCA Node supports MoCA 2.5 PHY if the value is
           {{true}}.
@@ -28781,7 +29759,8 @@
       </parameter>
 
       <parameter name="MpsInitScanPayload" access="readOnly"
-          id="moca25IfMpsInitScanPayload/1.3.6.1.4.1.31621.1.3.1.2.1.4">
+          id="moca25IfMpsInitScanPayload/1.3.6.1.4.1.31621.1.3.1.2.1.4"
+          version="2.17">
         <description>
           Reports the channel number, NC's (Network Coordinators) MoCA version,
           Network MPS (MoCA Protected Setup) trigger, and Network MPS
@@ -28799,7 +29778,7 @@
       </parameter>
 
       <parameter name="MpsState" access="readOnly"
-          id="moca25IfMpsState/1.3.6.1.4.1.31621.1.3.1.2.1.5">
+          id="moca25IfMpsState/1.3.6.1.4.1.31621.1.3.1.2.1.5" version="2.17">
         <description>
           Indicates the MPS (MoCA Protected Setup) state of the Node: paired if
           the value is {{true}} and un-Paired if the value is {{false}}.
@@ -28812,7 +29791,8 @@
       </parameter>
 
       <parameter name="NetworkNamePayload" access="readOnly"
-          id="moca25IfNetworkNamePayload/1.3.6.1.4.1.31621.1.3.1.2.1.6">
+          id="moca25IfNetworkNamePayload/1.3.6.1.4.1.31621.1.3.1.2.1.6"
+          version="2.17">
         <description>
           The payload of the latest received Network Name from the NC.
 
@@ -28826,7 +29806,7 @@
       </parameter>
 
       <parameter name="PrivacyNc" access="readOnly"
-          id="moca25IfPrivacyNc/1.3.6.1.4.1.31621.1.3.1.2.1.7">
+          id="moca25IfPrivacyNc/1.3.6.1.4.1.31621.1.3.1.2.1.7" version="2.17">
         <description>
           The latest NC_PRIVACY_SUPPORTED value received from the NC. Before
           any NC_PRIVACY_SUPPORTED is received, reflects the value of
@@ -28841,7 +29821,8 @@
       </parameter>
 
       <parameter name="PowerStateResp" access="readOnly"
-          id="moca25IfPowerStateResp/1.3.6.1.4.1.31621.1.3.1.2.1.8">
+          id="moca25IfPowerStateResp/1.3.6.1.4.1.31621.1.3.1.2.1.8"
+          version="2.17">
         <description>
           Carries the response of the MoCA Node to a request (through
           POWER_STATEREQ) to transition into a desired Power State: yes if the
@@ -28855,7 +29836,8 @@
       </parameter>
 
       <parameter name="PowerStateStatus" access="readOnly"
-          id="moca25IfPowerStateStatus/1.3.6.1.4.1.31621.1.3.1.2.1.9">
+          id="moca25IfPowerStateStatus/1.3.6.1.4.1.31621.1.3.1.2.1.9"
+          version="2.17">
         <description>
           Reports the current Power State of the Node (POWER_STATE_STATUS
           Managed Parameter).
@@ -28866,7 +29848,8 @@
       </parameter>
 
       <parameter name="ConnectedNodesDropReason" access="readOnly"
-          id="moca25IfConnectedNodesDropReason/1.3.6.1.4.1.31621.1.3.1.2.1.10">
+          id="moca25IfConnectedNodesDropReason/1.3.6.1.4.1.31621.1.3.1.2.1.10"
+          version="2.17">
         <description>
           Reports the GUID(s) of the dropped EN(s) and the reason of node drop
           for up to 15 nodes.
@@ -28875,13 +29858,13 @@
 
           See {{bibref|MoCAv2.5|Table 17-1}}.
 
-           struct moca25IfConnectedNodesDropReason { int numNodes; // 4 octets
-           (Number of dropped nodes) struct { char guid[8]; // 8 octets (Node
-           GUID MAC Address) char dropReason; // 1 octet (Reason of node drop:
-           // 0x00 Admission Failure // 0x01 Key Response Timeout // 0x02
-           Heartbeat Transmission Timeout // 0x03 Power State M0 Transition
-           Timeout // 0x04 Disadvantaged Node // 0x05 RR Transmission Timeout)
-           }[numNodes]; };
+              struct moca25IfConnectedNodesDropReason { int numNodes; // 4
+              octets (Number of dropped nodes) struct { char guid[8]; // 8
+              octets (Node GUID MAC Address) char dropReason; // 1 octet
+              (Reason of node drop: // 0x00 Admission Failure // 0x01 Key
+              Response Timeout // 0x02 Heartbeat Transmission Timeout // 0x03
+              Power State M0 Transition Timeout // 0x04 Disadvantaged Node //
+              0x05 RR Transmission Timeout) }[numNodes]; };
         </description>
         <syntax>
           <hexBinary/>
@@ -28889,7 +29872,8 @@
       </parameter>
 
       <parameter name="BelowPhyThresholdTrap" access="readOnly"
-          id="mocaTrapBelowPhyThreshold/1.3.6.1.4.1.31621.1.2.0.1">
+          id="mocaTrapBelowPhyThreshold/1.3.6.1.4.1.31621.1.2.0.1"
+          version="2.17">
         <description>
           If transmit PHY rate between all pairs of MoCA Nodes are greater than
           or equal to {{param|PhyThreshold}}, and subsequently the transmit PHY
@@ -28906,7 +29890,8 @@
       </parameter>
 
       <parameter name="AbovePhyThresholdTrap" access="readOnly"
-          id="mocaTrapAbovePhyThreshold/1.3.6.1.4.1.31621.1.2.0.2">
+          id="mocaTrapAbovePhyThreshold/1.3.6.1.4.1.31621.1.2.0.2"
+          version="2.17">
         <description>
           If transmit PHY rate between one or more pairs of MoCA Nodes are less
           than {{param|PhyThreshold}}, and subsequently the transmit PHY rate
@@ -28923,7 +29908,7 @@
       </parameter>
 
       <parameter name="StatusChangeTrap" access="readOnly"
-          id="mocaTrapIfStatusChange/1.3.6.1.4.1.31621.1.2.0.3">
+          id="mocaTrapIfStatusChange/1.3.6.1.4.1.31621.1.2.0.3" version="2.17">
         <description>
           This trap is sent when {{param|StatusChangeEnable}} is {{true}} and
           {{param|Status}} changes value.
@@ -28937,7 +29922,8 @@
       </parameter>
 
       <parameter name="NumNodesChangeTrap" access="readOnly"
-          id="mocaTrapIfNumNodesChange/1.3.6.1.4.1.31621.1.2.0.4">
+          id="mocaTrapIfNumNodesChange/1.3.6.1.4.1.31621.1.2.0.4"
+          version="2.17">
         <description>
           This trap is sent when {{param|NumNodesChangeEnable}} is {{true}} and
           {{param|NumNodes}} changes value.
@@ -28951,7 +29937,7 @@
       </parameter>
 
       <parameter name="MrRstSuccessTrap" access="readOnly"
-          id="mocaTrapMrRstSuccess/1.3.6.1.4.1.31621.1.2.0.5">
+          id="mocaTrapMrRstSuccess/1.3.6.1.4.1.31621.1.2.0.5" version="2.17">
         <description>
           An MR Entry Node reports that the network got reset successfully
           (MRRST_SUCCESS Event).
@@ -28965,7 +29951,7 @@
       </parameter>
 
       <parameter name="MrRstFailTrap" access="readOnly"
-          id="mocaTrapMrRstFail/1.3.6.1.4.1.31621.1.2.0.6">
+          id="mocaTrapMrRstFail/1.3.6.1.4.1.31621.1.2.0.6" version="2.17">
         <description>
           An MR Entry Node reports that the network reset did not complete
           successfully (MRRST_FAIL Event).
@@ -28979,7 +29965,8 @@
       </parameter>
 
       <parameter name="MrNetworkSuccessTrap" access="readOnly"
-          id="mocaTrapMrNetworkSuccess/1.3.6.1.4.1.31621.1.2.0.7">
+          id="mocaTrapMrNetworkSuccess/1.3.6.1.4.1.31621.1.2.0.7"
+          version="2.17">
         <description>
           An MR Entry Node reports that the network got reformed successfully
           following the MR transaction (MRNETWORK_SUCCESS Event).
@@ -28993,7 +29980,7 @@
       </parameter>
 
       <parameter name="MrNetworkFailTrap" access="readOnly"
-          id="mocaTrapMrNetworkFail/1.3.6.1.4.1.31621.1.2.0.8">
+          id="mocaTrapMrNetworkFail/1.3.6.1.4.1.31621.1.2.0.8" version="2.17">
         <description>
           An MR Entry Node reports that the MR transaction failed, and the
           network did not get reformed (MRNETWORK_FAIL Event).
@@ -29007,7 +29994,8 @@
       </parameter>
 
       <parameter name="PowerStateBcstRecTrap" access="readOnly"
-          id="mocaTrapPowerStateBcstRec/1.3.6.1.4.1.31621.1.2.0.9">
+          id="mocaTrapPowerStateBcstRec/1.3.6.1.4.1.31621.1.2.0.9"
+          version="2.17">
         <description>
           When the MoCA Node is in Power State M1 or M2, indicates that the
           MoCA Node has received a Broadcast data MSDU, which is available at
@@ -29022,7 +30010,7 @@
       </parameter>
 
       <parameter name="PowerStateM0NcTrap" access="readOnly"
-          id="mocaTrapPowerStateM0Nc/1.3.6.1.4.1.31621.1.2.0.10">
+          id="mocaTrapPowerStateM0Nc/1.3.6.1.4.1.31621.1.2.0.10" version="2.17">
         <description>
           When a MoCA Node is in Power State M1, indicates that it is going to
           move to Power State M0 due to the NCs instruction.
@@ -29036,7 +30024,7 @@
       </parameter>
 
       <parameter name="PowerStateNc1xTrap" access="readOnly"
-          id="mocaTrapPowerStateNc1x/1.3.6.1.4.1.31621.1.2.0.11">
+          id="mocaTrapPowerStateNc1x/1.3.6.1.4.1.31621.1.2.0.11" version="2.17">
         <description>
           When the MoCA Node is in Power State M1/M2/M3, indicates that MoCA 1
           Node is the NC (POWER_STATENC_1X Event).
@@ -29050,7 +30038,8 @@
       </parameter>
 
       <parameter name="PowerStateNetVerTrap" access="readOnly"
-          id="mocaTrapPowerStateNetVer/1.3.6.1.4.1.31621.1.2.0.12">
+          id="mocaTrapPowerStateNetVer/1.3.6.1.4.1.31621.1.2.0.12"
+          version="2.17">
         <description>
           When the MoCA Node is in Power State M2 or M3, indicates that the
           network MoCA version is changed (POWER_STATENET_VER Event).
@@ -29064,7 +30053,7 @@
       </parameter>
 
       <parameter name="PowerStateRespTrap" access="readOnly"
-          id="mocaTrapPowerStateResp/1.3.6.1.4.1.31621.1.2.0.13">
+          id="mocaTrapPowerStateResp/1.3.6.1.4.1.31621.1.2.0.13" version="2.17">
         <description>
           Carries the response of the MoCA Node to a request (through
           POWER_STATEREQ) to transition into a desired Power State
@@ -29079,7 +30068,8 @@
       </parameter>
 
       <parameter name="PowerStateUcstPenTrap" access="readOnly"
-          id="mocaTrapPowerStateUcstPen/1.3.6.1.4.1.31621.1.2.0.14">
+          id="mocaTrapPowerStateUcstPen/1.3.6.1.4.1.31621.1.2.0.14"
+          version="2.17">
         <description>
           When the MoCA Node is in Power State M2, indicates that a Unicast
           data MSDU destined to the MoCA Node is pending (POWER_STATEUCST_PEN
@@ -29094,7 +30084,8 @@
       </parameter>
 
       <parameter name="PowerStateTrnsReqTrap" access="readOnly"
-          id="mocaTrapPowerStateTrnsReq/1.3.6.1.4.1.31621.1.2.0.15">
+          id="mocaTrapPowerStateTrnsReq/1.3.6.1.4.1.31621.1.2.0.15"
+          version="2.17">
         <description>
           When a MoCA Node is in Power State M1 or M2, requests to transition
           to Power State M0 (POWER_STATETRNS_REQ Event).
@@ -29108,7 +30099,8 @@
       </parameter>
 
       <parameter name="PowerStateWupUrTrap" access="readOnly"
-          id="mocaTrapPowerStateWupUr/1.3.6.1.4.1.31621.1.2.0.16">
+          id="mocaTrapPowerStateWupUr/1.3.6.1.4.1.31621.1.2.0.16"
+          version="2.17">
         <description>
           When the MoCA Node is in Power State M2, this reports a wakeup
           request from NC due to unspecified reasons (POWER_STATEWUP_UR Event).
@@ -29122,7 +30114,7 @@
       </parameter>
 
       <parameter name="LmoStatusTrap" access="readOnly"
-          id="mocaTrapLmoStatus/1.3.6.1.4.1.31621.1.2.0.17">
+          id="mocaTrapLmoStatus/1.3.6.1.4.1.31621.1.2.0.17" version="2.17">
         <description>
           When {{param|LmoTrapEnable}} is enabled, reports that the MoCA Node
           is starting LMO (Link Maintenance Operation).
@@ -29136,7 +30128,7 @@
       </parameter>
 
       <parameter name="LinkFailureTrap" access="readOnly"
-          id="mocaTrapLinkFailure/1.3.6.1.4.1.31621.1.2.0.18">
+          id="mocaTrapLinkFailure/1.3.6.1.4.1.31621.1.2.0.18" version="2.17">
         <description>
           Indicates a link failure. If the failure was an Admission or LMO
           failure, {{param|LinkState}} indicates when the link was dropped
@@ -29151,7 +30143,8 @@
       </parameter>
 
       <parameter name="ConnectedNodesChangeTrap" access="readOnly"
-          id="moca25TrapConnectedNodesChange/1.3.6.1.4.1.31621.1.3.0.1">
+          id="moca25TrapConnectedNodesChange/1.3.6.1.4.1.31621.1.3.0.1"
+          version="2.17">
         <description>
           This trap is sent when {{param|ConnectedNodesChangeTrapEn}} is
           {{true}} and {{param|ConnectedNodesInfo}} changes value.
@@ -29165,7 +30158,8 @@
       </parameter>
 
       <parameter name="MgntEntityNetwIePayloadRecTrap" access="readOnly"
-          id="moca25TrapMgntEntityNetwIePayloadRec/1.3.6.1.4.1.31621.1.3.0.2">
+          id="moca25TrapMgntEntityNetwIePayloadRec/1.3.6.1.4.1.31621.1.3.0.2"
+          version="2.17">
         <description>
           This trap is sent when {{param|MgntEntityNetwIePayloadRecTrapEn}} is
           {{true}} and {{param|MgntEntityNetIePayloadRx}} changes value.
@@ -29179,7 +30173,8 @@
       </parameter>
 
       <parameter name="MpsInitScanRecTrap" access="readOnly"
-          id="moca25TrapMpsInitScanRec/1.3.6.1.4.1.31621.1.3.0.3">
+          id="moca25TrapMpsInitScanRec/1.3.6.1.4.1.31621.1.3.0.3"
+          version="2.17">
         <description>
           This trap is sent when {{param|MpsTrapEn}} is {{true}} and
           {{param|MpsInitScanPayload}} changes value.
@@ -29193,7 +30188,7 @@
       </parameter>
 
       <parameter name="MpsPairFailTrap" access="readOnly"
-          id="moca25TrapMpsPairFail/1.3.6.1.4.1.31621.1.3.0.4">
+          id="moca25TrapMpsPairFail/1.3.6.1.4.1.31621.1.3.0.4" version="2.17">
         <description>
           This trap is sent when {{param|MpsTrapEn}} is {{true}}, indicates a
           MPS pairing failure.
@@ -29207,7 +30202,8 @@
       </parameter>
 
       <parameter name="MpsPrivacyChangedTrap" access="readOnly"
-          id="moca25TrapMpsPrivacyChanged/1.3.6.1.4.1.31621.1.3.0.5">
+          id="moca25TrapMpsPrivacyChanged/1.3.6.1.4.1.31621.1.3.0.5"
+          version="2.17">
         <description>
           This trap is sent when {{param|MpsTrapEn}} is {{true}}, indicates
           that the Node's privacy settings (PRIVACYEN and/or PSWD) have been
@@ -29222,7 +30218,8 @@
       </parameter>
 
       <parameter name="NcPrivacySupportedRecTrap" access="readOnly"
-          id="moca25TrapNcPrivacySupportedRec/1.3.6.1.4.1.31621.1.3.0.6">
+          id="moca25TrapNcPrivacySupportedRec/1.3.6.1.4.1.31621.1.3.0.6"
+          version="2.17">
         <description>
           This trap is sent when {{param|NcPrivSupportedRecTrapEn}} is {{true}}
           and {{param|PrivacyNc}} changes value.
@@ -29236,7 +30233,8 @@
       </parameter>
 
       <parameter name="NetworkNameRecTrap" access="readOnly"
-          id="moca25TrapNetworkNameRec/1.3.6.1.4.1.31621.1.3.0.7">
+          id="moca25TrapNetworkNameRec/1.3.6.1.4.1.31621.1.3.0.7"
+          version="2.17">
         <description>
           This trap is sent when {{param|NetworkNameRecTrapEn}} is {{true}} and
           {{param|NetworkNamePayload}} changes value.
@@ -29250,7 +30248,8 @@
       </parameter>
 
       <parameter name="NodeDropAdmFailureTrap" access="readOnly"
-          id="moca25TrapNodeDropAdmFailure/1.3.6.1.4.1.31621.1.3.0.8">
+          id="moca25TrapNodeDropAdmFailure/1.3.6.1.4.1.31621.1.3.0.8"
+          version="2.17">
         <description>
           This trap is sent when {{param|NodeDropTrapEn}} is {{true}},
           indicates that the Node drops from the network due to admission
@@ -29265,7 +30264,8 @@
       </parameter>
 
       <parameter name="NodeDropNcTrap" access="readOnly"
-          id="moca25TrapTrapNodeDropNc/1.3.6.1.4.1.31621.1.3.0.9">
+          id="moca25TrapTrapNodeDropNc/1.3.6.1.4.1.31621.1.3.0.9"
+          version="2.17">
         <description>
           This trap is sent when {{param|NodeDropTrapEn}} is {{true}},
           indicates that the Node is dropped by the NC as indicated in the
@@ -29280,7 +30280,8 @@
       </parameter>
 
       <parameter name="NodeDropMpsTriggeredTrap" access="readOnly"
-          id="moca25TrapNodeDropMpsTriggered/1.3.6.1.4.1.31621.1.3.0.10">
+          id="moca25TrapNodeDropMpsTriggered/1.3.6.1.4.1.31621.1.3.0.10"
+          version="2.17">
         <description>
           This trap is sent when {{param|NodeDropTrapEn}} is {{true}},
           indicates that MPS is locally triggered when the Node is un-Paired.
@@ -29294,7 +30295,8 @@
       </parameter>
 
       <parameter name="NodeDropNcChgTrap" access="readOnly"
-          id="moca25TrapNodeDropNcChg/1.3.6.1.4.1.31621.1.3.0.11">
+          id="moca25TrapNodeDropNcChg/1.3.6.1.4.1.31621.1.3.0.11"
+          version="2.17">
         <description>
           This trap is sent when {{param|NodeDropTrapEn}} is {{true}}},
           indicates that there is a NC change when the Node is Non-Secured
@@ -29781,7 +30783,8 @@
 
       <parameter name="RxCorrectedErrors" access="readOnly"
           activeNotify="canDeny"
-          id="mocaIfRxCorrectedErrors/1.3.6.1.4.1.31621.1.2.1.8.1.4">
+          id="mocaIfRxCorrectedErrors/1.3.6.1.4.1.31621.1.2.1.8.1.4"
+          version="2.17">
         <description>
           The number of received Ethernet packets that have errors and are
           corrected by this MoCA interface.
@@ -30071,7 +31074,7 @@
       </parameter>
 
       <parameter name="Tag" access="readOnly"
-          id="mocaIfFlowTag/1.3.6.1.4.1.31621.1.2.1.9.1.7">
+          id="mocaIfFlowTag/1.3.6.1.4.1.31621.1.2.1.9.1.7" version="2.17">
         <description>
           The FLOW_TAG of the PQoS flow identified by {{param|FlowID}} in which
           this MoCA interface is an Ingress Node for this PQoS flow. The
@@ -30115,7 +31118,8 @@
       </parameter>
 
       <parameter name="IngressGuid" access="readOnly"
-          id="mocaIfFlowStatsIngressGuid/1.3.6.1.4.1.31621.1.2.1.9.1.10">
+          id="mocaIfFlowStatsIngressGuid/1.3.6.1.4.1.31621.1.2.1.9.1.10"
+          version="2.17">
         <description>
           The MAC address of the MoCA Node specified by the INGRESS_NODE_ID
           parameter of the flow.
@@ -30128,7 +31132,8 @@
       </parameter>
 
       <parameter name="EgressGuid" access="readOnly"
-          id="mocaIfFlowStatsEgressGuid/1.3.6.1.4.1.31621.1.2.1.9.1.11">
+          id="mocaIfFlowStatsEgressGuid/1.3.6.1.4.1.31621.1.2.1.9.1.11"
+          version="2.17">
         <description>
           The MAC address of the MoCA Node specified by the EGRESS_NODE_ID
           parameter of the flow.
@@ -30141,7 +31146,8 @@
       </parameter>
 
       <parameter name="MaximumLatency" access="readOnly"
-          id="mocaIfFlowStatsMaximumLatency/1.3.6.1.4.1.31621.1.2.1.9.1.12">
+          id="mocaIfFlowStatsMaximumLatency/1.3.6.1.4.1.31621.1.2.1.9.1.12"
+          version="2.17">
         <description>
           The MAXIMUM_LATENCY parameter of the flow in units of milliseconds. A
           value of 0 indicates no value available.
@@ -30154,7 +31160,8 @@
       </parameter>
 
       <parameter name="ShortTermAvgRatio" access="readOnly"
-          id="mocaIfFlowStatsShortTermAvgRatio/1.3.6.1.4.1.31621.1.2.1.9.1.13">
+          id="mocaIfFlowStatsShortTermAvgRatio/1.3.6.1.4.1.31621.1.2.1.9.1.13"
+          version="2.17">
         <description>
           The SHORT_TERM_AVERAGE_RATIO parameter of the flow.
 
@@ -30166,7 +31173,8 @@
       </parameter>
 
       <parameter name="FlowPer" access="readOnly"
-          id="mocaIfFlowStatsFlowPer/1.3.6.1.4.1.31621.1.2.1.9.1.15">
+          id="mocaIfFlowStatsFlowPer/1.3.6.1.4.1.31621.1.2.1.9.1.15"
+          version="2.17">
         <description>
           The FLOW_PER parameter of this flow, where a value of 0 indicates
           NPER and 1 indicates VLPER.
@@ -30179,7 +31187,8 @@
       </parameter>
 
       <parameter name="IngressClassify" access="readOnly"
-          id="mocaIfFlowStatsIngressClassify/1.3.6.1.4.1.31621.1.2.1.9.1.16">
+          id="mocaIfFlowStatsIngressClassify/1.3.6.1.4.1.31621.1.2.1.9.1.16"
+          version="2.17">
         <description>
           The INGRESS_CLASSIFICATION_RULE parameter of the flow.
 
@@ -30191,7 +31200,8 @@
       </parameter>
 
       <parameter name="VlanTag" access="readOnly"
-          id="mocaIfFlowStatsVlanTag/1.3.6.1.4.1.31621.1.2.1.9.1.17">
+          id="mocaIfFlowStatsVlanTag/1.3.6.1.4.1.31621.1.2.1.9.1.17"
+          version="2.17">
         <description>
           The VLAN_TAG parameter of the flow.
 
@@ -30203,7 +31213,8 @@
       </parameter>
 
       <parameter name="DscpMoca" access="readOnly"
-          id="mocaIfFlowStatsDscpMoca/1.3.6.1.4.1.31621.1.2.1.9.1.18">
+          id="mocaIfFlowStatsDscpMoca/1.3.6.1.4.1.31621.1.2.1.9.1.18"
+          version="2.17">
         <description>
           The DSCP_MOCA parameter of the flow.
 
@@ -30215,7 +31226,8 @@
       </parameter>
 
       <parameter name="Dfid" access="readOnly"
-          id="mocaIfFlowStatsDfid/1.3.6.1.4.1.31621.1.2.1.9.1.19">
+          id="mocaIfFlowStatsDfid/1.3.6.1.4.1.31621.1.2.1.9.1.19"
+          version="2.17">
         <description>
           The destination flow ID of the flow assigned by the Ingress Node.
 
@@ -30411,7 +31423,7 @@
       </parameter>
 
       <parameter name="TxDrops" access="readOnly"
-          id="mocaLinkTxDrops/1.3.6.1.4.1.31621.1.2.1.10.1.3">
+          id="mocaLinkTxDrops/1.3.6.1.4.1.31621.1.2.1.10.1.3" version="2.17">
         <description>
           The number of Unicast EPDUs received at the ECL, destined to the
           associated MoCA Node, and not transmitted by this MoCA interface.
@@ -30436,7 +31448,8 @@
       </parameter>
 
       <parameter name="RxCorrected" access="readOnly"
-          id="mocaNodeRxCorrected/1.3.6.1.4.1.31621.1.2.1.11.1.12">
+          id="mocaNodeRxCorrected/1.3.6.1.4.1.31621.1.2.1.11.1.12"
+          version="2.17">
         <description>
           The number of Ethernet packets received by this MoCA interface that
           have errors and are corrected from the MoCA Node identified by
@@ -30462,7 +31475,8 @@
       </parameter>
 
       <parameter name="BondingCapable" access="readOnly"
-          id="mocaNodeBondingCapable/1.3.6.1.4.1.31621.1.2.1.11.1.9">
+          id="mocaNodeBondingCapable/1.3.6.1.4.1.31621.1.2.1.11.1.9"
+          version="2.17">
         <description>
           The MoCA Node identified by {{param|MACAddress}} supports Bonding if
           the value is {{true}}. The MoCA Node identified by
@@ -30545,7 +31559,8 @@
       </parameter>
 
       <parameter name="SupportedIngressPqosFlows" access="readOnly"
-          id="mocaNodeSupportedIngressPqosFlows/1.3.6.1.4.1.31621.1.2.1.11.1.15">
+          id="mocaNodeSupportedIngressPqosFlows/1.3.6.1.4.1.31621.1.2.1.11.1.15"
+          version="2.17">
         <description>
           The number of Ingress PQoS Flows supported by this MoCA interface
           from the MoCA Node identified by {{param|MACAddress}}.
@@ -30556,7 +31571,8 @@
       </parameter>
 
       <parameter name="SupportedEgressPqosFlows" access="readOnly"
-          id="mocaNodeSupportedEgressPqosFlows/1.3.6.1.4.1.31621.1.2.1.11.1.16">
+          id="mocaNodeSupportedEgressPqosFlows/1.3.6.1.4.1.31621.1.2.1.11.1.16"
+          version="2.17">
         <description>
           The number of Egress PQoS Flows supported by this MoCA interface from
           the MoCA Node identified by {{param|MACAddress}}.
@@ -30567,7 +31583,8 @@
       </parameter>
 
       <parameter name="AggregationSize" access="readOnly"
-          id="mocaNodeAggregationSize/1.3.6.1.4.1.31621.1.2.1.11.1.17">
+          id="mocaNodeAggregationSize/1.3.6.1.4.1.31621.1.2.1.11.1.17"
+          version="2.17">
         <description>
           The maximum number of bytes that can be aggregated in a MoCA frame
           that this MoCA Node supports.
@@ -30578,7 +31595,7 @@
       </parameter>
 
       <parameter name="AeNumber" access="readOnly"
-          id="mocaNodeAeNumber/1.3.6.1.4.1.31621.1.2.1.11.1.18">
+          id="mocaNodeAeNumber/1.3.6.1.4.1.31621.1.2.1.11.1.18" version="2.17">
         <description>
           The maximum number of allocation elements, excluding the TAUs and the
           Dummy DAUs, in one MAP that this MoCA Node supports.
@@ -30589,7 +31606,8 @@
       </parameter>
 
       <parameter name="PowerState" access="readOnly"
-          id="mocaNodePowerState/1.3.6.1.4.1.31621.1.2.1.11.1.19">
+          id="mocaNodePowerState/1.3.6.1.4.1.31621.1.2.1.11.1.19"
+          version="2.17">
         <description>
           Power State of the MoCA Node identified by the {{param|MACAddress}}.
         </description>
@@ -30599,7 +31617,8 @@
       </parameter>
 
       <parameter name="PowerStateCapability" access="readOnly"
-          id="mocaNodePowerStateCapability/1.3.6.1.4.1.31621.1.2.1.11.1.20">
+          id="mocaNodePowerStateCapability/1.3.6.1.4.1.31621.1.2.1.11.1.20"
+          version="2.17">
         <description>
           Power State capability of the MoCA Node identified by the
           {{param|MACAddress}}.
@@ -30610,7 +31629,7 @@
       </parameter>
 
       <parameter name="PDelay" access="readOnly"
-          id="mocaNodePDelay/1.3.6.1.4.1.31621.1.2.1.11.1.21">
+          id="mocaNodePDelay/1.3.6.1.4.1.31621.1.2.1.11.1.21" version="2.17">
         <description>
           Propagation delay measured in units of 10ns between the local MoCA
           Node and the MoCA Node identified by the {{param|MACAddress}}.
@@ -30621,7 +31640,8 @@
       </parameter>
 
       <parameter name="EnhancedPrivacyCapable" access="readOnly"
-          id="moca25NodeEnhancedPrivacyCapable/1.3.6.1.4.1.31621.1.3.1.3.1.2">
+          id="moca25NodeEnhancedPrivacyCapable/1.3.6.1.4.1.31621.1.3.1.3.1.2"
+          version="2.17">
         <description>
           Indicates the MoCA Node identified by {{param|MACAddress}} supports
           MoCA 2 Enhanced Privacy if the value is {{true}}. Indicates the MoCA
@@ -30634,7 +31654,7 @@
       </parameter>
 
       <parameter name="LinkType" access="readOnly"
-          id="moca25NodeLinkType/1.3.6.1.4.1.31621.1.3.1.3.1.3">
+          id="moca25NodeLinkType/1.3.6.1.4.1.31621.1.3.1.3.1.3" version="2.17">
         <description>
           Indicates the type of link used for unicast data transmissions
           between the managed MoCA Node and the MoCA Node identified by
@@ -30665,7 +31685,8 @@
       </parameter>
 
       <parameter name="Moca25PhyCapable" access="readOnly"
-          id="moca25NodeMoca25PhyCapable/1.3.6.1.4.1.31621.1.3.1.3.1.4">
+          id="moca25NodeMoca25PhyCapable/1.3.6.1.4.1.31621.1.3.1.3.1.4"
+          version="2.17">
         <description>
           Indicates the MoCA Node identified by {{param|MACAddress}} supports
           MoCA 2.5 PHY if the value is {{true}}. Indicates the MoCA Node
@@ -30678,7 +31699,7 @@
       </parameter>
 
       <parameter name="RxPwrList" access="readOnly"
-          id="moca25NodeRxPwrList/1.3.6.1.4.1.31621.1.3.1.3.1.5">
+          id="moca25NodeRxPwrList/1.3.6.1.4.1.31621.1.3.1.3.1.5" version="2.17">
         <description>
           Per channel list of Receive power levels in dBm from the MoCA Node
           identified by {{param|MACAddress}} to the managed MoCA Node.
@@ -30703,9 +31724,9 @@
 
           * 500 MHz MoCA 2.5 PHY - 5
 
-           struct moca25NodePowerList { char numValues; // 1 octet (Number of
-           Values to follow) struct { char power; // 1 octet (Rx Power Level in
-           dBm) } [numValues]; };
+              struct moca25NodePowerList { char numValues; // 1 octet (Number
+              of Values to follow) struct { char power; // 1 octet (Rx Power
+              Level in dBm) } [numValues]; };
         </description>
         <syntax>
           <string>
@@ -30715,7 +31736,7 @@
       </parameter>
 
       <parameter name="RxSNRList" access="readOnly"
-          id="moca25NodeRxSNRList/1.3.6.1.4.1.31621.1.3.1.3.1.6">
+          id="moca25NodeRxSNRList/1.3.6.1.4.1.31621.1.3.1.3.1.6" version="2.17">
         <description>
           Per channel list of Average Receive Signal to Noise Ratio (SNR)
           across all available subcarriers based on the EVM probe from the MoCA
@@ -30735,9 +31756,9 @@
 
           * 500 MHz MoCA 2.5 PHY - 5
 
-           struct moca25NodeRxSNRList { char numValues; // 1 octet (Number of
-           Values to follow) struct { char snr; // 1 octet (Rx SNR in dB) }
-           [numValues]; };
+              struct moca25NodeRxSNRList { char numValues; // 1 octet (Number
+              of Values to follow) struct { char snr; // 1 octet (Rx SNR in dB)
+              } [numValues]; };
         </description>
         <syntax>
           <string>
@@ -30747,7 +31768,7 @@
       </parameter>
 
       <parameter name="TxPwrList" access="readOnly"
-          id="moca25NodeTxPwrList/1.3.6.1.4.1.31621.1.3.1.3.1.7">
+          id="moca25NodeTxPwrList/1.3.6.1.4.1.31621.1.3.1.3.1.7" version="2.17">
         <description>
           Per channel list of Transmit power levels in dBm from the managed
           MoCA Node to the MoCA Node identified by {{param|MACAddress}}. The
@@ -30768,9 +31789,9 @@
 
           * 500 MHz MoCA 2.5 PHY - 5
 
-           struct moca25NodePowerList { char numValues; // 1 octet (Number of
-           Values to follow) struct { char power; // 1 octet (Tx Power Level in
-           dBm) } [numValues]; };
+              struct moca25NodePowerList { char numValues; // 1 octet (Number
+              of Values to follow) struct { char power; // 1 octet (Tx Power
+              Level in dBm) } [numValues]; };
         </description>
         <syntax>
           <string>
@@ -30780,7 +31801,8 @@
       </parameter>
 
       <parameter name="TxPwrReductionList" access="readOnly"
-          id="moca25NodeTxPwrReductionList/1.3.6.1.4.1.31621.1.3.1.3.1.8">
+          id="moca25NodeTxPwrReductionList/1.3.6.1.4.1.31621.1.3.1.3.1.8"
+          version="2.17">
         <description>
           Per channel list of Transmit Power Control (TPC) back-off in dB used
           for unicast transmissions from the managed MoCA Node to the MoCA Node
@@ -30803,9 +31825,9 @@
 
           * 500 MHz MoCA 2.5 PHY - 5
 
-           struct moca25NodeTxPwrReductionList { char numValues; // 1 octet
-           (Number of Values to follow) struct { char tpc; // 1 octet (TPC in
-           dB) } [numValues]; };
+              struct moca25NodeTxPwrReductionList { char numValues; // 1 octet
+              (Number of Values to follow) struct { char tpc; // 1 octet (TPC
+              in dB) } [numValues]; };
         </description>
         <syntax>
           <string>
@@ -30815,7 +31837,8 @@
       </parameter>
 
       <parameter name="EgressNodeNumFlows" access="readOnly"
-          id="mocaLinkEgressNodeNumFlows/1.3.6.1.4.1.31621.1.2.1.10.1.4">
+          id="mocaLinkEgressNodeNumFlows/1.3.6.1.4.1.31621.1.2.1.10.1.4"
+          version="2.17">
         <description>
           The number of PQoS flows in which this MoCA interface is an Egress
           Node for these PQoS flows.
@@ -30826,7 +31849,8 @@
       </parameter>
 
       <parameter name="IngressNodeNumFlows" access="readOnly"
-          id="mocaLinkIngressNodeNumFlows/1.3.6.1.4.1.31621.1.2.1.10.1.5">
+          id="mocaLinkIngressNodeNumFlows/1.3.6.1.4.1.31621.1.2.1.10.1.5"
+          version="2.17">
         <description>
           The number of PQoS flows in which this MoCA interface is an Ingress
           Node for these PQoS flows.
@@ -30965,9 +31989,9 @@
 
           * {{enum|bonded|LinkType}} - 2
 
-           struct mocaPower { char numValues; // 1 octet (Number of Values to
-           follow) { char power; // 1 octet (Tx or Rx Power Level in dB) }
-           [numValues]; };
+              struct mocaPower { char numValues; // 1 octet (Number of Values
+              to follow) { char power; // 1 octet (Tx or Rx Power Level in dB)
+              } [numValues]; };
 
           This parameter is only used for MoCA 2.0.
         </description>
@@ -31001,9 +32025,9 @@
 
           * {{enum|bonded|LinkType}} - 2
 
-           struct mocaPowerReduction { char numValues; // 1 octet (Number of
-           Values to follow) { char tpc; // 1 octet (TPC in dB) } [numValues];
-           };
+              struct mocaPowerReduction { char numValues; // 1 octet (Number of
+              Values to follow) { char tpc; // 1 octet (TPC in dB) }
+              [numValues]; };
 
           This parameter is only used for MoCA 2.0.
         </description>
@@ -31033,8 +32057,9 @@
 
           * {{enum|bonded|LinkType}} - 2
 
-           struct mocaRxSNR { char numValues; // 1 octet (Number of Values to
-           follow) { char rx_snr; // 1 octet (Rx SNR in dB) } [numValues]; };
+              struct mocaRxSNR { char numValues; // 1 octet (Number of Values
+              to follow) { char rx_snr; // 1 octet (Rx SNR in dB) }
+              [numValues]; };
 
           This parameter is only used for MoCA 2.0.
         </description>
@@ -31302,12 +32327,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.4">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -31417,7 +32442,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="MaxTransmitRate" access="readOnly">
+      <parameter name="MaxTransmitRate" access="readOnly" version="2.8">
         <description>
           The maximum PHY data rate that the interface is capable of
           transmitting (expressed in {{units}}).
@@ -31515,7 +32540,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="DMRequested" access="readWrite">
+      <parameter name="DMRequested" access="readWrite" version="2.8">
         <description>
           Indicates a request to force the role of the G.hn interface to Domain
           Master (DM) for the G.hn domain it is connected to. The selection of
@@ -31527,7 +32552,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="IsDM" access="readOnly">
+      <parameter name="IsDM" access="readOnly" version="2.8">
         <description>
           Indicates whether this G.hn interface is currently the Domain Master
           (DM) for the G.hn domain it is connected to, as described in
@@ -31548,7 +32573,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SCRequested" access="readWrite">
+      <parameter name="SCRequested" access="readWrite" version="2.8">
         <description>
           Indicates a request to force the role of the G.hn interface to
           Security Controller (SC) for the G.hn domain it is connected to. The
@@ -31560,7 +32585,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="IsSC" access="readOnly">
+      <parameter name="IsSC" access="readOnly" version="2.8">
         <description>
           Indicates whether this G.hn interface is currently the Security
           Controller (SC) for the G.hn domain it is connected to, as described
@@ -31571,7 +32596,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="StandardVersions" access="readOnly">
+      <parameter name="StandardVersions" access="readOnly" version="2.8">
         <description>
           The standard versions that the interface supports. The list MUST have
           an even number of items. The first item of each pair represents an
@@ -31590,7 +32615,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="MaxBandPlan" access="readOnly">
+      <parameter name="MaxBandPlan" access="readOnly" version="2.8">
         <description>
           The largest bandplan that the interface can support, as defined in
           {{bibref|G.9961|Clause 8.8.5.5}}.
@@ -31600,7 +32625,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="MediumType" access="readOnly">
+      <parameter name="MediumType" access="readOnly" version="2.8">
         <description>
           The medium type that the interface currently operates on. Refer to
           {{bibref|G.9962|Table 7-5}}.
@@ -31616,7 +32641,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="TAIFG" access="readOnly">
+      <parameter name="TAIFG" access="readOnly" version="2.8">
         <description>
           The Acknowledgement InterFrame Gap, or TAIFG, as defined in
           {{bibref|G.9961|Clause 8.4}}. It is represented as multiples of
@@ -31629,7 +32654,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="NotchedAmateurRadioBands" access="readWrite">
+      <parameter name="NotchedAmateurRadioBands" access="readWrite"
+          version="2.8">
         <description>
           A bit map representing usage of international amateur bands (0 =
           masked, 1 = unmasked). The LSB represents the lowest band (1.8-2.0
@@ -31649,7 +32675,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="PHYThroughputDiagnosticsEnable" access="readWrite">
+      <parameter name="PHYThroughputDiagnosticsEnable" access="readWrite"
+          version="2.8">
         <description>
           {{nolist}}
 
@@ -31664,7 +32691,7 @@
       </parameter>
 
       <parameter name="PerformanceMonitoringDiagnosticsEnable"
-          access="readWrite">
+          access="readWrite" version="2.8">
         <description>
           {{nolist}}
 
@@ -31679,7 +32706,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="SMMaskedBandNumberOfEntries" access="readOnly">
+      <parameter name="SMMaskedBandNumberOfEntries" access="readOnly"
+          version="2.8">
         <description>
           {{numentries}}
         </description>
@@ -31738,7 +32766,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="PSM" access="readWrite">
+      <parameter name="PSM" access="readWrite" version="2.12">
         <description>
           Specifies the list of PSD shaping mask (PSM) breakpoints to be
           applied to the G.hn interface.
@@ -32034,7 +33062,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="MgmtBytesSent" access="readOnly" activeNotify="canDeny">
+      <parameter name="MgmtBytesSent" access="readOnly" activeNotify="canDeny"
+          version="2.8">
         <description>
           The total number of MPDU bytes transmitted by the node through a
           physical medium, which correspond to management LPDUs and framing
@@ -32046,7 +33075,7 @@
       </parameter>
 
       <parameter name="MgmtBytesReceived" access="readOnly"
-          activeNotify="canDeny">
+          activeNotify="canDeny" version="2.8">
         <description>
           The total number of MPDU bytes received by the node through a
           physical medium, which correspond to management LPDUs and framing
@@ -32058,7 +33087,7 @@
       </parameter>
 
       <parameter name="MgmtPacketsSent" access="readOnly"
-          activeNotify="canDeny">
+          activeNotify="canDeny" version="2.8">
         <description>
           The total number of LCDUs requested for transmission by a management
           layer (i.e., outbound LCDUs generated in LLC defined in
@@ -32071,7 +33100,7 @@
       </parameter>
 
       <parameter name="MgmtPacketsReceived" access="readOnly"
-          activeNotify="canDeny">
+          activeNotify="canDeny" version="2.8">
         <description>
           The total number of LCDUs delivered to a management layer (i.e.,
           inbound LCDUs) that were received by the node through a physical
@@ -32082,7 +33111,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="BlocksSent" access="readOnly" activeNotify="canDeny">
+      <parameter name="BlocksSent" access="readOnly" activeNotify="canDeny"
+          version="2.8">
         <description>
           The total number of LPDUs that were transmitted by the node through a
           physical medium, regardless of new or retransmitted LPDUs.
@@ -32093,7 +33123,7 @@
       </parameter>
 
       <parameter name="BlocksReceived" access="readOnly"
-          activeNotify="canDeny">
+          activeNotify="canDeny" version="2.8">
         <description>
           The total number of LPDUs that were received by the node through a
           physical medium, with or without errors.
@@ -32103,7 +33133,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="BlocksResent" access="readOnly" activeNotify="canDeny">
+      <parameter name="BlocksResent" access="readOnly" activeNotify="canDeny"
+          version="2.8">
         <description>
           The total number of LPDUs that were retransmitted.
         </description>
@@ -32113,7 +33144,7 @@
       </parameter>
 
       <parameter name="BlocksErrorsReceived" access="readOnly"
-          activeNotify="canDeny">
+          activeNotify="canDeny" version="2.8">
         <description>
           The total number of received LPDUs that contained errors.
 
@@ -32528,7 +33559,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Interface" access="readWrite">
+      <parameter name="Interface" access="readWrite" version="2.8">
         <description>
           The interface over which the test is to be performed.
         </description>
@@ -32540,7 +33571,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="DiagnoseMACAddress" access="readWrite">
+      <parameter name="DiagnoseMACAddress" access="readWrite" version="2.8">
         <description>
           The MAC address of the originating G.hn interface of the link that is
           being diagnosed.
@@ -32552,7 +33583,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SampleInterval" access="readWrite">
+      <parameter name="SampleInterval" access="readWrite" version="2.8">
         <description>
           Time in {{units}} between automatic collection of performance
           monitoring data. A value of zero disables automatic collection of
@@ -32574,7 +33605,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SNRGroupLength" access="readWrite">
+      <parameter name="SNRGroupLength" access="readWrite" version="2.8">
         <description>
           The number of sub-carriers in a group to be used for averaging SNR
           values when providing SNR information for a channel.
@@ -33131,12 +34162,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -33749,12 +34780,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -34346,12 +35377,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -34412,12 +35443,12 @@
         <parameter ref="MACAddress"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -34477,7 +35508,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Type" access="readWrite">
+      <parameter name="Type" access="readWrite" version="2.0">
         <description>
           Indicates the type of port measurement test to be carried out.
           {{enum}}.
@@ -34494,7 +35525,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Interface" access="readWrite">
+      <parameter name="Interface" access="readWrite" version="2.0">
         <description>
           {{reference}} This is the local UPA interface from which the test is
           to be performed.
@@ -34508,7 +35539,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Port" access="readWrite">
+      <parameter name="Port" access="readWrite" version="2.0">
         <description>
           PLC port being measured. This identifies which PLC connection to
           measure between the local interface (indicated by
@@ -34521,7 +35552,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Measurements" access="readOnly">
+      <parameter name="Measurements" access="readOnly" version="2.0">
         <description>
           {{list}} Result of Signal-to-Noise-Ratio measurement (if
           {{param|Type}} is {{enum|SNR|Type}}) or Channel Frequency Response
@@ -34540,7 +35571,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="RxGain" access="readOnly">
+      <parameter name="RxGain" access="readOnly" version="2.0">
         <description>
           Reception gain of the adapter (expresssed in {{units}}).
         </description>
@@ -34597,7 +35628,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ResetCounter" access="readOnly">
+      <parameter name="ResetCounter" access="readOnly" version="2.12">
         <description>
           This parameter counts the number of WiFi host or driver resets since
           the last device reset. This parameter is reset to zero after the
@@ -34609,7 +35640,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ResetCause" access="readOnly">
+      <parameter name="ResetCause" access="readOnly" version="2.14">
         <description>
           Reports the cause for the previous Wi-Fi driver reset.
         </description>
@@ -34637,7 +35668,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Reset" access="readWrite">
+      <parameter name="Reset" access="readWrite" version="2.12">
         <description>
           This parameter represents a request to reset or reboot the WiFi
           sub-system without resetting or rebooting the device.
@@ -34649,7 +35680,7 @@
     </object>
 
     <object name="Device.WiFi.MultiAP." access="readOnly" minEntries="1"
-        maxEntries="1" status="obsoleted" version="2.13">
+        maxEntries="1" status="deleted" version="2.13">
       <description>
         This object describes a Wi-Fi network containing 1 or more Access Point
         devices.
@@ -34668,10 +35699,12 @@
         {{object|##.WiFi.DataElements.Network}} MultiAP objects}}
 
         {{obsoleted|2.17}}
+
+        {{deleted|2.18}}
       </description>
 
       <parameter name="APDeviceNumberOfEntries" access="readOnly"
-          status="obsoleted">
+          status="deleted">
         <description>
           {{numentries}}
 
@@ -34679,6 +35712,8 @@
           deprecated}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <unsignedInt/>
@@ -34687,7 +35722,7 @@
     </object>
 
     <object name="Device.WiFi.MultiAP.SteeringSummaryStats." access="readOnly"
-        minEntries="1" maxEntries="1" status="obsoleted" version="2.13">
+        minEntries="1" maxEntries="1" status="deleted" version="2.13">
       <description>
         The summary of statistics related to Multi-AP Steering for the Wi-Fi
         network.
@@ -34698,6 +35733,8 @@
         {{object|##.DataElements.Network.MultiAPSteeringSummaryStats}}}}
 
         {{obsoleted|2.17}}
+
+        {{deleted|2.18}}
       </description>
 
       <parameter name="NoCandidateAPFailures" access="readOnly">
@@ -34780,7 +35817,7 @@
 
     <object name="Device.WiFi.MultiAP.APDevice.{i}." access="readOnly"
         numEntriesParameter="APDeviceNumberOfEntries" minEntries="0"
-        maxEntries="unbounded" status="obsoleted" version="2.13">
+        maxEntries="unbounded" status="deleted" version="2.13">
       <description>
         Each instance of this object represents an individual Access Point
         device in the Wi-Fi network.
@@ -34795,12 +35832,14 @@
         deprecated as noted}}
 
         {{obsoleted|2.17}}
+
+        {{deleted|2.18}}
       </description>
       <uniqueKey functional="true">
         <parameter ref="MACAddress"/>
       </uniqueKey>
 
-      <parameter name="MACAddress" access="readOnly" status="obsoleted">
+      <parameter name="MACAddress" access="readOnly" status="deleted">
         <description>
           A unique identifier for this particular device within the Wi-Fi
           network.
@@ -34809,13 +35848,15 @@
           {{param|##.DataElements.Network.Device.{i}.ID}}}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <dataType ref="MACAddress"/>
         </syntax>
       </parameter>
 
-      <parameter name="Manufacturer" access="readOnly" status="obsoleted">
+      <parameter name="Manufacturer" access="readOnly" status="deleted">
         <description>
           The manufacturer of the Access Point device (human readable string).
 
@@ -34823,6 +35864,8 @@
           Elements R2}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <string/>
@@ -34848,7 +35891,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ProductClass" access="readOnly" status="obsoleted">
+      <parameter name="ProductClass" access="readOnly" status="deleted">
         <description>
           Identifier of the class of product for which the serial number
           applies. That is, for a given manufacturer, this parameter is used to
@@ -34862,6 +35905,8 @@
           Elements R2}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <string>
@@ -34870,7 +35915,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SerialNumber" access="readOnly" status="obsoleted">
+      <parameter name="SerialNumber" access="readOnly" status="deleted">
         <description>
           Identifier of the particular Access Point device that is unique for
           the indicated class of product and manufacturer.
@@ -34882,6 +35927,8 @@
           Elements R2}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <string>
@@ -34890,7 +35937,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SoftwareVersion" access="readOnly" status="obsoleted">
+      <parameter name="SoftwareVersion" access="readOnly" status="deleted">
         <description>
           A string identifying the software version currently installed in the
           Access Point device (i.e. version of the overall firmware).
@@ -34904,6 +35951,8 @@
           Elements R2}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <string>
@@ -35027,7 +36076,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="RadarDetections" access="readOnly">
+      <parameter name="RadarDetections" access="readOnly" version="2.14">
         <description>
           {{list}} List items represent channels in the non-occupancy list due
           to radars detected by Dynamic Frequency Selection (DFS) Channel
@@ -35041,7 +36090,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="DFSEnable" access="readWrite" status="obsoleted">
+      <parameter name="DFSEnable" access="readWrite" version="2.14"
+          status="deleted">
         <description>
           Enables or disables Dynamic Frequency Selection (DFS).
 
@@ -35049,6 +36099,8 @@
           Elements R2}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <boolean/>
@@ -35056,7 +36108,7 @@
       </parameter>
 
       <parameter name="RadioNumberOfEntries" access="readOnly"
-          status="obsoleted">
+          status="deleted">
         <description>
           {{numentries}}
 
@@ -35064,6 +36116,8 @@
           deprecated}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <unsignedInt/>
@@ -35073,7 +36127,7 @@
 
     <object name="Device.WiFi.MultiAP.APDevice.{i}.Radio.{i}."
         access="readOnly" numEntriesParameter="RadioNumberOfEntries"
-        minEntries="0" maxEntries="unbounded" status="obsoleted" version="2.13">
+        minEntries="0" maxEntries="unbounded" status="deleted" version="2.13">
       <description>
         This object represents all of the individual Radios contained within
         the identified Access Point device known to the controller.
@@ -35089,12 +36143,14 @@
         The remaining parameters deprecated as noted}}
 
         {{obsoleted|2.17}}
+
+        {{deleted|2.18}}
       </description>
       <uniqueKey functional="true">
         <parameter ref="MACAddress"/>
       </uniqueKey>
 
-      <parameter name="MACAddress" access="readOnly" status="obsoleted">
+      <parameter name="MACAddress" access="readOnly" status="deleted">
         <description>
           A unique identifier for this particular Radio within the identified
           Access Point.
@@ -35103,6 +36159,8 @@
           {{param|###.DataElements.Network.Device.{i}.Radio.{i}.ID}}}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <dataType ref="MACAddress"/>
@@ -35110,7 +36168,7 @@
       </parameter>
 
       <parameter name="OperatingFrequencyBand" access="readOnly"
-          status="obsoleted">
+          status="deleted">
         <description>
           Indicates the frequency band at which the radio is operating.
           {{enum}}
@@ -35119,18 +36177,19 @@
           {{param|###.DataElements.Network.Device.{i}.Radio.{i}.CurrentOperatingClassProfile.{i}.Class}}}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <string>
             <enumeration value="2.4GHz"/>
             <enumeration value="5GHz"/>
-            <enumeration value="6GHz"/>
+            <enumeration value="6GHz" version="2.16"/>
           </string>
         </syntax>
       </parameter>
 
-      <parameter name="OperatingStandards" access="readOnly"
-          status="obsoleted">
+      <parameter name="OperatingStandards" access="readOnly" status="deleted">
         <description>
           {{list}} List items indicate which IEEE 802.11 standard this
           {{object}} instance is configured for. {{enum}}
@@ -35156,6 +36215,8 @@
           EasyMesh}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <list/>
@@ -35182,7 +36243,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Channel" access="readWrite" status="obsoleted">
+      <parameter name="Channel" access="readWrite" status="deleted">
         <description>
           The current radio channel used by the connection.
 
@@ -35206,6 +36267,8 @@
           {{param|###.DataElements.Network.Device.{i}.Radio.{i}.CurrentOperatingClassProfile.{i}.Channel}}}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <unsignedInt>
@@ -35214,7 +36277,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ExtensionChannel" access="readOnly" status="obsoleted">
+      <parameter name="ExtensionChannel" access="readOnly" status="deleted">
         <description>
           The secondary extension channel position, applicable when operating
           in wide channel mode (i.e. when
@@ -35230,6 +36293,8 @@
           EasyMesh}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <string>
@@ -35240,7 +36305,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="PossibleChannels" access="readOnly" status="obsoleted">
+      <parameter name="PossibleChannels" access="readOnly" status="deleted"
+          version="2.14">
         <description>
           {{list}} List items represent possible radio channels for the
           wireless standard (a, b, g, n, ac, ax) and the regulatory domain.
@@ -35252,6 +36318,8 @@
           {{deprecated|2.15|because it is not available via EasyMesh}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <list>
@@ -35262,13 +36330,15 @@
       </parameter>
 
       <parameter name="CurrentOperatingChannelBandwidth" access="readOnly"
-          status="obsoleted">
+          status="deleted">
         <description>
           The channel bandwidth currently in use. {{enum}}
 
           {{deprecated|2.15|because it is not available via EasyMesh}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <string>
@@ -35280,7 +36350,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="MCS" access="readOnly" status="obsoleted">
+      <parameter name="MCS" access="readOnly" status="deleted">
         <description>
           The Modulation Coding Scheme index (applicable to 802.11n and
           802.11ac specifications only). Values from 0 to 15 MUST be supported
@@ -35291,6 +36361,8 @@
           EasyMesh}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <int>
@@ -35300,7 +36372,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="TransmitPower" access="readOnly" status="obsoleted">
+      <parameter name="TransmitPower" access="readOnly" status="deleted">
         <description>
           Indicates the current transmit power level as a {{units}} of full
           power.
@@ -35309,6 +36381,8 @@
           {{param|###.DataElements.Network.Device.{i}.Radio.{i}.CurrentOperatingClassProfile.{i}.TxPower}}}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <int>
@@ -35318,8 +36392,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="TransmitPowerLimit" access="readWrite"
-          status="obsoleted">
+      <parameter name="TransmitPowerLimit" access="readWrite" status="deleted"
+          version="2.14">
         <description>
           Indicates the maximum Effective Isotropic Radiated Power (EIRP) per
           20 MHz bandwidth representing the nominal transmit power limit for
@@ -35329,6 +36403,8 @@
           {{deprecated|2.15|because it is not available in EasyMesh}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <int>
@@ -35338,7 +36414,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="APNumberOfEntries" access="readOnly" status="obsoleted">
+      <parameter name="APNumberOfEntries" access="readOnly" status="deleted">
         <description>
           {{numentries}}
 
@@ -35346,6 +36422,8 @@
           deprecated}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <unsignedInt/>
@@ -35355,7 +36433,7 @@
 
     <object name="Device.WiFi.MultiAP.APDevice.{i}.Radio.{i}.AP.{i}."
         access="readOnly" numEntriesParameter="APNumberOfEntries"
-        minEntries="0" maxEntries="unbounded" status="obsoleted" version="2.13">
+        minEntries="0" maxEntries="unbounded" status="deleted" version="2.13">
       <description>
         A single logical Access Point operating on this radio.
 
@@ -35365,6 +36443,8 @@
         {{object|####.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.}}}}
 
         {{obsoleted|2.17}}
+
+        {{deleted|2.18}}
       </description>
       <uniqueKey functional="true">
         <parameter ref="BSSID"/>
@@ -35423,7 +36503,7 @@
       </parameter>
 
       <parameter name="AssociatedDeviceNumberOfEntries" access="readOnly"
-          status="obsoleted">
+          status="deleted">
         <description>
           {{numentries}}
 
@@ -35431,6 +36511,8 @@
           being deprecated}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <unsignedInt/>
@@ -35441,7 +36523,7 @@
     <object
         name="Device.WiFi.MultiAP.APDevice.{i}.Radio.{i}.AP.{i}.AssociatedDevice.{i}."
         access="readOnly" numEntriesParameter="AssociatedDeviceNumberOfEntries"
-        minEntries="0" maxEntries="unbounded" status="obsoleted" version="2.13">
+        minEntries="0" maxEntries="unbounded" status="deleted" version="2.13">
       <description>
         Object describing a single Associated Device (STA).
 
@@ -35453,6 +36535,8 @@
         except {{param|OperatingStandard}} which was deprecated as noted}}
 
         {{obsoleted|2.17}}
+
+        {{deleted|2.18}}
       </description>
       <uniqueKey functional="true">
         <parameter ref="MACAddress"/>
@@ -35467,7 +36551,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="OperatingStandard" access="readOnly" status="obsoleted">
+      <parameter name="OperatingStandard" access="readOnly" status="deleted">
         <description>
           The operating standard that this associated device is connected with.
           {{enum}}
@@ -35476,6 +36560,8 @@
           EasyMesh}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <string>
@@ -35501,7 +36587,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Active" access="readOnly" status="obsoleted">
+      <parameter name="Active" access="readOnly" status="deleted">
         <description>
           Whether or not this associated device is currently present on the
           Wi-Fi Access Point device.
@@ -35515,6 +36601,8 @@
           EasyMesh}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <boolean/>
@@ -35586,7 +36674,7 @@
       </parameter>
 
       <parameter name="SteeringHistoryNumberOfEntries" access="readOnly"
-          status="obsoleted">
+          status="deleted">
         <description>
           {{numentries}}
 
@@ -35595,6 +36683,8 @@
           is being deprecated}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <unsignedInt/>
@@ -35604,7 +36694,7 @@
 
     <object
         name="Device.WiFi.MultiAP.APDevice.{i}.Radio.{i}.AP.{i}.AssociatedDevice.{i}.Stats."
-        access="readOnly" minEntries="1" maxEntries="1" status="obsoleted"
+        access="readOnly" minEntries="1" maxEntries="1" status="deleted"
         version="2.13">
       <description>
         Object describing the Statistics for a single Associated Device (STA).
@@ -35613,6 +36703,8 @@
         {{object|######.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.}}}}
 
         {{obsoleted|2.17}}
+
+        {{deleted|2.18}}
       </description>
 
       <parameter name="BytesSent" access="readOnly">
@@ -35686,7 +36778,7 @@
 
     <object
         name="Device.WiFi.MultiAP.APDevice.{i}.Radio.{i}.AP.{i}.AssociatedDevice.{i}.SteeringSummaryStats."
-        access="readOnly" minEntries="1" maxEntries="1" status="obsoleted"
+        access="readOnly" minEntries="1" maxEntries="1" status="deleted"
         version="2.13">
       <description>
         The summary of statistics related to Multi-AP Steering for an
@@ -35698,6 +36790,8 @@
         {{object|######.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.MultiAPSTA.SteeringSummaryStats.}}}}
 
         {{obsoleted|2.17}}
+
+        {{deleted|2.18}}
       </description>
 
       <parameter name="NoCandidateAPFailures" access="readOnly">
@@ -35796,7 +36890,7 @@
     <object
         name="Device.WiFi.MultiAP.APDevice.{i}.Radio.{i}.AP.{i}.AssociatedDevice.{i}.SteeringHistory.{i}."
         access="readOnly" numEntriesParameter="SteeringHistoryNumberOfEntries"
-        minEntries="0" maxEntries="unbounded" status="obsoleted" version="2.13">
+        minEntries="0" maxEntries="unbounded" status="deleted" version="2.13">
       <description>
         The history of Multi-AP Steering for an individual STA on the Wi-Fi
         network.
@@ -35807,6 +36901,8 @@
         {{object|######.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.MultiAPSTA.SteeringHistory.{i}.}}}}
 
         {{obsoleted|2.17}}
+
+        {{deleted|2.18}}
       </description>
       <uniqueKey functional="true">
         <parameter ref="Time"/>
@@ -35918,7 +37014,7 @@
           string format as defined in {{bibref|RFC3339|Section 3}}.
         </description>
         <syntax>
-          <string/>
+          <dateTime/>
         </syntax>
       </parameter>
 
@@ -35940,7 +37036,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="MSCSDisallowedStaList" access="readOnly">
+      <parameter name="MSCSDisallowedStaList" access="readOnly" version="2.15">
         <description>
           List of STAs for which Mirrored Stream Classification Service (MSCS)
           operation is disallowed.
@@ -35951,7 +37047,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SCSDisallowedStaList" access="readOnly">
+      <parameter name="SCSDisallowedStaList" access="readOnly" version="2.15">
         <description>
           List of STAs for which Stream Classification Service (SCS) operation
           is disallowed.
@@ -35962,7 +37058,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ColocatedAgentID" access="readOnly">
+      <parameter name="ColocatedAgentID" access="readOnly" version="2.17">
         <description>
           AL MAC address of the EasyMesh Agent that is co-located in the same
           device with the Wi-Fi EasyMesh Controller.
@@ -35974,7 +37070,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SSIDNumberOfEntries" access="readOnly">
+      <parameter name="SSIDNumberOfEntries" access="readOnly" version="2.15">
         <description>
           {{numentries}}
         </description>
@@ -35983,7 +37079,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="STABlockNumberOfEntries" access="readOnly">
+      <parameter name="STABlockNumberOfEntries" access="readOnly"
+          version="2.17">
         <description>
           {{numentries}}
         </description>
@@ -36001,8 +37098,8 @@
         Wi-Fi Multi-AP network, or on this single-AP. Also specifies the
         {{param|Band}} for each {{param|SSID}}.
 
-         Note that VLAN IDs (VIDs) can be configured per SSID with
-         {{object|#.Device.{i}.SSIDtoVIDMapping.{i}}}.
+        Note that VLAN IDs (VIDs) can be configured per SSID with
+        {{object|#.Device.{i}.SSIDtoVIDMapping.{i}}}.
       </description>
       <uniqueKey functional="false">
         <parameter ref="SSID"/>
@@ -36066,7 +37163,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Enable" access="readOnly">
+      <parameter name="Enable" access="readOnly" version="2.17">
         <description>
           Enable or disable of this {{param|SSID}}. Disable stops the use of
           this {{param|SSID}}, but the object is retained.
@@ -36080,7 +37177,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="AKMsAllowed" access="readOnly">
+      <parameter name="AKMsAllowed" access="readOnly" version="2.17">
         <description>
           {{list}} List items indicate Authentication and Key Management (AKM)
           suites/security modes allowed on this BSS. {{enum}}
@@ -36122,7 +37219,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SuiteSelector" access="readOnly">
+      <parameter name="SuiteSelector" access="readOnly" version="2.17">
         <description>
           AKM suite selector, the AKM suite selector (OUI and type) is encoded
           as a 4-octet hex-encoded value without internal delimiters, e.g.
@@ -36138,7 +37235,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="AdvertisementEnabled" access="readOnly">
+      <parameter name="AdvertisementEnabled" access="readOnly" version="2.17">
         <description>
           Indicates if the SSID is advertised in beacons, or not.
 
@@ -36151,7 +37248,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="MFPConfig" access="readOnly">
+      <parameter name="MFPConfig" access="readOnly" version="2.17">
         <description>
           Management Frame Protection (MFP) configuration. {{enum}}
         </description>
@@ -36164,7 +37261,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="MobilityDomain" access="readOnly">
+      <parameter name="MobilityDomain" access="readOnly" version="2.17">
         <description>
           The IEEE 802.11 mobility domain {{bibref|802.11-2020|Section
           9.4.2.46}}.
@@ -36174,7 +37271,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="HaulType" access="readOnly">
+      <parameter name="HaulType" access="readOnly" version="2.17">
         <description>
           Indicates the use of this {{param|SSID}}. {{enum}}
         </description>
@@ -36227,7 +37324,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="ScheduleNumberOfEntries" access="readOnly">
+      <parameter name="ScheduleNumberOfEntries" access="readOnly"
+          version="2.17">
         <description>
           {{numentries}}
         </description>
@@ -36249,12 +37347,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.17">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -36442,7 +37540,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="ReportUnsuccessfulAssociations" access="readWrite">
+      <parameter name="ReportUnsuccessfulAssociations" access="readWrite"
+          version="2.15">
         <description>
           Indicates whether the Multi-AP Agent or the single AP reports
           unsuccessful association attempts of client Stations (STAs) to the
@@ -36453,7 +37552,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="MaxReportingRate" access="readOnly">
+      <parameter name="MaxReportingRate" access="readOnly" version="2.15">
         <description>
           Maximum rate for reporting unsuccessful association attempts in
           {{units}}.
@@ -36465,7 +37564,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="APMetricsReportingInterval" access="readWrite">
+      <parameter name="APMetricsReportingInterval" access="readWrite"
+          version="2.15">
         <description>
           AP Metrics Reporting Interval.
 
@@ -36481,7 +37581,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="AssociatedSTAReportingInterval" access="readWrite">
+      <parameter name="AssociatedSTAReportingInterval" access="readWrite"
+          version="2.17">
         <description>
           Associated STA Reporting Interval.
 
@@ -36497,7 +37598,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Manufacturer" access="readOnly">
+      <parameter name="Manufacturer" access="readOnly" version="2.15">
         <description>
           Identifier of the manufacturer of the device.
 
@@ -36510,7 +37611,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SerialNumber" access="readOnly">
+      <parameter name="SerialNumber" access="readOnly" version="2.15">
         <description>
           Identifier of the particular Access Point device that is unique for
           the indicated model and manufacturer.
@@ -36527,7 +37628,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ManufacturerModel" access="readOnly">
+      <parameter name="ManufacturerModel" access="readOnly" version="2.15">
         <description>
           Identifier of the manufacturer model to help the user more easily
           identify a particular piece of equipment.
@@ -36541,7 +37642,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SoftwareVersion" access="readOnly">
+      <parameter name="SoftwareVersion" access="readOnly" version="2.15">
         <description>
           Identifier of the software version currently installed in the Access
           Point device (i.e. version of the overall firmware).
@@ -36555,7 +37656,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ExecutionEnv" access="readOnly">
+      <parameter name="ExecutionEnv" access="readOnly" version="2.15">
         <description>
           Identifier of the execution environment (operating system) in the
           device. This parameter can be an entry in the table
@@ -36570,7 +37671,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="DSCPMap" access="readOnly">
+      <parameter name="DSCPMap" access="readOnly" version="2.15">
         <description>
           A hexadecimal string of 64 Priority Code Point (PCP) values (one
           octet per value) corresponding to the Differentiated Services Code
@@ -36585,7 +37686,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="MaxPrioritizationRules" access="readOnly">
+      <parameter name="MaxPrioritizationRules" access="readOnly"
+          version="2.15">
         <description>
           The maximum total number of service prioritization rules supported by
           the Agent.
@@ -36597,7 +37699,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="PrioritizationSupport" access="readOnly">
+      <parameter name="PrioritizationSupport" access="readOnly" version="2.15">
         <description>
           Indicates support for Service Prioritization.
         </description>
@@ -36606,7 +37708,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="MaxVIDs" access="readOnly">
+      <parameter name="MaxVIDs" access="readOnly" version="2.15">
         <description>
           Max Total Number of unique VLAN IDs (VIDs) the Multi-AP Agent
           supports.
@@ -36616,7 +37718,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="APMetricsWiFi6" access="readOnly" status="deprecated">
+      <parameter name="APMetricsWiFi6" access="readOnly" version="2.15"
+          status="obsoleted">
         <description>
           Associated Wi-Fi6 STA Status Inclusion Policy.
 
@@ -36628,13 +37731,15 @@
 
           {{deprecated|2.16|because it was the same as
           {{param|Radio.{i}.APMetricsWiFi6}}.}}
+
+          {{obsoleted|2.18}}
         </description>
         <syntax>
           <boolean/>
         </syntax>
       </parameter>
 
-      <parameter name="CountryCode" access="readOnly">
+      <parameter name="CountryCode" access="readOnly" version="2.15">
         <description>
           Two-character country code in which the Multi-AP Agent is operating
           according to {{bibref|ISO3166-1}}. The characters are encoded as
@@ -36651,7 +37756,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="LocalSteeringDisallowedSTAList" access="readWrite">
+      <parameter name="LocalSteeringDisallowedSTAList" access="readWrite"
+          version="2.15">
         <description>
           {{list}} The STAs for which local steering is disallowed.
         </description>
@@ -36661,7 +37767,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="BTMSteeringDisallowedSTAList" access="readWrite">
+      <parameter name="BTMSteeringDisallowedSTAList" access="readWrite"
+          version="2.15">
         <description>
           {{list}} The STAs for which BSS Transition Management (BTM) steering
           is disallowed.
@@ -36672,7 +37779,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="DFSEnable" access="readOnly">
+      <parameter name="DFSEnable" access="readOnly" version="2.15">
         <description>
           Indicates if Dynamic Frequency Selection (DFS) is enabled or
           disabled.
@@ -36682,7 +37789,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="ReportIndependentScans" access="readWrite">
+      <parameter name="ReportIndependentScans" access="readWrite"
+          version="2.15">
         <description>
           Channel Scan Reporting Policy, Report Independent Channel Scans
 
@@ -36697,7 +37805,7 @@
       </parameter>
 
       <parameter name="AssociatedSTAinAPMetricsWiFi6" access="readWrite"
-          status="deprecated">
+          version="2.15" status="obsoleted">
         <description>
           For EasyMesh {{bibref|EasyMesh}}, this is the Associated Wi-Fi6 STA
           Status Inclusion Policy.
@@ -36710,6 +37818,8 @@
 
           {{deprecated|2.16|because it was the same as
           {{param|Radio.{i}.APMetricsWiFi6}}.}}
+
+          {{obsoleted|2.18}}
         </description>
         <syntax>
           <boolean/>
@@ -36717,7 +37827,7 @@
       </parameter>
 
       <parameter name="MaxUnsuccessfulAssociationReportingRate"
-          access="readWrite">
+          access="readWrite" version="2.15">
         <description>
           For EasyMesh {{bibref|EasyMesh}}, this is the maximum rate for
           reporting unsuccessful association attempts (in attempts per
@@ -36730,7 +37840,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="STASteeringState" access="readOnly">
+      <parameter name="STASteeringState" access="readOnly" version="2.15">
         <description>
           Indicates if EasyMesh {{bibref|EasyMesh}} controller-initiated
           station steering is disallowed or allowed on this device.
@@ -36745,7 +37855,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="CoordinatedCACAllowed" access="readWrite">
+      <parameter name="CoordinatedCACAllowed" access="readWrite"
+          version="2.15">
         <description>
           Allow or disallow the use of EasyMesh {{bibref|EasyMesh}} Coordinated
           Channel Availability Check (CAC) on this device.
@@ -36759,7 +37870,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="TrafficSeparationAllowed" access="readOnly">
+      <parameter name="TrafficSeparationAllowed" access="readOnly"
+          version="2.15">
         <description>
           This parameter indicates if EasyMesh traffic separation
           {{bibref|EasyMesh|Section 19.1}} is allowed or disallowed.
@@ -36769,7 +37881,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="ServicePrioritizationAllowed" access="readOnly">
+      <parameter name="ServicePrioritizationAllowed" access="readOnly"
+          version="2.15">
         <description>
           This parameter indicates if EasyMesh service prioritization
           {{bibref|EasyMesh|Section 20}} is allowed or disallowed.
@@ -36779,7 +37892,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="ControllerOperationMode" access="readOnly">
+      <parameter name="ControllerOperationMode" access="readOnly"
+          version="2.17">
         <description>
           This parameter represents the status of Wi-Fi EasyMesh controller
           functionality. {{enum}}
@@ -36803,7 +37917,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="BackhaulMACAddress" access="readOnly">
+      <parameter name="BackhaulMACAddress" access="readOnly" version="2.17">
         <description>
           The MAC address of the interface on the network that is providing the
           backhaul for this EasyMesh Agent. For Wi-Fi backhaul, this is the
@@ -36814,7 +37928,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="BackhaulALID" access="readOnly">
+      <parameter name="BackhaulALID" access="readOnly" version="2.17">
         <description>
           The IEEE 1905 {{bibref|IEEE1905.1a}} Abstraction-Layer ID (ALID) of
           the EasyMesh Agent on the network that is providing the backhaul for
@@ -36825,7 +37939,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="BackhaulDownMACAddress" access="readOnly">
+      <parameter name="BackhaulDownMACAddress" access="readOnly"
+          version="2.17">
         <description>
           {{list}} Each MAC address is that of a downstream EasyMesh agent's
           backhaul link.
@@ -36836,7 +37951,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="BackhaulMediaType" access="readOnly">
+      <parameter name="BackhaulMediaType" access="readOnly" version="2.17">
         <description>
           Media type of the backhaul link of this EasyMesh Agent.
 
@@ -36896,7 +38011,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="BackhaulPHYRate" access="readOnly">
+      <parameter name="BackhaulPHYRate" access="readOnly" version="2.17">
         <description>
           The Physical Layer (PHY) rate in {{units}} on the backhaul link of
           this EasyMesh agent.
@@ -36908,7 +38023,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="TrafficSeparationCapability" access="readOnly">
+      <parameter name="TrafficSeparationCapability" access="readOnly"
+          version="2.17">
         <description>
           Indicator of EasyMesh Agent capability to support EasyMesh
           {{bibref|EasyMesh}} 802.1Q C-TAG Traffic Separation.
@@ -36918,7 +38034,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="EasyConnectCapability" access="readOnly">
+      <parameter name="EasyConnectCapability" access="readOnly" version="2.17">
         <description>
           Indicator of the device capability to support Wi-Fi Easy Connect
           onboarding.
@@ -36931,7 +38047,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="TestCapabilities" access="readOnly">
+      <parameter name="TestCapabilities" access="readOnly" version="2.17">
         <description>
           Indicates EasyMesh agent support for running a throughput or latency
           test.
@@ -36962,7 +38078,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="Default8021QNumberOfEntries" access="readOnly">
+      <parameter name="Default8021QNumberOfEntries" access="readOnly"
+          version="2.15">
         <description>
           {{numentries}}
         </description>
@@ -36971,7 +38088,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="SSIDtoVIDMappingNumberOfEntries" access="readOnly">
+      <parameter name="SSIDtoVIDMappingNumberOfEntries" access="readOnly"
+          version="2.15">
         <description>
           {{numentries}}
         </description>
@@ -36980,7 +38098,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="CACStatusNumberOfEntries" access="readOnly">
+      <parameter name="CACStatusNumberOfEntries" access="readOnly"
+          version="2.15">
         <description>
           {{numentries}}
         </description>
@@ -36989,7 +38108,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="IEEE1905SecurityNumberOfEntries" access="readOnly">
+      <parameter name="IEEE1905SecurityNumberOfEntries" access="readOnly"
+          version="2.15">
         <description>
           {{numentries}}
         </description>
@@ -36998,7 +38118,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SPRuleNumberOfEntries" access="readOnly">
+      <parameter name="SPRuleNumberOfEntries" access="readOnly" version="2.15">
         <description>
           {{numentries}}
         </description>
@@ -37007,7 +38127,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="AnticipatedChannelsNumberOfEntries" access="readOnly">
+      <parameter name="AnticipatedChannelsNumberOfEntries" access="readOnly"
+          version="2.15">
         <description>
           {{numentries}}
         </description>
@@ -37017,7 +38138,7 @@
       </parameter>
 
       <parameter name="AnticipatedChannelUsageNumberOfEntries"
-          access="readOnly">
+          access="readOnly" version="2.15">
         <description>
           {{numentries}}
         </description>
@@ -37026,7 +38147,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="MaxNumMLDs" access="readOnly">
+      <parameter name="MaxNumMLDs" access="readOnly" version="2.17">
         <description>
           The maximum number of MLDs that the EasyMesh Agent can support.
           {{bibref|EasyMesh}} source: Wi-Fi 7 Agent Capabilities TLV.
@@ -37036,7 +38157,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="APMLDMaxLinks" access="readOnly">
+      <parameter name="APMLDMaxLinks" access="readOnly" version="2.17">
         <description>
           The maximum number of affiliated APs supported by any APMLD on this
           EasyMesh Agent. Set to a value between 0 and 14, which is the number
@@ -37050,7 +38171,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="bSTAMLDMaxLinks" access="readOnly">
+      <parameter name="bSTAMLDMaxLinks" access="readOnly" version="2.17"
+          dmr:noNameCheck="true">
         <description>
           The maximum number of affiliated bSTAs supported by the bSTAMLD on
           this EasyMesh Agent. Set to a value between 0 and 14, which is the
@@ -37064,7 +38186,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="TIDLinkMapCapability" access="readOnly">
+      <parameter name="TIDLinkMapCapability" access="readOnly" version="2.17">
         <description>
           Indicates the EasyMesh Agent support for TID to Link mapping.
           {{bibref|EasyMesh}} source: Wi-Fi 7 Agent Capabilities TLV. {{enum}}
@@ -37092,7 +38214,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="APMLDNumberOfEntries" access="readOnly">
+      <parameter name="APMLDNumberOfEntries" access="readOnly" version="2.17">
         <description>
           {{numentries}}
         </description>
@@ -37160,7 +38282,7 @@
         <parameter ref="SSID"/>
       </uniqueKey>
 
-      <parameter name="SSID" access="readOnly">
+      <parameter name="SSID" access="readOnly" version="2.15">
         <description>
           The SSID.
         </description>
@@ -37171,7 +38293,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="VID" access="readOnly">
+      <parameter name="VID" access="readOnly" version="2.15">
         <description>
           The VLAN ID (VID).
         </description>
@@ -37242,6 +38364,7 @@
       </description>
       <uniqueKey functional="true">
         <parameter ref="OpClass"/>
+        <parameter ref="Channel"/>
       </uniqueKey>
 
       <parameter name="OpClass" access="readOnly">
@@ -37293,6 +38416,7 @@
       </description>
       <uniqueKey functional="true">
         <parameter ref="OpClass"/>
+        <parameter ref="Channel"/>
       </uniqueKey>
 
       <parameter name="OpClass" access="readOnly">
@@ -37343,6 +38467,7 @@
       </description>
       <uniqueKey functional="true">
         <parameter ref="OpClass"/>
+        <parameter ref="Channel"/>
       </uniqueKey>
 
       <parameter name="OpClass" access="readOnly">
@@ -37391,7 +38516,7 @@
         <parameter ref="ID"/>
       </uniqueKey>
 
-      <parameter name="ID" access="readOnly">
+      <parameter name="ID" access="readOnly" version="2.15">
         <description>
           Service prioritization rule Identifier.
         </description>
@@ -37400,7 +38525,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Precedence" access="readOnly">
+      <parameter name="Precedence" access="readOnly" version="2.15">
         <description>
           Rule Precedence - higher number means higher priority.
         </description>
@@ -37411,7 +38536,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Output" access="readOnly">
+      <parameter name="Output" access="readOnly" version="2.15">
         <description>
           Rule Output. The value of, or method used to select, the 802.1Q C-TAG
           Priority Code Point (PCP) output value.
@@ -37423,7 +38548,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="AlwaysMatch" access="readOnly">
+      <parameter name="AlwaysMatch" access="readOnly" version="2.15">
         <description>
           Indicates if the rule always matches.
         </description>
@@ -37496,7 +38621,7 @@
         <parameter ref="OpClass"/>
       </uniqueKey>
 
-      <parameter name="OpClass" access="readOnly">
+      <parameter name="OpClass" access="readOnly" version="2.15">
         <description>
           The Operating Class per {{bibref|802.11-2020|Table E-4}}.
 
@@ -37509,7 +38634,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ChannelList" access="readOnly">
+      <parameter name="ChannelList" access="readOnly" version="2.15">
         <description>
           {{list}} The channel numbers in this Operating Class which have
           anticipated channel preference.
@@ -37626,7 +38751,7 @@
 
           : 0 = single burst,
 
-          : 2^32-1 = indefinite/unknown.
+          : 2^32^-1 = indefinite/unknown.
         </description>
         <syntax>
           <unsignedInt/>
@@ -37741,7 +38866,7 @@
         This object represents an individual Access Point device.
       </description>
 
-      <parameter name="ManufacturerOUI" access="readOnly">
+      <parameter name="ManufacturerOUI" access="readOnly" status="deprecated">
         <description>
           Organizationally unique identifier of the Access Point device
           manufacturer. Represented as a six hexadecimal-digit value using all
@@ -37755,6 +38880,9 @@
           If the instance of this {{object}} is the same as {{object|Device.}},
           then this parameter is the same as
           {{param|Device.DeviceInfo.ManufacturerOUI}}.
+
+          {{deprecated|2.18|because it was essentially the same as
+          {{param|#.Manufacturer}}.}}
         </description>
         <syntax>
           <string>
@@ -37791,10 +38919,14 @@
         </syntax>
       </parameter>
 
-      <parameter name="EasyMeshControllerOperationMode" access="readOnly">
+      <parameter name="EasyMeshControllerOperationMode" access="readOnly"
+          status="deprecated">
         <description>
           This parameter represents the status of Wi-Fi CERTIFIED EasyMeshTM
           controller functionality. {{enum}}
+
+          {{deprecated|2.18|because it was the same as
+          {{param|#.ControllerOperationMode}}.}}
         </description>
         <syntax>
           <string>
@@ -37848,23 +38980,23 @@
         The endpoints of the backhaul interface are represented by the
         (Device's ID and interface MAC Address). This object represents the
         upward view of the backhaul interface. The two endpoints of the
-        backhaul interface are - ({{param|BackhaulDeviceID}},
-        {{param|BackhaulMACAddress}}) of the uplinked Backhaul Device -
-        {{param|MACAddress}} of this Access Point Device
-
-            {{param|BackhaulDeviceID}} / {{param|BackhaulMACAddress}} &lt;--
-            {{param|LinkType}} --- &lt; {{param|MACAddress}}
+        backhaul interface are - ({{param|BackhaulDeviceID|deprecated}},
+        {{param|BackhaulMACAddress|deprecated}}) of the uplinked Backhaul
+        Device - {{param|MACAddress|deprecated}} of this Access Point Device.
 
         {{empty}} is reserved for the {{object}} instance that represents the
         Multi-AP Controller.
       </description>
 
-      <parameter name="LinkType" access="readOnly">
+      <parameter name="LinkType" access="readOnly" status="deprecated">
         <description>
           The medium being used to backhaul this Access Point Device to the
           Backhaul Access Point Device. The {{enum|None}} value is reserved for
           the {{object}} instance that represents the Multi-AP Controller.
           {{enum}}
+
+          {{deprecated|2.18|because it was essentially the same as
+          {{param|##.BackhaulMediaType}}.}}
         </description>
         <syntax>
           <string>
@@ -37880,37 +39012,47 @@
         </syntax>
       </parameter>
 
-      <parameter name="BackhaulMACAddress" access="readOnly">
+      <parameter name="BackhaulMACAddress" access="readOnly"
+          status="deprecated">
         <description>
           The MAC Address at the far end of the backhaul link of the interface
           on the network that is providing a backhaul for this Access Point
-          Device. This along with {{param|BackhaulDeviceID}}, helps to identfy
-          the backhaul interface endpoint.
+          Device. This along with {{param|BackhaulDeviceID|deprecated}}, helps
+          to identify the backhaul interface endpoint.
 
           {{empty}} is reserved for the {{object}} instance that represents the
           Multi-AP Controller.
+
+          {{deprecated|2.18|because it was the same as
+          {{param|##.BackhaulMACAddress}}.}}
         </description>
         <syntax>
           <dataType ref="MACAddress"/>
         </syntax>
       </parameter>
 
-      <parameter name="BackhaulDeviceID" access="readOnly">
+      <parameter name="BackhaulDeviceID" access="readOnly" status="deprecated">
         <description>
           The Device's ID of the Device on the network that is providing a
           Backhaul Link for this Access Point Device.
+
+          {{deprecated|2.18|because it was essentially the same as
+          {{param|##.BackhaulALID}}.}}
         </description>
         <syntax>
           <dataType ref="MACAddress"/>
         </syntax>
       </parameter>
 
-      <parameter name="MACAddress" access="readOnly">
+      <parameter name="MACAddress" access="readOnly" status="deprecated">
         <description>
           The MAC Address at the near end of the backhaul link of this Access
           Point Device's backhaul interface that is connecting via
-          {{param|LinkType}} to {{param|BackhaulMACAddress}} of the Backhaul
-          Device identified by {{param|BackhaulDeviceID}}.
+          {{param|##.BackhaulMediaType}} to {{param|BackhaulMACAddress}} of the
+          Backhaul Device identified by {{param|BackhaulDeviceID}}.
+
+          {{deprecated|2.18|because it was the same as
+          {{param|##.Radio.{i}.BackhaulSta.MACAddress}}.}}
         </description>
         <syntax>
           <dataType ref="MACAddress"/>
@@ -38006,8 +39148,8 @@
       <parameter name="BytesSent" access="readOnly">
         <description>
           The total number of bytes transmitted across the backhaul medium (as
-          identified by the value of the {{param|#.LinkType}} parameter),
-          including framing characters.
+          identified by the value of the {{param|###.BackhaulMediaType}}}}
+          parameter), including framing characters.
         </description>
         <syntax>
           <dataType ref="StatsCounter64"/>
@@ -38017,8 +39159,8 @@
       <parameter name="BytesReceived" access="readOnly">
         <description>
           The total number of bytes received across the backhaul medium (as
-          identified by the value of the {{param|#.LinkType}} parameter),
-          including framing characters.
+          identified by the value of the {{param|###.BackhaulMediaType}}
+          parameter), including framing characters.
         </description>
         <syntax>
           <dataType ref="StatsCounter64"/>
@@ -38028,8 +39170,8 @@
       <parameter name="PacketsSent" access="readOnly">
         <description>
           The total number of packets transmitted across the backhaul medium
-          (as identified by the value of the {{param|#.LinkType}} parameter),
-          including framing characters.
+          (as identified by the value of the {{param|###.BackhaulMediaType}}
+          parameter), including framing characters.
         </description>
         <syntax>
           <dataType ref="StatsCounter64"/>
@@ -38039,8 +39181,8 @@
       <parameter name="PacketsReceived" access="readOnly">
         <description>
           The total number of packets received across the backhaul medium (as
-          identified by the value of the {{param|#.LinkType}} parameter),
-          including framing characters.
+          identified by the value of the {{param|###.BackhaulMediaType}}
+          parameter), including framing characters.
         </description>
         <syntax>
           <dataType ref="StatsCounter64"/>
@@ -38070,10 +39212,10 @@
       <parameter name="LinkUtilization" access="readOnly">
         <description>
           Current utilization (expressed in {{units}}) of the medium (as
-          identified by the value of the {{param|#.LinkType}} parameter) being
-          used to backhaul this Access Point device to the Multi-AP Controller.
-          A value of 0 is used for the {{object}} instance that represents the
-          Access Point on the Multi-AP Controller.
+          identified by the value of the {{param|###.BackhaulMediaType}}
+          parameter) being used to backhaul this Access Point device to the
+          Multi-AP Controller. A value of 0 is used for the {{object}} instance
+          that represents the Access Point on the Multi-AP Controller.
         </description>
         <syntax>
           <unsignedInt>
@@ -38089,8 +39231,8 @@
           Access Point (AP) to the Multi-AP Controller, measured in {{units}}.
           RCPI is encoded per {{bibref|802.11-2020|Table 9-176}}. The value of
           this parameter is indeterminate if the value of the
-          {{param|#.LinkType}} parameter is anything other than
-          {{enum|Wi-Fi|#.LinkType}}.
+          {{param|###.BackhaulMediaType}} parameter is anything other than a
+          type of IEEE 802.11 Wi-Fi.
         </description>
         <syntax>
           <unsignedInt>
@@ -38195,7 +39337,7 @@
           with 255 representing 100%) that the Access Point device sensed the
           medium was busy, as indicated by either the physical or virtual
           carier sense (CS) mechanism. This is essentially the amount of time
-          spent transmiting (both successful and failed transmissions),
+          spent transmitting (both successful and failed transmissions),
           receiving (both local and non-local transmissions), and processing
           noise {{bibref|802.11-2020|Section 9.4.2.27}}.
 
@@ -38253,7 +39395,7 @@
           (linearly scaled with 255 representing 100%) that the radio has spent
           on receiving individually or group addressed non-local transmissions
           (i.e. valid IEEE 802.11 PPDUs that are not associated with any BSS
-          operatin gon this radio).
+          operating on this radio).
 
           When more than one channel is in use for the BSS operating on the
           radio, the {{param}} value is calculated only for the primary
@@ -38266,7 +39408,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="TrafficSeparationCombinedFronthaul" access="readOnly">
+      <parameter name="TrafficSeparationCombinedFronthaul" access="readOnly"
+          version="2.15">
         <description>
           Indicates traffic separation on combined fronthaul and Profile-1
           backhaul support {{bibref|EasyMesh}}.
@@ -38276,7 +39419,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="TrafficSeparationCombinedBackhaul" access="readOnly">
+      <parameter name="TrafficSeparationCombinedBackhaul" access="readOnly"
+          version="2.15">
         <description>
           Indicates traffic separation on combined Profile-1 backhaul and
           Profile-2 backhaul support {{bibref|EasyMesh}}.
@@ -38286,7 +39430,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SteeringPolicy" access="readWrite">
+      <parameter name="SteeringPolicy" access="readWrite" version="2.15">
         <description>
           Steering Policy:
 
@@ -38304,7 +39448,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="ChannelUtilizationThreshold" access="readWrite">
+      <parameter name="ChannelUtilizationThreshold" access="readWrite"
+          version="2.15">
         <description>
           Channel Utilization Threshold (defined per Basic Service Set (BSS)
           Load element {{bibref|802.11-2020|Section 9.4.2.27}}.).
@@ -38316,7 +39461,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="RCPISteeringThreshold" access="readWrite">
+      <parameter name="RCPISteeringThreshold" access="readWrite"
+          version="2.15">
         <description>
           RCPI Steering Threshold (encoded per {{bibref|802.11-2020|Table
           9-176}}).
@@ -38328,7 +39474,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="STAReportingRCPIThreshold" access="readWrite">
+      <parameter name="STAReportingRCPIThreshold" access="readWrite"
+          version="2.15">
         <description>
           Station (STA) Metrics Reporting RCPI Threshold.
 
@@ -38345,7 +39492,7 @@
       </parameter>
 
       <parameter name="STAReportingRCPIHysteresisMarginOverride"
-          access="readWrite">
+          access="readWrite" version="2.15">
         <description>
           STA Metrics Reporting RCPI Hysteresis Margin Override.
 
@@ -38363,7 +39510,7 @@
       </parameter>
 
       <parameter name="ChannelUtilizationReportingThreshold"
-          access="readWrite">
+          access="readWrite" version="2.15">
         <description>
           AP Metrics Channel Utilization Reporting Threshold.
 
@@ -38379,7 +39526,7 @@
       </parameter>
 
       <parameter name="AssociatedSTATrafficStatsInclusionPolicy"
-          access="readWrite">
+          access="readWrite" version="2.15">
         <description>
           Associated STA Traffic Stats Inclusion Policy.
 
@@ -38395,7 +39542,7 @@
       </parameter>
 
       <parameter name="AssociatedSTALinkMetricsInclusionPolicy"
-          access="readWrite">
+          access="readWrite" version="2.15">
         <description>
           Associated STA Link Metrics Inclusion Policy.
 
@@ -38410,7 +39557,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ChipsetVendor" access="readOnly">
+      <parameter name="ChipsetVendor" access="readOnly" version="2.15">
         <description>
           A string identifying the Wi-Fi chip vendor of this radio in the
           device.
@@ -38420,7 +39567,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="APMetricsWiFi6" access="readWrite">
+      <parameter name="APMetricsWiFi6" access="readWrite" version="2.15">
         <description>
           Associated Wi-Fi6 STA Status Inclusion Policy.
 
@@ -38463,7 +39610,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="ScanResultNumberOfEntries" access="readOnly">
+      <parameter name="ScanResultNumberOfEntries" access="readOnly"
+          version="2.14">
         <description>
           {{numentries}}
         </description>
@@ -38473,7 +39621,7 @@
       </parameter>
 
       <parameter name="DisAllowedOpClassChannelsNumberOfEntries"
-          access="readOnly">
+          access="readOnly" version="2.15">
         <description>
           {{numentries}}
         </description>
@@ -38499,11 +39647,11 @@
           string format as defined in {{bibref|RFC3339|Section 3}}.
         </description>
         <syntax>
-          <string/>
+          <dateTime/>
         </syntax>
       </parameter>
 
-      <parameter name="AggregateScanDuration" access="readOnly">
+      <parameter name="AggregateScanDuration" access="readOnly" version="2.17">
         <description>
           Total time spent performing the scan of this channel in {{units}}.
         </description>
@@ -38514,7 +39662,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ScanType" access="readOnly">
+      <parameter name="ScanType" access="readOnly" version="2.17">
         <description>
           Indicates whether the scan was performed passively (false) or with
           active probing (true).
@@ -38602,7 +39750,7 @@
           3}}.
         </description>
         <syntax>
-          <string/>
+          <dateTime/>
         </syntax>
       </parameter>
 
@@ -38633,7 +39781,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ScanStatus" access="readOnly">
+      <parameter name="ScanStatus" access="readOnly" version="2.17">
         <description>
           Status code to indicate whether a scan has been performed and if not
           the reason for failure {{enum}}
@@ -38762,7 +39910,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="MLDMACAddress" access="readOnly">
+      <parameter name="MLDMACAddress" access="readOnly" version="2.17">
         <description>
           The Multi-Link Device (MLD) MAC address of the Multi-Link Operation
           (MLO) capable access point this neighboring BSS is affiliated to.
@@ -38773,7 +39921,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ReportingBSSID" access="readOnly">
+      <parameter name="ReportingBSSID" access="readOnly" version="2.17">
         <description>
           The BSSID of the reporting BSSID if different from {{param|BSSID}}.
           This will be set if the NeigborBSS was discovered through, for
@@ -38785,7 +39933,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="MultiBSSID" access="readOnly">
+      <parameter name="MultiBSSID" access="readOnly" version="2.17">
         <description>
           Indicates if the neighboring BSS is part of a MultiBSSID set and may
           be a non-transmitted BSSID.
@@ -38795,7 +39943,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="BSSLoadElementPresent" access="readOnly">
+      <parameter name="BSSLoadElementPresent" access="readOnly" version="2.17">
         <description>
           Set to true if the neighbour BSS Beacon/Probe Responses include a
           BSSLoad Element as defined in {{bibref|802.11-2020|Section
@@ -38806,7 +39954,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="BSSColor" access="readOnly">
+      <parameter name="BSSColor" access="readOnly" version="2.17">
         <description>
           Set to the BSS Color from the BSS Color Information field in the
           BSS's HE Operation element.
@@ -38845,7 +39993,7 @@
         This object describes the channel scan capabilities of a radio.
       </description>
 
-      <parameter name="OnBootOnly" access="readOnly">
+      <parameter name="OnBootOnly" access="readOnly" version="2.15">
         <description>
           On boot only flag, Indicates whether the specified radio is capable
           only of On boot scans.
@@ -38855,7 +40003,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Impact" access="readOnly">
+      <parameter name="Impact" access="readOnly" version="2.15">
         <description>
           Scan Impact of using this radio to perform a scan.
 
@@ -38869,12 +40017,12 @@
         </description>
         <syntax>
           <unsignedInt>
-            <range maxInclusive="3"/>
+            <range minInclusive="1" maxInclusive="4"/>
           </unsignedInt>
         </syntax>
       </parameter>
 
-      <parameter name="MinimumInterval" access="readOnly">
+      <parameter name="MinimumInterval" access="readOnly" version="2.15">
         <description>
           Minimum Scan Interval, the minimum interval in {{units}} between the
           start of two consecutive channel scans on this radio.
@@ -38909,7 +40057,7 @@
         <parameter ref="OpClass"/>
       </uniqueKey>
 
-      <parameter name="OpClass" access="readOnly">
+      <parameter name="OpClass" access="readOnly" version="2.15">
         <description>
           The Operating Class per {{bibref|802.11-2020|Table E-4}} For 2.4GHz
           and 5GHz bands, only 20MHz Operating Classes are valid.
@@ -39079,7 +40227,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="HECapabilities" access="readOnly" status="obsoleted">
+      <parameter name="HECapabilities" access="readOnly" status="deleted">
         <description>
           Describes the HE capabilities of the radio as defined by the
           HECapabilities TLV {{bibref|EasyMesh|Section 17.2.10}}.
@@ -39088,6 +40236,8 @@
           and {{object|WiFi6bSTARole}}}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <base64>
@@ -39096,7 +40246,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="MSCSCapability" access="readOnly">
+      <parameter name="MSCSCapability" access="readOnly" version="2.17">
         <description>
           This parameter indicates support for Mirrored Stream Classification
           Service (MSCS) and EasyMesh configuration of MSCS
@@ -39107,7 +40257,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SCSCapability" access="readOnly">
+      <parameter name="SCSCapability" access="readOnly" version="2.17">
         <description>
           This parameter indicates support for Stream Classification Service
           (SCS) and EasyMesh {{bibref|EasyMesh}} configuration of SCS
@@ -39118,7 +40268,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="QoSMapCapability" access="readOnly">
+      <parameter name="QoSMapCapability" access="readOnly" version="2.17">
         <description>
           This parameter indicates support for QoS Map {{bibref|EasyMesh|AP
           Radio Advanced Capabilities TLV}}.
@@ -39128,7 +40278,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="DSCPPolicyCapability" access="readOnly">
+      <parameter name="DSCPPolicyCapability" access="readOnly" version="2.17">
         <description>
           This parameter indicates support for DSCP Mapping Table TLV based
           DSCP-to-UP mapping and EasyMesh distribution of QoS Map elements to
@@ -39140,7 +40290,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="SCSTrafficDescriptionCapability" access="readOnly">
+      <parameter name="SCSTrafficDescriptionCapability" access="readOnly"
+          version="2.17">
         <description>
           This parameter indicates support for QoS Management Stream
           Classification Service (SCS) Traffic Description and EasyMesh
@@ -39162,7 +40313,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="AKMFrontHaulNumberOfEntries" access="readOnly">
+      <parameter name="AKMFrontHaulNumberOfEntries" access="readOnly"
+          version="2.15">
         <description>
           {{numentries}}
         </description>
@@ -39171,7 +40323,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="AKMBackhaulNumberOfEntries" access="readOnly">
+      <parameter name="AKMBackhaulNumberOfEntries" access="readOnly"
+          version="2.15">
         <description>
           {{numentries}}
         </description>
@@ -39287,7 +40440,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="DLOFDMA" access="readOnly">
+      <parameter name="DLOFDMA" access="readOnly" version="2.17">
         <description>
           Indicates support for Downlink (DL) Orthogonal Frequency Division
           Multiplexing (OFDMA).
@@ -39525,7 +40678,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="DLOFDMA" access="readOnly">
+      <parameter name="DLOFDMA" access="readOnly" version="2.17">
         <description>
           Indicates support for Downlink (DL) Orthogonal Frequency Division
           Multiplexing (OFDMA).
@@ -40180,7 +41333,7 @@
         <parameter ref="OUI"/>
       </uniqueKey>
 
-      <parameter name="OUI" access="readOnly">
+      <parameter name="OUI" access="readOnly" version="2.15">
         <description>
           Any Organizationally Unique Identifier (OUI) value specified in
           {{bibref|802.11-2020|Table 9-151}}).
@@ -40214,7 +41367,7 @@
         <parameter ref="OUI"/>
       </uniqueKey>
 
-      <parameter name="OUI" access="readOnly">
+      <parameter name="OUI" access="readOnly" version="2.15">
         <description>
           Any Organizationally Unique Identifier (OUI) value specified in
           {{bibref|802.11-2020|Table 9-151}}).
@@ -40363,7 +41516,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="TransmitPowerLimit" access="readOnly">
+      <parameter name="TransmitPowerLimit" access="readOnly" version="2.15">
         <description>
           This is the upper limit on nominal transmit Equivalent Isotropically
           Radiated Power (EIRP) that this radio is allowed to use for the
@@ -40384,7 +41537,7 @@
           string format as defined in {{bibref|RFC3339|Section 3}}.
         </description>
         <syntax>
-          <string/>
+          <dateTime/>
         </syntax>
       </parameter>
     </object>
@@ -40698,7 +41851,7 @@
           string format as defined in {{bibref|RFC3339|Section 3}}.
         </description>
         <syntax>
-          <string/>
+          <dateTime/>
         </syntax>
       </parameter>
 
@@ -40761,7 +41914,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ByteCounterUnits" access="readOnly">
+      <parameter name="ByteCounterUnits" access="readOnly" version="2.15">
         <description>
           Byte Counter Units.
 
@@ -40776,7 +41929,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="Profile1bSTAsDisallowed" access="readOnly">
+      <parameter name="Profile1bSTAsDisallowed" access="readOnly"
+          version="2.15">
         <description>
           Profile-1 Backhaul STA association disallowed.
 
@@ -40789,7 +41943,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="Profile2bSTAsDisallowed" access="readOnly">
+      <parameter name="Profile2bSTAsDisallowed" access="readOnly"
+          version="2.15">
         <description>
           Profile-2 Backhaul STA association disallowed.
 
@@ -40802,7 +41957,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="AssociationAllowanceStatus" access="readOnly">
+      <parameter name="AssociationAllowanceStatus" access="readOnly"
+          version="2.15">
         <description>
           The status of allowance of new client device associations on this
           BSS.
@@ -40870,7 +42026,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="BackhaulUse" access="readOnly">
+      <parameter name="BackhaulUse" access="readOnly" version="2.15">
         <description>
           Indicates that this BSS is in use as a backhaul BSS;
 
@@ -40885,7 +42041,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="FronthaulUse" access="readOnly">
+      <parameter name="FronthaulUse" access="readOnly" version="2.15">
         <description>
           Indicates that this BSS is in use as a fronthaul BSS;
 
@@ -40900,7 +42056,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="R1disallowed" access="readOnly">
+      <parameter name="R1disallowed" access="readOnly" version="2.15">
         <description>
           Multi-AP Profile-1 [3] (R1) disallowed status.
 
@@ -40915,7 +42071,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="R2disallowed" access="readOnly">
+      <parameter name="R2disallowed" access="readOnly" version="2.15">
         <description>
           Multi-AP Profile-2 [3] (R2) disallowed status.
 
@@ -40930,7 +42086,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="MultiBSSID" access="readOnly">
+      <parameter name="MultiBSSID" access="readOnly" version="2.15">
         <description>
           Multiple BSSID Set;
 
@@ -40945,7 +42101,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="TransmittedBSSID" access="readOnly">
+      <parameter name="TransmittedBSSID" access="readOnly" version="2.15">
         <description>
           Transmitted BSSID;
 
@@ -40960,7 +42116,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="FronthaulAKMsAllowed" access="readWrite">
+      <parameter name="FronthaulAKMsAllowed" access="readWrite" version="2.15">
         <description>
           {{list}} List items indicate Authentication and Key Management (AKM)
           suites/security modes allowed at this BSS for fronthaul. {{enum}}
@@ -41002,7 +42158,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="FronthaulSuiteSelector" access="readWrite">
+      <parameter name="FronthaulSuiteSelector" access="readWrite"
+          version="2.17">
         <description>
           AKM suite selector, the AKM suite selector (OUI and type) is encoded
           as a 4-octet hex-encoded value without internal delimiters, e.g.
@@ -41018,7 +42175,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="BackhaulAKMsAllowed" access="readWrite">
+      <parameter name="BackhaulAKMsAllowed" access="readWrite" version="2.15">
         <description>
           {{list}} List items indicate Authentication and Key Management (AKM)
           suites/security modes allowed at this BSS for backhaul. {{enum}}
@@ -41060,7 +42217,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="BackhaulSuiteSelector" access="readWrite">
+      <parameter name="BackhaulSuiteSelector" access="readWrite"
+          version="2.17">
         <description>
           AKM suite selector, the AKM suite selector (OUI and type) is encoded
           as a 4-octet hex-encoded value without internal delimiters, e.g.
@@ -41076,7 +42234,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="BasicDataTransmitRates" access="readOnly">
+      <parameter name="BasicDataTransmitRates" access="readOnly"
+          version="2.17">
         <description>
           {{list}} The current basic data rates; the set of data rates, in
           {{units}}, that have to be supported by all stations that desire to
@@ -41101,7 +42260,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="QMDescriptorNumberOfEntries" access="readOnly">
+      <parameter name="QMDescriptorNumberOfEntries" access="readOnly"
+          version="2.15">
         <description>
           {{numentries}}
         </description>
@@ -41122,7 +42282,7 @@
         <parameter ref="ClientMAC"/>
       </uniqueKey>
 
-      <parameter name="BSSID" access="readOnly">
+      <parameter name="BSSID" access="readOnly" version="2.17">
         <description>
           The BSSID of BSS for which this descriptor applies.
         </description>
@@ -41786,7 +42946,7 @@
           string format as defined in {{bibref|RFC3339|Section 3}}.
         </description>
         <syntax>
-          <string/>
+          <dateTime/>
         </syntax>
       </parameter>
 
@@ -41812,7 +42972,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="HECapabilities" access="readOnly" status="obsoleted">
+      <parameter name="HECapabilities" access="readOnly" status="deleted">
         <description>
           Describes the HE capabilities of the Associated Device (STA).
 
@@ -41820,6 +42980,8 @@
           {{object|WiFi6Capabilities}}}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <base64>
@@ -41828,7 +42990,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ClientCapabilities" access="readOnly">
+      <parameter name="ClientCapabilities" access="readOnly" version="2.15">
         <description>
           The frame body of the most recently received (Re)Association Request
           frame from this client (STA), as defined in Table 9-34 and Table 9-36
@@ -41948,7 +43110,7 @@
 
       <parameter name="LastConnectTime" access="readOnly">
         <description>
-          The time in {{units}} since this Assocated Device (STA) was
+          The time in {{units}} since this Associated Device (STA) was
           associated.
         </description>
         <syntax>
@@ -42110,7 +43272,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="CellularDataPreference" access="readWrite">
+      <parameter name="CellularDataPreference" access="readWrite"
+          version="2.15">
         <description>
           This is the Cellular Data Preference for a Agile Multiband (AMB)
           capable STA This specifies the use of the cellular data connection.
@@ -42125,7 +43288,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ReAssociationDelay" access="readWrite">
+      <parameter name="ReAssociationDelay" access="readWrite" version="2.15">
         <description>
           Re-association Delay {{bibref|AMB}}. The time, in {{units}}, after a
           BTM steer from AP1 to AP2 during which the station cannot go back and
@@ -42139,7 +43302,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SleepMode" access="readOnly">
+      <parameter name="SleepMode" access="readOnly" version="2.17">
         <description>
           This parameter indicates the current operating sleep mode as recorded
           by the BSS {{bibref|802.11-2020}}. {{enum}}
@@ -42158,7 +43321,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SecurityAssociation" access="readOnly">
+      <parameter name="SecurityAssociation" access="readOnly" version="2.17">
         <description>
           This parameter indicates the current operating security state as
           defined in {{bibref|802.11-2020|Section 12.6.1.1}}. {{enum}}
@@ -42181,7 +43344,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="TIDQueueSizesNumberOfEntries" access="readOnly">
+      <parameter name="TIDQueueSizesNumberOfEntries" access="readOnly"
+          version="2.15">
         <description>
           {{numentries}}
         </description>
@@ -42201,7 +43365,7 @@
         The counters contained in {{object}} are all reset on reboot.
       </description>
 
-      <parameter name="AssociationTime" access="readOnly">
+      <parameter name="AssociationTime" access="readOnly" status="deprecated">
         <description>
           Date and time in UTC when the device was associated.
 
@@ -42209,13 +43373,16 @@
           {{object|Device.WiFi.AccessPoint.{i}.AssociatedDevice.{i}.}}, then
           this parameter is the same as
           {{param|Device.WiFi.AccessPoint.{i}.AssociatedDevice.{i}.AssociationTime}}.
+
+          {{deprecated|2.18|because it was essentially the same as
+          {{param|#.LastConnectTime}}.}}
         </description>
         <syntax>
           <dateTime/>
         </syntax>
       </parameter>
 
-      <parameter name="Noise" access="readOnly">
+      <parameter name="Noise" access="readOnly" status="deprecated">
         <description>
           An indicator of the average radio noise plus interference power
           measured on the uplink from the Associated Device (STA) to the Access
@@ -42228,6 +43395,9 @@
           {{object|Device.WiFi.AccessPoint.{i}.AssociatedDevice.{i}.}}, then
           this parameter is the same as
           {{param|Device.WiFi.AccessPoint.{i}.AssociatedDevice.{i}.Noise}}.
+
+          {{deprecated|2.18|because it should be the same as
+          {{param|###.Noise}}.}}
         </description>
         <syntax>
           <unsignedInt>
@@ -42544,7 +43714,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="DLOFDMA" access="readOnly">
+      <parameter name="DLOFDMA" access="readOnly" version="2.17">
         <description>
           Indicates support for Downlink (DL) Orthogonal Frequency Division
           Multiplexing (OFDMA).
@@ -42719,11 +43889,14 @@
         network.
       </description>
 
-      <parameter name="RadarDetections" access="readOnly">
+      <parameter name="RadarDetections" access="readOnly" status="deprecated">
         <description>
           {{list}} List items represent channels in the non-occupancy list due
           to radars detected by Dynamic Frequency Selection (DFS) Channel
           Availability Check (CAC).
+
+          {{deprecated|2.18|because it was superseded by
+          {{object|##.CACStatus.{i}.}}.}}
         </description>
         <syntax>
           <list>
@@ -42771,7 +43944,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="OperatingClass" access="readOnly">
+      <parameter name="OperatingClass" access="readOnly" version="2.17">
         <description>
           Operating class on which this unassociated STA was last detected, per
           {{bibref|802.11-2020|Table E-4}}.
@@ -42783,7 +43956,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Channel" access="readOnly">
+      <parameter name="Channel" access="readOnly" version="2.17">
         <description>
           Channel on which this unassociated STA was last detected.
         </description>
@@ -43314,8 +44487,8 @@
 
       <parameter name="PacketsSent" access="readOnly">
         <description>
-           The total number of packets transmitted to the client MLD STA.
-           {{bibref|EasyMesh}} source: Associated STA Traffic Stats TLV.
+          The total number of packets transmitted to the client MLD STA.
+          {{bibref|EasyMesh}} source: Associated STA Traffic Stats TLV.
         </description>
         <syntax>
           <dataType ref="StatsCounter32"/>
@@ -43386,9 +44559,7 @@
 
     <object
         name="Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.STAMLD.{i}.WiFi7Capabilities."
-        access="readOnly"
-        numEntriesParameter="WiFi7CapabilitiesNumberOfEntries" minEntries="1"
-        maxEntries="1" version="2.17">
+        access="readOnly" version="2.17">
       <description>
         This object describes the Wi-Fi 7 capabilities for this STAMLD
         including Multi-Link Operation (MLO) capabilities. {{bibref|EasyMesh}}
@@ -43625,8 +44796,8 @@
 
       <parameter name="PacketsSent" access="readOnly">
         <description>
-           The total number of packets transmitted to the affiliated STA.
-           {{bibref|EasyMesh}} source: Associated STA Traffic Stats TLV.
+          The total number of packets transmitted to the affiliated STA.
+          {{bibref|EasyMesh}} source: Associated STA Traffic Stats TLV.
         </description>
         <syntax>
           <dataType ref="StatsCounter32"/>
@@ -43747,7 +44918,8 @@
     </object>
 
     <object name="Device.WiFi.DataElements.Network.Device.{i}.bSTAMLD."
-        access="readOnly" minEntries="1" maxEntries="1" version="2.17">
+        access="readOnly" minEntries="1" maxEntries="1" version="2.17"
+        dmr:noNameCheck="true">
       <description>
         This object represents the Multi-Link Operation (MLO) capable backhaul
         station (bSTA) operating on this EasyMesh Agent. Only one MLO capable
@@ -43789,7 +44961,8 @@
 
     <object
         name="Device.WiFi.DataElements.Network.Device.{i}.bSTAMLD.bSTAMLDConfig."
-        access="readOnly" minEntries="1" maxEntries="1" version="2.17">
+        access="readOnly" minEntries="1" maxEntries="1" version="2.17"
+        dmr:noNameCheck="true">
       <description>
         This object describes the Multi-Link Operation (MLO) configuration of a
         Multi-Link Device (MLD) backhaul STA (bSTA). {{bibref|EasyMesh}}
@@ -43888,7 +45061,7 @@
           format as defined in {{bibref|RFC3339|Section 3}}.
         </description>
         <syntax>
-          <string/>
+          <dateTime/>
         </syntax>
       </parameter>
 
@@ -43944,12 +45117,14 @@
         </syntax>
       </parameter>
 
-      <parameter name="HECapabilities" access="readOnly" status="deprecated">
+      <parameter name="HECapabilities" access="readOnly" status="obsoleted">
         <description>
           Describes the HE capabilities of the Associated Device (STA).
 
           {{deprecated|2.16|because it is superseded by
           {{object|WiFi6Capabilities}}.}}
+
+          {{obsoleted|2.18}}
         </description>
         <syntax>
           <base64>
@@ -43958,7 +45133,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ClientCapabilities" access="readOnly">
+      <parameter name="ClientCapabilities" access="readOnly" version="2.16">
         <description>
           The frame body of the (Re)Association Request frame received from
           this client (STA), as defined in Table 9-34 and Table 9-36 of
@@ -44081,7 +45256,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="DLOFDMA" access="readOnly">
+      <parameter name="DLOFDMA" access="readOnly" version="2.17">
         <description>
           Indicates support for Downlink (DL) Orthogonal Frequency Division
           Multiplexing (OFDMA).
@@ -44359,11 +45534,11 @@
           format as defined in {{bibref|RFC3339|Section 3}}.
         </description>
         <syntax>
-          <string/>
+          <dateTime/>
         </syntax>
       </parameter>
 
-      <parameter name="LastDataDownlinkRate" access="readOnly">
+      <parameter name="LastDataDownlinkRate" access="readOnly" version="2.17">
         <description>
           The data transmit rate in {{units}} that was most recently used for
           transmission of data from the access point to the Associated Device
@@ -44376,7 +45551,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="LastDataUplinkRate" access="readOnly">
+      <parameter name="LastDataUplinkRate" access="readOnly" version="2.17">
         <description>
           The data transmit rate in {{units}} that was most recently used for
           transmission of data from the Associated Device (STA) to the access
@@ -44389,7 +45564,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="UtilizationReceive" access="readOnly">
+      <parameter name="UtilizationReceive" access="readOnly" version="2.17">
         <description>
           The amount of time in {{units}} that the Radio has spent on the
           Channel receiving data from the Associated Device (STA).
@@ -44401,7 +45576,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="UtilizationTransmit" access="readOnly">
+      <parameter name="UtilizationTransmit" access="readOnly" version="2.17">
         <description>
           The amount of time in {{units}} that the Radio has spent on the
           Channel transmitting data to the Associated Device (STA).
@@ -44413,7 +45588,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="EstMACDataRateDownlink" access="readOnly">
+      <parameter name="EstMACDataRateDownlink" access="readOnly"
+          version="2.17">
         <description>
           Estimate of the MAC layer throughput in {{units}} achievable in the
           downlink direction to the Associated Device (STA) if 100% of channel
@@ -44427,7 +45603,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="EstMACDataRateUplink" access="readOnly">
+      <parameter name="EstMACDataRateUplink" access="readOnly" version="2.17">
         <description>
           Estimate of the MAC layer throughput in {{units}} achievable in the
           uplink direction from the Associated Device (STA) if 100% of channel
@@ -44441,7 +45617,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SignalStrength" access="readOnly">
+      <parameter name="SignalStrength" access="readOnly" version="2.17">
         <description>
           An indicator of radio signal strength of the uplink from the
           Associated Device (STA) to the access point - measured in {{units}}.
@@ -44456,9 +45632,9 @@
         </syntax>
       </parameter>
 
-      <parameter name="LastConnectTime" access="readOnly">
+      <parameter name="LastConnectTime" access="readOnly" version="2.17">
         <description>
-          The time in {{units}} since this Assocated Device (STA) was
+          The time in {{units}} since this Associated Device (STA) was
           associated.
         </description>
         <syntax>
@@ -44468,7 +45644,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Noise" access="readOnly">
+      <parameter name="Noise" access="readOnly" version="2.17">
         <description>
           An indicator of the average radio noise plus interference power at
           the access point measured for the primary operating channel to this
@@ -44484,7 +45660,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="InitiatedBy" access="readOnly">
+      <parameter name="InitiatedBy" access="readOnly" version="2.17">
         <description>
           This parameter indicates the entity that initiated this
           Disassociation Event. {{enum}}
@@ -44535,7 +45711,7 @@
         instead}}
       </description>
 
-      <parameter name="BSSID" access="readOnly">
+      <parameter name="BSSID" access="readOnly" version="2.17">
         <description>
           The MAC Address of the logical BSS (BSSID) which is reporting the
           failed connection event.
@@ -44583,7 +45759,7 @@
           format as defined in {{bibref|RFC3339|Section 3}}.
         </description>
         <syntax>
-          <string/>
+          <dateTime/>
         </syntax>
       </parameter>
     </object>
@@ -44669,12 +45845,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -44773,7 +45949,7 @@
           <string>
             <enumeration value="2.4GHz"/>
             <enumeration value="5GHz"/>
-            <enumeration value="6GHz"/>
+            <enumeration value="6GHz" version="2.16"/>
           </string>
         </syntax>
       </parameter>
@@ -44835,7 +46011,7 @@
             <enumeration value="ax">
               <description>{{bibref|802.11ax}}</description>
             </enumeration>
-            <enumeration value="be">
+            <enumeration value="be" version="2.17">
               <description>{{bibref|802.11be}}</description>
             </enumeration>
           </string>
@@ -44990,7 +46166,7 @@
       </parameter>
 
       <parameter name="ChannelLastChange" access="readOnly"
-          activeNotify="canDeny">
+          activeNotify="canDeny" version="2.12">
         <description>
           The accumulated time in {{units}} since the current {{param|Channel}}
           came into use.
@@ -45002,7 +46178,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="ChannelLastSelectionReason" access="readOnly">
+      <parameter name="ChannelLastSelectionReason" access="readOnly"
+          version="2.12">
         <description>
           The cause of the last channel selection.
         </description>
@@ -45048,7 +46225,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="MaxSupportedSSIDs" access="readOnly">
+      <parameter name="MaxSupportedSSIDs" access="readOnly" version="2.12">
         <description>
           Maximum number of SSIDs supported on this radio.
         </description>
@@ -45059,7 +46236,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="MaxSupportedAssociations" access="readOnly">
+      <parameter name="MaxSupportedAssociations" access="readOnly"
+          version="2.12">
         <description>
           Maximum number of associated devices supported.
         </description>
@@ -45070,7 +46248,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="FirmwareVersion" access="readOnly">
+      <parameter name="FirmwareVersion" access="readOnly" version="2.12">
         <description>
           This radio's WiFi firmware version.
 
@@ -45086,7 +46264,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="SupportedOperatingChannelBandwidths" access="readOnly">
+      <parameter name="SupportedOperatingChannelBandwidths" access="readOnly"
+          version="2.12">
         <description>
           {{list}} These are the valid writable values for
           {{param|OperatingChannelBandwidth}}.
@@ -45109,12 +46288,12 @@
             <enumeration value="80+80MHz">
               <description>802.11ac, 802.11ax and 802.11be only</description>
             </enumeration>
-            <enumeration value="320MHz-1">
+            <enumeration value="320MHz-1" version="2.17">
               <description>
                 802.11be only - channel center frequency 31, 95, 159
               </description>
             </enumeration>
-            <enumeration value="320MHz-2">
+            <enumeration value="320MHz-2" version="2.17">
               <description>
                 802.11be only - channel center frequency 63, 127, 191
               </description>
@@ -45136,7 +46315,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="CurrentOperatingChannelBandwidth" access="readOnly">
+      <parameter name="CurrentOperatingChannelBandwidth" access="readOnly"
+          version="2.11">
         <description>
           The channel bandwidth currently in use. {{enum}}
         </description>
@@ -45147,8 +46327,8 @@
             <enumeration value="80MHz"/>
             <enumeration value="160MHz"/>
             <enumeration value="80+80MHz"/>
-            <enumeration value="320MHz-1"/>
-            <enumeration value="320MHz-2"/>
+            <enumeration value="320MHz-1" version="2.17"/>
+            <enumeration value="320MHz-2" version="2.17"/>
           </string>
         </syntax>
       </parameter>
@@ -45188,32 +46368,32 @@
                 only
               </description>
             </enumeration>
-            <enumeration value="1xLTF_0.8us">
+            <enumeration value="1xLTF_0.8us" version="2.14">
               <description>
                 applicable to 802.11ax and 802.11be specifications only
               </description>
             </enumeration>
-            <enumeration value="1xLTF_1.6us">
+            <enumeration value="1xLTF_1.6us" version="2.14">
               <description>
                 applicable to 802.11ax and 802.11be specifications only
               </description>
             </enumeration>
-            <enumeration value="2xLTF_0.8us">
+            <enumeration value="2xLTF_0.8us" version="2.14">
               <description>
                 applicable to 802.11ax and 802.11be specifications only
               </description>
             </enumeration>
-            <enumeration value="2xLTF_1.6us">
+            <enumeration value="2xLTF_1.6us" version="2.14">
               <description>
                 applicable to 802.11ax and 802.11be specifications only
               </description>
             </enumeration>
-            <enumeration value="4xLTF_0.8us">
+            <enumeration value="4xLTF_0.8us" version="2.14">
               <description>
                 applicable to 802.11ax and 802.11be specifications only
               </description>
             </enumeration>
-            <enumeration value="4xLTF_3.2us">
+            <enumeration value="4xLTF_3.2us" version="2.14">
               <description>
                 applicable to 802.11ax and 802.11be specifications only
               </description>
@@ -45224,7 +46404,7 @@
       </parameter>
 
       <parameter name="CenterFrequencySegement0" access="readWrite"
-          status="deleted">
+          status="deleted" version="2.13">
         <description>
           When operating in {{enum|80+80MHz|CurrentOperatingChannelBandwidth}},
           this parameter determines the Center Frequency Segment 0 for the
@@ -45244,7 +46424,7 @@
       </parameter>
 
       <parameter name="CenterFrequencySegement1" access="readWrite"
-          status="deleted">
+          status="deleted" version="2.13">
         <description>
           When operating in {{enum|80+80MHz|CurrentOperatingChannelBandwidth}},
           this parameter determines the Center Frequency Segment 1 for the
@@ -45263,7 +46443,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="CenterFrequencySegment0" access="readWrite">
+      <parameter name="CenterFrequencySegment0" access="readWrite"
+          version="2.14">
         <description>
           When operating in {{enum|80+80MHz|CurrentOperatingChannelBandwidth}},
           this parameter determines the Center Frequency Segment 0 for the
@@ -45275,7 +46456,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="CenterFrequencySegment1" access="readWrite">
+      <parameter name="CenterFrequencySegment1" access="readWrite"
+          version="2.14">
         <description>
           When operating in {{enum|80+80MHz|CurrentOperatingChannelBandwidth}},
           this parameter determines the Center Frequency Segment 1 for the
@@ -45396,7 +46578,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="RetryLimit" access="readWrite">
+      <parameter name="RetryLimit" access="readWrite" version="2.8">
         <description>
           The maximum number of retransmissions of a short packet i.e. a packet
           that is no longer than the {{param|RTSThreshold}}. This corresponds
@@ -45410,7 +46592,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="CCARequest" access="readWrite">
+      <parameter name="CCARequest" access="readWrite" version="2.8">
         <description>
           A request for the clear channel assessment (CCA) report in the format
           specified in {{bibref|802.11-2012|Clause 8.4.2.23.3}}.
@@ -45422,7 +46604,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="CCAReport" access="readOnly">
+      <parameter name="CCAReport" access="readOnly" version="2.8">
         <description>
           The clear channel assessment (CCA) report in the format specified in
           {{bibref|802.11-2012|Clause 8.4.2.24.3}}.
@@ -45441,7 +46623,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="RPIHistogramRequest" access="readWrite">
+      <parameter name="RPIHistogramRequest" access="readWrite" version="2.8">
         <description>
           A request for a received power indicator (RPI) histogram in the
           format specified in {{bibref|802.11-2012|Clause 8.4.2.23.4}}.
@@ -45453,7 +46635,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="RPIHistogramReport" access="readOnly">
+      <parameter name="RPIHistogramReport" access="readOnly" version="2.8">
         <description>
           Received power indicator (RPI) histogram report in the format
           specified in {{bibref|802.11-2012|Clause 8.4.2.24.4}}.
@@ -45465,7 +46647,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="FragmentationThreshold" access="readWrite">
+      <parameter name="FragmentationThreshold" access="readWrite"
+          version="2.8">
         <description>
           This specifies the current maximum size, in {{units}}, of the MPDU
           that can be delivered to the PHY. This parameter is based on
@@ -45478,7 +46661,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="RTSThreshold" access="readWrite">
+      <parameter name="RTSThreshold" access="readWrite" version="2.8">
         <description>
           This indicates the number of {{units}} in an MPDU, below which an
           RTS/CTS handshake is not performed. This parameter is based on
@@ -45491,7 +46674,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="LongRetryLimit" access="readWrite">
+      <parameter name="LongRetryLimit" access="readWrite" version="2.8">
         <description>
           This indicates the maximum number of transmission attempts of a
           frame, the length of which is greater than {{param|RTSThreshold}},
@@ -45504,7 +46687,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="BeaconPeriod" access="readWrite">
+      <parameter name="BeaconPeriod" access="readWrite" version="2.8">
         <description>
           Time interval between transmitting beacons (expressed in {{units}}).
           This parameter is based on ''dot11BeaconPeriod'' from
@@ -45517,7 +46700,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="DTIMPeriod" access="readWrite">
+      <parameter name="DTIMPeriod" access="readWrite" version="2.8">
         <description>
           This specifies the number of beacon intervals (measured in {{units}})
           that elapse between transmission of Beacon frames containing a TIM
@@ -45531,7 +46714,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="PacketAggregationEnable" access="readWrite">
+      <parameter name="PacketAggregationEnable" access="readWrite"
+          version="2.8">
         <description>
           This determines whether or not packet aggregation (commonly called
           "frame aggregation") is enabled. This applies only to 802.11n.
@@ -45541,7 +46725,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="PreambleType" access="readWrite">
+      <parameter name="PreambleType" access="readWrite" version="2.8">
         <description>
           The type of preamble. Longer preambles (more overhead) are needed by
           802.11g to coexist with legacy systems 802.11 and 802.11b.
@@ -45555,7 +46739,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="BasicDataTransmitRates" access="readWrite">
+      <parameter name="BasicDataTransmitRates" access="readWrite"
+          version="2.8">
         <description>
           {{list}} The set of data rates, in ''Mbps'', that have to be
           supported by all stations that desire to join this BSS. The stations
@@ -45570,7 +46755,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="SupportedDataTransmitRates" access="readOnly">
+      <parameter name="SupportedDataTransmitRates" access="readOnly"
+          version="2.8">
         <description>
           {{list}} Maximum radio data transmit rates in ''Mbps'' for unicast
           frames (a superset of {{param|BasicDataTransmitRates}}). Given the
@@ -45587,7 +46773,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="OperationalDataTransmitRates" access="readWrite">
+      <parameter name="OperationalDataTransmitRates" access="readWrite"
+          version="2.8">
         <description>
           {{list}} Data transmit rates in ''Mbps'' for unicast frames at which
           the radio will permit operation with any associated station (a subset
@@ -45608,7 +46795,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="EnableRRM" access="readWrite">
+      <parameter name="EnableRRM" access="readWrite" version="2.14">
         <description>
           Enables or disables 802.11k {{bibref|802.11k}} Radio Resource
           Management (RRM).
@@ -45618,7 +46805,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ManagementPacketRate" access="readWrite">
+      <parameter name="ManagementPacketRate" access="readWrite" version="2.15">
         <description>
           The rate of Wi-Fi management frames (expressed in {{units}}).
         </description>
@@ -45654,7 +46841,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Channel" access="readWrite">
+      <parameter name="Channel" access="readWrite" version="2.15">
         <description>
           The number of the Wi-Fi channel the clear channel assessment (CCA)
           measurement is run on.
@@ -45664,7 +46851,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Frequency" access="readWrite">
+      <parameter name="Frequency" access="readWrite" version="2.16">
         <description>
           Frequency of the channel the clear channel assessment (CCA)
           measurement is run on.
@@ -45673,12 +46860,12 @@
           <string>
             <enumeration value="2.4GHz"/>
             <enumeration value="5GHz"/>
-            <enumeration value="6GHz"/>
+            <enumeration value="6GHz" version="2.16"/>
           </string>
         </syntax>
       </parameter>
 
-      <parameter name="DwellTime" access="readWrite">
+      <parameter name="DwellTime" access="readWrite" version="2.15">
         <description>
           The duration of the CCA measurement in {{units}}.
         </description>
@@ -45689,7 +46876,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="CCAReport" access="readOnly">
+      <parameter name="CCAReport" access="readOnly" version="2.15">
         <description>
           The clear channel assessment (CCA) report in the format specified in
           {{bibref|802.11-2020|Section 9.4.2.21.3}}.
@@ -45728,7 +46915,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="TargetBSS" access="readWrite">
+      <parameter name="TargetBSS" access="readWrite" version="2.15">
         <description>
           The BSSID of the remote BSS.
         </description>
@@ -45737,7 +46924,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Timeout" access="readWrite">
+      <parameter name="Timeout" access="readWrite" version="2.15">
         <description>
           The duration after which the request is timed out in {{units}}.
         </description>
@@ -45748,7 +46935,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="OperatingClass" access="readWrite">
+      <parameter name="OperatingClass" access="readWrite" version="2.15">
         <description>
           The Operating Class in {{bibref|802.11-2020|Table E-4}} for which the
           measurement is requested.
@@ -45760,7 +46947,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Channel" access="readWrite">
+      <parameter name="Channel" access="readWrite" version="2.15">
         <description>
           The number of the channel for which the measurement is requested.
         </description>
@@ -45769,7 +46956,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SignalStrength" access="readOnly">
+      <parameter name="SignalStrength" access="readOnly" version="2.15">
         <description>
           The received signal strength (RSSI) as received by the radio measured
           in {{units}}. RSSI is encoded as per {{bibref|802.11-2020|Table
@@ -45783,7 +46970,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Noise" access="readOnly">
+      <parameter name="Noise" access="readOnly" version="2.15">
         <description>
           An indicator of the average radio noise plus interference power as
           received by the radio. Encoded as defined for ANPI in
@@ -45950,7 +47137,7 @@
             <enumeration value="WPA3-SAE"/>
             <enumeration value="WPA2-PSK-WPA3-SAE"/>
             <enumeration value="WPA3-Enterprise"/>
-            <enumeration value="OWE"/>
+            <enumeration value="OWE" version="2.16"/>
           </string>
         </syntax>
       </parameter>
@@ -45983,7 +47170,7 @@
           <string>
             <enumeration value="2.4GHz"/>
             <enumeration value="5GHz"/>
-            <enumeration value="6GHz"/>
+            <enumeration value="6GHz" version="2.16"/>
           </string>
         </syntax>
       </parameter>
@@ -46029,7 +47216,7 @@
             <enumeration value="ax">
               <description>{{bibref|802.11ax}}</description>
             </enumeration>
-            <enumeration value="be">
+            <enumeration value="be" version="2.17">
               <description>{{bibref|802.11be}}</description>
             </enumeration>
           </string>
@@ -46080,8 +47267,8 @@
             <enumeration value="40MHz"/>
             <enumeration value="80MHz"/>
             <enumeration value="160MHz"/>
-            <enumeration value="320MHz-1"/>
-            <enumeration value="320MHz-2"/>
+            <enumeration value="320MHz-1" version="2.17"/>
+            <enumeration value="320MHz-2" version="2.17"/>
             <enumeration value="Auto"/>
           </string>
         </syntax>
@@ -46171,7 +47358,7 @@
         {{bibref|TR-181i2|Section 4.2.2}}.
       </description>
 
-      <parameter name="CtsReceived" access="readOnly">
+      <parameter name="CtsReceived" access="readOnly" version="2.14">
         <description>
           The total number of Request To Send (RTS) control frames that
           received a Clear To Send (CTS) response.
@@ -46181,7 +47368,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="NoCtsReceived" access="readOnly">
+      <parameter name="NoCtsReceived" access="readOnly" version="2.14">
         <description>
           The total number of Request To Send (RTS) control frames that did not
           receive a Clear To Send (CTS) response.
@@ -46191,7 +47378,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="FrameHeaderError" access="readOnly">
+      <parameter name="FrameHeaderError" access="readOnly" version="2.14">
         <description>
           The total number of received packets for which the PHY was able to
           correlate the preamble but not the header.
@@ -46201,7 +47388,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="GoodPLCPReceived" access="readOnly">
+      <parameter name="GoodPLCPReceived" access="readOnly" version="2.14">
         <description>
           The total number of received frames with a good Physical Layer
           Convergence Protocol (PLCP) header.
@@ -46211,7 +47398,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="DPacketOtherMACReceived" access="readOnly">
+      <parameter name="DPacketOtherMACReceived" access="readOnly"
+          version="2.14">
         <description>
           The total number of Wi-Fi data packets received from other Basic
           Service Sets (BSSs), with a good Frame Check Sequence (FCS) and not
@@ -46223,7 +47411,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="MPacketOtherMACReceived" access="readOnly">
+      <parameter name="MPacketOtherMACReceived" access="readOnly"
+          version="2.14">
         <description>
           The total number of Wi-Fi management packets received from other
           Basic Service Sets (BSSs), with a good Frame Check Sequence (FCS) and
@@ -46235,7 +47424,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="CPacketOtherMACReceived" access="readOnly">
+      <parameter name="CPacketOtherMACReceived" access="readOnly"
+          version="2.14">
         <description>
           The total number of Wi-Fi control packets received from other Basic
           Service Sets (BSSs), with a good Frame Check Sequence (FCS) and not
@@ -46247,7 +47437,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="CtsOtherMACReceived" access="readOnly">
+      <parameter name="CtsOtherMACReceived" access="readOnly" version="2.14">
         <description>
           The total number of received Clear to Send (CTS) packets not
           addressed to the MAC address of this receiver.
@@ -46257,7 +47447,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="RtsOtherMACReceived" access="readOnly">
+      <parameter name="RtsOtherMACReceived" access="readOnly" version="2.14">
         <description>
           The total number of received Request to Send (RTS) frames not
           addressed to the MAC address of this receiver.
@@ -46353,7 +47543,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="PLCPErrorCount" access="readOnly">
+      <parameter name="PLCPErrorCount" access="readOnly" version="2.7">
         <description>
           The number of packets that were received with a detected Physical
           Layer Convergence Protocol (PLCP) header error.
@@ -46363,7 +47553,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="FCSErrorCount" access="readOnly">
+      <parameter name="FCSErrorCount" access="readOnly" version="2.7">
         <description>
           The number of packets that were received with a detected FCS error.
           This parameter is based on dot11FCSErrorCount from
@@ -46374,7 +47564,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="InvalidMACCount" access="readOnly">
+      <parameter name="InvalidMACCount" access="readOnly" version="2.7">
         <description>
           The number of packets that were received with a detected invalid MAC
           header error.
@@ -46384,7 +47574,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="PacketsOtherReceived" access="readOnly">
+      <parameter name="PacketsOtherReceived" access="readOnly" version="2.7">
         <description>
           The number of packets that were received, but which were destined for
           a MAC address that is not associated with this interface.
@@ -46394,7 +47584,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Noise" access="readOnly">
+      <parameter name="Noise" access="readOnly" version="2.8">
         <description>
           An indicator of average noise strength received at this radio,
           measured in {{units}}. This measurement of non-IEEE 802.11 noise
@@ -46414,7 +47604,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="TotalChannelChangeCount" access="readOnly">
+      <parameter name="TotalChannelChangeCount" access="readOnly"
+          version="2.12">
         <description>
           The total number of times that the {{param|#.Channel}} has changed
           since the {{object|#}} entered its current operating state.
@@ -46424,7 +47615,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="ManualChannelChangeCount" access="readOnly">
+      <parameter name="ManualChannelChangeCount" access="readOnly"
+          version="2.12">
         <description>
           The number of times that the {{param|#.Channel}} has changed due to
           manual channel selection since the {{object|#}} entered its current
@@ -46435,7 +47627,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="AutoStartupChannelChangeCount" access="readOnly">
+      <parameter name="AutoStartupChannelChangeCount" access="readOnly"
+          version="2.12">
         <description>
           The number of times that the {{param|#.Channel}} has changed due to
           automatic channel selection procedure launched at radio startup since
@@ -46446,7 +47639,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="AutoUserChannelChangeCount" access="readOnly">
+      <parameter name="AutoUserChannelChangeCount" access="readOnly"
+          version="2.12">
         <description>
           The number of times that the {{param|#.Channel}} has changed due to
           automatic channel selection procedure triggered by the user (e.g. via
@@ -46457,7 +47651,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="AutoRefreshChannelChangeCount" access="readOnly">
+      <parameter name="AutoRefreshChannelChangeCount" access="readOnly"
+          version="2.12">
         <description>
           The number of times that the {{param|#.Channel}} has changed due to
           automatic channel selection procedure triggered by the
@@ -46469,7 +47664,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="AutoDynamicChannelChangeCount" access="readOnly">
+      <parameter name="AutoDynamicChannelChangeCount" access="readOnly"
+          version="2.12">
         <description>
           The number of times that the {{param|#.Channel}} has changed due to
           automatic channel selection procedure dynamically triggered to adjust
@@ -46481,7 +47677,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="AutoDFSChannelChangeCount" access="readOnly">
+      <parameter name="AutoDFSChannelChangeCount" access="readOnly"
+          version="2.12">
         <description>
           The number of times that the {{param|#.Channel}} has changed due to
           automatic channel selection procedure triggered by DFS
@@ -46574,12 +47771,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -46623,7 +47820,7 @@
           <string>
             <pathRef refType="strong" targetType="row"/>
           </string>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
@@ -46681,7 +47878,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="MLDUnit" access="readWrite">
+      <parameter name="MLDUnit" access="readWrite" version="2.17">
         <description>
           MLD-BSS unit number specifying BSS across multiple radios that form a
           single Multi Link Device. Assigning the same MLD unit groups Basic
@@ -46697,7 +47894,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Upstream" access="readOnly">
+      <parameter name="Upstream" access="readOnly" version="2.12">
         <description>
           Indicates whether the interface points towards the Internet
           ({{true}}) or towards End Devices ({{false}}).
@@ -46721,7 +47918,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ATFEnable" access="readWrite">
+      <parameter name="ATFEnable" access="readWrite" version="2.14">
         <description>
           Enables or disables Air Time Fairness (ATF).
         </description>
@@ -46730,7 +47927,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="FlushATFTable" access="readWrite">
+      <parameter name="FlushATFTable" access="readWrite" version="2.14">
         <description>
           After this parameter is set to true, the ATF configuration of the
           interface will be reset.
@@ -46740,7 +47937,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SetATF" access="readWrite">
+      <parameter name="SetATF" access="readWrite" version="2.14">
         <description>
           Configures the ATF setting for all associated devices on an
           individual SSID. Expressed as {{units}} of airtime, such that no
@@ -46821,7 +48018,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="RetransCount" access="readOnly">
+      <parameter name="RetransCount" access="readOnly" version="2.7">
         <description>
           The total number of transmitted packets which were retransmissions.
           Two retransmissions of the same packet results in this counter
@@ -46832,7 +48029,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="FailedRetransCount" access="readOnly">
+      <parameter name="FailedRetransCount" access="readOnly" version="2.7">
         <description>
           The number of packets that were not transmitted successfully due to
           the number of retransmission attempts exceeding an 802.11 retry
@@ -46844,7 +48041,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="RetryCount" access="readOnly">
+      <parameter name="RetryCount" access="readOnly" version="2.7">
         <description>
           The number of packets that were successfully transmitted after one or
           more retransmissions. This parameter is based on dot11RetryCount from
@@ -46855,7 +48052,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="MultipleRetryCount" access="readOnly">
+      <parameter name="MultipleRetryCount" access="readOnly" version="2.7">
         <description>
           The number of packets that were successfully transmitted after more
           than one retransmission. This parameter is based on
@@ -46866,7 +48063,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ACKFailureCount" access="readOnly">
+      <parameter name="ACKFailureCount" access="readOnly" version="2.7">
         <description>
           The number of expected ACKs that were never received. This parameter
           is based on dot11ACKFailureCount from {{bibref|802.11-2012}}.
@@ -46876,7 +48073,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="AggregatedPacketCount" access="readOnly">
+      <parameter name="AggregatedPacketCount" access="readOnly" version="2.7">
         <description>
           The number of aggregated packets that were transmitted. This applies
           only to 802.11n and 802.11ac.
@@ -47006,7 +48203,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="DiscardPacketsSentBufOverflow" access="readOnly">
+      <parameter name="DiscardPacketsSentBufOverflow" access="readOnly"
+          version="2.14">
         <description>
           The total number of discarded packets during transmission caused by
           transmit buffer overflow.
@@ -47016,7 +48214,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="DiscardPacketsSentNoAssoc" access="readOnly">
+      <parameter name="DiscardPacketsSentNoAssoc" access="readOnly"
+          version="2.14">
         <description>
           The total number of discarded packets due to the station not being
           associated.
@@ -47026,7 +48225,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="FragSent" access="readOnly">
+      <parameter name="FragSent" access="readOnly" version="2.14">
         <description>
           The total number of frame-fragments transmitted out of the interface.
         </description>
@@ -47035,7 +48234,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SentNoAck" access="readOnly">
+      <parameter name="SentNoAck" access="readOnly" version="2.14">
         <description>
           The total number of transmitted data packets that did not receive an
           ACK when expected.
@@ -47045,7 +48244,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="DupReceived" access="readOnly">
+      <parameter name="DupReceived" access="readOnly" version="2.14">
         <description>
           The total number of received packets whose Sequence Control field
           indicates it is a duplicate.
@@ -47055,7 +48254,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="TooLongReceived" access="readOnly">
+      <parameter name="TooLongReceived" access="readOnly" version="2.14">
         <description>
           The total number of received packets longer than the maximum allowed
           packet length.
@@ -47065,7 +48264,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="TooShortReceived" access="readOnly">
+      <parameter name="TooShortReceived" access="readOnly" version="2.14">
         <description>
           The total number of received packets that did not contain enough
           bytes for the packet type.
@@ -47075,7 +48274,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="AckUcastReceived" access="readOnly">
+      <parameter name="AckUcastReceived" access="readOnly" version="2.14">
         <description>
           The total number of unicast ACKs received, with good Frame Check
           Sequence (FCS).
@@ -47146,12 +48345,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -47250,7 +48449,7 @@
       </parameter>
 
       <parameter name="MaxAssociatedDevices" access="readWrite"
-          status="deleted">
+          status="deleted" version="2.4">
         <description>
           The maximum number of devices that can simultaneously be connected to
           the access point.
@@ -47269,7 +48468,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="IsolationEnable" access="readWrite">
+      <parameter name="IsolationEnable" access="readWrite" version="2.4">
         <description>
           Enables or disables device isolation.
 
@@ -47282,7 +48481,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="MACAddressControlEnabled" access="readWrite">
+      <parameter name="MACAddressControlEnabled" access="readWrite"
+          version="2.9">
         <description>
           Indicates whether or not MAC Address Control is enabled on this
           {{object|#}}. MAC Address Control limits client devices to those
@@ -47293,7 +48493,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="AllowedMACAddress" access="readWrite">
+      <parameter name="AllowedMACAddress" access="readWrite" version="2.9">
         <description>
           Hardware addresses of client devices that are allowed to associate
           with this {{object|#}} if {{param|MACAddressControlEnabled}} is
@@ -47305,7 +48505,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="MaxAllowedAssociations" access="readWrite">
+      <parameter name="MaxAllowedAssociations" access="readWrite"
+          version="2.12">
         <description>
           Maximum number of associated devices allowed for this SSID. If the
           number is reached new device connections to this access point will be
@@ -47325,7 +48526,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="CpeOperationMode" access="readWrite">
+      <parameter name="CpeOperationMode" access="readWrite" version="2.14">
         <description>
           Reports information about the CPE operation mode (router or
           bridge/range extender).
@@ -47339,7 +48540,7 @@
             </enumeration>
             <enumeration value="Bridge/Extender">
               <description>
-                Indicates operation as a range extender or acess point in
+                Indicates operation as a range extender or access point in
                 bridge mode.
               </description>
             </enumeration>
@@ -47381,7 +48582,7 @@
             <enumeration value="WPA2-Enterprise"/>
             <enumeration value="WPA3-Enterprise"/>
             <enumeration value="WPA-WPA2-Enterprise"/>
-            <enumeration value="OWE"/>
+            <enumeration value="OWE" version="2.16"/>
           </string>
         </syntax>
       </parameter>
@@ -47397,7 +48598,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="EncryptionMode" access="readWrite">
+      <parameter name="EncryptionMode" access="readWrite" version="2.14">
         <description>
           The type of encryption in use.
 
@@ -47495,7 +48696,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SAEPassphrase" access="readWrite">
+      <parameter name="SAEPassphrase" access="readWrite" version="2.13">
         <description>
           A passphrase for {{enum|WPA3-Personal|ModeEnabled}} or
           {{enum|WPA3-Personal-Transition|ModeEnabled}} security modes.
@@ -47522,7 +48723,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="SecondaryRadiusServerIPAddr" access="readWrite">
+      <parameter name="SecondaryRadiusServerIPAddr" access="readWrite"
+          version="2.5">
         <description>
           The IP Address of a secondary RADIUS server used for WLAN security.
           {{param}} is only applicable when {{param|ModeEnabled}} is an
@@ -47556,7 +48758,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="SecondaryRadiusServerPort" access="readWrite">
+      <parameter name="SecondaryRadiusServerPort" access="readWrite"
+          version="2.5">
         <description>
           The port number of the secondary RADIUS server used for WLAN
           security. {{param}} is only applicable when {{param|ModeEnabled}} is
@@ -47584,7 +48787,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SecondaryRadiusSecret" access="readWrite">
+      <parameter name="SecondaryRadiusSecret" access="readWrite" version="2.5">
         <description>
           The secret used for handshaking with the secondary RADIUS server
           {{bibref|RFC2865}}.
@@ -47597,7 +48800,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="MFPConfig" access="readWrite">
+      <parameter name="MFPConfig" access="readWrite" version="2.11">
         <description>
           Management Frame Protection configuration applicable when
           {{param|ModeEnabled}} is set to {{enum|WPA2-Personal|ModeEnabled}},
@@ -47616,7 +48819,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SPPAMSDU" access="readWrite">
+      <parameter name="SPPAMSDU" access="readWrite" version="2.16">
         <description>
           Signaling and Payload Protected for A-MSDU frames.
         </description>
@@ -47642,7 +48845,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="TransitionDisableIndication" access="readWrite">
+      <parameter name="TransitionDisableIndication" access="readWrite"
+          version="2.16">
         <description>
           Sets the transition disable indication. When this parameter is
           enabled with {{param|ModeEnabled}} set to a transition mode, such as
@@ -47658,7 +48862,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Reset" access="readWrite">
+      <parameter name="Reset" access="readWrite" version="2.4">
         <description>
           When set to {{true}}, this {{object|#}} instance's WiFi security
           settings are reset to their factory default values. The affected
@@ -47743,7 +48947,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Status" access="readOnly">
+      <parameter name="Status" access="readOnly" version="2.11">
         <description>
           Indicates the current status of WPS. If the device goes to
           {{enum|SetupLocked}} the WPS needs to be disabled and re-enabled to
@@ -47760,7 +48964,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Version" access="readOnly">
+      <parameter name="Version" access="readOnly" version="2.11">
         <description>
           The Wi-Fi Simple Configuration version supported by the device, a
           string of the form ''m.n'' where ''m'' is the major version and ''n''
@@ -47774,7 +48978,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="PIN" access="readWrite">
+      <parameter name="PIN" access="readWrite" version="2.11">
         <description>
           Represents the Device PIN used for PIN based pairing between WPS
           peers. This PIN is either a four digit number or an eight digit
@@ -47813,7 +49017,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Type" access="readOnly">
+      <parameter name="Type" access="readOnly" version="2.14">
         <description>
           Associated device type (Laptop, iPhone, Android, etc.).
         </description>
@@ -47822,7 +49026,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SetStaATF" access="readWrite">
+      <parameter name="SetStaATF" access="readWrite" version="2.14">
         <description>
           Configures the Air Time Fairness (ATF) setting of this individual
           associated device. Expressed as {{units}} of airtime, such that this
@@ -47838,7 +49042,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="OperatingStandard" access="readOnly">
+      <parameter name="OperatingStandard" access="readOnly" version="2.10">
         <description>
           The operating standard that this associated device is connected with.
         </description>
@@ -47862,7 +49066,7 @@
             <enumeration value="ax">
               <description>{{bibref|802.11ax}}</description>
             </enumeration>
-            <enumeration value="be">
+            <enumeration value="be" version="2.17">
               <description>{{bibref|802.11be}}</description>
             </enumeration>
           </string>
@@ -47898,7 +49102,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="MaxSupportedDataDownlinkRate" access="readOnly">
+      <parameter name="MaxSupportedDataDownlinkRate" access="readOnly"
+          version="2.17">
         <description>
           Maximum supported data rate on the downlink from the associated
           device to the access point, measured in {{units}}.
@@ -47930,7 +49135,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="MaxSupportedDataUplinkRate" access="readOnly">
+      <parameter name="MaxSupportedDataUplinkRate" access="readOnly"
+          version="2.17">
         <description>
           Maximum supported data rate on the uplink from the associated device
           to the access point, measured in {{units}}.
@@ -47943,7 +49149,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="AssociationTime" access="readOnly">
+      <parameter name="AssociationTime" access="readOnly" version="2.12">
         <description>
           Date and time in UTC when the device was associated
 
@@ -47976,7 +49182,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Noise" access="readOnly">
+      <parameter name="Noise" access="readOnly" version="2.12">
         <description>
           An indicator of radio noise on the uplink from the associated device
           to the access point, measured in {{units}}, as an average of the last
@@ -47986,7 +49192,7 @@
           If the instance of this {{object}} is the same as
           {{object|Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.}},
           then this parameter is the same as
-          {{param|Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.MultiAPSTA.Noise}}.
+          {{param|Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.MultiAPSTA.Noise|deprecated}}.
         </description>
         <syntax>
           <int>
@@ -47996,7 +49202,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SNR" access="readOnly">
+      <parameter name="SNR" access="readOnly" version="2.17">
         <description>
           An indicator of signal to noise ratio, in {{units}}, on the uplink
           from the associated device to the access point, measured in
@@ -48044,7 +49250,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="MaxSupportedBandwidth" access="readOnly">
+      <parameter name="MaxSupportedBandwidth" access="readOnly" version="2.17">
         <description>
           Specifies the maximum supported bandwidth for the associated device
           to the access point.
@@ -48151,7 +49357,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ErrorsReceived" access="readOnly">
+      <parameter name="ErrorsReceived" access="readOnly" version="2.14">
         <description>
           The total number of inbound packets that contained errors preventing
           them from being delivered to a higher-layer protocol.
@@ -48238,6 +49444,9 @@
       <uniqueKey functional="true">
         <parameter ref="AccessCategory"/>
       </uniqueKey>
+      <uniqueKey functional="false">
+        <parameter ref="Alias"/>
+      </uniqueKey>
 
       <parameter name="AccessCategory" access="readOnly">
         <description>
@@ -48253,16 +49462,16 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.8">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
-      <parameter name="AIFSN" access="readWrite" status="obsoleted">
+      <parameter name="AIFSN" access="readWrite" status="deleted">
         <description>
           Arbitration Inter Frame Spacing (Number). This is the number of time
           slots in the arbitration interframe space.
@@ -48270,6 +49479,8 @@
           {{deprecated|2.15|because it is superseded by the WMM Specification}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <unsignedInt>
@@ -48278,15 +49489,17 @@
         </syntax>
       </parameter>
 
-      <parameter name="ECWMin" access="readWrite" status="obsoleted">
+      <parameter name="ECWMin" access="readWrite" status="deleted">
         <description>
           Exponent of Contention Window (Minimum). This encodes the values of
-          CWMin as an exponent: CWMin = 2^ECWMin - 1. For example, if ECWMin is
-          8, then CWMin is 2^8 - 1, or 255, (expressed in {{units}}).
+          CWMin as an exponent: CWMin = 2^ECWMin^ - 1. For example, if ECWMin
+          is 8, then CWMin is 2^8^ - 1, or 255, (expressed in {{units}}).
 
           {{deprecated|2.15|because it is superseded by the WMM Specification}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <unsignedInt>
@@ -48296,15 +49509,17 @@
         </syntax>
       </parameter>
 
-      <parameter name="ECWMax" access="readWrite" status="obsoleted">
+      <parameter name="ECWMax" access="readWrite" status="deleted">
         <description>
           Exponent of Contention Window (Maximum). This encodes the values of
-          CWMax as an exponent: CWMax = 2^ECWMax - 1. For example, if ECWMax is
-          8, then CWMax is 2^8 - 1, or 255, (expressed in {{units}}).
+          CWMax as an exponent: CWMax = 2^ECWMax^ - 1. For example, if ECWMax
+          is 8, then CWMax is 2^8^ - 1, or 255, (expressed in {{units}}).
 
           {{deprecated|2.15|because it is superseded by the WMM Specification}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <unsignedInt>
@@ -48314,7 +49529,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="TxOpMax" access="readWrite" status="obsoleted">
+      <parameter name="TxOpMax" access="readWrite" status="deleted">
         <description>
           Maximum transmit opportunity, in multiples of {{units}}. A TXOP time
           interval of 0 means it is limited to a single MAC protocol data unit
@@ -48323,6 +49538,8 @@
           {{deprecated|2.15|because it is superseded by the WMM Specification}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <unsignedInt>
@@ -48696,12 +49913,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -48838,7 +50055,7 @@
             <enumeration value="WPA2-Enterprise"/>
             <enumeration value="WPA3-Enterprise"/>
             <enumeration value="WPA-WPA2-Enterprise"/>
-            <enumeration value="OWE"/>
+            <enumeration value="OWE" version="2.16"/>
           </string>
         </syntax>
       </parameter>
@@ -48895,12 +50112,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -49031,7 +50248,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SAEPassphrase" access="readWrite">
+      <parameter name="SAEPassphrase" access="readWrite" version="2.13">
         <description>
           A passphrase for {{enum|WPA3-Personal|ModeEnabled}} or
           {{enum|WPA3-Personal-Transition|ModeEnabled}} security modes.
@@ -49044,7 +50261,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="MFPConfig" access="readWrite">
+      <parameter name="MFPConfig" access="readWrite" version="2.11">
         <description>
           Management Frame Protection configuration applicable when
           {{param|ModeEnabled}} is set to {{enum|WPA2-Personal|ModeEnabled}},
@@ -49127,7 +50344,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Status" access="readOnly">
+      <parameter name="Status" access="readOnly" version="2.11">
         <description>
           Indicates the current status of WPS in EndPoint.
         </description>
@@ -49141,7 +50358,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Version" access="readOnly">
+      <parameter name="Version" access="readOnly" version="2.11">
         <description>
           The Wi-Fi Simple Configuration version supported by the device, a
           string of the form ''m.n'' where ''m'' is the major version and ''n''
@@ -49155,7 +50372,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="PIN" access="readWrite">
+      <parameter name="PIN" access="readWrite" version="2.11">
         <description>
           Represents the Device PIN used for PIN based pairing between WPS
           peers. This PIN is either a four digit number or an eight digit
@@ -49167,7 +50384,7 @@
         <syntax secured="true">
           <string>
             <size maxLength="8"/>
-            <pattern value="\d{4}|\d{8}"/>
+            <pattern value="\d{4}|\d{8}" version="2.16"/>
           </string>
         </syntax>
       </parameter>
@@ -49194,6 +50411,9 @@
       <uniqueKey functional="true">
         <parameter ref="AccessCategory"/>
       </uniqueKey>
+      <uniqueKey functional="false">
+        <parameter ref="Alias"/>
+      </uniqueKey>
 
       <parameter name="AccessCategory" access="readOnly">
         <description>
@@ -49209,16 +50429,16 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.8">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
-      <parameter name="AIFSN" access="readWrite" status="obsoleted">
+      <parameter name="AIFSN" access="readWrite" status="deleted">
         <description>
           Arbitration Inter Frame Spacing (Number). This is the number of time
           slots in the arbitration interframe space.
@@ -49226,6 +50446,8 @@
           {{deprecated|2.15|because it is superseded by the WMM Specification}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <unsignedInt>
@@ -49234,15 +50456,17 @@
         </syntax>
       </parameter>
 
-      <parameter name="ECWMin" access="readWrite" status="obsoleted">
+      <parameter name="ECWMin" access="readWrite" status="deleted">
         <description>
           Exponent of Contention Window (Minimum). This encodes the values of
-          CWMin as an exponent: CWMin = 2^ECWMin - 1. For example, if ECWMin is
-          8, then CWMin is 2^8 - 1, or 255, (expressed in {{units}}).
+          CWMin as an exponent: CWMin = 2^ECWMin^ - 1. For example, if ECWMin
+          is 8, then CWMin is 2^8^ - 1, or 255, (expressed in {{units}}).
 
           {{deprecated|2.15|because it is superseded by the WMM Specification}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <unsignedInt>
@@ -49252,15 +50476,17 @@
         </syntax>
       </parameter>
 
-      <parameter name="ECWMax" access="readWrite" status="obsoleted">
+      <parameter name="ECWMax" access="readWrite" status="deleted">
         <description>
           Exponent of Contention Window (Maximum). This encodes the values of
-          CWMax as an exponent: CWMax = 2^ECWMax - 1. For example, if ECWMax is
-          8, then CWMax is 2^8 - 1, or 255, (expressed in {{units}}).
+          CWMax as an exponent: CWMax = 2^ECWMax^ - 1. For example, if ECWMax
+          is 8, then CWMax is 2^8^ - 1, or 255, (expressed in {{units}}).
 
           {{deprecated|2.15|because it is superseded by the WMM Specification}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <unsignedInt>
@@ -49270,7 +50496,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="TxOpMax" access="readWrite" status="obsoleted">
+      <parameter name="TxOpMax" access="readWrite" status="deleted">
         <description>
           Maximum transmit opportunity, in multiples of {{units}}. A TXOP time
           interval of 0 means it is limited to a single MAC protocol data unit
@@ -49279,6 +50505,8 @@
           {{deprecated|2.15|because it is superseded by the WMM Specification}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <unsignedInt>
@@ -49573,12 +50801,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.7">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -49896,7 +51124,7 @@
         {{param|NetworkAddress}}. This is because the ZigBee specification
         describes only intra-area network topologies
         {{bibref|ZigBee2007|Section 1.1.4 Network Topology}}. As such if two or
-        more {{object}} instances have the same key value the implemenation is
+        more {{object}} instances have the same key value the implementation is
         undefined.
       </description>
       <uniqueKey functional="true">
@@ -49968,20 +51196,23 @@
         {{param|NetworkAddress}}. This is because the ZigBee specification
         describes only intra-area network topologies
         {{bibref|ZigBee2007|Section 1.1.4 Network Topology}}. As such if two or
-        more {{object}} instances have the same key value the implemenation is
+        more {{object}} instances have the same key value the implementation is
         undefined
       </description>
       <uniqueKey functional="true">
         <parameter ref="IEEEAddress"/>
         <parameter ref="NetworkAddress"/>
       </uniqueKey>
+      <uniqueKey functional="false">
+        <parameter ref="Alias"/>
+      </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.7">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -50261,7 +51492,7 @@
               <description>Constant (mains) power</description>
             </enumeration>
             <enumeration value="Rechargeable">
-              <description>Rechargable battery</description>
+              <description>Rechargeable battery</description>
             </enumeration>
             <enumeration value="Disposable">
               <description>Disposable battery</description>
@@ -50283,7 +51514,7 @@
               <description>Constant (mains) power</description>
             </enumeration>
             <enumeration value="Rechargeable">
-              <description>Rechargable battery</description>
+              <description>Rechargeable battery</description>
             </enumeration>
             <enumeration value="Disposable">
               <description>Disposable battery</description>
@@ -50623,8 +51854,7 @@
 
     <object name="Device.ZigBee.ZDO.{i}.NodeManager.RoutingTable.{i}."
         access="readOnly" numEntriesParameter="RoutingTableNumberOfEntries"
-        minEntries="0" maxEntries="unbounded" dmr:noUniqueKeys="true"
-        version="2.7">
+        minEntries="0" maxEntries="unbounded" version="2.7">
       <description>
         The {{object}} object describes the route table as defined in
         {{bibref|ZigBee2007|table 3.51 Routing Table Entry}}.
@@ -50724,12 +51954,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.7">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -50840,12 +52070,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.7">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -50901,12 +52131,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.7">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -51090,12 +52320,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.7">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -51212,7 +52442,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="MaxProviderBridgeEntries" access="readOnly">
+      <parameter name="MaxProviderBridgeEntries" access="readOnly"
+          version="2.7">
         <description>
           The maximum number of entries available in the
           {{object|ProviderBridge}} table. A non-zero value for this parameter
@@ -51223,7 +52454,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="ProviderBridgeNumberOfEntries" access="readOnly">
+      <parameter name="ProviderBridgeNumberOfEntries" access="readOnly"
+          version="2.7">
         <description>
           {{numentries}}
         </description>
@@ -51298,16 +52530,16 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
-      <parameter name="Name" access="readOnly">
+      <parameter name="Name" access="readOnly" version="2.16">
         <description>
           The textual name of the bridge as assigned by the device.
         </description>
@@ -51341,7 +52573,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="AgingTime" access="readWrite">
+      <parameter name="AgingTime" access="readWrite" version="2.16">
         <description>
           The timeout period in {{units}} for aging out dynamically-learned
           forwarding information as described in {{bibref|802.1Q-2011|Section
@@ -51572,12 +52804,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -51623,7 +52855,7 @@
           <string>
             <pathRef refType="strong" targetType="row"/>
           </string>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
@@ -51642,7 +52874,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Type" access="readWrite">
+      <parameter name="Type" access="readWrite" version="2.7">
         <description>
           The type of bridge port as defined in 802.1Q
           {{bibref|802.1Q-2011|Section 17 IEEE8021BridgePortType}}.
@@ -51710,7 +52942,7 @@
           <unsignedInt>
             <range minInclusive="0" maxInclusive="7"/>
           </unsignedInt>
-          <default type="object" value="0,1,2,3,4,5,6,7"/>
+          <default type="object" value="[0,1,2,3,4,5,6,7]"/>
         </syntax>
       </parameter>
 
@@ -51749,7 +52981,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="TPID" access="readWrite">
+      <parameter name="TPID" access="readWrite" version="2.7">
         <description>
           The Tag Protocol Identifier (TPID) assigned to this {{object}}. The
           TPID is an EtherType value used to identify the frame as a tagged
@@ -51806,7 +53038,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="ServiceAccessPrioritySelection" access="readWrite">
+      <parameter name="ServiceAccessPrioritySelection" access="readWrite"
+          version="2.7">
         <description>
           This parameter controls the Service Access Priority selection
           function as described in {{bibref|802.1Q-2011|section 6.13}}.
@@ -51821,7 +53054,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="ServiceAccessPriorityTranslation" access="readWrite">
+      <parameter name="ServiceAccessPriorityTranslation" access="readWrite"
+          version="2.7">
         <description>
           {{list}} List items represent service access priority translation
           values for each ingress priority on this {{object}} as described in
@@ -51838,7 +53072,7 @@
           <unsignedInt>
             <range minInclusive="0" maxInclusive="7"/>
           </unsignedInt>
-          <default type="object" value="0,1,2,3,4,5,6,7"/>
+          <default type="object" value="[0,1,2,3,4,5,6,7]"/>
         </syntax>
       </parameter>
 
@@ -51865,7 +53099,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="PathCost" access="readWrite">
+      <parameter name="PathCost" access="readWrite" version="2.16">
         <description>
           The Port’s contribution, when it is the Root Port, to the Root Path
           Cost for the Bridge as described in {{bibref|802.1D-2004|Section
@@ -51881,7 +53115,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Priority" access="readWrite">
+      <parameter name="Priority" access="readWrite" version="2.16">
         <description>
           The first four components of the Port’s port priority vector value as
           described in {{bibref|802.1D-2004|Section 17.19.21}}.
@@ -52156,7 +53390,7 @@
             [7,7,6,6,5,5,4,4,3,3,2,2,1,1,0,0],[7,7,6,6,5,4,5,4,3,3,2,2,1,1,0,0],[7,7,6,6,5,4,5,4,3,2,3,2,1,1,0,0],[7,7,6,6,5,4,5,4,3,2,3,2,1,0,1,0]
         </description>
         <syntax>
-          <list minItems="4" maxItems="4">
+          <list minItems="4" maxItems="4" nestedBrackets="required">
             <size/>
           </list>
           <string>
@@ -52192,7 +53426,7 @@
             [7,0,6,0,5,0,4,0,3,0,2,0,1,0,0,0],[7,0,6,0,4,0,4,1,3,0,2,0,1,0,0,0],[7,0,6,0,4,0,4,1,2,0,2,1,1,0,0,0],[7,0,6,0,4,0,4,1,2,0,2,1,0,0,0,1]
         </description>
         <syntax>
-          <list minItems="4" maxItems="4">
+          <list minItems="4" maxItems="4" nestedBrackets="required">
             <size/>
           </list>
           <string>
@@ -52234,12 +53468,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -52300,12 +53534,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -52387,12 +53621,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -52480,7 +53714,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="DHCPType" access="readWrite">
+      <parameter name="DHCPType" access="readWrite" version="2.2">
         <description>
           The DHCP protocol associated with the {{object}} instance. Affects
           only parameters that specify DHCP option values as filter criteria
@@ -52530,7 +53764,7 @@
             <size maxLength="256"/>
           </list>
           <unsignedInt/>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
@@ -52581,7 +53815,7 @@
             <size maxLength="512"/>
           </list>
           <string/>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
@@ -52628,7 +53862,7 @@
             <size maxLength="512"/>
           </list>
           <string/>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
@@ -52685,14 +53919,15 @@
         </syntax>
       </parameter>
 
-      <parameter name="SourceMACFromVendorClassIDFilterv6" access="readWrite">
+      <parameter name="SourceMACFromVendorClassIDFilterv6" access="readWrite"
+          version="2.2">
         <description>
           Classification criterion.
 
           A hexbinary string used to identify one or more devices via DHCP for
           which MAC address filtering would subsequently apply. A device is
           considered matching if the most recent DHCPv6 Vendor Class Identifier
-          (Option 16 as defined in {{bibref|RFC3315}}) was equal to the
+          (Option 16 as defined in {{bibref|RFC8415}}) was equal to the
           specified value. The option value is binary, so an exact match is
           REQUIRED.
 
@@ -52794,14 +54029,15 @@
         </syntax>
       </parameter>
 
-      <parameter name="DestMACFromVendorClassIDFilterv6" access="readWrite">
+      <parameter name="DestMACFromVendorClassIDFilterv6" access="readWrite"
+          version="2.2">
         <description>
           Classification criterion.
 
           A hexbinary string used to identify one or more devices via DHCP for
           which MAC address filtering would subsequently apply. A device is
           considered matching if the most recent DHCPv6 Vendor Class Identifier
-          (Option 16 as defined in {{bibref|RFC3315}}) was equal to the
+          (Option 16 as defined in {{bibref|RFC8415}}) was equal to the
           specified value. The option value is binary, so an exact match is
           REQUIRED.
 
@@ -52874,7 +54110,7 @@
           DHCP lease acquisition or renewal for DHCPv4) was equal to the
           specified value. The DHCP Client Identifier is Option 61 (as defined
           in {{bibref|RFC2132}}) for {{enum|DHCPv4|DHCPType}}, or is Option 1
-          (as defined in {{bibref|RFC3315}}) for {{enum|DHCPv6|DHCPType}}. The
+          (as defined in {{bibref|RFC8415}}) for {{enum|DHCPv6|DHCPType}}. The
           option value is binary, so an exact match is REQUIRED.
 
           Note that neither 802.1D {{bibref|802.1D-2004}} nor 802.1Q
@@ -52935,7 +54171,7 @@
           DHCP lease acquisition or renewal for DHCPv4) was equal to the
           specified value. The DHCP Client Identifier is Option 61 (as defined
           in {{bibref|RFC2132}}) for {{enum|DHCPv4|DHCPType}}, or is Option 1
-          (as defined in {{bibref|RFC3315}}) for {{enum|DHCPv6|DHCPType}}. The
+          (as defined in {{bibref|RFC8415}}) for {{enum|DHCPv6|DHCPType}}. The
           option value is binary, so an exact match is REQUIRED.
 
           Note: DHCPv4 Option values are limited to a length of 255, while
@@ -52988,7 +54224,7 @@
           (via DHCP lease acquisition or renewal for DHCPv4) was equal to the
           specified value. The DHCP User Class Identifier is Option 77 (as
           defined in {{bibref|RFC3004}}) for {{enum|DHCPv4|DHCPType}}, or is
-          Option 15 (as defined in {{bibref|RFC3315}}) for
+          Option 15 (as defined in {{bibref|RFC8415}}) for
           {{enum|DHCPv6|DHCPType}}. The option value is binary, so an exact
           match is REQUIRED.
 
@@ -53048,7 +54284,7 @@
           (via DHCP lease acquisition or renewal for DHCPv4) was equal to the
           specified value. The DHCP User Class Identifier is Option 77 (as
           defined in {{bibref|RFC3004}}) for {{enum|DHCPv4|DHCPType}}, or is
-          Option 15 (as defined in {{bibref|RFC3315}}) for
+          Option 15 (as defined in {{bibref|RFC8415}}) for
           {{enum|DHCPv6|DHCPType}}. The option value is binary, so an exact
           match is REQUIRED.
 
@@ -53089,7 +54325,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="DestIP" access="readWrite">
+      <parameter name="DestIP" access="readWrite" version="2.6">
         <description>
           Classification criterion.
 
@@ -53102,7 +54338,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="DestMask" access="readWrite">
+      <parameter name="DestMask" access="readWrite" version="2.6">
         <description>
           Destination IP address mask, represented as an IP routing prefix
           using CIDR notation [RFC4632]. The IP address part MUST be {{empty}}
@@ -53114,7 +54350,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="DestIPExclude" access="readWrite">
+      <parameter name="DestIPExclude" access="readWrite" version="2.6">
         <description>
           If {{false}}, the class includes only those packets that match the
           (masked) DestIP entry, if specified.
@@ -53128,7 +54364,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SourceIP" access="readWrite">
+      <parameter name="SourceIP" access="readWrite" version="2.6">
         <description>
           Classification criterion.
 
@@ -53141,7 +54377,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SourceMask" access="readWrite">
+      <parameter name="SourceMask" access="readWrite" version="2.6">
         <description>
           Source IP address mask, represented as an IP routing prefix using
           CIDR notation [RFC4632]. The IP address part MUST be an empty string
@@ -53153,7 +54389,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SourceIPExclude" access="readWrite">
+      <parameter name="SourceIPExclude" access="readWrite" version="2.6">
         <description>
           If {{false}}, the class includes only those packets that match the
           (masked) {{param|SourceIP}} entry, if specified.
@@ -53167,7 +54403,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Protocol" access="readWrite">
+      <parameter name="Protocol" access="readWrite" version="2.6">
         <description>
           Classification criterion.
 
@@ -53182,7 +54418,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ProtocolExclude" access="readWrite">
+      <parameter name="ProtocolExclude" access="readWrite" version="2.6">
         <description>
           If {{false}}, the class includes only those packets that match the
           {{param|Protocol}} entry, if specified.
@@ -53196,7 +54432,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="DestPort" access="readWrite">
+      <parameter name="DestPort" access="readWrite" version="2.6">
         <description>
           Classification criterion.
 
@@ -53211,7 +54447,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="DestPortRangeMax" access="readWrite">
+      <parameter name="DestPortRangeMax" access="readWrite" version="2.6">
         <description>
           Classification criterion.
 
@@ -53230,7 +54466,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="DestPortExclude" access="readWrite">
+      <parameter name="DestPortExclude" access="readWrite" version="2.6">
         <description>
           If {{false}}, the class includes only those packets that match the
           {{param|DestPort}} entry (or port range), if specified.
@@ -53244,7 +54480,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SourcePort" access="readWrite">
+      <parameter name="SourcePort" access="readWrite" version="2.6">
         <description>
           Classification criterion.
 
@@ -53259,7 +54495,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SourcePortRangeMax" access="readWrite">
+      <parameter name="SourcePortRangeMax" access="readWrite" version="2.6">
         <description>
           Classification criterion.
 
@@ -53278,7 +54514,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SourcePortExclude" access="readWrite">
+      <parameter name="SourcePortExclude" access="readWrite" version="2.6">
         <description>
           If {{false}}, the class includes only those packets that match the
           {{param|SourcePort}} entry (or port range), if specified.
@@ -53349,12 +54585,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.7">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -53407,7 +54643,7 @@
             <pathRef refType="strong" targetParent="#.Bridge."
                 targetType="row"/>
           </string>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
     </object>
@@ -53428,7 +54664,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SupportedNCPs" access="readOnly">
+      <parameter name="SupportedNCPs" access="readOnly" version="2.2">
         <description>
           The Network Control Protocols (NCPs) that are supported by the
           device. {{enum}}
@@ -53527,12 +54763,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -53571,7 +54807,7 @@
           <string>
             <pathRef refType="strong" targetType="row"/>
           </string>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
@@ -53836,7 +55072,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="LCPEchoAdaptive" access="readWrite">
+      <parameter name="LCPEchoAdaptive" access="readWrite" version="2.16">
         <description>
           When traffic is received during the {{param|LCPEcho}} interval, no
           LCP Echo-Request is sent until the next {{param|LCPEcho}} interval.
@@ -53847,7 +55083,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="IPCPEnable" access="readWrite">
+      <parameter name="IPCPEnable" access="readWrite" version="2.2">
         <description>
           Enables or disables IPCP ({{bibref|RFC1332}}) on this interface. If
           this parameter is present, {{enum|IPCP|#.SupportedNCPs}} MUST be
@@ -53858,7 +55094,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="IPv6CPEnable" access="readWrite">
+      <parameter name="IPv6CPEnable" access="readWrite" version="2.2">
         <description>
           Enables or disables IPv6CP ({{bibref|RFC5072}}) on this interface. If
           this parameter is present, {{enum|IPv6CP|#.SupportedNCPs}} MUST be
@@ -53951,7 +55187,7 @@
             <size/>
           </list>
           <dataType ref="IPv4Address"/>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
@@ -54243,7 +55479,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="IPv4Enable" access="readWrite">
+      <parameter name="IPv4Enable" access="readWrite" version="2.2">
         <description>
           Enables or disables the IPv4 stack, and so the use of IPv4 on the
           device. This affects only layer 3 and above.
@@ -54257,7 +55493,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="IPv4Status" access="readOnly">
+      <parameter name="IPv4Status" access="readOnly" version="2.2">
         <description>
           Indicates the status of the IPv4 stack. {{enum}}
 
@@ -54273,7 +55509,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="IPv6Capable" access="readOnly">
+      <parameter name="IPv6Capable" access="readOnly" version="2.2">
         <description>
           Indicates whether the device is IPv6 capable.
 
@@ -54285,7 +55521,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="IPv6Enable" access="readWrite">
+      <parameter name="IPv6Enable" access="readWrite" version="2.2">
         <description>
           Enables or disables the IPv6 stack, and so the use of IPv6 on the
           device. This affects only layer 3 and above.
@@ -54299,7 +55535,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="IPv6Status" access="readOnly">
+      <parameter name="IPv6Status" access="readOnly" version="2.2">
         <description>
           Indicates the status of the IPv6 stack. {{enum}}
 
@@ -54315,7 +55551,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ULAPrefix" access="readWrite">
+      <parameter name="ULAPrefix" access="readWrite" version="2.2">
         <description>
           The ULA /48 prefix {{bibref|RFC4193|Section 3}}.
         </description>
@@ -54324,7 +55560,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="InterfaceNumberOfEntries" access="readOnly">
+      <parameter name="ActivePortNumberOfEntries" access="readOnly">
         <description>
           {{numentries}}
         </description>
@@ -54333,7 +55569,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ActivePortNumberOfEntries" access="readOnly">
+      <parameter name="InterfaceNumberOfEntries" access="readOnly">
         <description>
           {{numentries}}
         </description>
@@ -54410,7 +55646,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="IPv4Enable" access="readWrite">
+      <parameter name="IPv4Enable" access="readWrite" version="2.2"
+          dmr:previousParameter="Enable">
         <description>
           If set to {{true}}, attaches this interface to the IPv4 stack. If set
           to {{false}}, detaches this interface from the IPv4 stack.
@@ -54431,38 +55668,6 @@
         </syntax>
       </parameter>
 
-      <parameter name="IPv6Enable" access="readWrite">
-        <description>
-          If set to {{true}}, attaches this interface to the IPv6 stack. If set
-          to {{false}}, detaches this interface from the IPv6 stack.
-
-          Once detached from the IPv6 stack, the interface will now no longer
-          be able to pass IPv6 packets, and will be operationally down (unless
-          also attached to an enabled IPv4 stack).
-
-          For an IPv6 capable device, if {{param}} is not present this
-          interface SHOULD be permanently attached to the IPv6 stack.
-
-          Note that {{param}} is independent of {{param|Enable}}, and that to
-          administratively enable an interface for IPv6 it is necessary for
-          both {{param|Enable}} and {{param}} to be {{true}}.
-        </description>
-        <syntax>
-          <boolean/>
-        </syntax>
-      </parameter>
-
-      <parameter name="ULAEnable" access="readWrite">
-        <description>
-          Controls whether or not ULAs {{bibref|RFC4193}} are generated and
-          used on this interface.
-        </description>
-        <syntax>
-          <boolean/>
-          <default type="object" value="false"/>
-        </syntax>
-      </parameter>
-
       <parameter name="Status" access="readOnly">
         <description>
           The current operational state of the interface (see
@@ -54504,12 +55709,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -54552,11 +55757,12 @@
           <string>
             <pathRef refType="strong" targetType="row"/>
           </string>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
-      <parameter name="Router" access="readWrite">
+      <parameter name="Router" access="readWrite"
+          dmr:previousParameter="LowerLayers">
         <description>
           {{reference}} The ''Router'' instance that is associated with this IP
           Interface entry.
@@ -54590,6 +55796,38 @@
         </syntax>
       </parameter>
 
+      <parameter name="IPv6Enable" access="readWrite" version="2.2">
+        <description>
+          If set to {{true}}, attaches this interface to the IPv6 stack. If set
+          to {{false}}, detaches this interface from the IPv6 stack.
+
+          Once detached from the IPv6 stack, the interface will now no longer
+          be able to pass IPv6 packets, and will be operationally down (unless
+          also attached to an enabled IPv4 stack).
+
+          For an IPv6 capable device, if {{param}} is not present this
+          interface SHOULD be permanently attached to the IPv6 stack.
+
+          Note that {{param}} is independent of {{param|Enable}}, and that to
+          administratively enable an interface for IPv6 it is necessary for
+          both {{param|Enable}} and {{param}} to be {{true}}.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ULAEnable" access="readWrite" version="2.2">
+        <description>
+          Controls whether or not ULAs {{bibref|RFC4193}} are generated and
+          used on this interface.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="object" value="false"/>
+        </syntax>
+      </parameter>
+
       <parameter name="MaxMTUSize" access="readWrite">
         <description>
           The maximum transmission unit (MTU); the largest allowed size of an
@@ -54658,7 +55896,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="IPv6AddressNumberOfEntries" access="readOnly">
+      <parameter name="IPv6AddressNumberOfEntries" access="readOnly"
+          version="2.2">
         <description>
           {{numentries}}
         </description>
@@ -54667,7 +55906,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="IPv6PrefixNumberOfEntries" access="readOnly">
+      <parameter name="IPv6PrefixNumberOfEntries" access="readOnly"
+          version="2.2">
         <description>
           {{numentries}}
         </description>
@@ -54693,7 +55933,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="TWAMPReflectorNumberOfEntries" access="readOnly">
+      <parameter name="TWAMPReflectorNumberOfEntries" access="readOnly"
+          version="2.12">
         <description>
           {{numentries}}
         </description>
@@ -54706,11 +55947,11 @@
     <object name="Device.IP.Interface.{i}.IPv4Address.{i}." access="readWrite"
         numEntriesParameter="IPv4AddressNumberOfEntries"
         enableParameter="Enable" minEntries="0" maxEntries="unbounded"
-        version="2.0">
+        version="2.0" dmr:previousObject="Device.IP.Interface.{i}.">
       <description>
         IPv4 address table. Entries are auto-created and auto-deleted as IP
-        addresses are added and deleted via DHCP, auto-IP, or IPCP. Static
-        entries are created and configured by the Controller.
+        addresses are added and deleted via DHCP, auto-IP, 3GPP-NAS, or IPCP.
+        Static entries are created and configured by the Controller.
       </description>
       <uniqueKey functional="false">
         <parameter ref="Alias"/>
@@ -54730,7 +55971,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Status" access="readOnly">
+      <parameter name="Status" access="readOnly" version="2.2">
         <description>
           The status of this {{object}} table entry. {{enum}}
 
@@ -54751,7 +55992,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.0">
         <description>
           {{datatype|expand}}
 
@@ -54759,7 +56000,7 @@
           {{enum|Static|AddressingType}}.
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -54801,6 +56042,18 @@
             <enumeration value="AutoIP"/>
             <enumeration value="IPCP"/>
             <enumeration value="Static"/>
+            <enumeration value="3GPP-NAS" version="2.18">
+              <description>
+                Assigned by the core network (fixed or cellular) using 3GPP NAS
+                signalling methods. e.g. PDU Session Establishment Request
+                {{bibref|3GPP-TS.24.501|Clause 6.2.4.2}}, PDN Connectivity
+                Request {{bibref|3GPP-TS.24.301|Clause 6.2.2}}, PDP Context
+                Activation Request {{bibref|3GPP-TS.24.008|Clause 6.1.2A}}, ...
+                This information is available from the AT commands
+                {{bibref|3GPP-TS.27.007|Clause 10.1.23}} PDP context read
+                dynamic parameters +CGCONTRDP.
+              </description>
+            </enumeration>
           </string>
           <default type="object" value="Static"/>
         </syntax>
@@ -54823,13 +56076,23 @@
         4.2.2}}.
       </description>
 
+      <parameter name="Reset" access="readWrite" version="2.18">
+        <description>
+          Set this to {{true}} to reset all this object's statistics counters
+          to zero.
+        </description>
+        <syntax command="true">
+          <boolean/>
+        </syntax>
+      </parameter>
+
       <parameter name="BytesSent" access="readOnly" activeNotify="canDeny">
         <description>
           The total number of bytes transmitted out of the interface, including
           framing characters.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
@@ -54839,7 +56102,7 @@
           framing characters.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
@@ -54848,7 +56111,7 @@
           The total number of packets transmitted out of the interface.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
@@ -54858,7 +56121,7 @@
           The total number of packets received on the interface.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
@@ -54868,7 +56131,7 @@
           because of errors.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="StatsCounter32"/>
         </syntax>
       </parameter>
 
@@ -54879,31 +56142,19 @@
           them from being delivered to a higher-layer protocol.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="StatsCounter32"/>
         </syntax>
       </parameter>
 
       <parameter name="UnicastPacketsSent" access="readOnly"
-          activeNotify="canDeny">
+          activeNotify="canDeny" dmr:previousParameter="ErrorsReceived">
         <description>
           The total number of packets requested for transmission which were not
           addressed to a multicast or broadcast address at this layer,
           including those that were discarded or not sent.
         </description>
         <syntax>
-          <unsignedLong/>
-        </syntax>
-      </parameter>
-
-      <parameter name="UnicastPacketsReceived" access="readOnly"
-          activeNotify="canDeny">
-        <description>
-          The total number of received packets, delivered by this layer to a
-          higher layer, which were not addressed to a multicast or broadcast
-          address at this layer.
-        </description>
-        <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
@@ -54916,7 +56167,7 @@
           could be to free up buffer space.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="StatsCounter32"/>
         </syntax>
       </parameter>
 
@@ -54929,19 +56180,31 @@
           to free up buffer space.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="StatsCounter32"/>
         </syntax>
       </parameter>
 
       <parameter name="MulticastPacketsSent" access="readOnly"
-          activeNotify="canDeny">
+          activeNotify="canDeny" dmr:previousParameter="DiscardPacketsReceived">
         <description>
           The total number of packets that higher-level protocols requested for
           transmission and which were addressed to a multicast address at this
           layer, including those that were discarded or not sent.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="UnicastPacketsReceived" access="readOnly"
+          activeNotify="canDeny">
+        <description>
+          The total number of received packets, delivered by this layer to a
+          higher layer, which were not addressed to a multicast or broadcast
+          address at this layer.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
@@ -54953,7 +56216,7 @@
           layer.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
@@ -54967,7 +56230,7 @@
           will never cause this counter to increment.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
@@ -54981,7 +56244,7 @@
           will never cause this counter to increment.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
@@ -54992,7 +56255,7 @@
           discarded because of an unknown or unsupported protocol.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="StatsCounter32"/>
         </syntax>
       </parameter>
     </object>
@@ -55000,7 +56263,8 @@
     <object name="Device.IP.Interface.{i}.TWAMPReflector.{i}."
         access="readWrite" minEntries="0" maxEntries="unbounded"
         enableParameter="Enable"
-        numEntriesParameter="TWAMPReflectorNumberOfEntries" version="2.12">
+        numEntriesParameter="TWAMPReflectorNumberOfEntries" version="2.12"
+        dmr:previousObject="Device.Interface.{i}.Stats.">
       <description>
         This object contains parameters associated with the configuration that
         permits this interface to be used as Two-Way Active Measurement
@@ -55035,12 +56299,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.12">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -55115,7 +56379,7 @@
           packets to be received from any source port.
 
           Each entry in the list MUST be either a port number or a range of
-          port numbers separated by a hypen (-).
+          port numbers separated by a hyphen (-).
 
           For example, an entry with the value: '2-40' accepts test packets
           from any allowed source IP addresses with a source port between 2 and
@@ -55146,7 +56410,7 @@
           of link-local addresses (for all types of device) and global
           addresses (for non-router devices).
 
-        * Automatically via DHCPv6 {{bibref|RFC3315}}, which covers generation
+        * Automatically via DHCPv6 {{bibref|RFC8415}}, which covers generation
           of any type of address (subject to the configured DHCP server
           policy).
 
@@ -55267,7 +56531,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.2">
         <description>
           {{datatype|expand}}
 
@@ -55275,7 +56539,7 @@
           {{enum|Static|Origin}}.
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -55308,12 +56572,12 @@
                 specified by SLAAC {{bibref|RFC4862|Section 5.3}}, a global
                 address as specified by SLAAC {{bibref|RFC4862|Section 5.5}},
                 or generated via CPE logic (e.g. from delegated prefix as
-                specified by {{bibref|RFC3633}}), or from ULA /48 prefix as
+                specified by {{bibref|RFC8415}}), or from ULA /48 prefix as
                 specified by {{bibref|RFC4193}}.
               </description>
             </enumeration>
             <enumeration value="DHCPv6">
-              <description>Assigned by DHCPv6 {{bibref|RFC3315}}.</description>
+              <description>Assigned by DHCPv6 {{bibref|RFC8415}}.</description>
             </enumeration>
             <enumeration value="IKEv2">
               <description>Assigned by IKEv2 {{bibref|RFC5996}}.</description>
@@ -55330,6 +56594,18 @@
                 loopback address, which is defined in {{bibref|RFC4291}}.
               </description>
             </enumeration>
+            <enumeration value="3GPP-NAS" version="2.18">
+              <description>
+                Address assigned by the core network (fixed or cellular) using
+                3GPP NAS signalling methods. e.g. PDU Session Establishment
+                Request {{bibref|3GPP-TS.24.501|Clause 6.2.4.2}}, PDN
+                Connectivity Request {{bibref|3GPP-TS.24.301|Clause 6.2.2}},
+                PDP Context Activation Request {{bibref|3GPP-TS.24.008|Clause
+                6.1.2A}}, ... This information is available from the AT
+                commands {{bibref|3GPP-TS.27.007|Clause 10.1.23}} PDP context
+                read dynamic parameters +CGCONTRDP.
+              </description>
+            </enumeration>
             <enumeration value="Static">
               <description>
                 For example, present in the factory default configuration (but
@@ -55429,8 +56705,8 @@
         * Automatically via {{bibref|RFC4861}} Router Advertisements. See also
           {{object|###.RouterAdvertisement}}.
 
-        * Automatically via DHCPv6 {{bibref|RFC3315}} prefix delegation
-          {{bibref|RFC3633}}. See also {{object|###.DHCPv6.Client}}.
+        * Automatically via DHCPv6 {{bibref|RFC8415}} prefix delegation
+          {{bibref|RFC8415}}. See also {{object|###.DHCPv6.Client}}.
 
         * Automatically via internal CPE logic, e.g. creation of child prefixes
           derived from a parent prefix.
@@ -55521,7 +56797,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.2">
         <description>
           {{datatype|expand}}
 
@@ -55529,7 +56805,7 @@
           {{enum|Static|Origin}}.
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -55585,7 +56861,7 @@
             </enumeration>
             <enumeration value="PrefixDelegation">
               <description>
-                Delegated via DHCPv6 {{bibref|RFC3633}} or some other protocol,
+                Delegated via DHCPv6 {{bibref|RFC8415}} or some other protocol,
                 e.g. IPv6rd {{bibref|RFC5969}}. Also see {{param|StaticType}}.
               </description>
             </enumeration>
@@ -55899,7 +57175,7 @@
         The IP Diagnostics object.
       </description>
 
-      <parameter name="IPv4PingSupported" access="readOnly">
+      <parameter name="IPv4PingSupported" access="readOnly" version="2.8">
         <description>
           Indicates that Ping over IPv4 is supported.
         </description>
@@ -55908,7 +57184,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="IPv6PingSupported" access="readOnly">
+      <parameter name="IPv6PingSupported" access="readOnly" version="2.8">
         <description>
           Indicates that Ping over IPv6 is supported.
         </description>
@@ -55917,7 +57193,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="IPv4TraceRouteSupported" access="readOnly">
+      <parameter name="IPv4TraceRouteSupported" access="readOnly"
+          version="2.8">
         <description>
           Indicates that TraceRoute over IPv4 is supported.
         </description>
@@ -55926,7 +57203,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="IPv6TraceRouteSupported" access="readOnly">
+      <parameter name="IPv6TraceRouteSupported" access="readOnly"
+          version="2.8">
         <description>
           Indicates that TraceRoute over IPv6 is supported.
         </description>
@@ -55935,7 +57213,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="IPv4DownloadDiagnosticsSupported" access="readOnly">
+      <parameter name="IPv4DownloadDiagnosticsSupported" access="readOnly"
+          version="2.9">
         <description>
           Indicates that Download Diagnostics over IPv4 is supported.
         </description>
@@ -55944,7 +57223,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="IPv6DownloadDiagnosticsSupported" access="readOnly">
+      <parameter name="IPv6DownloadDiagnosticsSupported" access="readOnly"
+          version="2.9">
         <description>
           Indicates that Download Diagnostics over IPv6 is supported.
         </description>
@@ -55953,7 +57233,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="IPv4UploadDiagnosticsSupported" access="readOnly">
+      <parameter name="IPv4UploadDiagnosticsSupported" access="readOnly"
+          version="2.9">
         <description>
           Indicates that Upload Diagnostics over IPv4 is supported.
         </description>
@@ -55962,7 +57243,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="IPv6UploadDiagnosticsSupported" access="readOnly">
+      <parameter name="IPv6UploadDiagnosticsSupported" access="readOnly"
+          version="2.9">
         <description>
           Indicates that Upload Diagnostics over IPv6 is supported.
         </description>
@@ -55971,7 +57253,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="IPv4UDPEchoDiagnosticsSupported" access="readOnly">
+      <parameter name="IPv4UDPEchoDiagnosticsSupported" access="readOnly"
+          version="2.9">
         <description>
           Indicates that UDPEcho Diagnostics over IPv4 is supported.
         </description>
@@ -55980,7 +57263,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="IPv6UDPEchoDiagnosticsSupported" access="readOnly">
+      <parameter name="IPv6UDPEchoDiagnosticsSupported" access="readOnly"
+          version="2.9">
         <description>
           Indicates that UDPEcho Diagnostics over IPv6 is supported.
         </description>
@@ -55989,7 +57273,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="IPLayerCapacitySupported" access="readOnly">
+      <parameter name="IPLayerCapacitySupported" access="readOnly"
+          version="2.14">
         <description>
           Indicates that IP Layer Capacity measurement is supported.
         </description>
@@ -55999,7 +57284,7 @@
       </parameter>
 
       <parameter name="IPv4ServerSelectionDiagnosticsSupported"
-          access="readOnly">
+          access="readOnly" version="2.9">
         <description>
           Indicates that ServerSelection Diagnostics over IPv4 is supported.
         </description>
@@ -56009,7 +57294,7 @@
       </parameter>
 
       <parameter name="IPv6ServerSelectionDiagnosticsSupported"
-          access="readOnly">
+          access="readOnly" version="2.9">
         <description>
           Indicates that ServerSelection Diagnostics over IPv6 is supported.
         </description>
@@ -56049,7 +57334,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Interface" access="readWrite">
+      <parameter name="Interface" access="readWrite" version="2.0">
         <description>
           {{reference}} The layer 2 or layer 3 interface over which the test is
           to be performed. Example: ''Device.IP.Interface.1'',
@@ -56065,7 +57350,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ProtocolVersion" access="readWrite">
+      <parameter name="ProtocolVersion" access="readWrite" version="2.8">
         <description>
           Indicates the IP protocol to be used.
         </description>
@@ -56086,7 +57371,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Host" access="readWrite">
+      <parameter name="Host" access="readWrite" version="2.0">
         <description>
           Host name or address of the host to ping.
 
@@ -56101,7 +57386,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="NumberOfRepetitions" access="readWrite">
+      <parameter name="NumberOfRepetitions" access="readWrite" version="2.0">
         <description>
           Number of repetitions of the ping test to perform before reporting
           the results.
@@ -56113,7 +57398,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Timeout" access="readWrite">
+      <parameter name="Timeout" access="readWrite" version="2.0">
         <description>
           Timeout in {{units}} for the ping test.
         </description>
@@ -56125,7 +57410,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="DataBlockSize" access="readWrite">
+      <parameter name="DataBlockSize" access="readWrite" version="2.0">
         <description>
           Size of the data block in bytes to be sent for each ping.
         </description>
@@ -56136,7 +57421,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="DSCP" access="readWrite">
+      <parameter name="DSCP" access="readWrite" version="2.0">
         <description>
           DiffServ codepoint to be used for the test packets. By default the
           CPE SHOULD set this value to zero.
@@ -56148,7 +57433,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="IPAddressUsed" access="readOnly">
+      <parameter name="IPAddressUsed" access="readOnly" version="2.8">
         <description>
           Indicates which IP address was used to send the Ping request. The
           parameter is only valid if the {{param|DiagnosticsState}} is
@@ -56159,7 +57444,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="SuccessCount" access="readOnly" activeNotify="canDeny">
+      <parameter name="SuccessCount" access="readOnly" activeNotify="canDeny"
+          version="2.0">
         <description>
           Result parameter indicating the number of successful pings (those in
           which a successful response was received prior to the timeout) in the
@@ -56170,7 +57456,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="FailureCount" access="readOnly" activeNotify="canDeny">
+      <parameter name="FailureCount" access="readOnly" activeNotify="canDeny"
+          version="2.0">
         <description>
           Result parameter indicating the number of failed pings in the most
           recent ping test.
@@ -56181,7 +57468,7 @@
       </parameter>
 
       <parameter name="AverageResponseTime" access="readOnly"
-          activeNotify="canDeny">
+          activeNotify="canDeny" version="2.0">
         <description>
           Result parameter indicating the average response time in {{units}}
           over all repetitions with successful responses of the most recent
@@ -56196,7 +57483,7 @@
       </parameter>
 
       <parameter name="MinimumResponseTime" access="readOnly"
-          activeNotify="canDeny">
+          activeNotify="canDeny" version="2.0">
         <description>
           Result parameter indicating the minimum response time in {{units}}
           over all repetitions with successful responses of the most recent
@@ -56210,7 +57497,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="MaximumResponseTime" access="readOnly">
+      <parameter name="MaximumResponseTime" access="readOnly" version="2.0">
         <description>
           Result parameter indicating the maximum response time in {{units}}
           over all repetitions with successful responses of the most recent
@@ -56225,7 +57512,7 @@
       </parameter>
 
       <parameter name="AverageResponseTimeDetailed" access="readOnly"
-          activeNotify="canDeny">
+          activeNotify="canDeny" version="2.7">
         <description>
           Result parameter indicating the average response time in {{units}}
           over all repetitions with successful responses of the most recent
@@ -56240,7 +57527,7 @@
       </parameter>
 
       <parameter name="MinimumResponseTimeDetailed" access="readOnly"
-          activeNotify="canDeny">
+          activeNotify="canDeny" version="2.7">
         <description>
           Result parameter indicating the minimum response time in {{units}}
           over all repetitions with successful responses of the most recent
@@ -56254,7 +57541,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="MaximumResponseTimeDetailed" access="readOnly">
+      <parameter name="MaximumResponseTimeDetailed" access="readOnly"
+          version="2.7">
         <description>
           Result parameter indicating the maximum response time in {{units}}
           over all repetitions with successful responses of the most recent
@@ -56301,7 +57589,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Interface" access="readWrite">
+      <parameter name="Interface" access="readWrite" version="2.0">
         <description>
           {{reference}} The layer 2 or layer 3 interface over which the test is
           to be performed. Example: ''Device.IP.Interface.1'',
@@ -56317,7 +57605,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ProtocolVersion" access="readWrite">
+      <parameter name="ProtocolVersion" access="readWrite" version="2.8">
         <description>
           Indicates the IP protocol to be used.
         </description>
@@ -56338,7 +57626,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Host" access="readWrite">
+      <parameter name="Host" access="readWrite" version="2.0">
         <description>
           Host name or address of the host to find a route to.
 
@@ -56353,7 +57641,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="NumberOfTries" access="readWrite">
+      <parameter name="NumberOfTries" access="readWrite" version="2.0">
         <description>
           Number of tries per hop. Set prior to running Diagnostic. By default,
           the CPE SHOULD set this value to 3.
@@ -56365,7 +57653,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Timeout" access="readWrite">
+      <parameter name="Timeout" access="readWrite" version="2.0">
         <description>
           Timeout in {{units}} for each hop of the trace route test. By default
           the CPE SHOULD set this value to 5000.
@@ -56378,7 +57666,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="DataBlockSize" access="readWrite">
+      <parameter name="DataBlockSize" access="readWrite" version="2.0">
         <description>
           Size of the data block in bytes to be sent for each trace route. By
           default, the CPE SHOULD set this value to 38.
@@ -56390,7 +57678,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="DSCP" access="readWrite">
+      <parameter name="DSCP" access="readWrite" version="2.0">
         <description>
           DiffServ codepoint to be used for the test packets. By default the
           CPE SHOULD set this value to 0.
@@ -56402,7 +57690,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="MaxHopCount" access="readWrite">
+      <parameter name="MaxHopCount" access="readWrite" version="2.0">
         <description>
           The maximum number of hop used in outgoing probe packets (max TTL).
           By default the CPE SHOULD set this value to 30.
@@ -56424,7 +57712,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="IPAddressUsed" access="readOnly">
+      <parameter name="IPAddressUsed" access="readOnly" version="2.8">
         <description>
           Indicates which IP address was used for TraceRoute. The parameter is
           only valid if the {{param|DiagnosticsState}} is
@@ -56435,7 +57723,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="ResponseTime" access="readOnly" activeNotify="canDeny">
+      <parameter name="ResponseTime" access="readOnly" activeNotify="canDeny"
+          version="2.0">
         <description>
           Result parameter indicating the response time in {{units}} the most
           recent trace route test. If a route could not be determined, this
@@ -56496,7 +57785,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Interface" access="readWrite">
+      <parameter name="Interface" access="readWrite" version="2.0">
         <description>
           {{reference}} The IP-layer interface over which the test is to be
           performed. Example: Device.IP.Interface.1
@@ -56511,7 +57800,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="DownloadURL" access="readWrite">
+      <parameter name="DownloadURL" access="readWrite" version="2.0">
         <description>
           The {{datatype}} for the CPE to perform the download on. This
           parameter MUST be in the form of a valid HTTP {{bibref|RFC2616}} or
@@ -56533,7 +57822,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="DownloadTransports" access="readOnly"
+      <parameter name="DownloadTransports" access="readOnly" version="2.0"
           dmr:previousParameter="DownloadURL">
         <description>
           Supported ''DownloadDiagnostics'' transport protocols for a CPE
@@ -56548,7 +57837,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="DSCP" access="readWrite">
+      <parameter name="DSCP" access="readWrite" version="2.0">
         <description>
           The DiffServ code point for marking packets transmitted in the test.
 
@@ -56561,7 +57850,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="EthernetPriority" access="readWrite">
+      <parameter name="EthernetPriority" access="readWrite" version="2.0">
         <description>
           Ethernet priority code for marking packets transmitted in the test
           (if applicable).
@@ -56575,7 +57864,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="TimeBasedTestDuration" access="readWrite">
+      <parameter name="TimeBasedTestDuration" access="readWrite" version="2.9">
         <description>
           Controls time based testing {{bibref|TR-143|Section 4.3}}. When
           {{param}} &gt; 0, {{param}} is the duration in {{units}} of a time
@@ -56590,7 +57879,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="TimeBasedTestMeasurementInterval" access="readWrite">
+      <parameter name="TimeBasedTestMeasurementInterval" access="readWrite"
+          version="2.9">
         <description>
           The measurement interval duration in {{units}} for objects in
           {{object|IncrementalResult}} for a time based FTP/HTTP download test
@@ -56610,7 +57900,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="TimeBasedTestMeasurementOffset" access="readWrite">
+      <parameter name="TimeBasedTestMeasurementOffset" access="readWrite"
+          version="2.9">
         <description>
           This {{param}} works in conjunction with
           {{param|TimeBasedTestMeasurementInterval}} to allow the interval
@@ -56629,7 +57920,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ProtocolVersion" access="readWrite">
+      <parameter name="ProtocolVersion" access="readWrite" version="2.9">
         <description>
           Indicates the IP protocol version to be used. The default value
           SHOULD be {{enum|Any}}.
@@ -56651,7 +57942,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="NumberOfConnections" access="readWrite">
+      <parameter name="NumberOfConnections" access="readWrite" version="2.9">
         <description>
           The number of connections to be used in the test. The default value
           SHOULD be 1. {{param}} MUST NOT be set to a value greater than
@@ -56665,7 +57956,7 @@
       </parameter>
 
       <parameter name="IPAddressUsed" access="readOnly" activeNotify="canDeny"
-          dmr:previousParameter="NumberOfConnections">
+          version="2.9" dmr:previousParameter="NumberOfConnections">
         <description>
           Indicates which IP address was used to send the request.
         </description>
@@ -56674,7 +57965,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="DownloadDiagnosticMaxConnections" access="readOnly">
+      <parameter name="DownloadDiagnosticMaxConnections" access="readOnly"
+          version="2.9">
         <description>
           Indicates the maximum number of connections that are supported by
           Download Diagnostics.
@@ -56687,7 +57979,7 @@
       </parameter>
 
       <parameter name="DownloadDiagnosticsMaxIncrementalResult"
-          access="readOnly">
+          access="readOnly" version="2.9">
         <description>
           The maximum number of rows in {{object|IncrementalResult}} that the
           CPE will store.
@@ -56699,7 +57991,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="ROMTime" access="readOnly" activeNotify="canDeny">
+      <parameter name="ROMTime" access="readOnly" activeNotify="canDeny"
+          version="2.0">
         <description>
           Request time in UTC, which MUST be specified to microsecond
           precision.
@@ -56720,7 +58013,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="BOMTime" access="readOnly" activeNotify="canDeny">
+      <parameter name="BOMTime" access="readOnly" activeNotify="canDeny"
+          version="2.0">
         <description>
           Begin of transmission time in UTC, which MUST be specified to
           microsecond precision
@@ -56741,7 +58035,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="EOMTime" access="readOnly" activeNotify="canDeny">
+      <parameter name="EOMTime" access="readOnly" activeNotify="canDeny"
+          version="2.0">
         <description>
           End of transmission in UTC, which MUST be specified to microsecond
           precision.
@@ -56762,7 +58057,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="TestBytesReceived" access="readOnly">
+      <parameter name="TestBytesReceived" access="readOnly" version="2.0">
         <description>
           The number of {{units}} received during the FTP/HTTP transaction
           including FTP/HTTP headers, between {{param|BOMTime}} and
@@ -56775,7 +58070,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="TotalBytesReceived" access="readOnly">
+      <parameter name="TotalBytesReceived" access="readOnly" version="2.0">
         <description>
           The total number of {{units}} (at the IP layer) received on the
           Interface between {{param|BOMTime}} and {{param|EOMTime}}. This MAY
@@ -56791,7 +58086,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="TotalBytesSent" access="readOnly">
+      <parameter name="TotalBytesSent" access="readOnly" version="2.9">
         <description>
           The total number of {{units}} (at the IP layer) sent on the Interface
           between {{param|BOMTime}} and {{param|EOMTime}}. This MAY be
@@ -56807,7 +58102,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="TestBytesReceivedUnderFullLoading" access="readOnly">
+      <parameter name="TestBytesReceivedUnderFullLoading" access="readOnly"
+          version="2.9">
         <description>
           The number of {{units}} of the test file received between the latest
           {{param|PerConnectionResult.{i}.BOMTime}} and the earliest
@@ -56820,7 +58116,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="TotalBytesReceivedUnderFullLoading" access="readOnly">
+      <parameter name="TotalBytesReceivedUnderFullLoading" access="readOnly"
+          version="2.9">
         <description>
           The total number of {{units}} (at the IP layer) received in between
           the latest {{param|PerConnectionResult.{i}.BOMTime}} and the earliest
@@ -56836,7 +58133,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="TotalBytesSentUnderFullLoading" access="readOnly">
+      <parameter name="TotalBytesSentUnderFullLoading" access="readOnly"
+          version="2.9">
         <description>
           The total number of {{units}} (at the IP layer) sent between the
           latest {{param|PerConnectionResult.{i}.BOMTime}} and the earliest
@@ -56852,7 +58150,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="PeriodOfFullLoading" access="readOnly">
+      <parameter name="PeriodOfFullLoading" access="readOnly" version="2.9">
         <description>
           The period of time in {{units}} between the latest
           {{param|PerConnectionResult.{i}.BOMTime}} and the earliest
@@ -56866,7 +58164,7 @@
       </parameter>
 
       <parameter name="TCPOpenRequestTime" access="readOnly"
-          activeNotify="canDeny">
+          activeNotify="canDeny" version="2.0">
         <description>
           Request time in UTC, which MUST be specified to microsecond
           precision.
@@ -56890,7 +58188,7 @@
       </parameter>
 
       <parameter name="TCPOpenResponseTime" access="readOnly"
-          activeNotify="canDeny">
+          activeNotify="canDeny" version="2.0">
         <description>
           Response time in UTC, which MUST be specified to microsecond
           precision.
@@ -56914,7 +58212,7 @@
       </parameter>
 
       <parameter name="PerConnectionResultNumberOfEntries" access="readOnly"
-          dmr:previousParameter="TCPOpenResponseTime">
+          dmr:previousParameter="TCPOpenResponseTime" version="2.9">
         <description>
           {{numentries}}
         </description>
@@ -56924,7 +58222,8 @@
       </parameter>
 
       <parameter name="EnablePerConnectionResults" access="readWrite"
-          activeNotify="canDeny" dmr:previousParameter="TCPOpenResponseTime">
+          activeNotify="canDeny" version="2.9"
+          dmr:previousParameter="TCPOpenResponseTime">
         <description>
           The results must be returned in the {{object|PerConnectionResult}}
           table for every connection when set to {{true}}. The default value
@@ -56936,7 +58235,7 @@
       </parameter>
 
       <parameter name="IncrementalResultNumberOfEntries" access="readOnly"
-          dmr:previousParameter="EnablePerConnectionResults">
+          dmr:previousParameter="EnablePerConnectionResults" version="2.9">
         <description>
           {{numentries}}
         </description>
@@ -56994,7 +58293,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Interface" access="readWrite">
+      <parameter name="Interface" access="readWrite" version="2.0">
         <description>
           {{reference}} The IP-layer interface over which the test is to be
           performed. Example: Device.IP.Interface.1
@@ -57009,7 +58308,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="UploadURL" access="readWrite">
+      <parameter name="UploadURL" access="readWrite" version="2.0">
         <description>
           The {{datatype}} for the CPE to Upload to. This parameter MUST be in
           the form of a valid HTTP {{bibref|RFC2616}} or FTP {{bibref|RFC959}}
@@ -57027,7 +58326,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="UploadTransports" access="readOnly"
+      <parameter name="UploadTransports" access="readOnly" version="2.0"
           dmr:previousParameter="UploadURL">
         <description>
           Supported ''UploadDiagnostics'' transport protocols for a CPE device.
@@ -57041,7 +58340,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="DSCP" access="readWrite">
+      <parameter name="DSCP" access="readWrite" version="2.0">
         <description>
           DiffServ code point for marking packets transmitted in the test.
 
@@ -57054,7 +58353,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="EthernetPriority" access="readWrite">
+      <parameter name="EthernetPriority" access="readWrite" version="2.0">
         <description>
           Ethernet priority code for marking packets transmitted in the test
           (if applicable).
@@ -57068,7 +58367,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="TestFileLength" access="readWrite">
+      <parameter name="TestFileLength" access="readWrite" version="2.0">
         <description>
           The size of the file {{units}} to be uploaded to the server.
 
@@ -57081,7 +58380,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="TimeBasedTestDuration" access="readWrite">
+      <parameter name="TimeBasedTestDuration" access="readWrite" version="2.9">
         <description>
           Controls time based testing {{bibref|TR-143|Section 4.3}}. When
           {{param}} &gt; 0, {{param}} is the duration in {{units}} of a time
@@ -57096,7 +58395,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="TimeBasedTestMeasurementInterval" access="readWrite">
+      <parameter name="TimeBasedTestMeasurementInterval" access="readWrite"
+          version="2.9">
         <description>
           The measurement interval duration in {{units}} for objects in
           {{object|IncrementalResult}} for a time based FTP/HTTP upload test
@@ -57116,7 +58416,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="TimeBasedTestMeasurementOffset" access="readWrite">
+      <parameter name="TimeBasedTestMeasurementOffset" access="readWrite"
+          version="2.9">
         <description>
           This {{param}} works in conjunction with
           {{param|TimeBasedTestMeasurementInterval}} and allows the interval
@@ -57135,7 +58436,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ProtocolVersion" access="readWrite">
+      <parameter name="ProtocolVersion" access="readWrite" version="2.9">
         <description>
           Indicates the IP protocol version to be used. The default value
           SHOULD be {{enum|Any}}.
@@ -57157,7 +58458,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="NumberOfConnections" access="readWrite">
+      <parameter name="NumberOfConnections" access="readWrite" version="2.9">
         <description>
           The number of connections to be used in the test. The default value
           SHOULD be 1. {{param}} MUST NOT be set to a value greater than
@@ -57170,7 +58471,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="IPAddressUsed" access="readOnly"
+      <parameter name="IPAddressUsed" access="readOnly" version="2.9"
           dmr:previousParameter="NumberOfConnections">
         <description>
           Indicates which IP address was used to send the request.
@@ -57180,7 +58481,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="UploadDiagnosticsMaxConnections" access="readOnly">
+      <parameter name="UploadDiagnosticsMaxConnections" access="readOnly"
+          version="2.9">
         <description>
           Indicates the maximum number of connections that are supported by
           Upload Diagnostics.
@@ -57193,7 +58495,7 @@
       </parameter>
 
       <parameter name="UploadDiagnosticsMaxIncrementalResult"
-          access="readOnly">
+          access="readOnly" version="2.9">
         <description>
           The maximum number of rows in {{object|IncrementalResult}} that the
           CPE will store.
@@ -57205,7 +58507,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="ROMTime" access="readOnly" activeNotify="canDeny">
+      <parameter name="ROMTime" access="readOnly" activeNotify="canDeny"
+          version="2.0">
         <description>
           Request time in UTC, which MUST be specified to microsecond
           precision.
@@ -57226,7 +58529,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="BOMTime" access="readOnly" activeNotify="canDeny">
+      <parameter name="BOMTime" access="readOnly" activeNotify="canDeny"
+          version="2.0">
         <description>
           Begin of transmission time in UTC, which MUST be specified to
           microsecond precision
@@ -57247,7 +58551,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="EOMTime" access="readOnly" activeNotify="canDeny">
+      <parameter name="EOMTime" access="readOnly" activeNotify="canDeny"
+          version="2.0">
         <description>
           End of transmission in UTC, which MUST be specified to microsecond
           precision.
@@ -57268,11 +58573,11 @@
         </syntax>
       </parameter>
 
-      <parameter name="TestBytesSent" access="readOnly">
+      <parameter name="TestBytesSent" access="readOnly" version="2.9">
         <description>
           The number of {{units}} of the test file sent during the FTP/HTTP
           transaction including FTP/HTTP headers, between {{param|BOMTime}} and
-          {{param|EOMTime}} acrosss all connections.
+          {{param|EOMTime}} across all connections.
         </description>
         <syntax>
           <dataType ref="StatsCounter64">
@@ -57281,7 +58586,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="TotalBytesReceived" access="readOnly">
+      <parameter name="TotalBytesReceived" access="readOnly" version="2.9">
         <description>
           The total number of {{units}} (at the IP layer) received on the
           Interface between {{param|BOMTime}} and {{param|EOMTime}}. This MAY
@@ -57297,7 +58602,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="TotalBytesSent" access="readOnly">
+      <parameter name="TotalBytesSent" access="readOnly" version="2.0">
         <description>
           The total number of {{units}} (at the IP layer) sent on the Interface
           between {{param|BOMTime}} and {{param|EOMTime}}. This MAY be
@@ -57313,7 +58618,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="TestBytesSentUnderFullLoading" access="readOnly">
+      <parameter name="TestBytesSentUnderFullLoading" access="readOnly"
+          version="2.9">
         <description>
           The number of {{units}} of the test file sent between the latest
           {{param|PerConnectionResult.{i}.BOMTime}} and the earliest
@@ -57326,7 +58632,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="TotalBytesReceivedUnderFullLoading" access="readOnly">
+      <parameter name="TotalBytesReceivedUnderFullLoading" access="readOnly"
+          version="2.9">
         <description>
           The total number of {{units}} (at the IP layer) received between the
           latest {{param|PerConnectionResult.{i}.BOMTime}} and the earliest
@@ -57345,7 +58652,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="TotalBytesSentUnderFullLoading" access="readOnly">
+      <parameter name="TotalBytesSentUnderFullLoading" access="readOnly"
+          version="2.9">
         <description>
           The total number of {{units}} (at the IP layer) sent between the
           latest {{param|PerConnectionResult.{i}.BOMTime}} and the earliest
@@ -57364,7 +58672,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="PeriodOfFullLoading" access="readOnly">
+      <parameter name="PeriodOfFullLoading" access="readOnly" version="2.9">
         <description>
           The period of time in {{units}} between the latest
           {{param|PerConnectionResult.{i}.BOMTime}} and the earliest
@@ -57378,7 +58686,7 @@
       </parameter>
 
       <parameter name="TCPOpenRequestTime" access="readOnly"
-          activeNotify="canDeny">
+          activeNotify="canDeny" version="2.0">
         <description>
           Request time in UTC, which MUST be specified to microsecond
           precision.
@@ -57402,7 +58710,7 @@
       </parameter>
 
       <parameter name="TCPOpenResponseTime" access="readOnly"
-          activeNotify="canDeny">
+          activeNotify="canDeny" version="2.0">
         <description>
           Response time in UTC, which MUST be specified to microsecond
           precision.
@@ -57426,7 +58734,7 @@
       </parameter>
 
       <parameter name="PerConnectionResultNumberOfEntries" access="readOnly"
-          dmr:previousParameter="TCPOpenResponseTime">
+          dmr:previousParameter="TCPOpenResponseTime" version="2.9">
         <description>
           {{numentries}}
         </description>
@@ -57436,7 +58744,8 @@
       </parameter>
 
       <parameter name="EnablePerConnectionResults" access="readWrite"
-          activeNotify="canDeny" dmr:previousParameter="TCPOpenResponseTime">
+          activeNotify="canDeny" version="2.9"
+          dmr:previousParameter="TCPOpenResponseTime">
         <description>
           The results must be returned in the {{object|PerConnectionResult}}
           table for every connection when set to {{true}}. The default value
@@ -57448,7 +58757,7 @@
       </parameter>
 
       <parameter name="IncrementalResultNumberOfEntries" access="readOnly"
-          dmr:previousParameter="EnablePerConnectionResults">
+          dmr:previousParameter="EnablePerConnectionResults" version="2.9">
         <description>
           {{numentries}}
         </description>
@@ -58194,7 +59503,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Interface" access="readWrite">
+      <parameter name="Interface" access="readWrite" version="2.9">
         <description>
           The IP-layer interface over which the test is to be performed.
           Example: Device.IP.Interface.1
@@ -58210,7 +59519,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="Host" access="readWrite" activeNotify="canDeny">
+      <parameter name="Host" access="readWrite" activeNotify="canDeny"
+          version="2.9">
         <description>
           Host name or address of the host to perform tests to.
         </description>
@@ -58221,7 +59531,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="Port" access="readWrite" activeNotify="canDeny">
+      <parameter name="Port" access="readWrite" activeNotify="canDeny"
+          version="2.9">
         <description>
           Port on the host to perform tests to.
         </description>
@@ -58234,7 +59545,7 @@
       </parameter>
 
       <parameter name="NumberOfRepetitions" access="readWrite"
-          activeNotify="canDeny">
+          activeNotify="canDeny" version="2.9">
         <description>
           Number of repetitions of the test to perform before reporting the
           results. The default value SHOULD be 1.
@@ -58246,7 +59557,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="Timeout" access="readWrite" activeNotify="canDeny">
+      <parameter name="Timeout" access="readWrite" activeNotify="canDeny"
+          version="2.9">
         <description>
           Timeout in {{units}} for the test. That is, the amount of time to
           wait for the return of a packet that was sent to the {{param|Host}}.
@@ -58260,7 +59572,7 @@
       </parameter>
 
       <parameter name="DataBlockSize" access="readWrite"
-          activeNotify="canDeny">
+          activeNotify="canDeny" version="2.9">
         <description>
           Size of the data block in {{units}} to be sent for each packet. The
           default value SHOULD be 24.
@@ -58273,7 +59585,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="DSCP" access="readWrite" activeNotify="canDeny">
+      <parameter name="DSCP" access="readWrite" activeNotify="canDeny"
+          version="2.9">
         <description>
           DiffServ codepoint to be used for the test packets. The default value
           SHOULD be zero.
@@ -58286,7 +59599,7 @@
       </parameter>
 
       <parameter name="InterTransmissionTime" access="readWrite"
-          activeNotify="canDeny">
+          activeNotify="canDeny" version="2.9">
         <description>
           The time in {{units}} between the {{param|NumberOfRepetitions}} of
           packets sent during a given test. The default value SHOULD be 1000.
@@ -58299,7 +59612,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ProtocolVersion" access="readWrite">
+      <parameter name="ProtocolVersion" access="readWrite" version="2.9">
         <description>
           Indicates the IP protocol version to be used. The default value
           SHOULD be {{enum|Any}}.
@@ -58321,7 +59634,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="IPAddressUsed" access="readOnly">
+      <parameter name="IPAddressUsed" access="readOnly" version="2.9">
         <description>
           Indicates which IP address was used to send the request.
         </description>
@@ -58330,7 +59643,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SuccessCount" access="readOnly">
+      <parameter name="SuccessCount" access="readOnly" version="2.9">
         <description>
           Result parameter indicating the number of successful packets (those
           in which a successful response was received prior to the timeout) in
@@ -58341,7 +59654,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="FailureCount" access="readOnly">
+      <parameter name="FailureCount" access="readOnly" version="2.9">
         <description>
           Result parameter indicating the number of failed packets (those in
           which a successful response was not received prior to the timeout) in
@@ -58352,7 +59665,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="AverageResponseTime" access="readOnly">
+      <parameter name="AverageResponseTime" access="readOnly" version="2.9">
         <description>
           Result parameter indicating the average response time in {{units}}
           over all repetitions with successful responses of the most recent
@@ -58365,7 +59678,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="MinimumResponseTime" access="readOnly">
+      <parameter name="MinimumResponseTime" access="readOnly" version="2.9">
         <description>
           Result parameter indicating the minimum response time in {{units}}
           over all repetitions with successful responses of the most recent
@@ -58378,7 +59691,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="MaximumResponseTime" access="readOnly">
+      <parameter name="MaximumResponseTime" access="readOnly" version="2.9">
         <description>
           Result parameter indicating the maximum response time in {{units}}
           over all repetitions with successful responses of the most recent
@@ -58392,7 +59705,8 @@
       </parameter>
 
       <parameter name="EnableIndividualPacketResults" access="readWrite"
-          activeNotify="canDeny" dmr:previousParameter="MaximumResponseTime">
+          activeNotify="canDeny" version="2.9"
+          dmr:previousParameter="MaximumResponseTime">
         <description>
           The results must be returned in the {{object|IndividualPacketResult}}
           table for every repetition of the test when set to {{true}}. The
@@ -58415,7 +59729,7 @@
       </parameter>
 
       <parameter name="UDPEchoDiagnosticsMaxResults" access="readOnly"
-          dmr:previousParameter="EnableIndividualPacketResults">
+          version="2.9" dmr:previousParameter="EnableIndividualPacketResults">
         <description>
           The maximum number of rows in {{object|IndividualPacketResult}} that
           the CPE will store. If a test would create more rows than {{param}}
@@ -58468,7 +59782,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="IPLayerMaxConnections" access="readOnly">
+      <parameter name="IPLayerMaxConnections" access="readOnly" version="2.14">
         <description>
           Indicates the maximum number of connections that are supported for an
           IP-Layer Capacity test.
@@ -58480,7 +59794,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="IPLayerMaxIncrementalResult" access="readOnly">
+      <parameter name="IPLayerMaxIncrementalResult" access="readOnly"
+          version="2.14">
         <description>
           The maximum number of rows in {{object|IncrementalResult}} that the
           device will store.
@@ -58492,7 +59807,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="IPLayerCapSupportedSoftwareVersion" access="readOnly">
+      <parameter name="IPLayerCapSupportedSoftwareVersion" access="readOnly"
+          version="2.15">
         <description>
           Indicates the installed version of the test software. The software
           version string will be implementation-dependent, and SHOULD identify
@@ -58506,7 +59822,7 @@
       </parameter>
 
       <parameter name="IPLayerCapSupportedControlProtocolVersion"
-          access="readOnly">
+          access="readOnly" version="2.15">
         <description>
           Indicates the control protocol version supported by the test
           software. Refer to {{bibref|TR-471}} for more information.
@@ -58518,7 +59834,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="IPLayerCapSupportedMetrics" access="readOnly">
+      <parameter name="IPLayerCapSupportedMetrics" access="readOnly"
+          version="2.14">
         <description>
           Indicates the test metrics from {{bibref|TR-471|Section 5.2}} that
           are supported by the device.
@@ -58548,7 +59865,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Interface" access="readWrite"
+      <parameter name="Interface" access="readWrite" version="2.14"
           dmr:previousParameter="SupportedTestProtocols">
         <description>
           {{reference}} The IP-layer interface over which the test is to be
@@ -58564,7 +59881,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Role" access="readWrite">
+      <parameter name="Role" access="readWrite" version="2.14">
         <description>
           Indicates whether the device will act as Sender or Receiver of test
           packets.
@@ -58581,7 +59898,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="Host" access="readWrite" status="deprecated">
+      <parameter name="Host" access="readWrite" status="deprecated"
+          version="2.14">
         <description>
           The Fully Qualified Domain Name (FQDN) or IP address of the Test
           Endpoint to perform the UDP Capacity tests with.
@@ -58597,7 +59915,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ServerList" access="readWrite">
+      <parameter name="ServerList" access="readWrite" version="2.17">
         <description>
           A list of servers intended as testing partners for the client. The
           client works through the server list attempting individual test flows
@@ -58617,13 +59935,13 @@
       </parameter>
 
       <parameter name="Port" access="readWrite" status="deprecated"
-          activeNotify="canDeny">
+          activeNotify="canDeny" version="2.14">
         <description>
           Port on the Test Endpoint host.
 
-           {{deprecated|2.17|because it is superseded by {{param|ServerList}}
-           with multi-flow and server capability. Refer to {{bibref|TR-471}}
-           for details}}
+          {{deprecated|2.17|because it is superseded by {{param|ServerList}}
+          with multi-flow and server capability. Refer to {{bibref|TR-471}} for
+          details}}
         </description>
         <syntax>
           <unsignedInt>
@@ -58632,7 +59950,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="JumboFramesPermitted" access="readWrite">
+      <parameter name="JumboFramesPermitted" access="readWrite" version="2.14">
         <description>
           If {{true}}, jumbo frames are allowed above 1 Gbps. The default value
           SHOULD be {{true}}.
@@ -58643,7 +59961,7 @@
       </parameter>
 
       <parameter name="NumberOfConnections" access="readWrite"
-          status="deprecated">
+          status="deprecated" version="2.14">
         <description>
           The number of connections to be used in the test. The default value
           SHOULD be 1. {{param}} MUST NOT be set to a value greater than
@@ -58660,7 +59978,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="FlowCount" access="readWrite">
+      <parameter name="FlowCount" access="readWrite" version="2.17">
         <description>
           Optional Number of flows required for a test. The default SHOULD be 0
           (a magic number that indicates the parameter is not used). {{param}}
@@ -58672,7 +59990,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="MaximumFlows" access="readWrite">
+      <parameter name="MaximumFlows" access="readWrite" version="2.17">
         <description>
           Optional number of flows to attempt. MaximumFlows must be greater
           than the size of ServerList or FlowCount.
@@ -58686,7 +60004,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="EthernetPriority" access="readWrite">
+      <parameter name="EthernetPriority" access="readWrite" version="2.14">
         <description>
           Ethernet priority code for marking packets transmitted in the test
           (if applicable). The default value SHOULD be zero.
@@ -58698,7 +60016,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="DSCP" access="readWrite">
+      <parameter name="DSCP" access="readWrite" version="2.14">
         <description>
           The DiffServ code point for marking packets transmitted in the test.
           The default value SHOULD be zero.
@@ -58710,7 +60028,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ProtocolVersion" access="readWrite">
+      <parameter name="ProtocolVersion" access="readWrite" version="2.14">
         <description>
           Indicates the IP protocol version to be used. The default value
           SHOULD be {{enum|Any}}.
@@ -58732,7 +60050,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="UDPPayloadMin" access="readWrite">
+      <parameter name="UDPPayloadMin" access="readWrite" version="2.14">
         <description>
           Minimum reference size of UDP payload in {{units}}. No default. The
           implementation will algorithmically determine a value if none is
@@ -58747,7 +60065,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="UDPPayloadMax" access="readWrite">
+      <parameter name="UDPPayloadMax" access="readWrite" version="2.14">
         <description>
           Maximum reference size of UDP payload in {{units}}. No default. The
           implementation will algorithmically determine a value if none is
@@ -58766,7 +60084,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="UDPPayloadContent" access="readWrite">
+      <parameter name="UDPPayloadContent" access="readWrite" version="2.15">
         <description>
           UDP Payload Content Type, If there is payload compression in the path
           and tests intend to characterize a possible advantage due to
@@ -58795,7 +60113,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="PortMin" access="readWrite">
+      <parameter name="PortMin" access="readWrite" version="2.14">
         <description>
           Starting value for range of Dynamic Ports supported for test traffic
           and status feedback messages. {{param}} MUST be less than or equal to
@@ -58811,7 +60129,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="PortMax" access="readWrite">
+      <parameter name="PortMax" access="readWrite" version="2.14">
         <description>
           Indicates the upper bound of the supported Dynamic Port range, where
           {{param|PortMin}} indicates the starting port number. {{param}} MUST
@@ -58827,7 +60145,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="PortOptionalMin" access="readWrite">
+      <parameter name="PortOptionalMin" access="readWrite" version="2.14">
         <description>
           Starting value for range of User Ports supported for test traffic and
           status feedback messages. A value of zero (0) indicates no User Ports
@@ -58841,7 +60159,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="PortOptionalMax" access="readWrite">
+      <parameter name="PortOptionalMax" access="readWrite" version="2.14">
         <description>
           Indicates the upper bound of the supported User Port range, where
           {{param|PortOptionalMin}} indicates the starting port number.
@@ -58857,7 +60175,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="TestType" access="readWrite">
+      <parameter name="TestType" access="readWrite" version="2.14">
         <description>
           Indicates the type of IP-Layer Capacity test being run. The default
           value SHOULD be {{enum|Search}}.
@@ -58876,7 +60194,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="IPDVEnable" access="readWrite">
+      <parameter name="IPDVEnable" access="readWrite" version="2.14">
         <description>
           Enables one-way IPDV (IP Packet Delay Variation) metric for load rate
           adjustment algorithm. When {{true}} (enabled), one-way delay
@@ -58888,7 +60206,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="IPRREnable" access="readWrite">
+      <parameter name="IPRREnable" access="readWrite" version="2.14">
         <description>
           Enables IPRR (IP packet Reordering Ratio) metric. The default value
           SHOULD be {{false}}.
@@ -58898,7 +60216,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="RIPREnable" access="readWrite">
+      <parameter name="RIPREnable" access="readWrite" version="2.15">
         <description>
           Enables RIPRR (Replicated IP Packet Ratio) metric. The default value
           SHOULD be {{false}}.
@@ -58908,7 +60226,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="PreambleDuration" access="readWrite">
+      <parameter name="PreambleDuration" access="readWrite" version="2.14">
         <description>
           Duration of the preamble testing, when traffic is being sent and/or
           received but the test clock has not been started. This is done to
@@ -58923,7 +60241,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="StartSendingRate" access="readWrite">
+      <parameter name="StartSendingRate" access="readWrite" version="2.14">
         <description>
           The Sending Rate for a {{enum|Fixed|TestType}} test or the initial
           Sending Rate value for a {{enum|Search|TestType}} test. Value
@@ -58937,7 +60255,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="StartSendingRateIndex" access="readWrite">
+      <parameter name="StartSendingRateIndex" access="readWrite"
+          version="2.16">
         <description>
           The configurable initial Sending Rate index (to a row of the sending
           rate table) for a {{enum|Fixed|TestType}} or {{enum|Search|TestType}}
@@ -58952,7 +60271,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="NumberTestSubIntervals" access="readWrite">
+      <parameter name="NumberTestSubIntervals" access="readWrite"
+          version="2.14">
         <description>
           Number of intermediate measurement reporting intervals. The value
           MUST NOT be greater than
@@ -58966,7 +60286,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="NumberFirstModeTestSubIntervals" access="readWrite">
+      <parameter name="NumberFirstModeTestSubIntervals" access="readWrite"
+          version="2.15">
         <description>
           When the value &gt;= 1, bimodal test mode is requested and the value
           represents the number of sub-intervals to be included in the first
@@ -58983,7 +60304,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="TestSubInterval" access="readWrite">
+      <parameter name="TestSubInterval" access="readWrite" version="2.14">
         <description>
           Duration of intermediate measurement reporting intervals. {{param}} *
           {{param|NumberTestSubIntervals}} MUST result in an integer value in
@@ -58999,7 +60320,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="StatusFeedbackInterval" access="readWrite">
+      <parameter name="StatusFeedbackInterval" access="readWrite"
+          version="2.14">
         <description>
           Period of status feedback message (receiver of offered load returns
           messages to the sender with results of measured metrics). Value
@@ -59013,7 +60335,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="TimeoutNoTraffic" access="readWrite" status="obsoleted">
+      <parameter name="TimeoutNoTraffic" access="readWrite" status="deleted"
+          version="2.14">
         <description>
           Timeout value. Value specified in {{units}}. The default value SHOULD
           be 5 {{units}}.
@@ -59023,6 +60346,8 @@
           Refer to {{bibref|TR-471}} for details}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <unsignedInt>
@@ -59032,7 +60357,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="TimeoutNoTestTraffic" access="readWrite">
+      <parameter name="TimeoutNoTestTraffic" access="readWrite" version="2.15">
         <description>
           Timeout value. If no test traffic packets are received for {{param}}
           {{units}}, test will timeout. Value specified in {{units}}. The
@@ -59046,7 +60371,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="TimeoutNoStatusMessage" access="readWrite">
+      <parameter name="TimeoutNoStatusMessage" access="readWrite"
+          version="2.15">
         <description>
           Timeout value. If no status message packets are received for
           {{param}} {{units}}, test will timeout. Value specified in {{units}}.
@@ -59060,7 +60386,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Tmax" access="readWrite">
+      <parameter name="Tmax" access="readWrite" version="2.14">
         <description>
           Maximum waiting time for packets to arrive. Value specified in
           {{units}}. The default value SHOULD be 1000 {{units}}.
@@ -59073,7 +60399,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="TmaxRTT" access="readWrite">
+      <parameter name="TmaxRTT" access="readWrite" version="2.14">
         <description>
           Maximum Round Trip Time waiting time for packets to arrive. Value
           specified in {{units}}. The default value SHOULD be 3000 {{units}}.
@@ -59086,7 +60412,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="TimestampResolution" access="readWrite">
+      <parameter name="TimestampResolution" access="readWrite" version="2.14">
         <description>
           Indicates the requested precision of timestamp values. The test
           implementation will determine the actual precision to use based on
@@ -59106,7 +60432,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SeqErrThresh" access="readWrite">
+      <parameter name="SeqErrThresh" access="readWrite" version="2.15">
         <description>
           This parameter is only meaningful if {{param|TestType}} is
           {{enum|Search|TestType}}. Threshold for Loss or Reordering or
@@ -59121,7 +60447,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ReordDupIgnoreEnable" access="readWrite">
+      <parameter name="ReordDupIgnoreEnable" access="readWrite" version="2.15">
         <description>
           This parameter is only meaningful if {{param|TestType}} is
           {{enum|Search|TestType}}. When {{true}} (enabled) only Loss counts
@@ -59135,7 +60461,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="LowerThresh" access="readWrite">
+      <parameter name="LowerThresh" access="readWrite" version="2.14">
         <description>
           This parameter is only meaningful if {{param|TestType}} is
           {{enum|Search|TestType}}. The lower threshold on the range of Round
@@ -59150,7 +60476,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="UpperThresh" access="readWrite">
+      <parameter name="UpperThresh" access="readWrite" version="2.14">
         <description>
           This parameter is only meaningful if {{param|TestType}} is
           {{enum|Search|TestType}}. The upper threshold on the range of Round
@@ -59165,7 +60491,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="RetryThresh" access="readWrite">
+      <parameter name="RetryThresh" access="readWrite" version="2.16">
         <description>
           The initial number of retries before activating “fast” sending rate
           increase mode. Different paths through the flow chart increase the
@@ -59181,7 +60507,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="HighSpeedDelta" access="readWrite">
+      <parameter name="HighSpeedDelta" access="readWrite" version="2.14">
         <description>
           This parameter is only meaningful if {{param|TestType}} is
           {{enum|Search|TestType}}. The number of rows to move in a single
@@ -59195,7 +60521,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="RateAdjAlgorithm" access="readWrite">
+      <parameter name="RateAdjAlgorithm" access="readWrite" version="2.16">
         <description>
           Configurable choice of Load Rate Adjustment Algorithm. Refer to
           {{bibref|TR-471}} for details.
@@ -59218,7 +60544,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SlowAdjThresh" access="readWrite">
+      <parameter name="SlowAdjThresh" access="readWrite" version="2.14">
         <description>
           This parameter is only meaningful if {{param|TestType}} is
           {{enum|Search|TestType}}. Threshold on the measured number of
@@ -59233,7 +60559,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="HSpeedThresh" access="readWrite">
+      <parameter name="HSpeedThresh" access="readWrite" version="2.14">
         <description>
           This parameter is only meaningful if {{param|TestType}} is
           {{enum|Search|TestType}}. Threshold for transition between low and
@@ -59250,7 +60576,7 @@
       </parameter>
 
       <parameter name="BOMTime" access="readOnly" activeNotify="canDeny"
-          dmr:previousParameter="HSpeedThresh">
+          version="2.14" dmr:previousParameter="HSpeedThresh">
         <description>
           Beginning of transmission send/receive time in UTC, which MUST be
           specified to {{param|TimestampResolution}} precision. If multiple
@@ -59272,7 +60598,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="ModalResultNumberOfEntries" access="readOnly">
+      <parameter name="ModalResultNumberOfEntries" access="readOnly"
+          version="2.15">
         <description>
           {{numentries}}
         </description>
@@ -59281,7 +60608,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="EOMTime" access="readOnly" activeNotify="canDeny">
+      <parameter name="EOMTime" access="readOnly" activeNotify="canDeny"
+          version="2.14">
         <description>
           End of transmission in UTC, which MUST be specified to
           {{param|TimestampResolution}} precision. If multiple connections are
@@ -59293,7 +60621,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="TmaxUsed" access="readOnly">
+      <parameter name="TmaxUsed" access="readOnly" version="2.14">
         <description>
           Configured value of {{param|Tmax}} used in the test. This value is
           expressed in {{units}}.
@@ -59305,7 +60633,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="TestInterval" access="readOnly">
+      <parameter name="TestInterval" access="readOnly" version="2.14">
         <description>
           Duration of the test (either downlink or uplink). This value is
           expected to equal {{param|TestSubInterval}} *
@@ -59319,14 +60647,14 @@
         </syntax>
       </parameter>
 
-      <parameter name="MaxIPLayerCapacity" access="readOnly">
+      <parameter name="MaxIPLayerCapacity" access="readOnly" version="2.14">
         <description>
           The maximum IP-Layer Capacity metric from among all
           {{param|IncrementalResult.{i}.IPLayerCapacity}} values measured
           between {{param|BOMTime}} and {{param|EOMTime}} across all
           connections for this test. This is calculated according to
           {{bibref|TR-471}} Equation 1. Result is expressed in {{units}} with 2
-          digits beyond the decimal. 10^6 bits/second = 1 {{units}}.
+          digits beyond the decimal. 10^6^ bits/second = 1 {{units}}.
         </description>
         <syntax>
           <decimal>
@@ -59335,7 +60663,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="TimeOfMax" access="readOnly">
+      <parameter name="TimeOfMax" access="readOnly" version="2.14">
         <description>
           Time in UTC of end of the sub-interval when
           {{param|MaxIPLayerCapacity}} was measured. If the value of
@@ -59349,13 +60677,13 @@
         </syntax>
       </parameter>
 
-      <parameter name="MaxETHCapacityNoFCS" access="readOnly">
+      <parameter name="MaxETHCapacityNoFCS" access="readOnly" version="2.15">
         <description>
           Results of measurements using the Maximum IP-Layer Capacity metric,
           according to {{bibref|TR-471}} Equation 1, and calculations to
           estimate the capacity at Layer 2 with Preamble and Inter-frame gap,
           but no ETH Frame Check Sequence. Result is expressed in {{units}}
-          with 2 digits beyond the decimal. 10^6 bits/second = 1 {{units}}.
+          with 2 digits beyond the decimal. 10^6^ bits/second = 1 {{units}}.
         </description>
         <syntax>
           <decimal>
@@ -59364,13 +60692,13 @@
         </syntax>
       </parameter>
 
-      <parameter name="MaxETHCapacityWithFCS" access="readOnly">
+      <parameter name="MaxETHCapacityWithFCS" access="readOnly" version="2.15">
         <description>
           Results of measurements using the Maximum IP-Layer Capacity metric,
           according to {{bibref|TR-471}} Equation 1, and calculations to
           estimate the capacity at Layer 2 with ETH Frame Check Sequence.
           Result is expressed in {{units}} with 2 digits beyond the decimal.
-          10^6bits/second = 1 {{units}}.
+          10^6^ bits/second = 1 {{units}}.
         </description>
         <syntax>
           <decimal>
@@ -59379,13 +60707,14 @@
         </syntax>
       </parameter>
 
-      <parameter name="MaxETHCapacityWithFCSVLAN" access="readOnly">
+      <parameter name="MaxETHCapacityWithFCSVLAN" access="readOnly"
+          version="2.15">
         <description>
           Results of measurements using the Maximum IP-Layer Capacity metric,
           according to {{bibref|TR-471}} Equation 1, and calculations to
           estimate the capacity at Layer 2 with ETH Frame Check Sequence and
           VLAN tag. Result is expressed in {{units}} with 2 digits beyond the
-          decimal. 10^6bits/second = 1 {{units}}.
+          decimal. 10^6^ bits/second = 1 {{units}}.
         </description>
         <syntax>
           <decimal>
@@ -59394,7 +60723,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="LossRatioAtMax" access="readOnly">
+      <parameter name="LossRatioAtMax" access="readOnly" version="2.14">
         <description>
           Ratio of lost packets to total packets during sub-interval of
           {{param|MaxIPLayerCapacity}}. This value is expressed as a decimal to
@@ -59405,7 +60734,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="RTTRangeAtMax" access="readOnly">
+      <parameter name="RTTRangeAtMax" access="readOnly" version="2.14">
         <description>
           The range of Round Trip Time (RTT) during sub-interval of
           {{param|MaxIPLayerCapacity}}. This value is expressed in {{units}}.
@@ -59418,7 +60747,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="PDVRangeAtMax" access="readOnly">
+      <parameter name="PDVRangeAtMax" access="readOnly" version="2.14">
         <description>
           The range of Packet Delay Variation (PDV) during sub-interval of
           {{param|MaxIPLayerCapacity}}. This value is expressed in {{units}}.
@@ -59431,7 +60760,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="MinOnewayDelayAtMax" access="readOnly">
+      <parameter name="MinOnewayDelayAtMax" access="readOnly" version="2.14">
         <description>
           The minimum one-way delay during the sub-interval of
           {{param|MaxIPLayerCapacity}}. The minimum one-way delay is calculated
@@ -59447,7 +60776,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ReorderedRatioAtMax" access="readOnly">
+      <parameter name="ReorderedRatioAtMax" access="readOnly" version="2.14">
         <description>
           Ratio of reordered packets to total packets during the sub-interval
           of {{param|MaxIPLayerCapacity}}. This value is expressed as a decimal
@@ -59458,7 +60787,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ReplicatedRatioAtMax" access="readOnly">
+      <parameter name="ReplicatedRatioAtMax" access="readOnly" version="2.15">
         <description>
           Ratio of replicated packets to total packets during the sub-interval
           of {{param|MaxIPLayerCapacity}}. This value is expressed as a decimal
@@ -59469,14 +60798,14 @@
         </syntax>
       </parameter>
 
-      <parameter name="InterfaceEthMbpsAtMax" access="readOnly">
+      <parameter name="InterfaceEthMbpsAtMax" access="readOnly" version="2.15">
         <description>
           The number of bits observed on the Interface during an IP-Layer
           Capacity test for time interval of duration {{param|TestSubInterval}}
           ending at {{param|IncrementalResult.{i}.TimeOfSubInterval}}
           corresponding to the {{param|MaxIPLayerCapacity}}, divided by the
           duration of {{param|TestSubInterval}}. Result is expressed in Mbps
-          with 2 digits beyond the decimal. 10^6 bits/second = 1 {{units}}.
+          with 2 digits beyond the decimal. 10^6^ bits/second = 1 {{units}}.
           This is primarily a diagnostic measurement. Measurement direction
           follows the {{param|Role}}.
         </description>
@@ -59487,14 +60816,15 @@
         </syntax>
       </parameter>
 
-      <parameter name="IPLayerCapacitySummary" access="readOnly">
+      <parameter name="IPLayerCapacitySummary" access="readOnly"
+          version="2.15">
         <description>
           The IP-Layer Capacity metric from among all
           {{param|IncrementalResult.{i}.IPLayerCapacity}} values measured
           between {{param|BOMTime}} and {{param|EOMTime}} across all
           connections for this test. This is calculated according to
           {{bibref|TR-471}} Equation 1. Result is expressed in {{units}} with 2
-          digits beyond the decimal. 10^6 bits/second = 1 {{units}}.
+          digits beyond the decimal. 10^6^ bits/second = 1 {{units}}.
         </description>
         <syntax>
           <decimal>
@@ -59503,7 +60833,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="LossRatioSummary" access="readOnly">
+      <parameter name="LossRatioSummary" access="readOnly" version="2.15">
         <description>
           Ratio of lost packets to total packets during the complete
           {{param|TestInterval}}. This value is expressed as a decimal to 9
@@ -59514,7 +60844,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="RTTRangeSummary" access="readOnly">
+      <parameter name="RTTRangeSummary" access="readOnly" version="2.15">
         <description>
           The range of measured Round Trip Time (RTT) during the complete
           {{param|TestInterval}}. This value is expressed in {{units}}, as a
@@ -59527,7 +60857,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="PDVRangeSummary" access="readOnly">
+      <parameter name="PDVRangeSummary" access="readOnly" version="2.15">
         <description>
           The range of Packet Delay Variation (PDV) during the complete
           {{param|TestInterval}}. This value is expressed in {{units}}, as a
@@ -59540,7 +60870,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="MinOnewayDelaySummary" access="readOnly">
+      <parameter name="MinOnewayDelaySummary" access="readOnly" version="2.15">
         <description>
           The minimum one-way delay during the complete {{param|TestInterval}}.
           This value is expressed in {{units}}, as a decimal to 9 decimal
@@ -59553,7 +60883,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="MinRTTSummary" access="readOnly">
+      <parameter name="MinRTTSummary" access="readOnly" version="2.15">
         <description>
           The minimum RTT during the complete {{param|TestInterval}}. This
           value is expressed in {{units}}, as a decimal to 9 decimal digits.
@@ -59565,7 +60895,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ReorderedRatioSummary" access="readOnly">
+      <parameter name="ReorderedRatioSummary" access="readOnly" version="2.15">
         <description>
           Ratio of reordered packets to total packets during the complete
           {{param|TestInterval}}. This value is expressed as a decimal to 9
@@ -59576,7 +60906,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="ReplicatedRatioSummary" access="readOnly">
+      <parameter name="ReplicatedRatioSummary" access="readOnly"
+          version="2.15">
         <description>
           Ratio of replicated packets to total packets during the complete
           {{param|TestInterval}}. This value is expressed as a decimal to 9
@@ -59587,13 +60918,14 @@
         </syntax>
       </parameter>
 
-      <parameter name="InterfaceEthMbpsSummary" access="readOnly">
+      <parameter name="InterfaceEthMbpsSummary" access="readOnly"
+          version="2.15">
         <description>
           The number of bits observed on the {{param|Interface}} during an
           IP-Layer Capacity test for the entire time interval of duration
           {{param|TestInterval}}, divided by the duration of
           {{param|TestInterval}}. Result is expressed in {{units}} with 2
-          digits beyond the decimal. 10^6 bits/second = 1 {{units}}. This is
+          digits beyond the decimal. 10^6^ bits/second = 1 {{units}}. This is
           primarily a diagnostic measurement. Measurement direction follows the
           {{param|Role}}.
         </description>
@@ -59604,7 +60936,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="TmaxRTTUsed" access="readOnly">
+      <parameter name="TmaxRTTUsed" access="readOnly" version="2.14">
         <description>
           Configured value of {{param|TmaxRTT}} used in the test. This value is
           expressed in {{units}}.
@@ -59616,7 +60948,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="TimestampResolutionUsed" access="readOnly">
+      <parameter name="TimestampResolutionUsed" access="readOnly"
+          version="2.14">
         <description>
           Indicates the timestamp resolution of reported results. This is a
           function of the measurement protocol, and it is usually determined
@@ -59629,7 +60962,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ActiveFlows" access="readOnly">
+      <parameter name="ActiveFlows" access="readOnly" version="2.17">
         <description>
           Number of flows set-up and used for a test.
         </description>
@@ -59663,8 +60996,8 @@
           {{param|#.IncrementalResult.{i}.IPLayerCapacity}} values within
           corresponding mode across all connections for this test. This is
           calculated according to {{bibref|TR-471}} Equation 1. Result is
-          expressed in {{units}} with 2 digits beyond the decimal.
-          10^6bits/second = 1 {{units}}.
+          expressed in {{units}} with 2 digits beyond the decimal. 10^6^
+          bits/second = 1 {{units}}.
         </description>
         <syntax>
           <decimal>
@@ -59693,7 +61026,7 @@
           according to {{bibref|TR-471}} Equation 1, and calculations to
           estimate the capacity at Layer 2 with Preamble and Inter-frame gap,
           but no ETH Frame Check Sequence. Result is expressed in {{units}}
-          with 2 digits beyond the decimal. 10^6bits/second = 1 {{units}}.
+          with 2 digits beyond the decimal. 10^6^ bits/second = 1 {{units}}.
         </description>
         <syntax>
           <decimal>
@@ -59708,7 +61041,7 @@
           according to {{bibref|TR-471}} Equation 1, and calculations to
           estimate the capacity at Layer 2 with ETH Frame Check Sequence.
           Result is expressed in {{units}} with 2 digits beyond the decimal.
-          10^6bits/second = 1 {{units}}.
+          10^6^ bits/second = 1 {{units}}.
         </description>
         <syntax>
           <decimal>
@@ -59723,7 +61056,7 @@
           according to {{bibref|TR-471}} Equation 1, and calculations to
           estimate the capacity at Layer 2 with ETH Frame Check Sequence and
           VLAN tag. Result is expressed in {{units}} with 2 digits beyond the
-          decimal. 10^6bits/second = 1 {{units}}.
+          decimal. 10^6^ bits/second = 1 {{units}}.
         </description>
         <syntax>
           <decimal>
@@ -59807,7 +61140,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="InterfaceEthMbpsAtMax" access="readOnly">
+      <parameter name="InterfaceEthMbpsAtMax" access="readOnly" version="2.15">
         <description>
           The number of bits observed on the {{param|#.Interface}} during an
           IP-Layer Capacity test for time interval of duration
@@ -59815,7 +61148,7 @@
           {{param|#.IncrementalResult.{i}.TimeOfSubInterval}} corresponding to
           the {{param|MaxIPLayerCapacity}}, divided by the duration of
           {{param|#.TestSubInterval}}. Result is expressed in Mbps with 2
-          digits beyond the decimal. 10^6 bits/second = 1 {{units}}. This is
+          digits beyond the decimal. 10^6^ bits/second = 1 {{units}}. This is
           primarily a diagnostic measurement. Measurement direction follows the
           {{param|#.Role}}.
         </description>
@@ -59849,7 +61182,7 @@
           for time interval of duration {{param|#.TestSubInterval}} ending at
           {{param|TimeOfSubInterval}} across all connections for this test.
           Result is expressed in {{units}} with 2 digits beyond the decimal.
-          10^6 bits/second = 1 {{units}}.
+          10^6^ bits/second = 1 {{units}}.
         </description>
         <syntax>
           <decimal>
@@ -59943,7 +61276,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ReplicatedRatio" access="readOnly">
+      <parameter name="ReplicatedRatio" access="readOnly" version="2.15">
         <description>
           Ratio of replicated packets to total packets, for time interval of
           duration {{param|#.TestSubInterval}} ending at
@@ -59955,13 +61288,13 @@
         </syntax>
       </parameter>
 
-      <parameter name="InterfaceEthMbps" access="readOnly">
+      <parameter name="InterfaceEthMbps" access="readOnly" version="2.15">
         <description>
           The number of bits observed on the {{param|#.Interface}} during an
           IP-Layer Capacity test for time interval of duration
           {{param|#.TestSubInterval}} ending at {{param|TimeOfSubInterval}},
           divided by the duration of {{param|#.TestSubInterval}}. Result is
-          expressed in Mbps with 2 digits beyond the decimal. 10^6 bits/second
+          expressed in Mbps with 2 digits beyond the decimal. 10^6^ bits/second
           = 1 {{units}}. This is primarily a diagnostic measurement.
           Measurement direction follows the {{param|#.Role}}.
         </description>
@@ -60142,7 +61475,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Interface" access="readWrite">
+      <parameter name="Interface" access="readWrite" version="2.9">
         <description>
           {{reference|the IP-layer interface over which the test is to be
           performed}} Example: Device.IP.Interface.1
@@ -60158,7 +61491,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ProtocolVersion" access="readWrite">
+      <parameter name="ProtocolVersion" access="readWrite" version="2.9">
         <description>
           Indicates the IP protocol version to be used.
         </description>
@@ -60180,7 +61513,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Protocol" access="readWrite">
+      <parameter name="Protocol" access="readWrite" version="2.9">
         <description>
           The protocol over which the test is to be performed.
         </description>
@@ -60192,7 +61525,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="HostList" access="readWrite">
+      <parameter name="HostList" access="readWrite" version="2.9">
         <description>
           Each entry is a Host name or address of a host to ping.
         </description>
@@ -60206,7 +61539,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="NumberOfRepetitions" access="readWrite">
+      <parameter name="NumberOfRepetitions" access="readWrite" version="2.9">
         <description>
           Number of repetitions of the ping test to perform for each
           {{param|HostList}} entry before reporting the results.
@@ -60218,7 +61551,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Timeout" access="readWrite">
+      <parameter name="Timeout" access="readWrite" version="2.9">
         <description>
           Timeout in {{units}} for each iteration of the ping test where the
           total number of iterations is the value of
@@ -60233,7 +61566,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="FastestHost" access="readOnly" activeNotify="canDeny">
+      <parameter name="FastestHost" access="readOnly" activeNotify="canDeny"
+          version="2.9">
         <description>
           Result parameter indicating the Host (one of the items within the
           {{param|HostList}} Parameter) with the smallest average response
@@ -60245,7 +61579,7 @@
       </parameter>
 
       <parameter name="MinimumResponseTime" access="readOnly"
-          activeNotify="canDeny">
+          activeNotify="canDeny" version="2.9">
         <description>
           Result parameter indicating the minimum response time in {{units}}
           over all repetitions with successful responses of the most recent
@@ -60261,7 +61595,7 @@
       </parameter>
 
       <parameter name="AverageResponseTime" access="readOnly"
-          activeNotify="canDeny">
+          activeNotify="canDeny" version="2.9">
         <description>
           Result parameter indicating the average response time in {{units}}
           over all repetitions with successful responses of the most recent
@@ -60276,7 +61610,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="MaximumResponseTime" access="readOnly">
+      <parameter name="MaximumResponseTime" access="readOnly" version="2.9">
         <description>
           Result parameter indicating the maximum response time in {{units}}
           over all repetitions with successful responses of the most recent
@@ -60291,7 +61625,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="IPAddressUsed" access="readOnly">
+      <parameter name="IPAddressUsed" access="readOnly" version="2.9">
         <description>
           Indicates which IP address was used to send the request to the host
           identified in {{param|FastestHost}}.
@@ -61318,12 +62652,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.5">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -61644,12 +62978,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.5">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -61810,7 +63144,7 @@
           <string>
             <enumerationRef targetParam=".IPsec.SupportedIntegrityAlgorithms"/>
           </string>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
@@ -61824,7 +63158,7 @@
           <string>
             <enumerationRef targetParam=".IPsec.SupportedIntegrityAlgorithms"/>
           </string>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
@@ -62042,12 +63376,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.5">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -62117,12 +63451,12 @@
         <parameter ref="TunneledInterface"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.5">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -62252,7 +63586,7 @@
 
     <object name="Device.IPsec.IKEv2SA.{i}." access="readOnly"
         numEntriesParameter="IKEv2SANumberOfEntries" minEntries="0"
-        maxEntries="unbounded" dmr:noUniqueKeys="true" version="2.5">
+        maxEntries="unbounded" version="2.5">
       <description>
         Represents an IKEv2 Security Association (SA), corresponding to an
         IKEv2 session. Instances are automatically created and deleted as IKEv2
@@ -62261,6 +63595,9 @@
       <uniqueKey functional="true">
         <parameter ref="Tunnel"/>
       </uniqueKey>
+      <uniqueKey functional="false">
+        <parameter ref="Alias"/>
+      </uniqueKey>
 
       <parameter name="Status" access="readOnly">
         <description>
@@ -62277,12 +63614,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.5">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -62629,6 +63966,9 @@
       <uniqueKey functional="true">
         <parameter ref="OutboundSPI"/>
       </uniqueKey>
+      <uniqueKey functional="false">
+        <parameter ref="Alias"/>
+      </uniqueKey>
 
       <parameter name="Status" access="readOnly">
         <description>
@@ -62645,12 +63985,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.5">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -62877,12 +64217,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.8">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -63168,12 +64508,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.8">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -63471,12 +64811,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.8">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -63629,12 +64969,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.12">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -63985,12 +65325,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.12">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -64278,12 +65618,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.12">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -64436,12 +65776,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.12">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -64764,12 +66104,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.12">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -65018,12 +66358,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.12">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -65204,12 +66544,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.8">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -65316,10 +66656,10 @@
         </syntax>
       </parameter>
 
-      <parameter name="PSIDOffset" access="readWrite" status="obsoleted">
+      <parameter name="PSIDOffset" access="readWrite" status="deleted">
         <description>
           ''Port-set ID'' (PSID) offset in {{units}}. The number of Port-sets
-          is 2^{{param}}.
+          is 2^{{param}}^.
 
           Corresponds to the {{bibref|RFC7598}} ''S46_PORTPARAMS'' (Port
           Parameters) option's ''offset'' field.
@@ -65329,6 +66669,8 @@
           the proper location within the {{object|Rule.{i}.}} object}}
 
           {{obsoleted|2.14-2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <unsignedInt>
@@ -65339,7 +66681,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="PSIDLength" access="readWrite" status="obsoleted">
+      <parameter name="PSIDLength" access="readWrite" status="deleted">
         <description>
           The length in {{units}} of the ''Port-set id'' (PSID) configured in
           the {{param|PSID}} parameter.
@@ -65352,6 +66694,8 @@
           the proper location within the {{object|Rule.{i}.}} object}}
 
           {{obsoleted|2.14-2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <unsignedInt>
@@ -65362,7 +66706,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="PSID" access="readWrite" status="obsoleted">
+      <parameter name="PSID" access="readWrite" status="deleted">
         <description>
           ''Port-set ID'' (PSID) to use in preference to the value extracted
           from the ''Embedded Address'' (EA) bits.
@@ -65379,6 +66723,8 @@
           the proper location within the {{object|Rule.{i}.}} object}}
 
           {{obsoleted|2.14-2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <unsignedInt>
@@ -65388,19 +66734,18 @@
         </syntax>
       </parameter>
 
-      <parameter name="IncludeSystemPorts" access="readWrite"
-          status="obsoleted">
+      <parameter name="IncludeSystemPorts" access="readWrite" status="deleted">
         <description>
           Whether to include low-numbered (system) ports in the Port-sets.
           Normally ports in the range
-          [0:2^(16-{{param|PSIDOffset|obsoleted}})-1] are excluded, e.g. for
-          the default {{param|PSIDOffset|obsoleted}} value of 6, ports [0:1023]
-          are not included in the Port-sets.
+          [0:2^(16-{{param|PSIDOffset|deleted}})^-1] are excluded, e.g. for the
+          default {{param|PSIDOffset|deleted}} value of 6, ports [0:1023] are
+          not included in the Port-sets.
 
           This parameter is related to {{bibref|RFC7597}}'s ''N'', which is
           defined as ''the number of ports (e.g., 1024) excluded from the lower
           end of the range''. The parameter is relevant only when
-          {{param|PSIDOffset|obsoleted}} is 0; {{false}} corresponds to
+          {{param|PSIDOffset|deleted}} is 0; {{false}} corresponds to
           ''N=1024'' and {{true}} corresponds to ''N=0''.
 
           {{deprecated|2.15|because details changed between drafting this data
@@ -65408,6 +66753,8 @@
           the proper location within the {{object|Rule.{i}.}} object}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <boolean/>
@@ -65471,12 +66818,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.8">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -65569,10 +66916,10 @@
         </syntax>
       </parameter>
 
-      <parameter name="PSIDOffset" access="readWrite">
+      <parameter name="PSIDOffset" access="readWrite" version="2.12">
         <description>
           ''Port-set ID'' (PSID) offset in {{units}}. The number of Port-sets
-          is 2^{{param}}.
+          is 2^{{param}}^.
 
           Corresponds to the {{bibref|RFC7598}} ''S46_PORTPARAMS'' (Port
           Parameters) option's ''offset'' field.
@@ -65586,7 +66933,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="PSIDLength" access="readWrite">
+      <parameter name="PSIDLength" access="readWrite" version="2.12">
         <description>
           The length in {{units}} of the ''Port-set id'' (PSID) configured in
           the {{param|PSID}} parameter.
@@ -65603,7 +66950,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="PSID" access="readWrite">
+      <parameter name="PSID" access="readWrite" version="2.12">
         <description>
           ''Port-set ID'' (PSID) to use in preference to the value extracted
           from the ''Embedded Address'' (EA) bits.
@@ -65623,10 +66970,10 @@
         </syntax>
       </parameter>
 
-      <parameter name="IncludeSystemPorts" access="readWrite">
+      <parameter name="IncludeSystemPorts" access="readWrite" version="2.15">
         <description>
           Whether to include low-numbered (system) ports in the Port-sets.
-          Normally ports in the range [0:2^(16-{{param|PSIDOffset}})-1] are
+          Normally ports in the range [0:2^(16-{{param|PSIDOffset}})^-1] are
           excluded, e.g. for the default {{param|PSIDOffset}} value of 6, ports
           [0:1023] are not included in the Port-sets.
 
@@ -65703,12 +67050,16 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.8"
+          status="deprecated">
         <description>
           {{datatype|expand}}
+
+          {{deprecated|2.18|because {{object|#}} already has an Alias
+          parameter.}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -66104,12 +67455,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -66122,7 +67473,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="IPv6ForwardingNumberOfEntries" access="readOnly">
+      <parameter name="IPv6ForwardingNumberOfEntries" access="readOnly"
+          version="2.2">
         <description>
           {{numentries}}
         </description>
@@ -66141,8 +67493,8 @@
 
         In addition to statically configured routes, this table MUST include
         dynamic routes learned through layer 3 routing protocols, including RIP
-        (i.e. RIP version 2), OSPF, DHCPv4, and IPCP. The CPE MAY reject
-        attempts to delete or modify a dynamic route entry.
+        (i.e. RIP version 2), OSPF, DHCPv4, 3GPP-NAS and IPCP. The CPE MAY
+        reject attempts to delete or modify a dynamic route entry.
 
         For each incoming packet, the layer 3 forwarding decision is
         conceptually made as follows:
@@ -66214,16 +67566,16 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
-      <parameter name="Type" access="readWrite">
+      <parameter name="Type" access="readWrite" version="2.16">
         <description>
           Specifies the forwarding entry type. Based on {{bibref|RFC8349}}
         </description>
@@ -66365,7 +67717,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Origin" access="readOnly">
+      <parameter name="Origin" access="readOnly" version="2.2">
         <description>
           Protocol via which the IPv4 forwarding rule was learned. {{enum}}
         </description>
@@ -66375,6 +67727,16 @@
             <enumeration value="OSPF"/>
             <enumeration value="IPCP"/>
             <enumeration value="RIP"/>
+            <enumeration value="3GPP-NAS" version="2.18">
+              <description>
+                Assigned by the core network (fixed or cellular) using 3GPP NAS
+                signalling methods. e.g. PDU Session Establishment Request, PDN
+                Connectivity Request, PDP Context Activation Request, ... This
+                information is available from the AT commands
+                {{bibref|3GPP-TS.27.007|Clause 10.1.23}} PDP context read
+                dynamic parameters +CGCONTRDP.
+              </description>
+            </enumeration>
             <enumeration value="Static">
               <description>
                 For example, present in the factory default configuration,
@@ -66409,8 +67771,8 @@
 
         In addition to statically configured routes, this table MUST include
         dynamic routes learned through layer 3 routing protocols, including
-        RIPng, OSPF, DHCPv6, and RA. The CPE MAY reject attempts to delete or
-        modify a dynamic route entry.
+        RIPng, OSPF, DHCPv6, 3GPP-NAS, and RA. The CPE MAY reject attempts to
+        delete or modify a dynamic route entry.
 
         For each incoming packet, the layer 3 forwarding decision is
         conceptually made as follows:
@@ -66475,16 +67837,16 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.2">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
-      <parameter name="Type" access="readWrite">
+      <parameter name="Type" access="readWrite" version="2.16">
         <description>
           Specifies the forwarding entry type. Based on {{bibref|RFC8349}}
         </description>
@@ -66617,6 +67979,16 @@
             <enumeration value="RIPng">
               <description>RIPng for IPv6 {{bibref|RFC2080}}</description>
             </enumeration>
+            <enumeration value="3GPP-NAS" version="2.18">
+              <description>
+                Address assigned by the core network (fixed or cellular) using
+                3GPP NAS signalling methods. e.g. PDU Session Establishment
+                Request, PDN Connectivity Request, PDP Context Activation
+                Request, ... This information is available from the AT commands
+                {{bibref|3GPP-TS.27.007|Clause 10.1.23}} PDP context read
+                dynamic parameters +CGCONTRDP.
+              </description>
+            </enumeration>
             <enumeration value="Static">
               <description>
                 For example, present in the factory default configuration,
@@ -66756,12 +68128,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -66914,7 +68286,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="ManagedAddressConfiguration" access="readOnly">
+      <parameter name="ManagedAddressConfiguration" access="readOnly"
+          version="2.16">
         <description>
           When set, it indicates that addresses are available via Dynamic Host
           Configuration Protocol [DHCPv6]. If the {{param}} is set, the
@@ -66927,7 +68300,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="OtherConfiguration" access="readOnly">
+      <parameter name="OtherConfiguration" access="readOnly" version="2.16">
         <description>
           When set, it indicates that other configuration information is
           available via DHCPv6. Examples of such information are DNS-related
@@ -66953,7 +68326,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ReachableTime" access="readOnly">
+      <parameter name="ReachableTime" access="readOnly" version="2.16">
         <description>
           The time, in {{units}}, that a node assumes a neighbor is reachable
           after having received a reachability confirmation. Used by the
@@ -66969,7 +68342,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="RetransTimer" access="readOnly">
+      <parameter name="RetransTimer" access="readOnly" version="2.16">
         <description>
           The time, in {{units}}, between retransmitted Neighbor Solicitation
           messages. Used by address resolution and the Neighbor Unreachability
@@ -66984,7 +68357,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="HomeAgent" access="readOnly">
+      <parameter name="HomeAgent" access="readOnly" version="2.16">
         <description>
           The Home Agent (H) bit is set in a Router Advertisement to indicate
           that the router sending this Router Advertisement is also functioning
@@ -66996,7 +68369,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="OptionNumberOfEntries" access="readOnly">
+      <parameter name="OptionNumberOfEntries" access="readOnly" version="2.16">
         <description>
           {{numentries}}
         </description>
@@ -67023,12 +68396,12 @@
         <parameter ref="Tag"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.16">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -67247,7 +68620,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="StatsReset" access="readWrite">
+      <parameter name="StatsReset" access="readWrite" version="2.15">
         <description>
           When set to {{true}}, all Babel statistics counters are reset to
           zero. Statistics are provided in
@@ -67328,12 +68701,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.15">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -67762,7 +69135,7 @@
         numEntriesParameter="RouteNumberOfEntries" minEntries="0"
         maxEntries="unbounded" version="2.15">
       <description>
-        This object provides parameters for routes recieved from neighbors and
+        This object provides parameters for routes received from neighbors and
         internal routes.
       </description>
       <uniqueKey functional="true">
@@ -67891,12 +69264,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.15">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -67937,12 +69310,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.15">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -68005,7 +69378,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="MACTestState" access="readWrite">
+      <parameter name="MACTestState" access="readWrite" version="2.15">
         <description>
           This parameter allows the MAC key and MAC algorithm to be tested to
           see if they produce an expected outcome. The command calculates a MAC
@@ -68027,7 +69400,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="InputString" access="readWrite">
+      <parameter name="InputString" access="readWrite" version="2.15">
         <description>
           Setting {{param|MACTestState}} to {{enum|Requested|MACTestState}}
           calculates a MAC of {{param}} using the {{param|KeyValue}} and the
@@ -68038,7 +69411,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="InputMAC" access="readWrite">
+      <parameter name="InputMAC" access="readWrite" version="2.15">
         <description>
           Whenever a MAC is calculated from {{param|InputString}} that MAC is
           then compared to {{param}}.
@@ -68048,7 +69421,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Match" access="readOnly">
+      <parameter name="Match" access="readOnly" version="2.15">
         <description>
           {{param}} is {{true}} if the calculated MAC and {{param|InputMAC}}
           are the same.
@@ -68070,12 +69443,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.15">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -68116,12 +69489,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.15">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -68250,12 +69623,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.2">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -68272,7 +69645,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="DADTransmits" access="readWrite">
+      <parameter name="DADTransmits" access="readWrite" version="2.13">
         <description>
           The number of consecutive Neighbor Solicitation messages sent while
           performing Duplicate Address Detection on a tentative address
@@ -68459,12 +69832,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.2">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -68481,7 +69854,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="RDNSSMode" access="readWrite">
+      <parameter name="RDNSSMode" access="readWrite" version="2.17">
         <description>
           Describes which IPv6 address information MUST be specified in the
           RDNSS option field specified in {{bibref|RFC8106|5.1. Recursive DNS
@@ -68519,7 +69892,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="RDNSS" access="readWrite">
+      <parameter name="RDNSS" access="readWrite" version="2.17">
         <description>
           The RDNSS parameter contains one or more IPv6 addresses of RDNSSes as
           described in {{bibref|RFC8106|5.1. Recursive DNS Server Option}}.
@@ -68533,11 +69906,11 @@
         <syntax>
           <list/>
           <dataType ref="IPv6Address"/>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
-      <parameter name="DNSSL" access="readWrite">
+      <parameter name="DNSSL" access="readWrite" version="2.17">
         <description>
           The DNSSL parameter contains one or more domain names of DNS suffixes
           as described in {{bibref|RFC8106|5.2. DNS Search List Option}}.
@@ -68547,7 +69920,7 @@
         <syntax>
           <list/>
           <string/>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
@@ -68576,7 +69949,7 @@
             <pathRef refType="strong"
                 targetParent="##.IP.Interface.{i}.IPv6Prefix." targetType="row"/>
           </string>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
@@ -68672,7 +70045,7 @@
       <parameter name="AdvManagedFlag" access="readWrite">
         <description>
           The value placed in the "Managed address configuration" (M) flag
-          field of Router Advertisement messages on this interafce (see
+          field of Router Advertisement messages on this interface (see
           {{bibref|RFC4861|Section 4.2}}, and {{bibref|RFC4862}}).
         </description>
         <syntax>
@@ -68799,7 +70172,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="AdvRDNSSLifetime" access="readWrite">
+      <parameter name="AdvRDNSSLifetime" access="readWrite" version="2.17">
         <description>
           The Lifetime field in RDNSS specifies the maximum duration, in
           {{units}}, during which the provided RDNSS addresses can be used for
@@ -68825,7 +70198,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="AdvDNSSLLifetime" access="readWrite">
+      <parameter name="AdvDNSSLLifetime" access="readWrite" version="2.17">
         <description>
           The Lifetime field in DNSSL specifies the maximum duration, in
           {{units}}, during which the provided DNSSL domain names can be used
@@ -68893,12 +70266,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.2">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -69005,12 +70378,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.2">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -69224,12 +70597,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.2">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -69248,7 +70621,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="EndpointAddressTypePrecedence" access="readWrite">
+      <parameter name="EndpointAddressTypePrecedence" access="readWrite"
+          version="2.5">
         <description>
           Indicates the preferred method to be used to assign the address of
           the DS-Lite Endpoint when both {{param|EndpointName}} and
@@ -69273,7 +70647,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="EndpointAddressInUse" access="readOnly">
+      <parameter name="EndpointAddressInUse" access="readOnly" version="2.5">
         <description>
           Indicates the address currently in use for the tunnel concentrator
           (remote endpoint). It is derived from the values of the
@@ -69333,7 +70707,7 @@
         <syntax>
           <string>
             <enumeration value="DHCPv6">
-              <description>Assigned by DHCPv6 {{bibref|RFC3315}}.</description>
+              <description>Assigned by DHCPv6 {{bibref|RFC8415}}.</description>
             </enumeration>
             <enumeration value="Static">
               <description>
@@ -69534,7 +70908,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="MaxSchedulerEntries" access="readOnly">
+      <parameter name="MaxSchedulerEntries" access="readOnly" version="2.16">
         <description>
           The maximum number of entries available in the {{object|Scheduler}}
           table.
@@ -69544,7 +70918,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="SchedulerNumberOfEntries" access="readOnly">
+      <parameter name="SchedulerNumberOfEntries" access="readOnly"
+          version="2.16">
         <description>
           {{numentries}}
         </description>
@@ -69637,7 +71012,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="DefaultInnerEthernetPriorityMark" access="readWrite">
+      <parameter name="DefaultInnerEthernetPriorityMark" access="readWrite"
+          version="2.7">
         <description>
           Ethernet priority code (as defined in {{bibref|802.1Q-2011}}) to mark
           traffic of the inner VLAN Tag as defined in 802.1Q, when the PDU is
@@ -69742,16 +71118,16 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
-      <parameter name="DHCPType" access="readWrite">
+      <parameter name="DHCPType" access="readWrite" version="2.2">
         <description>
           The DHCP protocol associated with the {{object}} instance. Affects
           only parameters that specify DHCP option values as classification
@@ -69808,7 +71184,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="IPVersion" access="readWrite">
+      <parameter name="IPVersion" access="readWrite" version="2.16">
         <description>
           Classification criterion.
 
@@ -70289,13 +71665,13 @@
         </syntax>
       </parameter>
 
-      <parameter name="SourceVendorClassIDv6" access="readWrite">
+      <parameter name="SourceVendorClassIDv6" access="readWrite" version="2.2">
         <description>
           Classification criterion.
 
           A hexbinary string used to identify one or more LAN devices, value of
           the DHCPv6 Vendor Class Identifier (Option 16) as defined in
-          {{bibref|RFC3315}}. The option value is binary, so an exact match is
+          {{bibref|RFC8415}}. The option value is binary, so an exact match is
           REQUIRED.
 
           {{empty}} indicates this criterion is not used for classification.
@@ -70376,13 +71752,13 @@
         </syntax>
       </parameter>
 
-      <parameter name="DestVendorClassIDv6" access="readWrite">
+      <parameter name="DestVendorClassIDv6" access="readWrite" version="2.2">
         <description>
           Classification criterion.
 
           A hexbinary string used to identify one or more LAN devices, value of
           the DHCPv6 Vendor Class Identifier (Option 16) as defined in
-          {{bibref|RFC3315}}. The option value is binary, so an exact match is
+          {{bibref|RFC8415}}. The option value is binary, so an exact match is
           REQUIRED.
 
           {{empty}} indicates this criterion is not used for classification.
@@ -70443,7 +71819,7 @@
           A hexbinary string used to identify one or more LAN devices, value of
           the DHCP Client Identifier. The DHCP Client Identifier is Option 61
           (as defined in {{bibref|RFC2132}}) for {{enum|DHCPv4|DHCPType}}, or
-          is Option 1 (as defined in {{bibref|RFC3315}}) for
+          is Option 1 (as defined in {{bibref|RFC8415}}) for
           {{enum|DHCPv6|DHCPType}}. The option value is binary, so an exact
           match is REQUIRED.
 
@@ -70489,7 +71865,7 @@
           A hexbinary string used to identify one or more LAN devices, value of
           the DHCP Client Identifier. The DHCP Client Identifier is Option 61
           (as defined in {{bibref|RFC2132}}) for {{enum|DHCPv4|DHCPType}}, or
-          is Option 1 (as defined in {{bibref|RFC3315}}) for
+          is Option 1 (as defined in {{bibref|RFC8415}}) for
           {{enum|DHCPv6|DHCPType}}. The option value is binary, so an exact
           match is REQUIRED.
 
@@ -70536,7 +71912,7 @@
           the DHCP User Class Identifier. The DHCP User Class Identifier is
           Option 77 (as defined in {{bibref|RFC3004}}) for
           {{enum|DHCPv4|DHCPType}}, or is Option 15 (as defined in
-          {{bibref|RFC3315}}) for {{enum|DHCPv6|DHCPType}}. The option value is
+          {{bibref|RFC8415}}) for {{enum|DHCPv6|DHCPType}}. The option value is
           binary, so an exact match is REQUIRED.
 
           {{empty}} indicates this criterion is not used for classification.
@@ -70580,7 +71956,7 @@
           the DHCP User Class Identifier. The DHCP User Class Identifier is
           Option 77 (as defined in {{bibref|RFC3004}}) for
           {{enum|DHCPv4|DHCPType}}, or is Option 15 (as defined in
-          {{bibref|RFC3315}}) for {{enum|DHCPv6|DHCPType}}. The option value is
+          {{bibref|RFC8415}}) for {{enum|DHCPv6|DHCPType}}. The option value is
           binary, so an exact match is REQUIRED.
 
           {{empty}} indicates this criterion is not used for classification.
@@ -70625,7 +72001,7 @@
           {{param|SourceVendorSpecificInfoSubOption}}. The DHCP Vendor-specific
           Information is Option 125 (as defined in {{bibref|RFC3925}}) for
           {{enum|DHCPv4|DHCPType}}, or is Option 17 (as defined in
-          {{bibref|RFC3315}}) for {{enum|DHCPv6|DHCPType}}.
+          {{bibref|RFC8415}}) for {{enum|DHCPv6|DHCPType}}.
 
           {{empty}} indicates this criterion is not used for classification.
 
@@ -70697,7 +72073,7 @@
           {{param|DestVendorSpecificInfoSubOption}}. The DHCP Vendor-specific
           Information is Option 125 (as defined in {{bibref|RFC3925}}) for
           {{enum|DHCPv4|DHCPType}}, or is Option 17 (as defined in
-          {{bibref|RFC3315}}) for {{enum|DHCPv6|DHCPType}}.
+          {{bibref|RFC8415}}) for {{enum|DHCPv6|DHCPType}}.
 
           {{empty}} indicates this criterion is not used for classification.
 
@@ -70792,10 +72168,12 @@
         <description>
           Classification criterion.
 
-          Minimum IP Packet Length (including header) in bytes.
+          Minimum IP Packet Length (including header) in {{units}}.
         </description>
         <syntax>
-          <unsignedInt/>
+          <unsignedInt>
+            <units value="bytes"/>
+          </unsignedInt>
           <default type="object" value="0"/>
         </syntax>
       </parameter>
@@ -70804,13 +72182,15 @@
         <description>
           Classification criterion.
 
-          Maximum IP Packet Length (including header) in bytes.
+          Maximum IP Packet Length (including header) in {{units}}.
 
           A value of zero indicates that no maximum is specified (an umlimited
           maximum length).
         </description>
         <syntax>
-          <unsignedInt/>
+          <unsignedInt>
+            <units value="bytes"/>
+          </unsignedInt>
           <default type="object" value="0"/>
         </syntax>
       </parameter>
@@ -70944,7 +72324,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="InnerEthernetPriorityCheck" access="readWrite">
+      <parameter name="InnerEthernetPriorityCheck" access="readWrite"
+          version="2.7">
         <description>
           Classification criterion.
 
@@ -70960,7 +72341,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="InnerEthernetPriorityExclude" access="readWrite">
+      <parameter name="InnerEthernetPriorityExclude" access="readWrite"
+          version="2.7">
         <description>
           If {{false}}, the class includes only those packets that match the
           {{param|InnerEthernetPriorityCheck}} entry, if specified.
@@ -70974,7 +72356,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="InnerEthernetPriorityMark" access="readWrite">
+      <parameter name="InnerEthernetPriorityMark" access="readWrite"
+          version="2.7">
         <description>
           Classification result.
 
@@ -70996,7 +72379,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="EthernetDEICheck" access="readWrite">
+      <parameter name="EthernetDEICheck" access="readWrite" version="2.7">
         <description>
           Classification criterion.
 
@@ -71013,7 +72396,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="EthernetDEIExclude" access="readWrite">
+      <parameter name="EthernetDEIExclude" access="readWrite" version="2.7">
         <description>
           If {{false}}, the class includes only those packets that match the
           {{param|EthernetDEICheck}} entry, if specified.
@@ -71196,12 +72579,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -71311,7 +72694,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="DefaultInnerEthernetPriorityMark" access="readWrite">
+      <parameter name="DefaultInnerEthernetPriorityMark" access="readWrite"
+          version="2.7">
         <description>
           Ethernet priority code (as defined in {{bibref|802.1Q-2011}}) to mark
           the inner VLAN Tags as defined in 802.1Q with this {{object}} table
@@ -71369,12 +72753,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -71404,7 +72788,7 @@
           <string>
             <size maxLength="256"/>
           </string>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
@@ -71509,7 +72893,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="InnerEthernetPriorityMark" access="readWrite">
+      <parameter name="InnerEthernetPriorityMark" access="readWrite"
+          version="2.7">
         <description>
           Ethernet priority code (as defined in {{bibref|802.1Q-2011}}) to mark
           the inner VLAN Tags with for traffic that falls into this flow.
@@ -71566,45 +72951,52 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
       <parameter name="CommittedRate" access="readWrite">
         <description>
           Committed rate allowed for this policer in {{units}}.
+
+          Note: To be able to support higher bit rates, this parameter was
+          changed to unsignedLong in the Device:2.18 version.
         </description>
         <syntax>
-          <unsignedInt>
+          <unsignedLong>
             <units value="bits per second"/>
-          </unsignedInt>
+          </unsignedLong>
           <default type="object" value="0"/>
         </syntax>
       </parameter>
 
       <parameter name="CommittedBurstSize" access="readWrite">
         <description>
-          Committed Burstsize in bytes.
+          Committed Burstsize in {{units}}.
         </description>
         <syntax>
-          <unsignedInt/>
+          <unsignedInt>
+            <units value="bytes"/>
+          </unsignedInt>
           <default type="object" value="0"/>
         </syntax>
       </parameter>
 
       <parameter name="ExcessBurstSize" access="readWrite">
         <description>
-          Excess Burstsize in bytes.
+          Excess Burstsize in {{units}}.
 
           Applied for a {{enum|SingleRateThreeColor|MeterType}} meter.
         </description>
         <syntax>
-          <unsignedInt/>
+          <unsignedInt>
+            <units value="bytes"/>
+          </unsignedInt>
           <default type="object" value="0"/>
         </syntax>
       </parameter>
@@ -71614,23 +73006,28 @@
           Peak rate allowed for this Meter in {{units}}.
 
           Applied for {{enum|TwoRateThreeColor|MeterType}} meters.
+
+          Note: To be able to support higher bit rates, this parameter was
+          changed to unsignedLong in the Device:2.18 version.
         </description>
         <syntax>
-          <unsignedInt>
+          <unsignedLong>
             <units value="bits per second"/>
-          </unsignedInt>
+          </unsignedLong>
           <default type="object" value="0"/>
         </syntax>
       </parameter>
 
       <parameter name="PeakBurstSize" access="readWrite">
         <description>
-          Peak Burstsize in bytes.
+          Peak Burstsize in {{units}}.
 
           Applied for {{enum|TwoRateThreeColor|MeterType}} meters.
         </description>
         <syntax>
-          <unsignedInt/>
+          <unsignedInt>
+            <units value="bytes"/>
+          </unsignedInt>
           <default type="object" value="0"/>
         </syntax>
       </parameter>
@@ -71947,16 +73344,16 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
-      <parameter name="Children" access="readWrite">
+      <parameter name="Children" access="readWrite" version="2.16">
         <description>
           {{list}} Each reference can be associated with another
           {{object|##.QoS.Queue.{i}}}, {{object|##.QoS.Shaper.{i}}},
@@ -71990,7 +73387,7 @@
             <size maxLength="256"/>
           </list>
           <unsignedInt/>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
@@ -72040,14 +73437,16 @@
 
       <parameter name="BufferLength" access="readOnly">
         <description>
-          Number of bytes in the buffer.
+          Number of {{units}} in the buffer.
 
           Queue buffer size for all egress interfaces for which this queue
           exists. If the buffer size is not the same for all such egress
           interfaces, this parameter MUST be 0.
         </description>
         <syntax>
-          <unsignedInt/>
+          <unsignedInt>
+            <units value="bytes"/>
+          </unsignedInt>
         </syntax>
       </parameter>
 
@@ -72183,31 +73582,37 @@
           ATM layer is rate-constrained, then the rate is calculated relative
           to this rate. Otherwise, the rate is calculated relative to the
           physical-layer DSL rate.
+
+          Note: To be able to support higher bit rates, this parameter was
+          changed to unsignedLong in the Device:2.18 version.
         </description>
         <syntax>
-          <int>
+          <long>
             <range minInclusive="-1"/>
-          </int>
+          </long>
           <default type="object" value="-1"/>
         </syntax>
       </parameter>
 
-      <parameter name="CurrentShapingRate" access="readOnly">
+      <parameter name="CurrentShapingRate" access="readOnly" version="2.16">
         <description>
           If the Queue is active, the CurrentShapingRate must reflect the
           actual configured ShapingRate, in {{units}} per second. -1 means no
           rate due to do Queue not active.
+
+          Note: To be able to support higher bit rates, this parameter was
+          changed to unsignedLong in the Device:2.18 version.
         </description>
         <syntax>
-          <int>
+          <long>
             <range minInclusive="-1"/>
             <units value="bits per second"/>
-          </int>
+          </long>
           <default type="object" value="-1"/>
         </syntax>
       </parameter>
 
-      <parameter name="AssuredRate" access="readWrite">
+      <parameter name="AssuredRate" access="readWrite" version="2.16">
         <description>
           Minimum rate to shape this queue's traffic to.
 
@@ -72217,37 +73622,45 @@
           If &gt; 100, in bits per second.
 
           A value of -1 indicates no shaping.
+
+          Note: To be able to support higher bit rates, this parameter was
+          changed to unsignedLong in the Device:2.18 version.
         </description>
         <syntax>
-          <int>
+          <long>
             <range minInclusive="-1"/>
-          </int>
+          </long>
           <default type="object" value="-1"/>
         </syntax>
       </parameter>
 
-      <parameter name="CurrentAssuredRate" access="readOnly">
+      <parameter name="CurrentAssuredRate" access="readOnly" version="2.16">
         <description>
           If the Queue is active, the CurrentAssuredRate must reflect the
           actual configured AssuredRate, in bits per second. -1 means no rate
           due to do Queue not active.
+
+          Note: To be able to support higher bit rates, this parameter was
+          changed to unsignedLong in the Device:2.18 version.
         </description>
         <syntax>
-          <int>
+          <long>
             <range minInclusive="-1"/>
-          </int>
+          </long>
           <default type="object" value="-1"/>
         </syntax>
       </parameter>
 
       <parameter name="ShapingBurstSize" access="readWrite">
         <description>
-          Burst size in bytes. For both leaky bucket (constant rate shaping)
-          and token bucket (variable rate shaping) this is the bucket size and
-          is therefore the maximum burst size.
+          Burst size in {{units}}. For both leaky bucket (constant rate
+          shaping) and token bucket (variable rate shaping) this is the bucket
+          size and is therefore the maximum burst size.
         </description>
         <syntax>
-          <unsignedInt/>
+          <unsignedInt>
+            <units value="bytes"/>
+          </unsignedInt>
         </syntax>
       </parameter>
     </object>
@@ -72306,12 +73719,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -72359,10 +73772,12 @@
 
       <parameter name="OutputBytes" access="readOnly" activeNotify="canDeny">
         <description>
-          Number of bytes output through the queue.
+          Number of {{units}} output through the queue.
         </description>
         <syntax>
-          <unsignedInt/>
+          <unsignedInt>
+            <units value="bytes"/>
+          </unsignedInt>
           <default type="object" value="0"/>
         </syntax>
       </parameter>
@@ -72380,10 +73795,12 @@
 
       <parameter name="DroppedBytes" access="readOnly" activeNotify="canDeny">
         <description>
-          Number of bytes dropped by the queue.
+          Number of {{units}} dropped by the queue.
         </description>
         <syntax>
-          <unsignedInt/>
+          <unsignedInt>
+            <units value="bytes"/>
+          </unsignedInt>
           <default type="object" value="0"/>
         </syntax>
       </parameter>
@@ -72475,16 +73892,16 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
-      <parameter name="Children" access="readWrite">
+      <parameter name="Children" access="readWrite" version="2.16">
         <description>
           {{list}} Each reference can be associated with another
           {{object|##.QoS.Queue.{i}}}, {{object|##.QoS.Shaper.{i}}},
@@ -72533,23 +73950,28 @@
           layer is rate-constrained, then the rate is calculated relative to
           this rate. Otherwise, the rate is calculated relative to the
           physical-layer DSL rate.
+
+          Note: To be able to support higher bit rates, this parameter was
+          changed to unsignedLong in the Device:2.18 version.
         </description>
         <syntax>
-          <int>
+          <long>
             <range minInclusive="-1"/>
-          </int>
+          </long>
           <default type="object" value="-1"/>
         </syntax>
       </parameter>
 
       <parameter name="ShapingBurstSize" access="readWrite">
         <description>
-          Burst size in bytes. For both leaky bucket (constant rate shaping)
-          and token bucket (variable rate shaping) this is the bucket size and
-          is therefore the maximum burst size.
+          Burst size in {{units}}. For both leaky bucket (constant rate
+          shaping) and token bucket (variable rate shaping) this is the bucket
+          size and is therefore the maximum burst size.
         </description>
         <syntax>
-          <unsignedInt/>
+          <unsignedInt>
+            <units value="bytes"/>
+          </unsignedInt>
         </syntax>
       </parameter>
     </object>
@@ -72595,16 +74017,16 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.16">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
-      <parameter name="Children" access="readWrite">
+      <parameter name="Children" access="readWrite" version="2.16">
         <description>
           {{list}} Each reference can be associated with another
           {{object|##.QoS.Queue.{i}}}, {{object|##.QoS.Shaper.{i}}},
@@ -72669,11 +74091,14 @@
           If &gt; 100, in bits per second.
 
           A value of -1 indicates no shaping.
+
+          Note: To be able to support higher bit rates, this parameter was
+          changed to unsignedLong in the Device:2.18 version.
         </description>
         <syntax>
-          <int>
+          <long>
             <range minInclusive="-1"/>
-          </int>
+          </long>
           <default type="object" value="-1"/>
         </syntax>
       </parameter>
@@ -72685,11 +74110,14 @@
           Must be &gt; 0 and &lt; ShapingRate, for a valid rate.
 
           A value of -1 indicates the ShapingRate's value is not used.
+
+          Note: To be able to support higher bit rates, this parameter was
+          changed to unsignedLong in the Device:2.18 version.
         </description>
         <syntax>
-          <int>
+          <long>
             <range minInclusive="-1"/>
-          </int>
+          </long>
           <default type="object" value="-1"/>
         </syntax>
       </parameter>
@@ -72757,7 +74185,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="AccessControlNumberOfEntries" access="readOnly">
+      <parameter name="AccessControlNumberOfEntries" access="readOnly"
+          version="2.14">
         <description>
           {{numentries}}
         </description>
@@ -72777,7 +74206,8 @@
         <parameter ref="PhysAddress"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly" status="deleted">
+      <parameter name="Alias" access="readWrite" version="2.0"
+          status="deleted">
         <description>
           {{datatype|expand}}
 
@@ -72788,7 +74218,7 @@
           {{deleted|2.15}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -72842,7 +74272,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="DHCPClient" access="readOnly">
+      <parameter name="DHCPClient" access="readOnly" version="2.2">
         <description>
           {{reference}} Each list item is the DHCPv4 or DHCPv6 server's client
           entry that corresponds to the host.
@@ -72883,7 +74313,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="AssociatedDevice" access="readOnly">
+      <parameter name="AssociatedDevice" access="readOnly" version="2.2">
         <description>
           {{noreference}}The value MUST be the path name of the
           ''AssociatedDevice'' (or equivalent) table row that models the host,
@@ -72933,7 +74363,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="InterfaceType" access="readOnly">
+      <parameter name="InterfaceType" access="readOnly" version="2.13">
         <description>
           Type of physical interface through which this host is connected.
         </description>
@@ -73064,7 +74494,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ActiveLastChange" access="readOnly">
+      <parameter name="ActiveLastChange" access="readOnly" version="2.10">
         <description>
           The datetime when {{param|Active}} last changed from {{true}} to
           {{false}} or from {{false}} to {{true}}. The initial detection of a
@@ -73084,7 +74514,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="IPv4AddressNumberOfEntries" access="readOnly">
+      <parameter name="IPv4AddressNumberOfEntries" access="readOnly"
+          version="2.2">
         <description>
           {{numentries}}
         </description>
@@ -73093,7 +74524,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="IPv6AddressNumberOfEntries" access="readOnly">
+      <parameter name="IPv6AddressNumberOfEntries" access="readOnly"
+          version="2.2">
         <description>
           {{numentries}}
         </description>
@@ -73250,18 +74682,21 @@
         <parameter ref="PhysAddress"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.14">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
-      <parameter name="Origin" access="readOnly">
+      <parameter name="Origin" access="writeOnceReadOnly" version="2.17">
         <description>
           Indicates the owner of the {{object}} instance.
+
+          Note: This parameter was changed to writeOnceReadOnly in the
+          Device:2.18 version.
         </description>
         <syntax>
           <string>
@@ -73300,7 +74735,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="PhysAddressMask" access="readWrite">
+      <parameter name="PhysAddressMask" access="readWrite" version="2.17">
         <description>
           Mask to be applied on {{param|PhysAddress}}. When set to
           'FF:FF:FF:FF:FF:FF' the access control rule is applicable to a single
@@ -73344,11 +74779,14 @@
           Allows or denies access for a device.
 
           If {{param}} is set to "Allow", device access is allowed based on the
-          {{object|Schedule}} objects. Access is enabled if there is no
-          {{object|Schedule}} object defined.
+          {{object|.Schedules.Schedule}} objects referenced by the
+          {{param|ScheduleRef}} parameter. Access is enabled if there is no
+          {{object|.Schedules.Schedule}} object referenced by the
+          {{param|ScheduleRef}} parameter.
 
-          If {{param}} is set to "Deny", defined {{object|Schedule}} objects
-          are ignored and no access is allowed for the device.
+          If {{param}} is set to "Deny", {{object|.Schedules.Schedule}} objects
+          referenced by the {{param|ScheduleRef}} parameter are ignored and no
+          access is allowed for the device.
         </description>
         <syntax>
           <string>
@@ -73359,8 +74797,27 @@
         </syntax>
       </parameter>
 
-      <parameter name="ScheduleNumberOfEntries" access="readOnly">
+      <parameter name="ScheduleRef" access="readWrite" version="2.18">
         <description>
+          Each reference provides a schedule where time based access can be
+          enabled. When {{param}} is {{empty}} the {{object}} is not scheduled,
+          and the {{param|Enable}} defines the operational state.
+        </description>
+        <syntax>
+          <list/>
+          <string>
+            <pathRef refType="strong" targetParent=".Schedules.Schedule."
+                targetType="row"/>
+          </string>
+          <default type="object" value="[]"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ScheduleNumberOfEntries" access="readOnly"
+          status="deprecated">
+        <description>
+          {{deprecated|2.18|in favor of {{object|.Schedules.}}}}
+
           {{numentries}}
         </description>
         <syntax>
@@ -73372,8 +74829,10 @@
     <object name="Device.Hosts.AccessControl.{i}.Schedule.{i}."
         access="readWrite" numEntriesParameter="ScheduleNumberOfEntries"
         enableParameter="Enable" minEntries="0" maxEntries="unbounded"
-        version="2.14">
+        version="2.14" status="deprecated">
       <description>
+        {{deprecated|2.18|in favor of {{object|.Schedules.}}}}
+
         Each instance of this object provides a schedule where access is
         enabled.
       </description>
@@ -73381,12 +74840,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.14">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -73460,7 +74919,7 @@
         Properties for Domain Name Service (DNS).
       </description>
 
-      <parameter name="SupportedRecordTypes" access="readOnly">
+      <parameter name="SupportedRecordTypes" access="readOnly" version="2.2">
         <description>
           The DNS record types that are supported by the device. {{enum}}
         </description>
@@ -73483,7 +74942,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ZoneNumberOfEntries" access="readOnly">
+      <parameter name="ZoneNumberOfEntries" access="readOnly" version="2.17">
         <description>
           {{numentries}}
         </description>
@@ -73503,12 +74962,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.17">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -73532,9 +74991,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Origin" access="readOnly">
+      <parameter name="Origin" access="writeOnceReadOnly">
         <description>
           The mechanism via which the Zone was created.
+
+          Note: This parameter was changed to writeOnceReadOnly in the
+          Device:2.18 version.
         </description>
         <syntax>
           <string>
@@ -73596,12 +75058,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.17">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -73626,9 +75088,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Origin" access="readWrite">
+      <parameter name="Origin" access="writeOnceReadOnly">
         <description>
           Indicates the owner of the {{object}} instance.
+
+          Note: This parameter was changed to writeOnceReadOnly in the
+          Device:2.18 version.
         </description>
         <syntax>
           <string>
@@ -73725,8 +75190,8 @@
       <description>
         This table contains the DNS Server IP address to be used by the DNS
         Client (it does ''not'' model a DNS Server). Entries are either
-        automatically created as result of DHCP (v4 or v6), IPCP, or RA
-        received DNS server information, or are statically configured by the
+        automatically created as result of DHCP (v4 or v6), IPCP, 3GPP-NAS, or
+        RA received DNS server information, or are statically configured by the
         Controller.
       </description>
       <uniqueKey functional="true">
@@ -73763,12 +75228,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -73778,8 +75243,8 @@
 
           Note: {{param}} is only writable when {{param|Type}} is
           {{enum|Static|Type}}; otherwise, {{param}} is automatically
-          configured as result of DHCP, IPCP, or RA received DNS server
-          information.
+          configured as result of DHCP, IPCP, 3GPP-NAS, or RA received DNS
+          server information.
         </description>
         <syntax>
           <dataType ref="IPAddress"/>
@@ -73795,8 +75260,8 @@
 
           Note: {{param}} is only writable when {{param|Type}} is
           {{enum|Static|Type}}; otherwise, {{param}} is automatically
-          configured as result of DHCP, IPCP, or RA received DNS server
-          information.
+          configured as result of DHCP, IPCP, 3GPP-NAS, or RA received DNS
+          server information.
         </description>
         <syntax>
           <string>
@@ -73813,10 +75278,11 @@
           Method used to assign the {{param|DNSServer}} address. {{enum}}
 
           Table entries that are automatically created as result of DHCP, IPCP,
-          or RA received DNS server information will have {{param}} set to
-          {{enum|DHCPv4}}, {{enum|DHCPv6}}, {{enum|IPCP}}, or
-          {{enum|RouterAdvertisement}}, as the case may be. Manually created
-          table entires will have their {{param}} set to {{enum|Static}}.
+          3GPP-NAS, or RA received DNS server information will have {{param}}
+          set to {{enum|DHCPv4}}, {{enum|DHCPv6}}, {{enum|IPCP}},
+          {{enum|3GPP-NAS}} or {{enum|RouterAdvertisement}}, as the case may
+          be. Manually created table entries will have their {{param}} set to
+          {{enum|Static}}.
         </description>
         <syntax>
           <string>
@@ -73832,6 +75298,21 @@
             <enumeration value="DHCPv6"/>
             <enumeration value="RouterAdvertisement"/>
             <enumeration value="IPCP"/>
+            <enumeration value="3GPP-NAS" version="2.18">
+              <description>
+                Assigned by the core network (fixed or cellular) using 3GPP NAS
+                signalling methods. e.g. PDU Session Establishment Request
+                using the extended Protocol Configuration Options
+                {{bibref|3GPP-TS.24.008|clause 10.5.6.3}}, PDN Connectivity
+                Request using the Protocol Configuration Options
+                {{bibref|3GPP-TS.24.008|clause 10.5.6.3}, PDP Context
+                Activation Request using the Protocol Configuration Options
+                {{bibref|3GPP-TS.24.008|clause 10.5.6.3}, ... This information
+                is available from the AT commands
+                {{bibref|3GPP-TS.27.007|Clause 10.1.23}} PDP context read
+                dynamic parameters +CGCONTRDP.
+              </description>
+            </enumeration>
             <enumeration value="Static"/>
           </string>
           <default type="object" value="Static"/>
@@ -73873,7 +75354,7 @@
       </parameter>
 
       <parameter name="ConfigNumberOfEntries" access="readOnly"
-          dmr:customNumEntriesParameter="true">
+          dmr:customNumEntriesParameter="true" version="2.17">
         <description>
           {{numentries}}
         </description>
@@ -73904,12 +75385,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.17">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -73924,7 +75405,7 @@
             <pathRef refType="strong" targetParent="#.Forwarding."
                 targetType="row"/>
           </string>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
@@ -73959,7 +75440,7 @@
 
       <parameter name="CacheMinTTL" access="readOnly">
         <description>
-          Specifies the minium TTL amount of time, in {{units}}, that an entry
+          Specifies the minimum TTL amount of time, in {{units}}, that an entry
           MUST be kept in the cache regardless of what has been specified by
           the domain owner.
 
@@ -74038,12 +75519,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -74091,7 +75572,7 @@
           or RA received DNS server information will have {{param}} set to
           {{enum|DHCPv4}}, {{enum|DHCPv6}}, {{enum|IPCP}}, or
           {{enum|RouterAdvertisement}}, as the case may be. Manually created
-          table entires will have their {{param}} set to {{enum|Static}}.
+          table entries will have their {{param}} set to {{enum|Static}}.
         </description>
         <syntax>
           <string>
@@ -74159,7 +75640,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Interface" access="readWrite">
+      <parameter name="Interface" access="readWrite" version="2.0">
         <description>
           {{reference}} The layer 3 interface over which the test is to be
           performed. Example: ''Device.IP.Interface.1''.
@@ -74174,7 +75655,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="HostName" access="readWrite">
+      <parameter name="HostName" access="readWrite" version="2.0">
         <description>
           Specifies the Host Name that NS Lookup is to look for. The current
           domain name MUST be used unless the name is a fully qualified name.
@@ -74186,7 +75667,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="DNSServer" access="readWrite">
+      <parameter name="DNSServer" access="readWrite" version="2.0">
         <description>
           Specifies the DNS Server name or IP address that NS Lookup is to use
           for the lookup. The name of this server will be resolved using the
@@ -74202,7 +75683,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Timeout" access="readWrite">
+      <parameter name="Timeout" access="readWrite" version="2.0">
         <description>
           Timeout in {{units}} that indicates that a request has failed.
         </description>
@@ -74213,7 +75694,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="NumberOfRepetitions" access="readWrite">
+      <parameter name="NumberOfRepetitions" access="readWrite" version="2.0">
         <description>
           The number of times the device SHOULD repeat the execution of the
           NSLookup using the same input parameters. If the diagnostics test
@@ -74241,7 +75722,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="SuccessCount" access="readOnly" activeNotify="canDeny">
+      <parameter name="SuccessCount" access="readOnly" activeNotify="canDeny"
+          version="2.0">
         <description>
           Number of successfully executed repetitions.
         </description>
@@ -74373,7 +75855,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="AdvertiseNumberOfEntries" access="readOnly">
+      <parameter name="AdvertiseNumberOfEntries" access="readOnly"
+          version="2.17">
         <description>
           {{numentries}}
         </description>
@@ -74392,7 +75875,7 @@
       </parameter>
 
       <parameter name="AdvertisedInterfaces" access="readWrite"
-          status="deprecated">
+          status="deprecated" version="2.12">
         <description>
           {{reference|the {{object|##.IP.Interface}} object instance from which
           DNS-SD services are advertised}}
@@ -74454,12 +75937,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.17">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -74512,11 +75995,14 @@
         </syntax>
       </parameter>
 
-      <parameter name="InstanceName" access="readOnly">
+      <parameter name="InstanceName" access="readWrite">
         <description>
           Human-readable instance name {{bibref|DNS-SD|Section 4.1.1 Instance
           Names}} (i.e. The "[{{param}}]" portion of the '"Service Instance
           Name'").
+
+          Note: This parameter was promoted to readWrite in the Device:2.18
+          version.
         </description>
         <syntax>
           <string>
@@ -74525,11 +76011,14 @@
         </syntax>
       </parameter>
 
-      <parameter name="ApplicationProtocol" access="readOnly">
+      <parameter name="ApplicationProtocol" access="readWrite">
         <description>
           The Application Protocol, without the leading underscore, associated
           with the service (e.g., daap) as defined by the DNS-SD service
           {{bibref|DNS-SD|Section 7 Application Protocol Names}}.
+
+          Note: This parameter was promoted to readWrite in the Device:2.18
+          version.
         </description>
         <syntax>
           <string>
@@ -74538,10 +76027,13 @@
         </syntax>
       </parameter>
 
-      <parameter name="TransportProtocol" access="readOnly">
+      <parameter name="TransportProtocol" access="readWrite">
         <description>
           The Transport Protocol associated with the service as defined by the
           DNS-SD service {{bibref|DNS-SD|Section 4.1.2 Service Names}}.
+
+          Note: This parameter was promoted to readWrite in the Device:2.18
+          version.
         </description>
         <syntax>
           <string>
@@ -74551,12 +76043,15 @@
         </syntax>
       </parameter>
 
-      <parameter name="Domain" access="readOnly">
+      <parameter name="Domain" access="readWrite">
         <description>
           The value to be entered into the Name field of the DNS SRV record
           {{bibref|RFC2782}} which represents the fully qualified domain name
           (FQDN) associated with the service as defined by the DNS-SD service
           {{bibref|DNS-SD|Section 4.1.3 Domain Names}}.
+
+          Note: This parameter was promoted to readWrite in the Device:2.18
+          version.
         </description>
         <syntax>
           <string>
@@ -74566,10 +76061,13 @@
         </syntax>
       </parameter>
 
-      <parameter name="Port" access="readOnly">
+      <parameter name="Port" access="readWrite">
         <description>
           The value to be entered into the Port field of the DNS SRV record
           {{bibref|RFC2782}} that is used to contact the service.
+
+          Note: This parameter was promoted to readWrite in the Device:2.18
+          version.
         </description>
         <syntax>
           <unsignedInt>
@@ -74589,7 +76087,7 @@
     </object>
 
     <object name="Device.DNS.SD.Advertise.{i}.TextRecord.{i}."
-        access="readOnly" numEntriesParameter="TextRecordNumberOfEntries"
+        access="readWrite" numEntriesParameter="TextRecordNumberOfEntries"
         minEntries="0" maxEntries="unbounded" dmr:noUniqueKeys="true"
         version="2.17">
       <description>
@@ -74599,6 +76097,8 @@
 
         When multiple instances of the {{object}} table have the same value for
         the {{param|Key}} parameter, the implementation is CPE specific.
+
+        Note: This object was promoted to readWrite in the Device:2.18 version.
       </description>
 
       <parameter name="Key" access="readWrite">
@@ -74912,7 +76412,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="MaxNumberOfPortMappings" access="readOnly">
+      <parameter name="MaxNumberOfPortMappings" access="readOnly"
+          version="2.17">
         <description>
           The maximum number of port mappings that can exist at any given time.
 
@@ -74924,7 +76425,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="PortTriggerNumberOfEntries" access="readOnly">
+      <parameter name="PortTriggerNumberOfEntries" access="readOnly"
+          version="2.16">
         <description>
           {{numentries}}
         </description>
@@ -74933,7 +76435,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="MaxNumberOfPortTriggers" access="readOnly">
+      <parameter name="MaxNumberOfPortTriggers" access="readOnly"
+          version="2.17">
         <description>
           The maximum number of port triggers that can exist at any given time.
 
@@ -75019,12 +76522,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -75043,7 +76546,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SourceNetwork" access="readWrite">
+      <parameter name="SourceNetwork" access="readWrite" version="2.16">
         <description>
           Each list item MUST be the Path name of a
           {{object|.IP.Interface.{i}.IPv4Address.}} table or of one of its
@@ -75065,11 +76568,12 @@
           <string>
             <size maxLength="256"/>
           </string>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
-      <parameter name="TCPTranslationTimeout" access="readWrite">
+      <parameter name="TCPTranslationTimeout" access="readWrite"
+          version="2.13">
         <description>
           Determines the timeout, in {{units}}, of NAT translations for TCP
           sessions. It is the time after which a NAT entry is removed from the
@@ -75085,7 +76589,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="UDPTranslationTimeout" access="readWrite">
+      <parameter name="UDPTranslationTimeout" access="readWrite"
+          version="2.13">
         <description>
           Determines the timeout, in {{units}}, of NAT translations for UDP
           bindings. It is the time after which a NAT entry is removed from the
@@ -75159,6 +76664,13 @@
           <string>
             <enumeration value="Disabled"/>
             <enumeration value="Enabled"/>
+            <enumeration value="Inactive" version="2.18">
+              <description>
+                Indicates that the port mapping is still enabled but has been
+                temporarily deactivated due to the Schedules defined in
+                {{param|ScheduleRef}}.
+              </description>
+            </enumeration>
             <enumeration value="Error_Misconfigured"/>
             <enumeration value="Error" optional="true"/>
           </string>
@@ -75166,9 +76678,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Origin" access="readOnly">
+      <parameter name="Origin" access="writeOnceReadOnly" version="2.17">
         <description>
           Indicates the Origin of the {{object}} instance.
+
+          Note: This parameter was changed to writeOnceReadOnly in the
+          Device:2.18 version.
         </description>
         <syntax>
           <string>
@@ -75201,7 +76716,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.0">
         <description>
           {{datatype|expand}}
 
@@ -75210,7 +76725,7 @@
           because automatically-created {{object}} instances can be transitory.
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -75266,6 +76781,26 @@
         </syntax>
       </parameter>
 
+      <parameter name="RemainingLeaseTime" access="readOnly"
+          activeNotify="canDeny" version="2.18">
+        <description>
+          For a dynamic (non-static) port mapping, when this parameter is read,
+          the value represents the time (in {{units}}) remaining on the port
+          mapping lease. That is, for a dynamic port mapping, the value counts
+          down toward 0. When a dynamic port mapping lease expires, the device
+          MUST automatically terminate that port mapping, and MUST
+          automatically delete the corresponding {{object}} table entry.
+
+          For a static port mapping, this parameter is irrelevant and should
+          return ''0''.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
       <parameter name="RemoteHost" access="readWrite">
         <description>
           This parameter is the IP address of the source of inbound packets.
@@ -75376,6 +76911,9 @@
         <description>
           The port on {{param|InternalClient}} that the gateway SHOULD forward
           traffic to.
+
+          When {{param|ExternalPortEndRange}} is utilized, this range will also
+          be applied accordingly, starting from the {{param}} number.
         </description>
         <syntax>
           <unsignedInt>
@@ -75442,6 +76980,22 @@
           <default type="object" value=""/>
         </syntax>
       </parameter>
+
+      <parameter name="ScheduleRef" access="readWrite" version="2.18">
+        <description>
+          Each reference provides a schedule where time based access can be
+          enabled. When {{param}} is {{empty}} the {{object}} is not scheduled,
+          and the {{param|Enable}} defines the operational state.
+        </description>
+        <syntax>
+          <list/>
+          <string>
+            <pathRef refType="strong" targetParent=".Schedules.Schedule."
+                targetType="row"/>
+          </string>
+          <default type="object" value="[]"/>
+        </syntax>
+      </parameter>
     </object>
 
     <object name="Device.NAT.PortTrigger.{i}." access="readWrite"
@@ -75454,12 +77008,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.16">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -75488,6 +77042,13 @@
                 Indicates that the PortTrigger entry is enabled.
               </description>
             </enumeration>
+            <enumeration value="Inactive" version="2.18">
+              <description>
+                Indicates that the PortTrigger is still enabled but has been
+                temporary deactivated due to the Schedules defined in
+                {{param|ScheduleRef}}.
+              </description>
+            </enumeration>
             <enumeration value="Error_Misconfigured">
               <description>
                 Indicates that a necessary configuration value is undefined or
@@ -75504,9 +77065,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Origin" access="readWrite">
+      <parameter name="Origin" access="writeOnceReadOnly">
         <description>
           Indicates the owner of the {{object}} instance.
+
+          Note: This parameter was changed to writeOnceReadOnly in the
+          Device:2.18 version.
         </description>
         <syntax>
           <string>
@@ -75608,10 +77172,13 @@
         </syntax>
       </parameter>
 
-      <parameter name="ActivationDate" access="readWrite">
+      <parameter name="ActivationDate" access="readOnly">
         <description>
           Indicates when the port trigger was enabled. When the port trigger is
           no longer active.
+
+          Note: This parameter was demoted to readOnly in the Device:2.18
+          version.
         </description>
         <syntax>
           <dateTime/>
@@ -75631,7 +77198,23 @@
         </syntax>
       </parameter>
 
-      <parameter name="RuleNumberOfEntries" access="readOnly">
+      <parameter name="ScheduleRef" access="readWrite" version="2.18">
+        <description>
+          Each reference provides a schedule where time based access can be
+          enabled. When {{param}} is {{empty}} the {{object}} is not scheduled,
+          and the {{param|Enable}} defines the operational state.
+        </description>
+        <syntax>
+          <list/>
+          <string>
+            <pathRef refType="strong" targetParent=".Schedules.Schedule."
+                targetType="row"/>
+          </string>
+          <default type="object" value="[]"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="RuleNumberOfEntries" access="readOnly" version="2.16">
         <description>
           {{numentries}}
         </description>
@@ -75651,12 +77234,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.16">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -75718,7 +77301,7 @@
         description of the working of this PCP data model.
       </description>
 
-      <parameter name="Enable" access="readWrite">
+      <parameter name="Enable" access="readWrite" version="2.16">
         <description>
           Enables or disables the PCP stack. If the stack is disabled then the
           status of any enabled {{object|Client}} entries will change to
@@ -75806,12 +77389,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.8">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -75839,7 +77422,7 @@
           <string>
             <enumeration value="Disabled"/>
             <enumeration value="Enabled"/>
-            <enumeration value="StackDisabled"/>
+            <enumeration value="StackDisabled" version="2.16"/>
             <enumeration value="Error" optional="true"/>
           </string>
         </syntax>
@@ -76054,12 +77637,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.8">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -76315,12 +77898,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.8">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -76561,12 +78144,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.8">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -76606,7 +78189,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="RemotePortEndRange" access="readOnly">
+      <parameter name="RemotePortEndRange" access="readWrite">
         <description>
           Indicates the last port of the remote port range that starts with
           {{param|RemotePort}}.
@@ -76616,6 +78199,9 @@
 
           A value of zero (0) indicates that no remote port range is specified,
           i.e. that the range consists only of {{param|RemotePort}}.
+
+          Note: This parameter was promoted to readWrite in the Device:2.18
+          version.
         </description>
         <syntax>
           <unsignedInt>
@@ -76703,12 +78289,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.8">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -76948,12 +78534,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -77060,7 +78646,7 @@
             <size maxLength="256"/>
           </list>
           <dataType ref="IPv4Address"/>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
@@ -77077,7 +78663,7 @@
             <size maxLength="256"/>
           </list>
           <dataType ref="IPv4Address"/>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
@@ -77184,12 +78770,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -77253,12 +78839,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -77292,6 +78878,120 @@
       </parameter>
     </object>
 
+    <object name="Device.DHCPv4.Client.{i}.Retransmission." access="readOnly"
+        version="2.18">
+      <description>
+        This object enables the configurion of the DHCPv4 retransmission
+        behavior according to the guidelines described in
+        {{bibref|RFC2131|Chapter 4.1}}.
+      </description>
+
+      <parameter name="DiscoverInitialTimeout" access="readWrite">
+        <description>
+          Initial delay, expressed in {{units}}, before initiating the first
+          DCHCPDISCOVER message.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+          <default type="object" value="4"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="DiscoverMaxTimeout" access="readWrite">
+        <description>
+          Maximum duration, expressed in {{units}}, between two DHCPDISCOVER
+          message retransmission.
+
+          According to {{bibref|RFC2131|Chapter 4.1}}, the recommended value
+          for this parameter is 64 {{units}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+          <default type="object" value="64"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="DiscoverMaxDuration" access="readWrite">
+        <description>
+          Maximum duration, expressed in {{units}}, during which the DHCPv4
+          client is permitted to retransmit DHCPDISCOVER message
+
+          A value of '0' indicates that no specific maximum duration is set.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+          <default type="object" value="0"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="RequestInitialTimeout" access="readWrite">
+        <description>
+          Initial delay, expressed in {{units}}, before initiating the first
+          DHCPREQUEST message.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+          <default type="object" value="4"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="RequestMaxTimeout" access="readWrite">
+        <description>
+          Maximum duration, expressed in {{units}}, between two DHCPREQUEST
+          message retransmission.
+
+          According to {{bibref|RFC2131|Chapter 4.1}}, the recommended value
+          for this parameter is 64 {{units}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+          <default type="object" value="64"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="RequestMaxDuration" access="readWrite">
+        <description>
+          Maximum duration, expressed in {{units}}, during which the DHCPv4
+          client is permitted to retransmit DHCPREQUEST message.
+
+          A value of '0' indicates that no specific maximum duration is set.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+          <default type="object" value="0"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="TimeoutRandomize" access="readWrite">
+        <description>
+          The Randomization factor for the retransmission timeout, in
+          {{units}}, as defined in {{bibref|RFC2131|4.1 Constructing and
+          sending DHCP messages}}.
+
+          E.g. a timeout of 2000ms with a randomization of 1000 will end up
+          between 1000 and 3000 ms.
+        </description>
+        <syntax>
+          <int>
+            <units value="ms"/>
+          </int>
+          <default type="object" value="1000"/>
+        </syntax>
+      </parameter>
+    </object>
+
     <object name="Device.DHCPv4.Server." access="readOnly" minEntries="1"
         maxEntries="1" version="2.0">
       <description>
@@ -77373,12 +79073,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -77578,7 +79278,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="AllowedDevices" access="readWrite">
+      <parameter name="AllowedDevices" access="readWrite" version="2.13">
         <description>
           Pool association criterion. Determines which devices are allowed,
           {{enum}}
@@ -77655,7 +79355,7 @@
             <size/>
           </list>
           <dataType ref="IPv4Address"/>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
@@ -77756,7 +79456,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ClientNumberOfEntries" access="readOnly">
+      <parameter name="ClientNumberOfEntries" access="readOnly" version="2.2">
         <description>
           {{numentries}}
         </description>
@@ -77806,12 +79506,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -77863,12 +79563,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -77912,7 +79612,7 @@
         <parameter ref="Chaddr"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.2">
         <description>
           {{datatype|expand}}
 
@@ -77921,7 +79621,7 @@
           because automatically-created {{object}} instances can be transitory.
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -78119,12 +79819,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -78355,7 +80055,7 @@
         maxEntries="1" version="2.2">
       <description>
         The Dynamic Host Configuration Protocol (DHCP) IPv6 object
-        {{bibref|RFC3315}}. This entire object applies to IPv6 only. It
+        {{bibref|RFC8415}}. This entire object applies to IPv6 only. It
         contains the {{object|Client}} and {{object|Server}} objects.
       </description>
 
@@ -78406,12 +80106,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.2">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -78454,8 +80154,8 @@
 
       <parameter name="DUID" access="readOnly">
         <description>
-          The client's DHCP Unique Identifier (DUID) {{bibref|RFC3315|Section
-          9}}. {{param}} is set by the CPE.
+          The client's DHCP Unique Identifier (DUID) {{bibref|RFC8415|Section
+          11}}. {{param}} is set by the CPE.
         </description>
         <syntax>
           <hexBinary>
@@ -78468,7 +80168,7 @@
         <description>
           Enables or disables inclusion of the ''Identity Association (IA) for
           Non-Temporary Address'' option OPTION_IA_NA(3)
-          {{bibref|RFC3315|Section 22.4}} in Solicit messages.
+          {{bibref|RFC8415|Section 21.4}} in Solicit messages.
         </description>
         <syntax>
           <boolean/>
@@ -78479,8 +80179,8 @@
       <parameter name="RequestPrefixes" access="readWrite">
         <description>
           Enables or disables inclusion of the ''Identity Association (IA) for
-          Prefix Delegation'' option OPTION_IA_PD(25) {{bibref|RFC3633|Section
-          10}} in Solicit messages.
+          Prefix Delegation'' option OPTION_IA_PD(25) {{bibref|RFC8415|Section
+          21.22}} in Solicit messages.
 
           Note that this is only appropriate for an upstream interface on a
           requesting router, e.g. for an RG WAN interface.
@@ -78494,7 +80194,7 @@
       <parameter name="RapidCommit" access="readWrite">
         <description>
           Enables or disables inclusion of the ''Rapid Commit'' option
-          OPTION_RAPID_COMMIT(14) {{bibref|RFC3315|Section 22.14}} in Solicit
+          OPTION_RAPID_COMMIT(14) {{bibref|RFC8415|Section 21.14}} in Solicit
           messages.
         </description>
         <syntax>
@@ -78504,7 +80204,7 @@
       </parameter>
 
       <parameter name="Renew" access="readWrite"
-          dmr:previousParameter="RapidCommit">
+          dmr:previousParameter="RapidCommit" version="2.2">
         <description>
           When set to {{true}}, the {{object}} will renew its DHCPv6-supplied
           information (i.e. the CPE will do a renew or information request as
@@ -78520,8 +80220,8 @@
       <parameter name="SuggestedT1" access="readWrite">
         <description>
           T1 value, in {{units}}, that the client SHOULD use when sending IA
-          options, e.g. OPTION_IA_NA {{bibref|RFC3315|Section 22.4}} and
-          OPTION_IA_PD {{bibref|RFC3633|Section 10}}.
+          options, e.g. OPTION_IA_NA {{bibref|RFC8415|Section 21.4}} and
+          OPTION_IA_PD {{bibref|RFC8415|Section 10}}.
 
           A value of -1 indicates that no T1 value is specified.
         </description>
@@ -78536,8 +80236,8 @@
       <parameter name="SuggestedT2" access="readWrite">
         <description>
           T2 value, in {{units}}, that the client SHOULD use when sending IA
-          options, e.g. OPTION_IA_NA {{bibref|RFC3315|Section 22.4}} and
-          OPTION_IA_PD {{bibref|RFC3633|Section 10}}.
+          options, e.g. OPTION_IA_NA {{bibref|RFC8415|Section 21.4}} and
+          OPTION_IA_PD {{bibref|RFC8415|Section 21.22}}.
 
           A value of -1 indicates that no T2 value is specified.
         </description>
@@ -78581,8 +80281,8 @@
           options and handle them as best it can.
 
           Loosely speaking, these are the options that the client will include
-          in OPTION_ORO {{bibref|RFC3315}} but the client is free to decide (in
-          accordance with {{bibref|RFC3315}}) in which messages to request
+          in OPTION_ORO {{bibref|RFC8415}} but the client is free to decide (in
+          accordance with {{bibref|RFC8415}}) in which messages to request
           which option, whether also to request additional options, whether not
           to request inappropriate options, and in which order to request any
           options that are also in {{param|SupportedOptions}}.
@@ -78646,8 +80346,8 @@
 
       <parameter name="DUID" access="readOnly">
         <description>
-          The server's DHCP Unique Identifier (DUID) {{bibref|RFC3315|Section
-          9}} as received via OPTION_SERVERID.
+          The server's DHCP Unique Identifier (DUID) {{bibref|RFC8415|Section
+          11}} as received via OPTION_SERVERID.
         </description>
         <syntax>
           <hexBinary>
@@ -78704,18 +80404,18 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.2">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
       <parameter name="Tag" access="readWrite">
         <description>
-          Option tag (code) {{bibref|RFC3315|Section 22.1}}.
+          Option tag (code) {{bibref|RFC8415|Section 21.1}}.
         </description>
         <syntax>
           <unsignedInt>
@@ -78726,10 +80426,10 @@
 
       <parameter name="Value" access="readWrite">
         <description>
-          A hexbinary encoded option data {{bibref|RFC3315|Section 22.1}}.
+          A hexbinary encoded option data {{bibref|RFC8415|Section 21.1}}.
 
           Note: The length of the option data is ''option-len'' octets, as
-          specified in {{bibref|RFC3315|Section 22.1}}.
+          specified in {{bibref|RFC8415|Section 21.1}}.
         </description>
         <syntax>
           <hexBinary>
@@ -78759,7 +80459,7 @@
 
       <parameter name="Tag" access="readOnly">
         <description>
-          Option tag (code) {{bibref|RFC3315|Section 22.1}}.
+          Option tag (code) {{bibref|RFC8415|Section 21.1}}.
         </description>
         <syntax>
           <unsignedInt>
@@ -78770,7 +80470,7 @@
 
       <parameter name="Value" access="readOnly">
         <description>
-          A hexbinary encoded option data {{bibref|RFC3315|Section 22.1}}.
+          A hexbinary encoded option data {{bibref|RFC8415|Section 21.1}}.
         </description>
         <syntax>
           <hexBinary>
@@ -78793,6 +80493,346 @@
       </parameter>
     </object>
 
+    <object name="Device.DHCPv6.Client.{i}.Retransmission." access="readOnly"
+        version="2.18">
+      <description>
+        This object enables the configurion of the DHCPv6 retransmission
+        behavior according to the guidelines described in
+        {{bibref|RFC8415|Section 7.6}}.
+      </description>
+
+      <parameter name="SolicitMaxDelay" access="readWrite">
+        <description>
+          Maximum delay of first Solicit, expressed in {{units}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+          <default type="object" value="1"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="SolicitInitialTimeout" access="readWrite">
+        <description>
+          Initial solicit, expressed in {{units}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+          <default type="object" value="1"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="SolicitMaxTimeout" access="readWrite">
+        <description>
+          Maximum solicit timeout value, expressed in {{units}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+          <default type="object" value="3600"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="RequestInitialTimeout" access="readWrite">
+        <description>
+          Initial request timeout, expressed in {{units}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+          <default type="object" value="1"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="RequestMaxTimeout" access="readWrite">
+        <description>
+          Maximum request timeout, expressed in {{units}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+          <default type="object" value="30"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="RequestMaxRetry" access="readWrite">
+        <description>
+          Maximum request retry attempts.
+        </description>
+        <syntax>
+          <unsignedInt/>
+          <default type="object" value="10"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ConfirmMaxDelay" access="readWrite">
+        <description>
+          Maximum delay of first confirm, expressed in {{units}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+          <default type="object" value="1"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ConfirmInitialTimeout" access="readWrite">
+        <description>
+          Initial confirm timeout, expressed in {{units}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+          <default type="object" value="1"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ConfirmMaxTimeout" access="readWrite">
+        <description>
+          Maximum confirm timeout, expressed in {{units}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+          <default type="object" value="4"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ConfirmMaxDuration" access="readWrite">
+        <description>
+          Maximum confirm duration, expressed in {{units}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+          <default type="object" value="10"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="RenewInitialTimeout" access="readWrite">
+        <description>
+          Initial renew timeout, expressed in {{units}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+          <default type="object" value="10"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="RenewMaxTimeout" access="readWrite">
+        <description>
+          Maximum renew timeout value, expressed in {{units}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+          <default type="object" value="600"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="RebindInitialTimeout" access="readWrite">
+        <description>
+          Initial rebind timeout, expressed in {{units}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+          <default type="object" value="10"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="RebindMaxTimeout" access="readWrite">
+        <description>
+          Maximum rebind timeout value, expressed in {{units}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+          <default type="object" value="600"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="InformationRequestMaxDelay" access="readWrite">
+        <description>
+          Maximum delay of first information-request, expressed in {{units}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+          <default type="object" value="1"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="InformationRequestInitialTimeout" access="readWrite">
+        <description>
+          Initial information-request timeout, expressed in {{units}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+          <default type="object" value="1"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="InformationRequestMaxTimeout" access="readWrite">
+        <description>
+          Maximum information-request timeout, expressed in {{units}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+          <default type="object" value="3600"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ReleaseInitialTimeout" access="readWrite">
+        <description>
+          Initial Release timeout, expressed in {{units}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+          <default type="object" value="1"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ReleaseMaxAttempts" access="readWrite">
+        <description>
+          Maximum release retry attempts.
+        </description>
+        <syntax>
+          <unsignedInt/>
+          <default type="object" value="4"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="DeclineInitialTimeout" access="readWrite">
+        <description>
+          Initial Decline timeout, expressed in {{units}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+          <default type="object" value="1"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="DeclineMaxAttempts" access="readWrite">
+        <description>
+          Maximum decline retry attempts.
+        </description>
+        <syntax>
+          <unsignedInt/>
+          <default type="object" value="4"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ReconfigureInitialTimeout" access="readWrite">
+        <description>
+          Initial reconfigure timeout, expressed in {{units}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+          <default type="object" value="2"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ReconfigureMaxAttempts" access="readWrite">
+        <description>
+          Maximum reconfigure attempts.
+        </description>
+        <syntax>
+          <unsignedInt/>
+          <default type="object" value="8"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="HopCountLimit" access="readWrite">
+        <description>
+          Maximum hop count in a relay-forward message.
+        </description>
+        <syntax>
+          <unsignedInt/>
+          <default type="object" value="32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="InformationRefreshTime" access="readWrite">
+        <description>
+          Default information refresh time, expressed in {{units}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+          <default type="object" value="86400"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="MinInformationRefreshTime" access="readWrite">
+        <description>
+          Minimum information refresh time, expressed in {{units}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+          <default type="object" value="600"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="MaxWaitTime" access="readWrite">
+        <description>
+          Maximum required time to wait for a response, expressed in {{units}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+          <default type="object" value="60"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="TimeoutRandomize" access="readWrite">
+        <description>
+          The Randomization factor for the retransmission timeout, in
+          {{units}}, as defined in {{bibref|RFC8415|15 Reliability of
+          Client-Initiated Message Exchanges}}.
+
+          E.g. a timeout of 1000ms with a randomization of 100 will end up
+          between 900 and 1100 ms.
+        </description>
+        <syntax>
+          <int>
+            <units value="ms"/>
+          </int>
+          <default type="object" value="100"/>
+        </syntax>
+      </parameter>
+    </object>
+
     <object name="Device.DHCPv6.Server." access="readOnly" minEntries="1"
         maxEntries="1" version="2.2">
       <description>
@@ -78873,12 +80913,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.2">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -78913,8 +80953,8 @@
           Pool association criterion.
 
           A hexbinary string used to identify one or more LAN devices, value of
-          the DHCPv6 Client Identifier (Option 1) {{bibref|RFC3315|Section
-          22.2}}. The option value is binary, so an exact match is REQUIRED.
+          the DHCPv6 Client Identifier (Option 1) {{bibref|RFC8415|Section
+          21.2}}. The option value is binary, so an exact match is REQUIRED.
 
           {{empty}} indicates this criterion is not used.
 
@@ -78949,7 +80989,7 @@
 
           A hexbinary string used to identify one or more LAN devices, value of
           the DHCPv6 Vendor Class Identifier (Option 16)
-          {{bibref|RFC3315|Section 22.16}}. The option value is binary, so an
+          {{bibref|RFC8415|Section 21.16}}. The option value is binary, so an
           exact match is REQUIRED.
 
           {{empty}} indicates this criterion is not used.
@@ -78981,8 +81021,8 @@
           Pool association criterion.
 
           A hexbinary string used to identify one or more LAN devices, value of
-          the DHCPv6 User Class Identifier (Option 15) {{bibref|RFC3315|Section
-          22.15}}.
+          the DHCPv6 User Class Identifier (Option 15) {{bibref|RFC8415|Section
+          21.15}}.
 
           {{empty}} indicates this criterion is not used.
         </description>
@@ -79087,7 +81127,7 @@
                 targetParent="###.IP.Interface.{i}.IPv6Prefix."
                 targetType="row"/>
           </string>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
@@ -79163,7 +81203,7 @@
                 targetParent="###.IP.Interface.{i}.IPv6Prefix."
                 targetType="row"/>
           </string>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
@@ -79255,7 +81295,7 @@
         <parameter ref="SourceAddress"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.2">
         <description>
           {{datatype|expand}}
 
@@ -79264,7 +81304,7 @@
           because automatically-created {{object}} instances can be transitory.
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -79416,7 +81456,7 @@
 
       <parameter name="Tag" access="readOnly">
         <description>
-          Option tag (code) {{bibref|RFC3315|Section 22.1}}.
+          Option tag (code) {{bibref|RFC8415|Section 21.1}}.
         </description>
         <syntax>
           <unsignedInt>
@@ -79466,18 +81506,18 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.2">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
       <parameter name="Tag" access="readWrite">
         <description>
-          Option tag (code) {{bibref|RFC3315|Section 22.1}}.
+          Option tag (code) {{bibref|RFC8415|Section 21.1}}.
         </description>
         <syntax>
           <unsignedInt>
@@ -79600,12 +81640,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -79933,6 +81973,36 @@
           <dataType ref="MACAddress"/>
         </syntax>
       </parameter>
+
+      <parameter name="SuccessCount" access="readOnly" version="2.18">
+        <description>
+          Count of the number of successful authentications from the
+          perspective of this supplicant.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="FailureCount" access="readOnly" version="2.18">
+        <description>
+          Count of the number of failed authentications from the perspective of
+          this supplicant.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Reset" access="readWrite" version="2.18">
+        <description>
+          Set this to {{true}} to reset this object's statistics counters to
+          zero.
+        </description>
+        <syntax command="true">
+          <boolean/>
+        </syntax>
+      </parameter>
     </object>
 
     <object name="Device.IEEE8021x.Supplicant.{i}.EAPMD5." access="readOnly"
@@ -80011,7 +82081,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="GroupNumberOfEntries" access="readOnly">
+      <parameter name="GroupNumberOfEntries" access="readOnly" version="2.15">
         <description>
           {{numentries}}
         </description>
@@ -80020,7 +82090,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="RoleNumberOfEntries" access="readOnly">
+      <parameter name="RoleNumberOfEntries" access="readOnly" version="2.15">
         <description>
           {{numentries}}
         </description>
@@ -80029,7 +82099,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="SupportedShellNumberOfEntries" access="readOnly">
+      <parameter name="SupportedShellNumberOfEntries" access="readOnly"
+          version="2.15">
         <description>
           {{numentries}}
         </description>
@@ -80037,6 +82108,63 @@
           <unsignedInt/>
         </syntax>
       </parameter>
+
+      <parameter name="SupportedCapabilities" access="readOnly" version="2.18">
+        <description>
+          This parameter contains the supported capabilities on this system.
+          These are privileges that allow precise control for individual
+          processes. Essentially, capabilities can be assigned to processes
+          giving them necessary permissions to perform certain functions.
+          Please refer to Linux man page on capabilities ("capabilities(7) -
+          Linux manual page").
+        </description>
+        <syntax>
+          <list/>
+          <string>
+            <enumeration value="CAP_AUDIT_CONTROL"/>
+            <enumeration value="CAP_AUDIT_READ"/>
+            <enumeration value="CAP_AUDIT_WRITE"/>
+            <enumeration value="CAP_BLOCK_SUSPEND"/>
+            <enumeration value="CAP_BPF"/>
+            <enumeration value="CAP_CHECKPOINT_RESTORE"/>
+            <enumeration value="CAP_CHOWN"/>
+            <enumeration value="CAP_DAC_OVERRIDE"/>
+            <enumeration value="CAP_DAC_READ_SEARCH"/>
+            <enumeration value="CAP_FOWNER"/>
+            <enumeration value="CAP_FSETID"/>
+            <enumeration value="CAP_IPC_LOCK"/>
+            <enumeration value="CAP_IPC_OWNER"/>
+            <enumeration value="CAP_KILL"/>
+            <enumeration value="CAP_LEASE"/>
+            <enumeration value="CAP_LINUX_IMMUTABLE"/>
+            <enumeration value="CAP_MAC_ADMIN"/>
+            <enumeration value="CAP_MAC_OVERRIDE"/>
+            <enumeration value="CAP_MKNOD"/>
+            <enumeration value="CAP_NET_ADMIN"/>
+            <enumeration value="CAP_NET_BIND_SERVICE"/>
+            <enumeration value="CAP_NET_BROADCAST"/>
+            <enumeration value="CAP_NET_RAW"/>
+            <enumeration value="CAP_PERFMON"/>
+            <enumeration value="CAP_SETGID"/>
+            <enumeration value="CAP_SETFCAP"/>
+            <enumeration value="CAP_SETPCAP"/>
+            <enumeration value="CAP_SETUID"/>
+            <enumeration value="CAP_SYS_ADMIN"/>
+            <enumeration value="CAP_SYS_BOOT"/>
+            <enumeration value="CAP_SYS_CHROOT"/>
+            <enumeration value="CAP_SYS_MODULE"/>
+            <enumeration value="CAP_SYS_NICE"/>
+            <enumeration value="CAP_SYS_PACCT"/>
+            <enumeration value="CAP_SYS_PTRACE"/>
+            <enumeration value="CAP_SYS_RAWIO"/>
+            <enumeration value="CAP_SYS_RESOURCE"/>
+            <enumeration value="CAP_SYS_TIME"/>
+            <enumeration value="CAP_SYS_TTY_CONFIG"/>
+            <enumeration value="CAP_SYSLOG"/>
+            <enumeration value="CAP_WAKE_ALARM"/>
+          </string>
+        </syntax>
+      </parameter>
     </object>
 
     <object name="Device.Users.User.{i}." access="readWrite"
@@ -80055,12 +82183,12 @@
         <parameter ref="UserID"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -80078,7 +82206,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="UserID" access="readWrite">
+      <parameter name="UserID" access="readWrite" version="2.15">
         <description>
           Unique Identifier of the user. Depending on the implementation this
           can be the unique identifier assigned by the underlying system.
@@ -80089,7 +82217,7 @@
       </parameter>
 
       <parameter name="RemoteAccessCapable" access="readWrite"
-          status="deprecated">
+          status="obsoleted">
         <description>
           Allows this user to remotely access the UserInterface via the
           mechanism defined in {{object|##.UserInterface.HTTPAccess}}
@@ -80097,6 +82225,8 @@
           {{deprecated|2.16|due to the introduction of
           {{object|.UserInterface.HTTPAccess.{i}.}} and
           {{param|RoleParticipation}}}}
+
+          {{obsoleted|2.18}}
         </description>
         <syntax>
           <boolean/>
@@ -80138,7 +82268,7 @@
           <string>
             <pathRef refType="weak" targetParent="#.Group." targetType="row"/>
           </string>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
@@ -80153,7 +82283,7 @@
           <string>
             <pathRef refType="weak" targetParent="#.Role." targetType="row"/>
           </string>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
@@ -80266,12 +82396,12 @@
         <parameter ref="GroupID"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.15">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -80290,7 +82420,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="GroupID" access="readWrite">
+      <parameter name="GroupID" access="readWrite" version="2.15">
         <description>
           Unique Identifier of the group. Depending on the implementation this
           can be the unique identifier assigned by the underlying system.
@@ -80324,7 +82454,7 @@
           <string>
             <pathRef refType="weak" targetParent="#.Role." targetType="row"/>
           </string>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
@@ -80355,12 +82485,12 @@
         <parameter ref="Name"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.15">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -80402,12 +82532,12 @@
         <parameter ref="RoleID"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.15">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -80453,6 +82583,18 @@
           <default type="object" value="false"/>
         </syntax>
       </parameter>
+
+      <parameter name="RequiredCapabilities" access="readWrite" version="2.18">
+        <description>
+          Capabilities that have been assigned to this {{object}}.
+        </description>
+        <syntax>
+          <list/>
+          <string>
+            <enumerationRef targetParam=".Users.SupportedCapabilities"/>
+          </string>
+        </syntax>
+      </parameter>
     </object>
 
     <object name="Device.SmartCardReaders." access="readOnly" minEntries="1"
@@ -80485,12 +82627,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.3">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -81132,7 +83274,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="LastUpdate" access="readOnly">
+      <parameter name="LastUpdate" access="readOnly" version="2.6">
         <description>
           The date and time at which the last advertisement from this
           {{object}} was received.
@@ -81280,7 +83422,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="LastUpdate" access="readOnly">
+      <parameter name="LastUpdate" access="readOnly" version="2.6">
         <description>
           The date and time at which the last advertisement from this
           {{object}} was received.
@@ -81400,7 +83542,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="LastUpdate" access="readOnly">
+      <parameter name="LastUpdate" access="readOnly" version="2.6">
         <description>
           The date and time at which the last advertisement from this
           {{object}} was received.
@@ -81410,7 +83552,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ParentDevice" access="readOnly">
+      <parameter name="ParentDevice" access="readOnly" version="2.6">
         <description>
           {{reference|the {{object|#.RootDevice}} or {{object|#.Device}} table
           entries that embeds this {{object}}}} This parameter is populated by
@@ -81624,7 +83766,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="DeviceCategory" access="readOnly">
+      <parameter name="DeviceCategory" access="readOnly" version="2.8">
         <description>
           Each list item is the value of an element in the Device Description
           Document for this {{object}} that indicates a device category (e.g.
@@ -81661,7 +83803,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ManufacturerOUI" access="readOnly">
+      <parameter name="ManufacturerOUI" access="readOnly" version="2.8">
         <description>
           The value of an element in the Device Description Document for this
           {{object}} that indicates the manufacturer OUI if this value is
@@ -81940,7 +84082,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="Results" access="readOnly" activeNotify="canDeny">
+      <parameter name="Results" access="readOnly" activeNotify="canDeny"
+          version="2.0">
         <description>
           Results of self-test (vendor specific).
         </description>
@@ -82098,7 +84241,7 @@
         {{enum|Advanced|Config}} configuration.
       </description>
 
-      <parameter name="Enable" access="readWrite">
+      <parameter name="Enable" access="readWrite" version="2.2">
         <description>
           Enables or disables the Firewall.
 
@@ -82160,7 +84303,7 @@
                 {{param|AdvancedLevel}}.
               </description>
             </enumeration>
-            <enumeration value="Policy" optional="true">
+            <enumeration value="Policy" optional="true" version="2.16">
               <description>
                 Policy firewall configuration applies, as specified by
                 {{param|PolicyLevel}}.
@@ -82170,7 +84313,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="AdvancedLevel" access="readWrite">
+      <parameter name="AdvancedLevel" access="readWrite" version="2.2">
         <description>
           Selects the currently active Firewall Level.
 
@@ -82184,7 +84327,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="PolicyLevel" access="readWrite">
+      <parameter name="PolicyLevel" access="readWrite" version="2.16">
         <description>
           Selects the currently active Firewall Policy Level.
 
@@ -82198,7 +84341,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Type" access="readOnly">
+      <parameter name="Type" access="readOnly" version="2.2">
         <description>
           Firewall Type. {{enum}}
 
@@ -82265,7 +84408,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="LevelNumberOfEntries" access="readOnly">
+      <parameter name="LevelNumberOfEntries" access="readOnly" version="2.2">
         <description>
           {{numentries}}
         </description>
@@ -82274,7 +84417,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ChainNumberOfEntries" access="readOnly">
+      <parameter name="ChainNumberOfEntries" access="readOnly" version="2.2">
         <description>
           {{numentries}}
         </description>
@@ -82283,7 +84426,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="DMZNumberOfEntries" access="readOnly">
+      <parameter name="DMZNumberOfEntries" access="readOnly" version="2.16">
         <description>
           {{numentries}}
         </description>
@@ -82292,7 +84435,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="ServiceNumberOfEntries" access="readOnly">
+      <parameter name="ServiceNumberOfEntries" access="readOnly"
+          version="2.16">
         <description>
           {{numentries}}
         </description>
@@ -82301,7 +84445,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="PinholeNumberOfEntries" access="readOnly">
+      <parameter name="PinholeNumberOfEntries" access="readOnly"
+          version="2.16">
         <description>
           {{numentries}}
         </description>
@@ -82310,7 +84455,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="PolicyNumberOfEntries" access="readOnly">
+      <parameter name="PolicyNumberOfEntries" access="readOnly" version="2.16">
         <description>
           {{numentries}}
         </description>
@@ -82319,7 +84464,17 @@
         </syntax>
       </parameter>
 
-      <parameter name="InterfaceSettingNumberOfEntries" access="readOnly">
+      <parameter name="InterfaceSettingNumberOfEntries" access="readOnly"
+          version="2.17">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="SetNumberOfEntries" access="readOnly" version="2.18">
         <description>
           {{numentries}}
         </description>
@@ -82347,12 +84502,12 @@
         <parameter ref="Name"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.2">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -82391,7 +84546,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Policies" access="readWrite">
+      <parameter name="Policies" access="readWrite" version="2.16">
         <description>
           {{list}} {{reference|a {{object|#.Policy}}}} {{param}} only applies
           when {{param|#.Config}} is {{enum|Policy|#.Config}}.
@@ -82497,12 +84652,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.16">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -82710,12 +84865,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.2">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -82868,12 +85023,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.2">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -83177,6 +85332,38 @@
         </syntax>
       </parameter>
 
+      <parameter name="DestMatchSet" access="readWrite" version="2.18">
+        <description>
+          {{object}} criterion.
+
+          Destination Match Set, Matches packets if their destination is found
+          in the designated {{object|##.Set.}} reference. {{empty}} indicates
+          this criterion is not used for matching.
+        </description>
+        <syntax>
+          <string>
+            <pathRef refType="strong" targetParent="##.Set." targetType="row"/>
+          </string>
+          <default type="object" value=""/>
+        </syntax>
+      </parameter>
+
+      <parameter name="DestMatchSetExclude" access="readWrite" version="2.18">
+        <description>
+          {{object}} criterion.
+
+          Destination Exclude Match Set, Matches packets if their destination
+          is not found in the designated {{object|##.Set.}} reference.
+          {{empty}} indicates this criterion is not used for matching.
+        </description>
+        <syntax>
+          <string>
+            <pathRef refType="strong" targetParent="##.Set." targetType="row"/>
+          </string>
+          <default type="object" value=""/>
+        </syntax>
+      </parameter>
+
       <parameter name="SourceIP" access="readWrite">
         <description>
           {{object}} criterion.
@@ -83222,6 +85409,39 @@
         </syntax>
       </parameter>
 
+      <parameter name="SourceMatchSet" access="readWrite" version="2.18">
+        <description>
+          {{object}} criterion.
+
+          Source Match Set, Matches packets if their source is found in the
+          designated {{object|##.Set.}} reference. {{empty}} indicates this
+          criterion is not used for matching.
+        </description>
+        <syntax>
+          <string>
+            <pathRef refType="strong" targetParent="##.Set." targetType="row"/>
+          </string>
+          <default type="object" value=""/>
+        </syntax>
+      </parameter>
+
+      <parameter name="SourceMatchSetExclude" access="readWrite"
+          version="2.18">
+        <description>
+          {{object}} criterion.
+
+          Source Exclude Match Set, Matches packets if their source is not
+          found in the designated {{object|##.Set.}} reference. {{empty}}
+          indicates this criterion is not used for matching.
+        </description>
+        <syntax>
+          <string>
+            <pathRef refType="strong" targetParent="##.Set." targetType="row"/>
+          </string>
+          <default type="object" value=""/>
+        </syntax>
+      </parameter>
+
       <parameter name="Protocol" access="readWrite">
         <description>
           {{object}} criterion.
@@ -83419,7 +85639,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ConnectionState" access="readWrite">
+      <parameter name="ConnectionState" access="readWrite" version="2.16">
         <description>
           Matches only packets according to the following connection states.
           {{empty}} indicates this criterion is not used for matching.
@@ -83456,7 +85676,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SourceMAC" access="readWrite">
+      <parameter name="SourceMAC" access="readWrite" version="2.16">
         <description>
           Source MAC address. {{empty}} indicates this criterion is not used
           for matching.
@@ -83467,7 +85687,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SourceMACExclude" access="readWrite">
+      <parameter name="SourceMACExclude" access="readWrite" version="2.16">
         <description>
           If {{false}}, the rule matches only those packets that match the
           {{param|SourceMAC}} entry, if specified.
@@ -83500,12 +85720,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.16">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -83532,6 +85752,13 @@
             <enumeration value="Enabled">
               <description>Indicates that the pinhole is enabled.</description>
             </enumeration>
+            <enumeration value="Inactive" version="2.18">
+              <description>
+                Indicates that the pinhole is still enabled but has been
+                temporarily deactivated due to the Schedules defined in
+                {{param|ScheduleRef}}.
+              </description>
+            </enumeration>
             <enumeration value="Error_Misconfigured">
               <description>
                 Indicates that a necessary configuration value is undefined or
@@ -83548,9 +85775,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Origin" access="readOnly">
+      <parameter name="Origin" access="writeOnceReadOnly">
         <description>
           Indicates the Origin of the {{object}} instance.
+
+          Note: This parameter was changed to writeOnceReadOnly in the
+          Device:2.18 version.
         </description>
         <syntax>
           <string>
@@ -83566,7 +85796,7 @@
                 system itself.
               </description>
             </enumeration>
-            <enumeration value="UPnP">
+            <enumeration value="UPnP" version="2.17">
               <description>
                 Used for indicating that the pinhole rule was created by a
                 device using UPnP-IGD.
@@ -83608,7 +85838,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="LeaseDuration" access="readWrite">
+      <parameter name="LeaseDuration" access="readWrite" version="2.17">
         <description>
           Determines the time to live, in {{units}}, of a pin hole lease, where
           "time to live" means the number of {{units}} before the pin hole
@@ -83626,7 +85856,7 @@
       </parameter>
 
       <parameter name="RemainingLeaseTime" access="readOnly"
-          activeNotify="canDeny">
+          activeNotify="canDeny" version="2.17">
         <description>
           For a dynamic (non-static) pin hole, when this parameter is read, the
           value represents the time (in {{units}}) remaining on the pin hole
@@ -83658,6 +85888,23 @@
         </syntax>
       </parameter>
 
+      <parameter name="SourcePortRangeMax" access="readWrite" version="2.18">
+        <description>
+          If specified, indicates the {{object}} criterion is to include the
+          port range from {{param|SourcePort}} through {{param}} (inclusive).
+          If specified, {{param}} MUST be greater than or equal to
+          {{param|SourcePort}}.
+
+          A value of -1 indicates that no port range is specified.
+        </description>
+        <syntax>
+          <int>
+            <range minInclusive="-1" maxInclusive="65535"/>
+          </int>
+          <default type="object" value="-1"/>
+        </syntax>
+      </parameter>
+
       <parameter name="DestPort" access="readWrite">
         <description>
           Destination port number. A value of ''-1'' indicates this criterion
@@ -83671,6 +85918,23 @@
         </syntax>
       </parameter>
 
+      <parameter name="DestPortRangeMax" access="readWrite" version="2.18">
+        <description>
+          If specified, indicates the {{object}} criterion is to include the
+          port range from {{param|DestPort}} through {{param}} (inclusive). If
+          specified, {{param}} MUST be greater than or equal to
+          {{param|DestPort}}.
+
+          A value of -1 indicates that no port range is specified.
+        </description>
+        <syntax>
+          <int>
+            <range minInclusive="-1" maxInclusive="65535"/>
+          </int>
+          <default type="object" value="-1"/>
+        </syntax>
+      </parameter>
+
       <parameter name="IPVersion" access="readWrite">
         <description>
           IP Protocol Version as specified in {{bibref|IANA-ipversionnumbers}}.
@@ -83697,15 +85961,16 @@
 
           * ''6'' (TCP)
 
-          * ''17''(UDP) A value of ''-1'' indicates this criterion is not used
-            for matching.
+          * ''17'' (UDP)
+
+          A value of ''-1'' indicates this criterion is not used for matching.
         </description>
         <syntax>
           <list/>
           <int>
             <range minInclusive="-1" maxInclusive="255"/>
           </int>
-          <default type="object" value="-1"/>
+          <default type="object" value="[-1]"/>
         </syntax>
       </parameter>
 
@@ -83744,6 +86009,22 @@
           <dataType ref="MACAddress"/>
         </syntax>
       </parameter>
+
+      <parameter name="ScheduleRef" access="readWrite" version="2.18">
+        <description>
+          Each reference provides a schedule where time based access can be
+          enabled. When {{param}} is {{empty}} the {{object}} is not scheduled,
+          and the {{param|Enable}} defines the operational state.
+        </description>
+        <syntax>
+          <list/>
+          <string>
+            <pathRef refType="strong" targetParent=".Schedules.Schedule."
+                targetType="row"/>
+          </string>
+          <default type="object" value="[]"/>
+        </syntax>
+      </parameter>
     </object>
 
     <object name="Device.Firewall.DMZ.{i}." access="readWrite"
@@ -83751,7 +86032,7 @@
         minEntries="0" maxEntries="unbounded" version="2.16">
       <description>
         Firewall DMZ object that is be used for configuring a demilitarized
-        zone. A DMZ network is a seperate network perimeter that protects the
+        zone. A DMZ network is a separate network perimeter that protects the
         internal network from untrusted traffic. Typically the DMZ is located
         between two firewalls, the firewall of the internal network and the
         firewall responsible for handling untrusted traffic.
@@ -83773,12 +86054,12 @@
         <parameter ref="SourcePrefix"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.16">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -83823,9 +86104,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Origin" access="readWrite">
+      <parameter name="Origin" access="writeOnceReadOnly">
         <description>
           Indicates who configured the {{object}} instance.
+
+          Note: This parameter was changed to writeOnceReadOnly in the
+          Device:2.18 version.
         </description>
         <syntax>
           <string>
@@ -83877,7 +86161,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="LeaseDuration" access="readWrite">
+      <parameter name="LeaseDuration" access="readWrite" version="2.17">
         <description>
           Determines the time to live, in {{units}}, of a DMZ rule, where "time
           to live" means the number of {{units}} before the DMZ rule expires.
@@ -83894,7 +86178,7 @@
       </parameter>
 
       <parameter name="RemainingLeaseTime" access="readOnly"
-          activeNotify="canDeny">
+          activeNotify="canDeny" version="2.17">
         <description>
           For a dynamic (non-static) DMZ rule, when this parameter is read, the
           value represents the time (in {{units}}) remaining on the DMZ rule
@@ -83962,12 +86246,12 @@
         <parameter ref="SourcePrefixes"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.16">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -84037,7 +86321,7 @@
           <int>
             <range minInclusive="-1" maxInclusive="65535"/>
           </int>
-          <default type="object" value="-1"/>
+          <default type="object" value="[-1]"/>
         </syntax>
       </parameter>
 
@@ -84067,15 +86351,16 @@
 
           * ''6'' (TCP)
 
-          * ''17''(UDP) A value of ''-1'' indicates this criterion is not used
-            for matching.
+          * ''17'' (UDP)
+
+          A value of ''-1'' indicates this criterion is not used for matching.
         </description>
         <syntax>
           <list/>
           <int>
             <range minInclusive="-1" maxInclusive="255"/>
           </int>
-          <default type="object" value="-1"/>
+          <default type="object" value="[-1]"/>
         </syntax>
       </parameter>
 
@@ -84103,7 +86388,7 @@
         <syntax>
           <list/>
           <dataType ref="IPPrefix"/>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
@@ -84194,12 +86479,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.17">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -84276,6 +86561,18 @@
         </syntax>
       </parameter>
 
+      <parameter name="IPv6PassTroughICMPEchoRequest" access="readWrite"
+          version="2.18">
+        <description>
+          When {{true}} the 'ICMPv6 echo request' packet must be forward to the
+          LAN device. When {{false}} the 'ICMPv6 echo request' packet must be
+          dropped.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
       <parameter name="StealthMode" access="readWrite">
         <description>
           Enables or disables the stealth mode. Stealth mode defines how the
@@ -84569,6 +86866,215 @@
       </parameter>
     </object>
 
+    <object name="Device.Firewall.Set.{i}." access="readWrite"
+        numEntriesParameter="SetNumberOfEntries" enableParameter="Enable"
+        minEntries="0" maxEntries="unbounded" version="2.18">
+      <description>
+        This object is used for configuring sets of IP, MAC addresses and/or
+        port numbers which can then be used in conjunction with the firewall.
+
+        It provides a more efficient way to manage large collections of
+        addresses and ports compared to traditional methods of listing them
+        individually within firewall rules.
+      </description>
+      <uniqueKey functional="false">
+        <parameter ref="Alias"/>
+      </uniqueKey>
+      <uniqueKey functional="true">
+        <parameter ref="Name"/>
+      </uniqueKey>
+
+      <parameter name="Alias" access="readWrite" version="2.18">
+        <description>
+          {{datatype|expand}}
+        </description>
+        <syntax>
+          <dataType ref="_AliasCWMP"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Enable" access="readWrite">
+        <description>
+          Enables or disables this {{object}} entry.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="object" value="false"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Origin" access="writeOnceReadOnly">
+        <description>
+          Indicates the Origin of the {{object}} instance.
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="User">
+              <description>
+                Used for indicating that the set rule was created by the
+                end-user. For example through the web-ui.
+              </description>
+            </enumeration>
+            <enumeration value="System">
+              <description>
+                Used for indicating that the set rule was created by the system
+                itself.
+              </description>
+            </enumeration>
+            <enumeration value="Controller">
+              <description>
+                Used for indicating that the set rule was created by a
+                Controller.
+              </description>
+            </enumeration>
+          </string>
+          <default type="object" value="Controller"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Name" access="readWrite">
+        <description>
+          Human-readable name associated with this {{object}} entry.
+        </description>
+        <syntax>
+          <string>
+            <size maxLength="31"/>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="Type" access="readWrite">
+        <description>
+          Describes the intention of the {{object|Rule}} entries and what it
+          contains.
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="IPAddresses">
+              <description>
+                The Rule set entry describes only a list of IPaddresses.
+              </description>
+            </enumeration>
+            <enumeration value="Ports">
+              <description>
+                The Rule set entry describes only a list of ports.
+              </description>
+            </enumeration>
+            <enumeration value="MACAddresses">
+              <description>
+                The Rule set entry describes only a list of MAC addresses.
+              </description>
+            </enumeration>
+          </string>
+          <default type="object" value="IPAddresses"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="IPVersion" access="readWrite">
+        <description>
+          IP Protocol Version as specified in {{bibref|IANA-ipversionnumbers}}.
+          For example:
+
+          * ''4'' (IPv4)
+
+          * ''6'' (IPv6)
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range minInclusive="4" maxInclusive="4"/>
+            <range minInclusive="6" maxInclusive="6"/>
+          </unsignedInt>
+          <default type="object" value="6"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="RuleNumberOfEntries" access="readOnly">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object name="Device.Firewall.Set.{i}.Rule.{i}." access="readWrite"
+        numEntriesParameter="RuleNumberOfEntries" minEntries="0"
+        maxEntries="unbounded" version="2.18">
+      <description>
+        Firewall Rule object that is used for configuring the set lists.
+      </description>
+      <uniqueKey functional="false">
+        <parameter ref="Alias"/>
+      </uniqueKey>
+
+      <parameter name="Alias" access="readWrite" version="2.18">
+        <description>
+          {{datatype|expand}}
+        </description>
+        <syntax>
+          <dataType ref="_AliasCWMP"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Exclude" access="readWrite">
+        <description>
+          Specifies if this rule entry should match or not match the configured
+          criteria.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="object" value="false"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="IPAddressList" access="readWrite">
+        <description>
+          Source IPv4 or IPv6 address or subnet mask.
+
+          Note: The IP version of the IP address MUST correspond to the IP
+          version set in {{param|#.IPVersion}}. Can not be used in combination
+          with {{param|MACAddressList}} or {{param|PortList}}.
+        </description>
+        <syntax>
+          <list/>
+          <dataType ref="IPAddress"/>
+          <default type="object" value="[]"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="MACAddressList" access="readWrite">
+        <description>
+          Specifies the MACAddress that can be used by the {{object}} entry.
+
+          Note: Can not be used in combination with {{param|IPAddressList}} or
+          {{param|PortList}}.
+        </description>
+        <syntax>
+          <dataType ref="MACAddress"/>
+          <default type="object" value=""/>
+        </syntax>
+      </parameter>
+
+      <parameter name="PortList" access="readWrite">
+        <description>
+          Specifies the Port number or a port range that can be used by the
+          {{object}} entry. Syntax:
+
+          A single port can be configured as e.g. '80'. A port range can be
+          configured as '8000-80010'.
+
+          Note: Can not be used in combination with {{param|MACAddressList}} or
+          {{param|IPAddressList}}.
+        </description>
+        <syntax>
+          <list/>
+          <string/>
+          <default type="object" value="[]"/>
+        </syntax>
+      </parameter>
+    </object>
+
     <object name="Device.PeriodicStatistics." access="readOnly" minEntries="1"
         maxEntries="1" version="2.0">
       <description>
@@ -84632,12 +87138,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.3">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -84774,7 +87280,7 @@
           <unsignedInt>
             <units value="seconds"/>
           </unsignedInt>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
@@ -84963,12 +87469,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.3">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -85054,6 +87560,14 @@
                 interval
               </description>
             </enumeration>
+            <enumeration value="Histogram" version="2.18">
+              <description>
+                Statistic is a histogram representing the sampled values during
+                the sample interval with histogram bin spacing defined by
+                {{param|HistogramBinBoundaries}}. With this selection, the
+                output is in {{param|ValuesIfHistogram}}.
+              </description>
+            </enumeration>
           </string>
           <default type="object" value="Latest"/>
         </syntax>
@@ -85114,7 +87628,7 @@
           <unsignedInt>
             <units value="seconds"/>
           </unsignedInt>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
@@ -85132,7 +87646,7 @@
           <unsignedInt>
             <range maxInclusive="1"/>
           </unsignedInt>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
@@ -85147,11 +87661,42 @@
           If the {{param|SampleMode}} parameter is not present, or is
           inappropriate for the referenced parameter, the statistics values
           MUST be collected in Current mode.
+
+          if {{param|CalculationMode}} has value "Histogram" then the values of
+          the referenced parameter are in {{param|ValuesIfHistogram}}.
         </description>
         <syntax>
           <list/>
           <string/>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ValuesIfHistogram" access="readOnly"
+          activeNotify="canDeny" version="2.18">
+        <description>
+          {{list}} Each entry indicates the value of the referenced parameter,
+          as determined by {{param|SampleMode}}, during the sample interval.
+
+          The statistics values in this comma-separated list MUST be in time
+          order, with the oldest one first and the most recent one last.
+
+          If the {{param|SampleMode}} parameter is not present, or is
+          inappropriate for the referenced parameter, the statistics values
+          MUST be collected in Current mode.
+
+          This parameter applies only if {{param|CalculationMode}} has value
+          "Histogram" and then this parameter is the values of the sampled
+          histograms, where each histogram bin is the count of the number of
+          samples within the corresponding {{param|HistogramBinBoundaries}},
+          and this parameter is expressed using square brackets to protect
+          comma separators within nested lists. For example,
+          [12,5,1,0,1],[12,3,2,1,0] represents two histograms.
+        </description>
+        <syntax>
+          <list nestedBrackets="required"/>
+          <string/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
@@ -85195,6 +87740,26 @@
           <default type="object" value="0"/>
         </syntax>
       </parameter>
+
+      <parameter name="HistogramBinBoundaries" access="readWrite"
+          version="2.18">
+        <description>
+          {{list}} Definition of the boundaries between histogram bins. Applies
+          if {{param|CalculationMode}} has value "Histogram". Each value is the
+          minimum value of this bin, and the next value is just above the
+          maximum value of this bin. For example, “0,1,4,8,” defines the four
+          histogram bins: 0 to 1 but not including values identically equal to
+          1, 1 to 4 but not including values identically equal to 4, 4 to 8 but
+          not including values identically equal to 8, and greater than or
+          equal to 8. (No value after the last comma means no upper bound.) If
+          this parameter is set to an empty string, then no histogram will be
+          collected.
+        </description>
+        <syntax>
+          <list/>
+          <string/>
+        </syntax>
+      </parameter>
     </object>
 
     <object name="Device.FaultMgmt." access="readOnly" minEntries="1"
@@ -86393,7 +88958,7 @@
       </parameter>
 
       <parameter name="GPSReset" access="readWrite"
-          dmr:previousParameter="NumberOfSatellites">
+          dmr:previousParameter="NumberOfSatellites" version="2.4">
         <description>
           Setting this to {{true}} will cause a reset on the GPS Hardware.
           Setting this to {{false}} has no effect.
@@ -86803,12 +89368,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.4">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -88069,7 +90634,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="ParameterWildCardSupported" access="readOnly">
+      <parameter name="ParameterWildCardSupported" access="readOnly"
+          version="2.10">
         <description>
           When {{true}}, the Device supports the use of wildcards to determine
           the parameters that are reported using a Profile.
@@ -88152,16 +90718,16 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.5">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
-      <parameter name="Name" access="readWrite">
+      <parameter name="Name" access="readWrite" version="2.10">
         <description>
           The name of the profile.
         </description>
@@ -88172,7 +90738,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="NumberOfRetainedFailedReports" access="readWrite">
+      <parameter name="NumberOfRetainedFailedReports" access="readWrite"
+          version="2.10">
         <description>
           The number of failed reports to be retained and transmitted (in
           addition to the current report) at the end of the current reporting
@@ -88446,7 +91013,7 @@
         omitted if {{param|Exclude}} is {{true}}.
       </description>
 
-      <parameter name="Name" access="readWrite">
+      <parameter name="Name" access="readWrite" version="2.10">
         <description>
           Name of the parameter in the report body.
 
@@ -88488,7 +91055,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Exclude" access="readWrite">
+      <parameter name="Exclude" access="readWrite" version="2.16">
         <description>
           When {{true}}, the entry is to be excluded from the report.
         </description>
@@ -88856,7 +91423,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="PersistAcrossReboot" access="readWrite">
+      <parameter name="PersistAcrossReboot" access="readWrite" version="2.12">
         <description>
           Determines whether or not data transfers that have failed are
           required to be persisted across reboots.
@@ -88986,7 +91553,8 @@
         Top level object for dynamically managed software applications.
       </description>
 
-      <parameter name="ExecEnvClassNumberOfEntries" access="readOnly">
+      <parameter name="ExecEnvClassNumberOfEntries" access="readOnly"
+          version="2.16">
         <description>
           {{numentries}}
         </description>
@@ -89041,12 +91609,12 @@
         <parameter ref="Version"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.16">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -89100,7 +91668,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="CapabilityNumberOfEntries" access="readOnly">
+      <parameter name="CapabilityNumberOfEntries" access="readOnly"
+          version="2.16">
         <description>
           {{numentries}}
         </description>
@@ -89262,12 +91831,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.1">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -89367,7 +91936,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="InitialExecutionUnitRunLevel" access="readWrite">
+      <parameter name="InitialExecutionUnitRunLevel" access="readWrite"
+          version="2.4">
         <description>
           Indicates the initial value on creation for
           {{param|#.ExecutionUnit.{i}.RunLevel}} for all Execution Unit
@@ -89452,7 +92022,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="AllocatedCPUPercent" access="readOnly">
+      <parameter name="AllocatedCPUPercent" access="readOnly" version="2.16">
         <description>
           The percentage of CPU time allocated to this ExecEnv, i.e. the
           percentage of the whole CPU (all cores) which is available to the
@@ -89503,7 +92073,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="AvailableCPUPercent" access="readOnly">
+      <parameter name="AvailableCPUPercent" access="readOnly" version="2.16">
         <description>
           The fraction (in {{units}}) of CPU time currently available to this
           {{object}}. This value changes as the {{object|#.ExecutionUnit}}
@@ -89537,9 +92107,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="ProcessorRefList" access="readOnly">
+      <parameter name="ProcessorRefList" access="readOnly" status="deprecated">
         <description>
           Represents the processors that this {{object}} has available to it.
+
+          {{deprecated|2.18|because the referenced
+          object,{{object|##.DeviceInfo.Processor.}}, is deprecated.}}
         </description>
         <syntax>
           <list/>
@@ -89550,7 +92123,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="CreatedAt" access="readOnly">
+      <parameter name="CreatedAt" access="readOnly" version="2.16">
         <description>
           The time and date at which this {{object}} was created. If the
           {{object}} is provided by the primary firmware of the device then
@@ -89561,7 +92134,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ExecEnvClassRef" access="readOnly">
+      <parameter name="ExecEnvClassRef" access="readOnly" version="2.16">
         <description>
           The {{object|#.ExecEnvClass}} of which this {{object}} is an
           instance.
@@ -89574,7 +92147,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="ApplicationDataNumberOfEntries" access="readOnly">
+      <parameter name="ApplicationDataNumberOfEntries" access="readOnly"
+          version="2.16">
         <description>
           {{numentries}}
         </description>
@@ -89655,12 +92229,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.16">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -89737,12 +92311,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.1">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -89939,7 +92513,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Installed" access="readOnly">
+      <parameter name="Installed" access="readOnly" version="2.16">
         <description>
           Documents when this {{object}} instance was installed.
         </description>
@@ -89948,7 +92522,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="LastUpdate" access="readOnly">
+      <parameter name="LastUpdate" access="readOnly" version="2.16">
         <description>
           Documents when this {{object}} instance was last updated.
         </description>
@@ -90012,12 +92586,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.1">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -90222,7 +92796,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="AllocatedDiskSpace" access="readOnly">
+      <parameter name="AllocatedDiskSpace" access="readOnly" version="2.16">
         <description>
           The amount of disk space measured in {{units}} allocated to this
           {{object}}. A value of -1 MUST be used for {{object}} instances where
@@ -90251,7 +92825,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="AllocatedMemory" access="readOnly">
+      <parameter name="AllocatedMemory" access="readOnly" version="2.16">
         <description>
           The amount of physical RAM measured in {{units}} allocated to this
           {{object}}. A value of -1 MUST be used for {{object}} instances where
@@ -90279,7 +92853,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="AllocatedCPUPercent" access="readOnly">
+      <parameter name="AllocatedCPUPercent" access="readOnly" version="2.16">
         <description>
           The CPU power allocated to this {{object}}, as a fraction (in
           {{units}}) of the CPU allocation of the {{object|#.ExecEnv}} in which
@@ -90294,7 +92868,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="CPUPercentInUse" access="readOnly">
+      <parameter name="CPUPercentInUse" access="readOnly" version="2.16">
         <description>
           The CPU power currently being used by this by this {{object}}, as a
           fraction (in {{units}}) of the CPU allocation of the
@@ -90310,6 +92884,88 @@
         </syntax>
       </parameter>
 
+      <parameter name="AllocatedEUUID" access="readOnly" version="2.18">
+        <description>
+          This parameter is allocated by the host system. This is the user
+          identifier within the execution unit's environment. This UID is local
+          to the execution unit and is used by the EU's internal processes to
+          manage permissions. By default, processes within the EU execute as
+          root (UID 0) unless otherwise specified.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="AllocatedEUGID" access="readOnly" version="2.18">
+        <description>
+          This parameter is allocated by the host system. This is the group
+          identifier within the execution unit's environment. This GID is local
+          to the execution unit and is used by the EU's internal processes to
+          manage permissions.
+        </description>
+        <syntax>
+          <string/>
+        </syntax>
+      </parameter>
+
+      <parameter name="AllocatedHostUID" access="readOnly" version="2.18">
+        <description>
+          This parameter is allocated by the host system. This is the user
+          identifier on the host system where this EU is running. This UID is
+          system wide and is managed by the kernel.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="AllocatedHostGID" access="readOnly" version="2.18">
+        <description>
+          This parameter is allocated by the host system. This is the group
+          identifier on the host system where this EU is running. This GID is
+          system wide and is managed by the kernel.
+        </description>
+        <syntax>
+          <string/>
+        </syntax>
+      </parameter>
+
+      <parameter name="CreationTime" access="readOnly" version="2.18">
+        <description>
+          The date and time when the EU was created.
+        </description>
+        <syntax>
+          <dateTime/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Uptime" access="readOnly" version="2.18">
+        <description>
+          The amount of time in {{units}} that this EU has been up and running
+          since it was activated.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="ShutdownDelay" access="readWrite" version="2.18">
+        <description>
+          The delay in {{units}} before which the container is shutdown. This
+          delay ensures that the application has enough time to perform any
+          cleanup before the Execution Unit transitions to idle state.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+          <default type="implementation" value="10"/>
+        </syntax>
+      </parameter>
+
       <parameter name="References" access="readOnly">
         <description>
           Represents the instances of multi-instanced objects that are directly
@@ -90411,7 +93067,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ApplicationDataList" access="readOnly">
+      <parameter name="ApplicationDataList" access="readOnly" version="2.16">
         <description>
           Represents the application data volumes that are used by this
           {{object}}.
@@ -90438,7 +93094,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="HostObjectNumberOfEntries" access="readOnly">
+      <parameter name="HostObjectNumberOfEntries" access="readOnly"
+          version="2.16">
         <description>
           {{numentries}}
         </description>
@@ -90447,7 +93104,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="EnvVariableNumberOfEntries" access="readOnly">
+      <parameter name="EnvVariableNumberOfEntries" access="readOnly"
+          version="2.17">
         <description>
           {{numentries}}
         </description>
@@ -90475,13 +93133,13 @@
         value of {{param|RetryIntervalMultiplier}}, and ''n'' the current value
         of {{param|RetryCount}}. Then on the next occasion that the Agent
         determines that the EU has terminated abnormally, the delay before
-        re-starting the EU must lie between ''m * (k/1000)^n'' and ''m *
-        (k/1000)^(n+1)'' seconds, so long as ''m * (k/1000)^n'' evaluates to a
-        value less than {{param|RetryMaximumWaitInterval}}. Once this point has
-        been reached, on all subsequent occasion that the Agent determines that
-        the EU has terminated abnormally the delay before re-starting the EU
-        must lie between {{param|RetryMaximumWaitInterval}}'' * (1000/k)'' and
-        {{param|RetryMaximumWaitInterval}} seconds.
+        re-starting the EU must lie between ''m * (k/1000)^n^'' and ''m *
+        (k/1000)^(n+1)^'' seconds, so long as ''m * (k/1000)^n^'' evaluates to
+        a value less than {{param|RetryMaximumWaitInterval}}. Once this point
+        has been reached, on all subsequent occasion that the Agent determines
+        that the EU has terminated abnormally the delay before re-starting the
+        EU must lie between {{param|RetryMaximumWaitInterval}}'' * (1000/k)''
+        and {{param|RetryMaximumWaitInterval}} seconds.
       </description>
 
       <parameter name="Enable" access="readWrite">
@@ -90578,8 +93236,8 @@
       <parameter name="NextRestart" access="readOnly">
         <description>
           The time at which the next restart of the {{object|#}} is scheduled
-          to occur. The Infinte Time (9999-12-31T23:59:59Z) is used to indicate
-          that no restart is currently scheduled.
+          to occur. The Infinite Time (9999-12-31T23:59:59Z) is used to
+          indicate that no restart is currently scheduled.
         </description>
         <syntax>
           <dateTime/>
@@ -90678,12 +93336,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.16">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
     </object>
@@ -90726,12 +93384,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.17">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
     </object>
@@ -90773,7 +93431,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="SupportedServerConnectAlgorithms" access="readOnly">
+      <parameter name="SupportedServerConnectAlgorithms" access="readOnly"
+          version="2.11">
         <description>
           The algorithms supported by the CPE for resolving XMPP server
           addresses and ports. {{enum}}
@@ -90853,12 +93512,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.7">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -90921,7 +93580,7 @@
         <description>
           The complete Jabber ID as determined by the first-hop XMPP server at
           time of connection establishment. This Jabber ID will usually be the
-          standard concatentation of the local-part (Username), domain-part
+          standard concatenation of the local-part (Username), domain-part
           (Domain), and resource-part (Resource) as defined in
           {{bibref|RFC6120|Section 2.1}}
           (local-part@domain-part/resource-part), but since the Jabber ID is
@@ -91182,12 +93841,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.7">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -91229,8 +93888,8 @@
           for this {{object|##.Connection}}.
 
           If the value of this Parameter is a FQDN that resolves to multiple
-          addresses then each address SHOULD be attemtped (in an
-          implemnetation-specific order) until a connection can be made or all
+          addresses then each address SHOULD be attempted (in an
+          implementation-specific order) until a connection can be made or all
           addresses are exhausted, in which case the next {{object}} instance
           (based on {{param|Priority}} and {{param|Weight}}) SHOULD be used.
         </description>
@@ -91455,7 +94114,7 @@
 
     <object name="Device.IEEE1905.AL.Interface.{i}." access="readOnly"
         numEntriesParameter="InterfaceNumberOfEntries" minEntries="0"
-        maxEntries="unbounded" dmr:noUniqueKeys="true" version="2.9">
+        maxEntries="unbounded" version="2.9">
       <description>
         The 1905 interface table (described in {{bibref|IEEE1905.1a|sub-clause
         5 Abstraction Layer Management}}).
@@ -92041,7 +94700,7 @@
         minEntries="0" maxEntries="unbounded" dmr:noUniqueKeys="true"
         version="2.9">
       <description>
-        The 1905 fowarding rule for the ALME-SET-FWD-RULE.request and
+        The 1905 forwarding rule for the ALME-SET-FWD-RULE.request and
         ALME-GET-FWD-RULES.response with classification criteria as defined in
         {{bibref|IEEE1905.1a|Table 5-9: ClassificationSet elements}}.
       </description>
@@ -92064,7 +94723,7 @@
             <pathRef refType="strong" targetParent="##.Interface."
                 targetType="row"/>
           </string>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
@@ -92476,22 +95135,19 @@
         </syntax>
       </parameter>
 
-      <parameter name="AssocWiFiNetworkDeviceRef" access="readOnly">
+      <parameter name="AssocWiFiNetworkDeviceRef" access="readOnly"
+          version="2.13">
         <description>
-          {{reference||obsoleted}}{{param}} is a reference to a MultiAP.Device
-          or Wi-Fi Network Data Elements Device. Since IEEE 1905.1 is the
-          protocol used by the Wi-Fi Alliance's EasyMesh specification for
-          communications, this parameter allows the IEEE 1905.1 portion of the
-          data model to reference the associated EasyMesh portion of the data
-          model.
+          {{param}} is a reference to a Wi-Fi Network Data Elements Device.
+          Since IEEE 1905.1 is the protocol used by the Wi-Fi Alliance's
+          EasyMesh specification for communications, this parameter allows the
+          IEEE 1905.1 portion of the data model to reference the associated
+          EasyMesh portion of the data model.
         </description>
         <syntax>
           <string>
-            <pathRef
-                refType="strong"
-                targetParent="
-                  ####.WiFi.MultiAP.APDevice.
-                  ####.WiFi.DataElements.Network.Device."
+            <pathRef refType="strong"
+                targetParent="####.WiFi.DataElements.Network.Device."
                 targetType="row"/>
           </string>
         </syntax>
@@ -93088,8 +95744,7 @@
     <object
         name="Device.IEEE1905.AL.NetworkTopology.IEEE1905Device.{i}.IEEE1905Neighbor.{i}.Metric.{i}."
         access="readOnly" numEntriesParameter="MetricNumberOfEntries"
-        minEntries="0" maxEntries="unbounded" dmr:noUniqueKeys="true"
-        version="2.9">
+        minEntries="0" maxEntries="unbounded" version="2.9">
       <description>
         This object represents the metrics included in a Link metric response
         from the IEEE1905Device where {{param|#.LocalInterface}} is the MAC
@@ -93396,7 +96051,7 @@
                 Protocol according to {{bibref|MQTT311}}
               </description>
             </enumeration>
-            <enumeration value="5.0">
+            <enumeration value="5.0" version="2.13">
               <description>
                 Protocol according to {{bibref|MQTT50}}
               </description>
@@ -93423,7 +96078,7 @@
                 Unencrypted MQTT connection over a WebSocket transport
               </description>
             </enumeration>
-            <enumeration value="WebSocketTLS">
+            <enumeration value="WebSocketTLS" version="2.15">
               <description>
                 TLS encrypted MQTT connection over a WebSocket transport
               </description>
@@ -93469,8 +96124,7 @@
 
     <object name="Device.MQTT.Client.{i}." access="readWrite"
         numEntriesParameter="ClientNumberOfEntries" enableParameter="Enable"
-        minEntries="0" maxEntries="unbounded" dmr:fixedObject="true"
-        version="2.10">
+        minEntries="0" maxEntries="unbounded" version="2.10">
       <description>
         MQTT client table. Contains a list of configured MQTT clients.
       </description>
@@ -93481,12 +96135,12 @@
         <parameter ref="Name"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.10">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -93560,7 +96214,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Interface" access="readWrite">
+      <parameter name="Interface" access="readWrite" version="2.16">
         <description>
           The IP Interface associated with the {{object}} entry.
 
@@ -93589,7 +96243,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="EnableEncryption" access="readWrite" status="obsoleted">
+      <parameter name="EnableEncryption" access="readWrite" version="2.14"
+          status="deleted">
         <description>
           When {{true}}, encryption MUST be used for this MQTT {{object}}
           instance.
@@ -93598,6 +96253,8 @@
           handled by the {{param|TransportProtocol}} parameter}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <boolean/>
@@ -93661,7 +96318,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="CleanStart" access="readWrite">
+      <parameter name="CleanStart" access="readWrite" version="2.13">
         <description>
           The value of the MQTT Clean Start flag in the MQTT CONNECT packet
           (see {{bibref|MQTT50|section 3.1.2.4}}. If this flag is set to
@@ -93749,7 +96406,7 @@
       </parameter>
 
       <parameter name="ForceReconnect" access="readWrite"
-          dmr:previousParameter="KeepAliveTime">
+          dmr:previousParameter="KeepAliveTime" version="2.10">
         <description>
           Disconnects the MQTT client from the MQTT broker and reconnects it
           again (toggle connection). It is only effective if the MQTT client is
@@ -93767,7 +96424,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="SessionExpiryInterval" access="readWrite">
+      <parameter name="SessionExpiryInterval" access="readWrite"
+          version="2.13">
         <description>
           Session expiry interval in {{units}} defines the wait time before a
           session expires after the connection has been closed by the MQTT
@@ -93782,7 +96440,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ReceiveMaximum" access="readWrite">
+      <parameter name="ReceiveMaximum" access="readWrite" version="2.13">
         <description>
           The MQTT client uses this value to limit the number of QoS 1 and QoS
           2 publications that it is willing to process concurrently (see
@@ -93797,7 +96455,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="MaximumPacketSize" access="readWrite">
+      <parameter name="MaximumPacketSize" access="readWrite" version="2.13">
         <description>
           The maximum packet size in {{units}} the MQTT client can and will
           accept from the MQTT broker. A value of 0 means no limit. If the
@@ -93815,7 +96473,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="TopicAliasMaximum" access="readWrite">
+      <parameter name="TopicAliasMaximum" access="readWrite" version="2.13">
         <description>
           This value indicates the highest value that the MQTT client will
           accept as a Topic Alias sent by the Server (see
@@ -93836,7 +96494,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="RequestResponseInfo" access="readWrite">
+      <parameter name="RequestResponseInfo" access="readWrite" version="2.13">
         <description>
           The MQTT client uses this value in a MQTT CONNECT packet to request
           the Server to return Response Information in the MQTT CONNACK (see
@@ -93851,7 +96509,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="RequestProblemInfo" access="readWrite">
+      <parameter name="RequestProblemInfo" access="readWrite" version="2.13">
         <description>
           This value indicates whether the Reason String or User Properties are
           sent in the case of failures.(see {{bibref|MQTT50|section
@@ -93866,7 +96524,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="AuthenticationMethod" access="readWrite">
+      <parameter name="AuthenticationMethod" access="readWrite" version="2.13">
         <description>
           This value defines the extended authentication method to be used (see
           {{bibref|MQTT50|section 3.1.2.11.9}}).
@@ -93908,7 +96566,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="WillDelayInterval" access="readWrite">
+      <parameter name="WillDelayInterval" access="readWrite" version="2.13">
         <description>
           The delay in {{units}} after the session is disconnected, before
           sending the Will message {{bibref|MQTT50|section 3.1.3.2.2}}). A
@@ -93926,7 +96584,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="WillMessageExpiryInterval" access="readWrite">
+      <parameter name="WillMessageExpiryInterval" access="readWrite"
+          version="2.13">
         <description>
           The lifetime in {{units}} of a Will Message (see
           {{bibref|MQTT50|section 3.1.3.2.4}}). A value of 0 indicates that no
@@ -93942,7 +96601,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="WillContentType" access="readWrite">
+      <parameter name="WillContentType" access="readWrite" version="2.13">
         <description>
           Describes the type of the {{param|WillValue}} {{bibref|MQTT50|section
           3.1.3.2.5}}).
@@ -93958,7 +96617,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="WillResponseTopic" access="readWrite">
+      <parameter name="WillResponseTopic" access="readWrite" version="2.13">
         <description>
           Topic Name for a will response message. The presence of a Response
           Topic identifies the Will Message as a Request
@@ -94044,7 +96703,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="PublishMessageExpiryInterval" access="readWrite">
+      <parameter name="PublishMessageExpiryInterval" access="readWrite"
+          version="2.13">
         <description>
           The lifetime in {{units}} of a PUBLISH Message (see
           {{bibref|MQTT50|section 3.3.2.3.3}}). A value of 0 indicates that no
@@ -94089,8 +96749,8 @@
 
           If the parameter {{param|ConnectRetryIntervalMultiplier}} is defined,
           the MQTT client MUST use a random value between
-          {{param}}*({{param|ConnectRetryIntervalMultiplier}}/1000)^(n-1) and
-          {{param}}*({{param|ConnectRetryIntervalMultiplier}}/1000)^n for the
+          {{param}}*({{param|ConnectRetryIntervalMultiplier}}/1000)^(n-1)^ and
+          {{param}}*({{param|ConnectRetryIntervalMultiplier}}/1000)^n^ for the
           connect retry time, with n equals the current retry number. The max
           number of n is 10, starting with the 11th retry always the value n =
           10 is used.
@@ -94109,7 +96769,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="ConnectRetryIntervalMultiplier" access="readWrite">
+      <parameter name="ConnectRetryIntervalMultiplier" access="readWrite"
+          version="2.13">
         <description>
           Configures the retry interval multiplier.
 
@@ -94124,7 +96785,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="ConnectRetryMaxInterval" access="readWrite">
+      <parameter name="ConnectRetryMaxInterval" access="readWrite"
+          version="2.13">
         <description>
           The maximum reconnection wait interval, in {{units}}.
         </description>
@@ -94137,7 +96799,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ResponseInformation" access="readOnly">
+      <parameter name="ResponseInformation" access="readOnly" version="2.13">
         <description>
           The value of the CONNACK Response Information property supplied by a
           MQTT 5.0 server. This value is used by a MQTT 5.0 client as the basis
@@ -94163,7 +96825,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="UserPropertyNumberOfEntries" access="readOnly">
+      <parameter name="UserPropertyNumberOfEntries" access="readOnly"
+          version="2.13">
         <description>
           {{numentries}}
         </description>
@@ -94176,7 +96839,7 @@
     <object name="Device.MQTT.Client.{i}.Subscription.{i}." access="readWrite"
         numEntriesParameter="SubscriptionNumberOfEntries"
         enableParameter="Enable" minEntries="0" maxEntries="unbounded"
-        dmr:fixedObject="true" version="2.10">
+        version="2.10">
       <description>
         List of MQTT subscriptions handled by the MQTT client.
 
@@ -94193,12 +96856,12 @@
         <parameter ref="Topic"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.10">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -94282,7 +96945,7 @@
     <object name="Device.MQTT.Client.{i}.UserProperty.{i}." access="readWrite"
         numEntriesParameter="UserPropertyNumberOfEntries"
         enableParameter="Enable" minEntries="0" maxEntries="unbounded"
-        dmr:fixedObject="true" version="2.13">
+        version="2.13">
       <description>
         List of user properties used by the MQTT client.
 
@@ -94296,12 +96959,12 @@
         <parameter ref="Name"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.13">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -94418,7 +97081,7 @@
     </object>
 
     <object name="Device.MQTT.Client.{i}.Stats." access="readOnly"
-        minEntries="1" maxEntries="1" dmr:fixedObject="true" version="2.10">
+        minEntries="1" maxEntries="1" version="2.10">
       <description>
         Contains the MQTT client statistics and usage information.
 
@@ -94538,8 +97201,7 @@
 
     <object name="Device.MQTT.Broker.{i}." access="readWrite"
         numEntriesParameter="BrokerNumberOfEntries" enableParameter="Enable"
-        minEntries="0" maxEntries="unbounded" dmr:fixedObject="true"
-        version="2.10">
+        minEntries="0" maxEntries="unbounded" version="2.10">
       <description>
         MQTT broker table. Contains a list of configured MQTT brokers.
       </description>
@@ -94550,12 +97212,12 @@
         <parameter ref="Name"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.10">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -94665,8 +97327,7 @@
 
     <object name="Device.MQTT.Broker.{i}.Bridge.{i}." access="readWrite"
         numEntriesParameter="BridgeNumberOfEntries" enableParameter="Enable"
-        minEntries="0" maxEntries="unbounded" dmr:fixedObject="true"
-        version="2.10">
+        minEntries="0" maxEntries="unbounded" version="2.10">
       <description>
         Configures MQTT bridges, which are used to communicate with other MQTT
         brokers.
@@ -94678,12 +97339,12 @@
         <parameter ref="Name"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.10">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -94796,7 +97457,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="CleanStart" access="readWrite">
+      <parameter name="CleanStart" access="readWrite" version="2.13">
         <description>
           The value of the MQTT Clean Start flag in the MQTT CONNECT packet
           (see {{bibref|MQTT50|section 3.1.2.4}} to establish a MQTT bridge
@@ -94838,7 +97499,7 @@
       </parameter>
 
       <parameter name="ForceReconnect" access="readWrite"
-          dmr:previousParameter="KeepAliveTime">
+          dmr:previousParameter="KeepAliveTime" version="2.10">
         <description>
           Disconnects the MQTT bridge to the remote MQTT broker and reconnects
           it again (toggle connection). It is only effective if the MQTT bridge
@@ -95052,12 +97713,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.10">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -95148,12 +97809,12 @@
         <parameter ref="Direction"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.10">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -95367,7 +98028,7 @@
     </object>
 
     <object name="Device.MQTT.Broker.{i}.Stats." access="readOnly"
-        minEntries="1" maxEntries="1" dmr:fixedObject="true" version="2.10">
+        minEntries="1" maxEntries="1" version="2.10">
       <description>
         The MQTT broker statistics values. These will reset with each MQTT
         broker start, either after reboot or if the MQTT broker gets
@@ -95578,12 +98239,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.10">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -95788,12 +98449,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.10">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -95948,12 +98609,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.11">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -96099,12 +98760,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.11">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -96256,12 +98917,12 @@
         <parameter ref="MeasurementAgent"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.12">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -96483,12 +99144,12 @@
         <parameter ref="Identifier"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.12">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -96877,12 +99538,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.12">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -97127,12 +99788,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.12">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -97380,12 +100041,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.12">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -97452,12 +100113,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.12">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -97528,12 +100189,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.12">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -97587,12 +100248,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.12">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -97664,12 +100325,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.12">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -97769,12 +100430,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.12">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -97875,12 +100536,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.12">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -97975,7 +100636,7 @@
         action ({{object|#.MeasurementAgent.{i}.Schedule.{i}.Action.{i}}}).
 
         The {{object}} replicates the {{object|#.MeasurementAgent.{i}}} object
-        instance's data at the time of the action exection.
+        instance's data at the time of the action execution.
 
         When a {{object|##.BulkData.Profile.{i}}} object instance is used to
         communicate a {{object}} instance, the CPE adds a
@@ -98037,8 +100698,7 @@
 
     <object name="Device.LMAP.Report.{i}.Result.{i}." access="readOnly"
         minEntries="0" maxEntries="unbounded"
-        numEntriesParameter="ResultNumberOfEntries" dmr:noUniqueKeys="true"
-        version="2.12">
+        numEntriesParameter="ResultNumberOfEntries" version="2.12">
       <description>
         The {{object}} object provides the meta-data of the result report of a
         single executed action that produced the result.
@@ -98400,12 +101060,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.12">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -98846,12 +101506,12 @@
         <parameter ref="Name"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.14">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -98891,7 +101551,7 @@
           <string>
             <enumeration value="RM_REGISTERED">
               <description>
-                The 5G-RG has sucessfully authenticated and has been assigned
+                The 5G-RG has successfully authenticated and has been assigned
                 an AMF to manage it.
               </description>
             </enumeration>
@@ -98988,7 +101648,7 @@
     <object name="Device.WWC.AccessNetwork.{i}.GUTI." access="readOnly"
         minEntries="1" maxEntries="1" version="2.14">
       <description>
-        A 5G Globally Unique Temparary Identity (GUTI) securely identifes an
+        A 5G Globally Unique Temporary Identity (GUTI) securely identifes an
         CPE by keeping the permanent User Equipment (UE identifier (IMSI)
         hidden. This identity is globally unique and assigned by the AMF at the
         time of registration.
@@ -98996,7 +101656,7 @@
         See {{bibref|3GPP-TS.23.003|.Clause 2.10}}.
       </description>
 
-      <parameter name="PLMN" access="readOnly">
+      <parameter name="PLMN" access="readOnly" version="2.14">
         <description>
           The Public Land Mobile Network (PLMN) globally identifies the service
           provider. A PLMN consists of a country code (MCC) and a network code
@@ -99012,7 +101672,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="AMFId" access="readOnly">
+      <parameter name="AMFId" access="readOnly" version="2.14">
         <description>
           The AMFId identifies an AMF instance within a service provider's
           network. In conjunction with the PLMN, it forms a Globally Unique AMF
@@ -99025,7 +101685,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="TMSI" access="readOnly">
+      <parameter name="TMSI" access="readOnly" version="2.14">
         <description>
           The Temporary Mobile Subscriber Identity (TMSI) is allocatred by the
           AMF at the time of registration and uniquely identifies the CPE.
@@ -99050,7 +101710,7 @@
         capabilities' matching 'ims' in order to establish a dedicated PDU
         session for telephony.
 
-        See {{bibref|3GPP-TS.24.526|Clause 5.2}} for a full descrption of the
+        See {{bibref|3GPP-TS.24.526|Clause 5.2}} for a full description of the
         URSP data elements.
       </description>
       <uniqueKey functional="false">
@@ -99060,12 +101720,12 @@
         <parameter ref="Precedence"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.14">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -99109,12 +101769,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.14">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -99170,12 +101830,12 @@
         <parameter ref="Precedence"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.14">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -99262,7 +101922,7 @@
         See {{bibref|3GPP-TS.24.501|Clause 9.11.2.8}}
       </description>
 
-      <parameter name="SliceServiceType" access="readOnly">
+      <parameter name="SliceServiceType" access="readOnly" version="2.14">
         <description>
           The Slice Service Type (SST). {{enum}}
 
@@ -99273,7 +101933,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SliceDifferentiator" access="readOnly">
+      <parameter name="SliceDifferentiator" access="readOnly" version="2.14">
         <description>
           The Slice differentiator is an optional number used to differentiate
           network slices with the same SST.
@@ -99320,12 +101980,12 @@
         <parameter ref="SessionID"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.14">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -99481,7 +102141,7 @@
         <description>
           The Data Network Name used by the PDU. The DNN value may be from the
           optional S-NSSAI specified at the time of PDU establishment or a
-          default determined by the 5G core. A DNN is analagous to an LTE APN
+          default determined by the 5G core. A DNN is analogous to an LTE APN
           used the same format defined in {{bibref|3GPP-TS.24.501|clause
           9.11.2.1A}}.
         </description>
@@ -99571,7 +102231,7 @@
         See {{bibref|3GPP-TS.24.501|Clause 9.11.2.8}}
       </description>
 
-      <parameter name="SliceServiceType" access="readOnly">
+      <parameter name="SliceServiceType" access="readOnly" version="2.14">
         <description>
           The Slice Service Type (SST). {{enum}}
 
@@ -99582,7 +102242,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SliceDifferentiator" access="readOnly">
+      <parameter name="SliceDifferentiator" access="readOnly" version="2.14">
         <description>
           The Slice differentiator is an optional number used to differentiate
           network slices with the same SST.
@@ -99601,7 +102261,7 @@
       <description>
         This object describes the PDU QoS Rule table. The purpose of the QoS
         Rule table is to assign a QFI to mark traffic based on a set of
-        classification rules. The rules are set by the netowrk operator and are
+        classification rules. The rules are set by the network operator and are
         specific for each PDU.
 
         For example:
@@ -99651,12 +102311,12 @@
         <parameter ref="Identifier"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.14">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -99739,12 +102399,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.14">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -99816,12 +102476,12 @@
         <parameter ref="QFI"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.14">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -99964,12 +102624,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.14">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -100319,12 +102979,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.16">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -100382,7 +103042,7 @@
         interface status is discussed in {{bibref|TR-181i2|section 4.2.2}}.
 
         This information SHOULD be mirrored or aggregated from the active
-        underlaying interfaces.
+        underlying interfaces.
       </description>
 
       <parameter name="BytesSent" access="readOnly" activeNotify="canDeny">
@@ -100835,12 +103495,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.16">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -101227,12 +103887,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.16">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -102157,7 +104817,7 @@
 
           This parameter specifies the downstream bit error rate (BER)
           threshold to detect the SF alarm. When this value is y, the BER
-          threshold is 10^–y.
+          threshold is 10^-y^.
 
           This parameter is based on ''Signal fail (SF) threshold'' from
           {{bibref|G.988|Section 9.2.1}}.
@@ -102174,7 +104834,7 @@
           Signal degrade (SD) threshold.
 
           This parameter specifies the downstream BER threshold to detect the
-          SD alarm. When this value is x, the BER threshold for SD is 10^–x .
+          SD alarm. When this value is x, the BER threshold for SD is 10^-x^.
           The SD threshold must be lower than the SF threshold; i.e., x &gt; y.
 
           This parameter is based on ''Signal degrade (SD) threshold'' from
@@ -102315,7 +104975,7 @@
 
       <parameter name="LODS" access="readOnly">
         <description>
-          Loss of downstream syncronization. See {{bibref|G.9807.1|}}.
+          Loss of downstream synchronization. See {{bibref|G.9807.1|}}.
         </description>
         <syntax>
           <boolean/>
@@ -102648,12 +105308,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.16">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -102661,8 +105321,8 @@
         <description>
           The IP Interface associated with the {{object}} entry.
 
-          If {{empty}} is specified, the CPE MUST use its bridging or routing
-          policy to determine the appropriate interface.
+          If {{empty}} is specified, the service should listen on all
+          interfaces.
         </description>
         <syntax>
           <string>
@@ -102826,9 +105486,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="PID" access="readWrite">
+      <parameter name="PID" access="readOnly">
         <description>
-          Current PID of the SSH server instance.
+          Current Process Identifier of the SSH server instance.
+
+          Note: This parameter was demoted to readOnly in the Device:2.18
+          version.
         </description>
         <syntax>
           <unsignedInt/>
@@ -102846,7 +105509,7 @@
       </parameter>
     </object>
 
-    <object name="Device.SSH.Server.{i}.Session.{i}." access="readWrite"
+    <object name="Device.SSH.Server.{i}.Session.{i}." access="readOnly"
         numEntriesParameter="SessionNumberOfEntries" minEntries="0"
         maxEntries="unbounded" version="2.16">
       <description>
@@ -102856,18 +105519,21 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.16">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
-      <parameter name="User" access="readWrite">
+      <parameter name="User" access="readOnly">
         <description>
           The user to whom the session belongs to.
+
+          Note: This parameter was demoted to readOnly in the Device:2.18
+          version.
         </description>
         <syntax>
           <string>
@@ -102875,7 +105541,6 @@
             <pathRef refType="strong" targetParent=".Users.User."
                 targetType="row"/>
           </string>
-          <default type="object" value=""/>
         </syntax>
       </parameter>
 
@@ -102908,12 +105573,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.16">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -102972,12 +105637,12 @@
         <parameter ref="Path"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.16">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -103085,7 +105750,7 @@
       <parameter name="DeploymentUnitRef" access="readOnly">
         <description>
           {{reference|the {{object|##.SoftwareModules.DeploymentUnit.}} object
-          instance that this USP Service is part off.}}
+          instance that this USP Service is part of.}}
 
           {{empty}} means that USP service doesn't have a corresponding
           software module.
@@ -103100,6 +105765,24 @@
         </syntax>
       </parameter>
 
+      <parameter name="ExecutionUnitRef" access="readOnly" version="2.18">
+        <description>
+          {{reference|the {{object|##.SoftwareModules.ExecutionUnit.}} object
+          instance that this USP Service is part of.}}
+
+          {{empty}} means that USP service doesn't have a corresponding
+          software module.
+        </description>
+        <syntax>
+          <list/>
+          <string>
+            <pathRef refType="strong"
+                targetParent="##.SoftwareModules.ExecutionUnit."
+                targetType="row"/>
+          </string>
+        </syntax>
+      </parameter>
+
       <parameter name="HasController" access="readOnly">
         <description>
           The USP service has controller functionality next to the standard USP
@@ -103203,12 +105886,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.17">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -103297,7 +105980,7 @@
               <description>All facilities are selected.</description>
             </enumeration>
           </string>
-          <default type="object" value="All"/>
+          <default type="object" value="[All]"/>
         </syntax>
       </parameter>
 
@@ -103430,12 +106113,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.17">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -103617,9 +106300,9 @@
           received. When {{empty}} is specified the syslog service will listen
           to all available network interfaces. Example:
 
-          * ''Device.IP.Interface.1''.
+          * ''Device.IP.Interface.1''
 
-          * ''Device.Logical.Interface.1''.
+          * ''Device.Logical.Interface.1''
 
           {{template|INTERFACE-ROUTING}}
         </description>
@@ -103686,12 +106369,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.17">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -103729,12 +106412,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.17">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -103750,7 +106433,7 @@
             <pathRef refType="strong" targetParent="#.Source."
                 targetType="row"/>
           </string>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
@@ -103773,7 +106456,7 @@
             <pathRef refType="strong" targetParent="#.Filter."
                 targetType="row"/>
           </string>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
@@ -103882,10 +106565,13 @@
         </syntax>
       </parameter>
 
-      <parameter name="Protocol" access="readOnly">
+      <parameter name="Protocol" access="readWrite">
         <description>
           Protocol to be used to deliver the syslog messages to the remote
           server.
+
+          Note: This parameter was promoted to readWrite in the Device:2.18
+          version.
         </description>
         <syntax>
           <string>
@@ -103952,6 +106638,175 @@
       </parameter>
     </object>
 
+    <object name="Device.Schedules." access="readOnly" version="2.18">
+      <description>
+        This object is responsible for managing the schedules that are embedded
+        within the Device.
+      </description>
+
+      <parameter name="Enable" access="readWrite">
+        <description>
+          Enables or disables the scheduling. If the scheduling is disabled
+          then the status of any enabled {{object|Schedule}} entries will
+          change to {{enum|StackDisabled|Schedule.{i}.Status}}.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="implementation" value="true"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ScheduleNumberOfEntries" access="readOnly">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object name="Device.Schedules.Schedule.{i}." access="readWrite"
+        numEntriesParameter="ScheduleNumberOfEntries" enableParameter="Enable"
+        minEntries="0" maxEntries="unbounded" version="2.18">
+      <description>
+        Each instance of this object provides a schedule where access is
+        enabled.
+      </description>
+      <uniqueKey functional="false">
+        <parameter ref="Alias"/>
+      </uniqueKey>
+
+      <parameter name="Alias" access="readWrite" version="2.18">
+        <description>
+          {{datatype|expand}}
+        </description>
+        <syntax>
+          <dataType ref="_AliasCWMP"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Enable" access="readWrite">
+        <description>
+          Enables or disables this {{object}} entry.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="object" value="false"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Status" access="readOnly">
+        <description>
+          Status of the schedule.
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="Active"/>
+            <enumeration value="Inactive"/>
+            <enumeration value="StackDisabled">
+              <description>
+                When the global {{param|#.Enable}} is {{false}} and the
+                {{param|Enable}} parameter is {{true}}, the scheduling is
+                disabled and the status of the enabled {{object}} entry must
+                change to {{enum|StackDisabled|Status}}. The value of the
+                {{param|Enable}} parameter is not changed.
+              </description>
+            </enumeration>
+            <enumeration value="Error" optional="true"/>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="Description" access="readWrite">
+        <description>
+          A description of the schedule (human readable string).
+        </description>
+        <syntax>
+          <string>
+            <size maxLength="256"/>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="Day" access="readWrite">
+        <description>
+          {{list|the days for which access is enabled}} {{enum}}
+        </description>
+        <syntax>
+          <list/>
+          <string>
+            <enumeration value="Monday"/>
+            <enumeration value="Tuesday"/>
+            <enumeration value="Wednesday"/>
+            <enumeration value="Thursday"/>
+            <enumeration value="Friday"/>
+            <enumeration value="Saturday"/>
+            <enumeration value="Sunday"/>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="StartTime" access="readWrite">
+        <description>
+          Start time of the enable schedule in hh:mm format. [hh] refers to a
+          zero-padded hour between 00 and 23. [mm] refers to a zero-padded
+          minute between 00 and 59.
+
+          Start time is in local time zone.
+        </description>
+        <syntax>
+          <string>
+            <size maxLength="5"/>
+            <pattern value=""/>
+            <pattern value="([01][0-9]|2[0-3]):[0-5][0-9]"/>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="Duration" access="readWrite">
+        <description>
+          The duration, in {{units}}, which the access is enabled.
+
+          If the {{param|StartTime}} is not defined, duration is the total time
+          access is allowed during a calendar day.
+
+          If a {{param|StartTime}} is defined, access is allowed for the
+          {{param}} period starting from {{param|StartTime}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range minInclusive="1"/>
+            <units value="seconds"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="InverseMode" access="readWrite">
+        <description>
+          When enabled, the Inverse Mode reverses the default behavior of the
+          schedule, creating a dynamic where actions that are typically
+          activated are now deactivated, and vice versa.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="object" value="false"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="TimeLeft" access="readOnly" activeNotify="canDeny">
+        <description>
+          The number of {{units}} remaining before the next state change will
+          occur. ''0'' means that schedule is disabled.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+    </object>
+
     <object name="Device.GatewayInfo." access="readOnly" minEntries="1"
         maxEntries="1" version="2.0">
       <description>
@@ -104033,7 +106888,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Interface" access="readWrite">
+      <parameter name="Interface" access="readWrite" version="2.13">
         <description>
           A reference to a (layer 2 or above) interface object that will be the
           target of this packet capture diagnostic.
@@ -104046,7 +106901,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Format" access="readOnly">
+      <parameter name="Format" access="readOnly" version="2.13">
         <description>
           This indicates whether the network trace will be recorded in libpcap
           {{bibref|LIBPCAP}} or pcapng format, and is dependent on the
@@ -104069,7 +106924,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Duration" access="readWrite">
+      <parameter name="Duration" access="readWrite" version="2.13">
         <description>
           The duration in {{units}} to copy packets to the file target. The
           diagnostic completes when either the {{param}},
@@ -104083,7 +106938,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="PacketCount" access="readWrite">
+      <parameter name="PacketCount" access="readWrite" version="2.13">
         <description>
           The maximum number of packets to record to the file target. A value
           of zero (0) indicates no limit. The diagnostic completes when the
@@ -104095,7 +106950,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ByteCount" access="readWrite">
+      <parameter name="ByteCount" access="readWrite" version="2.13">
         <description>
           The maximum number of bytes to record to the file target. A value of
           zero (0) indicates no limit. The diagnostic completes when
@@ -104107,7 +106962,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="FileTarget" access="readWrite">
+      <parameter name="FileTarget" access="readWrite" version="2.13">
         <description>
           The {{datatype}} specifying the destination file location. The HTTPS
           transport MUST be supported, and the HTTP transport MAY be supported.
@@ -104118,7 +106973,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="FilterExpression" access="readWrite">
+      <parameter name="FilterExpression" access="readWrite" version="2.13">
         <description>
           A ({{bibref|BPF}}) formatted expression used to restrict the types of
           network packets that are recorded to {{param|FileTarget}}.
@@ -104130,7 +106985,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Username" access="readWrite">
+      <parameter name="Username" access="readWrite" version="2.13">
         <description>
           Username to be used by the Agent to authenticate with the file
           location. This string is set to {{empty}} if no authentication is
@@ -104143,7 +106998,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Password" access="readWrite">
+      <parameter name="Password" access="readWrite" version="2.13">
         <description>
           Password to be used by the Agent to authenticate with the file
           location. This string is set to {{empty}} if no authentication is
@@ -104270,7 +107125,7 @@
         <syntax>
           <list minItems="1"/>
           <string>
-            <enumeration value="CoAP" status="obsoleted">
+            <enumeration value="CoAP" status="deleted">
               <description>
                 See {{bibref|RFC7252}}.
 
@@ -104278,6 +107133,8 @@
                 1.2}}
 
                 {{obsoleted|2.17}}
+
+                {{deleted|2.18}}
               </description>
             </enumeration>
             <enumeration value="WebSocket">
@@ -104291,7 +107148,7 @@
                 See {{bibref|MQTT311}} and {{bibref|MQTT50}}
               </description>
             </enumeration>
-            <enumeration value="UDS">
+            <enumeration value="UDS" version="2.16">
               <description>See {{bibref|TR-369}}</description>
             </enumeration>
           </string>
@@ -104425,12 +107282,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.15">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -104495,7 +107352,7 @@
           When {{true}}, the hostname advertised in the SRV record MUST be a
           Fully Qualified Domain Name (FQDN).
 
-          The interfaces that advertise these DNS-SD services are restriced to
+          The interfaces that advertise these DNS-SD services are restricted to
           the set of interfaces associated with this {{object}} instance and
           the interfaces defined by the
           {{param|.DNS.SD.Advertise.{i}.Interface}} parameter.
@@ -104509,7 +107366,7 @@
 
     <object name="Device.USPAgent.MTP.{i}.CoAP." access="readOnly"
         minEntries="0" maxEntries="1" discriminatorParameter="Protocol"
-        status="obsoleted" version="2.15">
+        status="deleted" version="2.15">
       <description>
         If the USP Endpoint uses the CoAP Message Transfer Protocol (MTP), then
         this object contains CoAP specific configuration parameters.
@@ -104517,6 +107374,8 @@
         {{deprecated|2.15|because the CoAP MTP was deprecated in USP 1.2}}
 
         {{obsoleted|2.17}}
+
+        {{deleted|2.18}}
       </description>
 
       <parameter name="Interfaces" access="readWrite">
@@ -104689,7 +107548,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="EnableEncryption" access="readWrite">
+      <parameter name="EnableEncryption" access="readWrite" version="2.15">
         <description>
           When {{true}}, encryption MUST be used for all connections to this
           MTP instance.
@@ -104700,7 +107559,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="KeepAliveInterval" access="readWrite">
+      <parameter name="KeepAliveInterval" access="readWrite" version="2.15">
         <description>
           The duration in {{units}} between when WebSocket ping control frames
           are transmitted by the Agent's WebSocket server to the Controller's
@@ -104845,12 +107704,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.15">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -105102,12 +107961,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.15">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -105137,7 +107996,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Order" access="readWrite">
+      <parameter name="Order" access="readWrite" version="2.15">
         <description>
           The order (relative priority) to use when determining which
           {{object}} to use for communicating to the Controller.
@@ -105163,7 +108022,7 @@
 
     <object name="Device.USPAgent.Controller.{i}.MTP.{i}.CoAP."
         access="readOnly" minEntries="0" maxEntries="1"
-        discriminatorParameter="Protocol" status="obsoleted" version="2.15">
+        discriminatorParameter="Protocol" status="deleted" version="2.15">
       <description>
         If the USP Endpoint uses the CoAP Message Transfer Protocol (MTP), then
         this object contains CoAP specific configuration parameters.
@@ -105171,6 +108030,8 @@
         {{deprecated|2.15|because the CoAP MTP was deprecated in USP 1.2}}
 
         {{obsoleted|2.17}}
+
+        {{deleted|2.18}}
       </description>
 
       <parameter name="Host" access="readWrite">
@@ -105253,7 +108114,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="USPServiceRef" access="readOnly">
+      <parameter name="USPServiceRef" access="readOnly" version="2.16">
         <description>
           A reference to the USP Service associated with this Agent when
           communicating via the STOMP MTP.
@@ -105328,7 +108189,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="EnableEncryption" access="readWrite">
+      <parameter name="EnableEncryption" access="readWrite" version="2.15">
         <description>
           When {{true}}, encryption MUST be used for this MTP instance.
         </description>
@@ -105403,7 +108264,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="USPServiceRef" access="readOnly">
+      <parameter name="USPServiceRef" access="readOnly" version="2.16">
         <description>
           A reference to the USP Service associated with this Agent when
           communicating via the WebSocket MTP.
@@ -105427,12 +108288,14 @@
         related to how this Controller communicates with the MQTT broker.
       </description>
 
-      <parameter name="Reference" access="readWrite" status="deprecated">
+      <parameter name="Reference" access="readWrite" status="obsoleted">
         <description>
           A reference to the MQTT Client used by this Controller when
           communicating via the MQTT MTP.
 
           {{deprecated|2.16|because {{param|AgentMTPReference}} was added}}
+
+          {{obsoleted|2.18}}
         </description>
         <syntax>
           <string>
@@ -105481,7 +108344,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="AgentMTPReference" access="readWrite">
+      <parameter name="AgentMTPReference" access="readWrite" version="2.16">
         <description>
           {{reference|the {{object|###.MTP.}} object instance containing the
           Response Topic used by this Controller when communicating via the
@@ -105495,7 +108358,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="USPServiceRef" access="readOnly">
+      <parameter name="USPServiceRef" access="readOnly" version="2.16">
         <description>
           A reference to the USP Service associated with this Agent when
           communicating via the MQTT MTP.
@@ -105571,12 +108434,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.15">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -105661,7 +108524,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SecuredRoles" access="readWrite">
+      <parameter name="SecuredRoles" access="readWrite" version="2.16">
         <description>
           {{list|each entry is a Role that is associated with Controllers to
           indicate their access to secured parameters (e.g.
@@ -105761,12 +108624,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.15">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -105818,12 +108681,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.15">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -105872,7 +108735,7 @@
         <syntax>
           <list/>
           <string/>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
@@ -105881,10 +108744,11 @@
           The permissions of a Role for the specified Targets.
 
           A string of 4 characters where each character represents a permission
-          ("r" for Read, "w" for Write, "x" for Execute", and "n" for Notify).
+          ("`r`" for Read, "`w`" for Write, "`x`" for Execute", and "`n`" for
+          Notify).
 
-          The string is always in the same order (rwxn) and the lack of a
-          permission is signified by a "-" character (e.g., r--n).
+          The string is always in the same order (`rwxn`) and the lack of a
+          permission is signified by a "`-`" character (e.g., `r--n`).
 
           The following describes the meaning of the permissions for Parameter
           type of Targets:
@@ -105914,10 +108778,11 @@
           The permissions of a Role for the specified Targets.
 
           A string of 4 characters where each character represents a permission
-          ("r" for Read, "w" for Write, "x" for Execute", and "n" for Notify).
+          ("`r`" for Read, "`w`" for Write, "`x`" for Execute", and "`n`" for
+          Notify).
 
-          The string is always in the same order (rwxn) and the lack of a
-          permission is signified by a "-" character (e.g., r--n).
+          The string is always in the same order (`rwxn`) and the lack of a
+          permission is signified by a "`-`" character (e.g., `r--n`).
 
           The following describes the meaning of the permissions for Object
           type of Targets:
@@ -105948,10 +108813,11 @@
           The permissions of a Role for the specified Targets.
 
           A string of 4 characters where each character represents a permission
-          ("r" for Read, "w" for Write, "x" for Execute", and "n" for Notify).
+          ("`r`" for Read, "`w`" for Write, "`x`" for Execute", and "`n`" for
+          Notify).
 
-          The string is always in the same order (rwxn) and the lack of a
-          permission is signified by a "-" character (e.g., r--n).
+          The string is always in the same order (`rwxn`) and the lack of a
+          permission is signified by a "`-`" character (e.g., `r--n`).
 
           The following describes the meaning of the permissions for
           Instantiated Object type of Targets:
@@ -105986,10 +108852,11 @@
           The permissions of a Role for the specified Targets.
 
           A string of 4 characters where each character represents a permission
-          ("r" for Read, "w" for Write, "x" for Execute", and "n" for Notify).
+          ("`r`" for Read, "`w`" for Write, "`x`" for Execute", and "`n`" for
+          Notify).
 
-          The string is always in the same order (rwxn) and the lack of a
-          permission is signified by a "-" character (e.g., r--n).
+          The string is always in the same order (`rwxn`) and the lack of a
+          permission is signified by a "`-`" character (e.g., `r--n`).
 
           The following describes the meaning of the permissions for Command
           and Event type of Targets:
@@ -106031,8 +108898,9 @@
         trust) are considered "trusted".
 
         If the Controller authenticated via an entry in this table is not
-        previously known to the Agent, the associated Role entry is
-        automatically applied to the Controller.
+        previously known to the Agent, the Roles specified in the
+        {{param|Role}} parameter might be automatically applied, depending on
+        the value of the {{param|AllowedUses}} parameter.
       </description>
       <uniqueKey functional="true">
         <parameter ref="Credential"/>
@@ -106041,12 +108909,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.15">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -106107,23 +108975,26 @@
             <enumeration value="MTP-only">
               <description>
                 The CA can only authorize MTP (domain) connectivity, and cannot
-                authenticate Controllers.
+                authenticate Controllers, i.e. no Roles are automatically
+                applied.
               </description>
             </enumeration>
             <enumeration value="MTP-and-USP">
               <description>
                 The CA can authorize MTP (domain) connectivity and authenticate
-                Controllers.
+                Controller, i.e. the {{param|Role}} parameter applies.
               </description>
             </enumeration>
             <enumeration value="MTP-and-broker">
               <description>
                 The CA can authorize MTP (domain) connectivity and the
-                presenter of this certificate is trusted to have authenticated
-                the identity of Endpoints whose Records it transmits such that
-                the from_id can be trusted without additional authentication.
-                See {{bibref|TR-369|"Authentication and Authorization"}} for
-                additional description of the Trusted Broker function.
+                presenter of a certificate signed by such CA is trusted to have
+                authenticated the identity of Endpoints whose Records it
+                transmits. Any Controller communicating through such a Broker
+                is automatically authenticated, i.e. the {{param|Role}}
+                parameter applies. See {{bibref|TR-369|"Authentication and
+                Authorization"}} for additional description of the Trusted
+                Broker concept.
               </description>
             </enumeration>
           </string>
@@ -106167,12 +109038,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.15">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -106387,12 +109258,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.6">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -106648,12 +109519,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.6">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -106687,7 +109558,7 @@
         <syntax>
           <list/>
           <string/>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
@@ -106728,12 +109599,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.6">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -106772,7 +109643,7 @@
         name="Device.ETSIM2M.SCL.{i}.SAFPolicySet.{i}.ANPPolicy.{i}.BlockPeriod.{i}."
         access="readWrite" numEntriesParameter="BlockPeriodNumberOfEntries"
         enableParameter="Enable" minEntries="0" maxEntries="unbounded"
-        dmr:noUniqueKeys="true" version="2.6">
+        version="2.6">
       <description>
         This table contains a list of block periods for a
         {{object|##.ANPPolicy}}.
@@ -106798,12 +109669,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.6">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -106864,12 +109735,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.6">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -106932,12 +109803,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.6">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -106974,7 +109845,7 @@
         <syntax>
           <list/>
           <string/>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
@@ -106992,7 +109863,7 @@
         name="Device.ETSIM2M.SCL.{i}.SAFPolicySet.{i}.ANPPolicy.{i}.RequestCategory.{i}.Schedule.{i}.AbsTimeSpan.{i}."
         access="readWrite" numEntriesParameter="AbsTimeSpanNumberOfEntries"
         enableParameter="Enable" minEntries="0" maxEntries="unbounded"
-        dmr:noUniqueKeys="true" version="2.6">
+        version="2.6">
       <description>
         This object defines an instance of a time span used for determining an
         RCAT schedule.
@@ -107020,12 +109891,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.6">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -107122,12 +109993,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.6">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -107208,7 +110079,7 @@
             <pathRef refType="strong" targetParent="##.ANPPolicy."
                 targetType="row"/>
           </string>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
     </object>
@@ -107561,12 +110432,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="readWrite" version="2.15">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasCWMP"/>
         </syntax>
       </parameter>
 
@@ -107825,7 +110696,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="EnableEncryption" access="readWrite">
+      <parameter name="EnableEncryption" access="readWrite" version="2.15">
         <description>
           When {{true}}, encryption MUST be used for this STOMP Connection
           {{object}}.
@@ -107838,7 +110709,7 @@
     </object>
 
     <profile name="IPLayerCapacity:1" dmr:previousProfile="" version="2.14"
-        status="obsoleted">
+        status="deleted">
       <object ref="Device.IP.Diagnostics." requirement="present">
         <parameter ref="IPLayerCapacitySupported" requirement="readOnly"/>
       </object>
@@ -107850,11 +110721,11 @@
         <parameter ref="IPLayerCapSupportedMetrics" requirement="readOnly"/>
         <parameter ref="Interface" requirement="readWrite"/>
         <parameter ref="Role" requirement="readWrite"/>
-        <parameter ref="Host" requirement="readOnly" status="obsoleted"/>
-        <parameter ref="Port" requirement="readOnly" status="obsoleted"/>
+        <parameter ref="Host" requirement="readOnly" status="deleted"/>
+        <parameter ref="Port" requirement="readOnly" status="deleted"/>
         <parameter ref="JumboFramesPermitted" requirement="readOnly"/>
         <parameter ref="NumberOfConnections" requirement="readOnly"
-            status="obsoleted"/>
+            status="deleted"/>
         <parameter ref="EthernetPriority" requirement="readWrite"/>
         <parameter ref="DSCP" requirement="readWrite"/>
         <parameter ref="ProtocolVersion" requirement="readWrite"/>
@@ -107869,7 +110740,7 @@
         <parameter ref="TestSubInterval" requirement="readWrite"/>
         <parameter ref="StatusFeedbackInterval" requirement="readWrite"/>
         <parameter ref="TimeoutNoTraffic" requirement="readWrite"
-            status="obsoleted"/>
+            status="deleted"/>
         <parameter ref="Tmax" requirement="readOnly"/>
         <parameter ref="TmaxRTT" requirement="readWrite"/>
         <parameter ref="TimestampResolution" requirement="readWrite"/>
@@ -108046,7 +110917,7 @@
       </object>
     </profile>
 
-    <profile name="Processors:1" version="2.1">
+    <profile name="Processors:1" version="2.1" status="deprecated">
       <object ref="Device.DeviceInfo.Processor.{i}." requirement="present">
         <parameter ref="Architecture" requirement="readOnly"/>
       </object>
@@ -108094,14 +110965,12 @@
       </object>
     </profile>
 
-    <profile name="Time:1" version="2.0" status="deprecated">
+    <profile name="Time:1" version="2.0" status="obsoleted">
       <object ref="Device.Time." requirement="present">
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Status" requirement="readOnly"/>
-        <parameter ref="NTPServer1" requirement="readWrite"
-            status="deprecated"/>
-        <parameter ref="NTPServer2" requirement="readWrite"
-            status="deprecated"/>
+        <parameter ref="NTPServer1" requirement="readWrite" status="obsoleted"/>
+        <parameter ref="NTPServer2" requirement="readWrite" status="obsoleted"/>
         <parameter ref="CurrentLocalTime" requirement="readOnly"/>
         <parameter ref="LocalTimeZone" requirement="readWrite"/>
       </object>
@@ -110837,13 +113706,13 @@
     </profile>
 
     <profile name="MAPAdv:1" extends="MAPBasic:1" version="2.8"
-        status="obsoleted">
+        status="deleted">
       <object ref="Device.MAP.Domain.{i}." requirement="present">
-        <parameter ref="PSIDOffset" requirement="readWrite" status="obsoleted"/>
-        <parameter ref="PSIDLength" requirement="readWrite" status="obsoleted"/>
-        <parameter ref="PSID" requirement="readWrite" status="obsoleted"/>
+        <parameter ref="PSIDOffset" requirement="readWrite" status="deleted"/>
+        <parameter ref="PSIDLength" requirement="readWrite" status="deleted"/>
+        <parameter ref="PSID" requirement="readWrite" status="deleted"/>
         <parameter ref="IncludeSystemPorts" requirement="readWrite"
-            status="obsoleted"/>
+            status="deleted"/>
       </object>
       <object ref="Device.MAP.Domain.{i}.Rule.{i}." requirement="createDelete">
         <parameter ref="EABitsLength" requirement="readWrite"/>
@@ -111569,7 +114438,7 @@
       </object>
     </profile>
 
-    <profile name="AccessControl:1" version="2.14">
+    <profile name="AccessControl:1" status="deprecated" version="2.14">
       <object ref="Device.Hosts." requirement="present">
         <parameter ref="AccessControlNumberOfEntries" requirement="readOnly"/>
       </object>
@@ -111577,10 +114446,11 @@
         <parameter ref="PhysAddress" requirement="readWrite"/>
         <parameter ref="AccessPolicy" requirement="readWrite"/>
         <parameter ref="Enable" requirement="readWrite"/>
-        <parameter ref="ScheduleNumberOfEntries" requirement="readOnly"/>
+        <parameter ref="ScheduleNumberOfEntries" requirement="readOnly"
+            status="deprecated"/>
       </object>
       <object ref="Device.Hosts.AccessControl.{i}.Schedule.{i}."
-          requirement="present">
+          requirement="present" status="deprecated">
         <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Day" requirement="readWrite"/>
@@ -111589,6 +114459,18 @@
       </object>
     </profile>
 
+    <profile name="AccessControl:2" version="2.18">
+      <object ref="Device.Hosts." requirement="present">
+        <parameter ref="AccessControlNumberOfEntries" requirement="readOnly"/>
+      </object>
+      <object ref="Device.Hosts.AccessControl.{i}." requirement="present">
+        <parameter ref="PhysAddress" requirement="readWrite"/>
+        <parameter ref="AccessPolicy" requirement="readWrite"/>
+        <parameter ref="Enable" requirement="readWrite"/>
+        <parameter ref="ScheduleRef" requirement="readOnly"/>
+      </object>
+    </profile>
+
     <profile name="DNSRelay:1" version="2.0">
       <object ref="Device.DNS." requirement="present"/>
       <object ref="Device.DNS.Relay." requirement="present">
@@ -113321,6 +116203,19 @@
       </object>
     </profile>
 
+    <profile name="Schedules:1" version="2.18">
+      <object ref="Device.Schedules." requirement="present">
+        <parameter ref="ScheduleNumberOfEntries" requirement="readOnly"/>
+      </object>
+      <object ref="Device.Schedules.Schedule.{i}." requirement="present">
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
+        <parameter ref="Enable" requirement="readWrite"/>
+        <parameter ref="Day" requirement="readWrite"/>
+        <parameter ref="StartTime" requirement="readWrite"/>
+        <parameter ref="Duration" requirement="readWrite"/>
+      </object>
+    </profile>
+
     <profile name="_Baseline:1" status="deleted" version="2.0">
       <object ref="Device." requirement="present">
         <parameter ref="InterfaceStackNumberOfEntries" requirement="readOnly"/>
diff --git a/test/tools/01-tr-181-2-17-0-usp-full.xml b/test/tools/01-tr-181-2-18-0-usp-full.xml
similarity index 94%
rename from test/tools/01-tr-181-2-17-0-usp-full.xml
rename to test/tools/01-tr-181-2-18-0-usp-full.xml
index f19d0a4f..cbc369b0 100644
--- a/test/tools/01-tr-181-2-17-0-usp-full.xml
+++ b/test/tools/01-tr-181-2-18-0-usp-full.xml
@@ -2,7 +2,7 @@
 <!--
   Device:2 Root Data Model definition [USP]
 
-  Copyright (c) 2010-2023, Broadband Forum
+  Copyright (c) 2010-2024, Broadband Forum
 
   The undersigned members have elected to grant the copyright to
   their contributed material used in this software:
@@ -51,16 +51,16 @@
 -->
 
 <dm:document
-    xmlns:dm="urn:broadband-forum-org:cwmp:datamodel-1-10"
+    xmlns:dm="urn:broadband-forum-org:cwmp:datamodel-1-14"
     xmlns:dmr="urn:broadband-forum-org:cwmp:datamodel-report-1-0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="
-      urn:broadband-forum-org:cwmp:datamodel-1-10
-        https://www.broadband-forum.org/cwmp/cwmp-datamodel-1-10.xsd
+      urn:broadband-forum-org:cwmp:datamodel-1-14
+        https://www.broadband-forum.org/cwmp/cwmp-datamodel-1-14.xsd
       urn:broadband-forum-org:cwmp:datamodel-report-1-0
         https://www.broadband-forum.org/cwmp/cwmp-datamodel-report-1-0.xsd"
-    spec="urn:broadband-forum-org:tr-181-2-17-0-usp"
-    file="tr-181-2-17-0-usp.xml">
+    spec="urn:broadband-forum-org:tr-181-2-18-0-usp"
+    file="tr-181-2-18-0-usp.xml">
 
   <dataType name="_AliasCommon">
     <description>
@@ -74,6 +74,22 @@
     </string>
   </dataType>
 
+  <dataType name="_AliasUSP" base="_AliasCommon">
+    <description action="replace">
+      A non-volatile unique key used to reference this instance. Alias provides
+      a mechanism for a Controller to label this instance for future reference.
+
+      The following mandatory constraints MUST be enforced:
+
+      * The value MUST NOT be empty.
+
+      * The value MUST start with a letter.
+
+      * If the value is not assigned by the Controller at creation time, the
+        Agent MUST assign a value with an "cpe-" prefix.
+    </description>
+  </dataType>
+
   <dataType name="Alias" base="_AliasCommon">
     <description action="replace">
       A non-volatile unique key used to reference this instance. Alias provides
@@ -118,6 +134,42 @@
     </string>
   </dataType>
 
+  <dataType name="IPAddress">
+    <description>
+      IP address, i.e. IPv4 address (or IPv4 subnet mask) or IPv6 address.
+
+      All IPv4 addresses and subnet masks MUST be represented as strings in
+      IPv4 dotted-decimal notation. Here are some examples of valid IPv4
+      address textual representations:
+
+      * 216.52.29.100
+
+      * 192.168.1.254
+
+      All IPv6 addresses MUST be represented using any of the 3 standard
+      textual representations defined in {{bibref|RFC4291}} Sections 2.2.1,
+      2.2.2 and 2.2.3. Both lower-case and upper-case letters can be used, but
+      use of lower-case letters is RECOMMENDED. Here are some examples of valid
+      IPv6 address textual representations:
+
+      * 1080:0:0:800:ba98:3210:11aa:12dd
+
+      * 1080::800:ba98:3210:11aa:12dd
+
+      * 0:0:0:0:0:0:13.1.68.3
+
+      IPv6 addresses MUST NOT include zone identifiers. Zone identifiers are
+      discussed in {{bibref|RFC4007|Section 6}}.
+
+      Unspecified or inapplicable addresses (or IPv4 subnet masks) MUST be
+      represented as empty strings unless otherwise specified by the parameter
+      definition.
+    </description>
+    <string>
+      <size maxLength="45"/>
+    </string>
+  </dataType>
+
   <dataType name="IPv4Address" base="IPAddress">
     <description>
       IPv4 address (or subnet mask).
@@ -190,85 +242,6 @@
     </description>
   </dataType>
 
-  <dataType name="Order">
-    <description>
-      Position of the {{object}} entry in the order of precedence. A value of
-      ''1'' indicates the first entry to be considered (highest precedence).
-
-      When a {{object}} instance is created, or when an existing {{param}}
-      value is modified, if the value matches that of an existing entry, the
-      {{param}} values for the existing entry and all lower {{param}} entries
-      are incremented (lowered in precedence) to ensure uniqueness of this
-      value. A deletion causes {{param}} values to be compacted. When a value
-      is changed, incrementing occurs before compaction.
-
-      If no {{param}} value is supplied on creation of a {{object}} instance,
-      it MUST be assigned a value that is one more than the largest current
-      value (lowest precedence).
-    </description>
-    <unsignedInt>
-      <range minInclusive="1"/>
-    </unsignedInt>
-  </dataType>
-
-  <dataType name="URI">
-    <description>
-      Uniform Resource Identifier. See {{bibref|RFC3986}}.
-    </description>
-    <string>
-      <size maxLength="2048"/>
-    </string>
-  </dataType>
-
-  <dataType name="ZigBeeNetworkAddress">
-    <description>
-      The ZigBee 16-bit network address (NWK) as defined in
-      {{bibref|ZigBee2007}}. The address is assigned to a device by the network
-      layer and used by the network layer for routing messages between devices.
-    </description>
-    <string>
-      <size maxLength="4"/>
-      <pattern value=""/>
-      <pattern value="([0-9A-Fa-f]){4}"/>
-    </string>
-  </dataType>
-
-  <dataType name="IPAddress">
-    <description>
-      IP address, i.e. IPv4 address (or IPv4 subnet mask) or IPv6 address.
-
-      All IPv4 addresses and subnet masks MUST be represented as strings in
-      IPv4 dotted-decimal notation. Here are some examples of valid IPv4
-      address textual representations:
-
-      * 216.52.29.100
-
-      * 192.168.1.254
-
-      All IPv6 addresses MUST be represented using any of the 3 standard
-      textual representations defined in {{bibref|RFC4291}} Sections 2.2.1,
-      2.2.2 and 2.2.3. Both lower-case and upper-case letters can be used, but
-      use of lower-case letters is RECOMMENDED. Here are some examples of valid
-      IPv6 address textual representations:
-
-      * 1080:0:0:800:ba98:3210:11aa:12dd
-
-      * 1080::800:ba98:3210:11aa:12dd
-
-      * 0:0:0:0:0:0:13.1.68.3
-
-      IPv6 addresses MUST NOT include zone identifiers. Zone identifiers are
-      discussed in {{bibref|RFC4007|Section 6}}.
-
-      Unspecified or inapplicable addresses (or IPv4 subnet masks) MUST be
-      represented as empty strings unless otherwise specified by the parameter
-      definition.
-    </description>
-    <string>
-      <size maxLength="45"/>
-    </string>
-  </dataType>
-
   <dataType name="JSONObject">
     <description>
       A JSON Object as defined in {{bibref|RFC7159|Section 4}}.
@@ -291,6 +264,27 @@
     </string>
   </dataType>
 
+  <dataType name="Order">
+    <description>
+      Position of the {{object}} entry in the order of precedence. A value of
+      ''1'' indicates the first entry to be considered (highest precedence).
+
+      When a {{object}} instance is created, or when an existing {{param}}
+      value is modified, if the value matches that of an existing entry, the
+      {{param}} values for the existing entry and all lower {{param}} entries
+      are incremented (lowered in precedence) to ensure uniqueness of this
+      value. A deletion causes {{param}} values to be compacted. When a value
+      is changed, incrementing occurs before compaction.
+
+      If no {{param}} value is supplied on creation of a {{object}} instance,
+      it MUST be assigned a value that is one more than the largest current
+      value (lowest precedence).
+    </description>
+    <unsignedInt>
+      <range minInclusive="1"/>
+    </unsignedInt>
+  </dataType>
+
   <dataType name="StatsCounter32">
     <description>
       A 32-bit statistics parameter, e.g. a byte counter.
@@ -333,6 +327,26 @@
     <unsignedLong/>
   </dataType>
 
+  <dataType name="UUID">
+    <description>
+      Universally Unique Identifier. See {{bibref|RFC4122}}.
+    </description>
+    <string>
+      <size minLength="36" maxLength="36"/>
+      <pattern
+          value="[A-Fa-f0-9]{8}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{12}"/>
+    </string>
+  </dataType>
+
+  <dataType name="URI">
+    <description>
+      Uniform Resource Identifier. See {{bibref|RFC3986}}.
+    </description>
+    <string>
+      <size maxLength="2048"/>
+    </string>
+  </dataType>
+
   <dataType name="URL" base="URI">
     <description>
       Uniform Resource Locator. See {{bibref|RFC3986}} (URI),
@@ -342,14 +356,16 @@
     </description>
   </dataType>
 
-  <dataType name="UUID">
+  <dataType name="ZigBeeNetworkAddress">
     <description>
-      Universally Unique Identifier. See {{bibref|RFC4122}}.
+      The ZigBee 16-bit network address (NWK) as defined in
+      {{bibref|ZigBee2007}}. The address is assigned to a device by the network
+      layer and used by the network layer for routing messages between devices.
     </description>
     <string>
-      <size minLength="36" maxLength="36"/>
-      <pattern
-          value="[A-Fa-f0-9]{8}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{12}"/>
+      <size maxLength="4"/>
+      <pattern value=""/>
+      <pattern value="([0-9A-Fa-f]){4}"/>
     </string>
   </dataType>
 
@@ -511,6 +527,18 @@
       <enumeration value="J">
         <description>Joule [SI]</description>
       </enumeration>
+      <enumeration value="rpm">
+        <description>Rotations per minute</description>
+      </enumeration>
+      <enumeration value="pps">
+        <description>Pulses per second</description>
+      </enumeration>
+      <enumeration value="cu-m/s">
+        <description>Cubic meters per second</description>
+      </enumeration>
+      <enumeration value="liter/s">
+        <description>Liters per second</description>
+      </enumeration>
     </string>
   </dataType>
 
@@ -573,6 +601,8 @@
         </description>
       </enumeration>
       <enumeration value="Weight"/>
+      <enumeration value="Depth"/>
+      <enumeration value="Counter"/>
     </string>
   </dataType>
 
@@ -1080,10 +1110,10 @@
       Represents a measure of power in mW expressed in decibels, and calculated
       as follows:
 
-       power = 10*log10( Vrms^2 / R * 1000 )
+          power = 10*log10( Vrms^2 / R * 1000 )
 
-       where Vrms is the root-mean-square Voltage of the received waveform and
-       R is 75 ohms.
+      where Vrms is the root-mean-square Voltage of the received waveform and R
+      is 75 ohms.
     </description>
     <int/>
   </dataType>
@@ -1327,6 +1357,13 @@
       <organization>3GPP RAN WG4</organization>
       <hyperlink>https://www.3gpp.org/ftp/Specs/html-info/25171.htm</hyperlink>
     </reference>
+    <reference id="3GPP-TS.27.007">
+      <name>3GPP TS 24.007</name>
+      <title>AT command set for User Equipment (UE)</title>
+      <organization>3GPP CT WG1</organization>
+      <category>Technical specification</category>
+      <hyperlink>https://www.3gpp.org/ftp/Specs/html-info/24007.htm</hyperlink>
+    </reference>
     <reference id="CM-SP-RFIv2.0">
       <name>CM-SP-RFIv2.0</name>
       <title>
@@ -2266,14 +2303,6 @@
       <date>2002</date>
       <hyperlink>https://www.rfc-editor.org/rfc/rfc3232</hyperlink>
     </reference>
-    <reference id="RFC3315">
-      <name>RFC 3315</name>
-      <title>Dynamic Host Configuration Protocol for IPv6 (DHCPv6)</title>
-      <organization>IETF</organization>
-      <category>RFC</category>
-      <date>2003</date>
-      <hyperlink>https://www.rfc-editor.org/rfc/rfc3315</hyperlink>
-    </reference>
     <reference id="RFC3339">
       <name>RFC 3339</name>
       <title>Date and Time on the Internet: Timestamps</title>
@@ -2290,17 +2319,6 @@
       <date>2003</date>
       <hyperlink>https://www.rfc-editor.org/rfc/rfc3596</hyperlink>
     </reference>
-    <reference id="RFC3633">
-      <name>RFC 3633</name>
-      <title>
-        IPv6 Prefix Options for Dynamic Host Configuration Protocol (DHCP)
-        version 6
-      </title>
-      <organization>IETF</organization>
-      <category>RFC</category>
-      <date>2003</date>
-      <hyperlink>https://www.rfc-editor.org/rfc/rfc3633</hyperlink>
-    </reference>
     <reference id="RFC3646">
       <name>RFC 3646</name>
       <title>
@@ -2929,6 +2947,14 @@
       <date>March 2018</date>
       <hyperlink>https://www.rfc-editor.org/rfc/rfc8349</hyperlink>
     </reference>
+    <reference id="RFC8415">
+      <name>RFC 8415</name>
+      <title>Dynamic Host Configuration Protocol for IPv6 (DHCPv6)</title>
+      <organization>IETF</organization>
+      <category>RFC</category>
+      <date>November 2018</date>
+      <hyperlink>https://www.rfc-editor.org/rfc/rfc8415</hyperlink>
+    </reference>
     <reference id="RFC8822">
       <name>RFC 8822</name>
       <title>
@@ -3245,25 +3271,25 @@
       <name>IPDR File Transfer Protocol</name>
       <title>IPDR/File Transfer Protocol</title>
       <organization>TM Forum</organization>
-      <hyperlink>https://www.ipdr.org/public/</hyperlink>
+      <hyperlink>https://www.tmforum.org/ipdr/</hyperlink>
     </reference>
     <reference id="IPDR-SP">
       <name>IPDR Streaming Protocol</name>
       <title>IPDR Streaming Protocol (IPDR/SP) Specification</title>
       <organization>TM Forum</organization>
-      <hyperlink>https://www.ipdr.org/public/</hyperlink>
+      <hyperlink>https://www.tmforum.org/ipdr/</hyperlink>
     </reference>
     <reference id="IPDR-XDR">
       <name>IPDR XDR Encoding Format</name>
       <title>IPDR/XDR Encoding Format</title>
       <organization>TM Forum</organization>
-      <hyperlink>https://www.ipdr.org/public/</hyperlink>
+      <hyperlink>https://www.tmforum.org/ipdr/</hyperlink>
     </reference>
     <reference id="IPDR-XML">
       <name>IPDR XML File Encoding Format</name>
       <title>IPDR/XML File Encoding Format</title>
       <organization>TM Forum</organization>
-      <hyperlink>https://www.ipdr.org/public/</hyperlink>
+      <hyperlink>https://www.tmforum.org/ipdr/</hyperlink>
     </reference>
     <reference id="JJ-300.00">
       <name>JJ-300.00</name>
@@ -3607,7 +3633,7 @@
     restore this configuration file.
   </template>
 
-  <model name="Device:2.17">
+  <model name="Device:2.18">
 
     <object name="Device." access="readOnly" minEntries="1" maxEntries="1"
         version="2.0">
@@ -3616,7 +3642,7 @@
       </description>
 
       <parameter name="RootDataModelVersion" access="readOnly"
-          forcedInform="true">
+          forcedInform="true" version="2.4">
         <description>
           Root data model version, e.g. ''2.4''. For a vendor-defined root data
           model, this is the standard Broadband Forum model on which the
@@ -3639,7 +3665,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="ProxiedDeviceNumberOfEntries" access="readOnly">
+      <parameter name="ProxiedDeviceNumberOfEntries" access="readOnly"
+          version="2.12">
         <description>
           {{numentries}}
         </description>
@@ -3648,7 +3675,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="CollectionDeviceNumberOfEntries" access="readOnly">
+      <parameter name="CollectionDeviceNumberOfEntries" access="readOnly"
+          version="2.16">
         <description>
           {{numentries}}
         </description>
@@ -3657,13 +3685,55 @@
         </syntax>
       </parameter>
 
-      <command name="Reboot()" async="false">
+      <command name="Reboot()" version="2.12" async="false">
         <description>
           Reboot the entity associated with the containing {{object}}.
         </description>
+        <input>
+
+          <parameter name="Cause" mandatory="false" version="2.18">
+            <description>
+              The cause that will be contained within the {{event|#.Boot!}}
+              Event. By default the Device SHOULD set this value to
+              {{enum|RemoteReboot}}.
+            </description>
+            <syntax>
+              <string>
+                <enumeration value="LocalReboot">
+                  <description>
+                    A {{object|Device.|absolute}} Event that was the result of
+                    a reboot triggered locally on the Device (NOT as a result
+                    of a {{command|.Reboot()|model}}}} Command triggered by a
+                    remote trigger, e.g. another remote management protocol)
+                  </description>
+                </enumeration>
+                <enumeration value="RemoteReboot">
+                  <description>
+                    A {{object|Device.|absolute}} Event that was the result of
+                    a reboot triggered via the {{command|.Reboot()|model}}}
+                    Command or other remote trigger, e.g. another remote
+                    management protocol
+                  </description>
+                </enumeration>
+              </string>
+            </syntax>
+          </parameter>
+
+          <parameter name="Reason" mandatory="false" version="2.18">
+            <description>
+              The reason of the boot (e.g. power on reset, watchdog, overheat,
+              FAN fault, web userinterface, ...).
+
+              When absent the implementation must set {{param}} to 'Unknown'.
+            </description>
+            <syntax>
+              <string/>
+            </syntax>
+          </parameter>
+        </input>
       </command>
 
-      <event name="Boot!">
+      <event name="Boot!" version="2.12">
         <description>
           Boot event indicating that the {{object}} was rebooted.
         </description>
@@ -3686,47 +3756,61 @@
             <string>
               <enumeration value="LocalReboot">
                 <description>
-                  A {{object}} Event that was the result of a reboot triggered
-                  locally on the Device (NOT as a result of a
-                  {{command|#.Reboot()}} Command or other remote trigger, e.g.
-                  another remote management protocol)
+                  A {{object|Device.|absolute}} Event that was the result of a
+                  reboot triggered locally on the Device (NOT as a result of a
+                  {{command|.Reboot()|model}}}} Command triggered by a remote
+                  trigger, e.g. another remote management protocol)
                 </description>
               </enumeration>
               <enumeration value="RemoteReboot">
                 <description>
-                  A {{object}} Event that was the result of a reboot triggered
-                  via the {{command|#.Reboot()}} Command or other remote
-                  trigger, e.g. another remote management protocol
+                  A {{object|Device.|absolute}} Event that was the result of a
+                  reboot triggered via the {{command|.Reboot()|model}}} Command
+                  or other remote trigger, e.g. another remote management
+                  protocol
                 </description>
               </enumeration>
-              <enumeration value="FactoryReset">
+              <enumeration value="FactoryReset" version="2.15">
                 <description>
-                  A {{object}} Event that was the result of a factory reset
-                  triggered locally on the Device or remotely (as a result of a
-                  {{command|#.FactoryReset()}} Command or other remote trigger,
-                  e.g. another remote management protocol), which is to be used
-                  when the Agent cannot differentiate between local and remote
+                  A {{object|Device.|absolute}} Event that was the result of a
+                  factory reset triggered locally on the Device or remotely (as
+                  a result of a {{command|.FactoryReset()|model}}} Command or
+                  other remote trigger, e.g. another remote management
+                  protocol), which is to be used when the Agent cannot
+                  differentiate between local and remote
                 </description>
               </enumeration>
               <enumeration value="LocalFactoryReset">
                 <description>
-                  A {{object}} Event that was the result of a factory reset
-                  triggered locally on the Device (NOT as a result of a
-                  {{command|#.FactoryReset()}} Command or other remote trigger,
-                  e.g. another remote management protocol)
+                  A {{object|Device.|absolute}} Event that was the result of a
+                  factory reset triggered locally on the Device (NOT as a
+                  result of a {{command|.FactoryReset()|model}}} Command
+                  triggered by a remote trigger, e.g. another remote management
+                  protocol)
                 </description>
               </enumeration>
               <enumeration value="RemoteFactoryReset">
                 <description>
-                  A {{object}} Event that was the result of a factory reset
-                  triggered via the {{command|#.FactoryReset()}} Command or
-                  other remote trigger, e.g. another remote management protocol
+                  A {{object|Device.|absolute}} Event that was the result of a
+                  factory reset triggered via the
+                  {{command|.FactoryReset()|model}} Command or other remote
+                  trigger, e.g. another remote management protocol
                 </description>
               </enumeration>
             </string>
           </syntax>
         </parameter>
 
+        <parameter name="Reason" version="2.18">
+          <description>
+            The reason of the boot (e.g. power on reset, watchdog, overheat,
+            FAN fault, web userinterface, ...).
+          </description>
+          <syntax>
+            <string/>
+          </syntax>
+        </parameter>
+
         <parameter name="FirmwareUpdated">
           <description>
             {{true}} if the firmware was updated as a result of the boot that
@@ -3754,16 +3838,59 @@
         <description>
           Factory reset the entity associated with the containing {{object}}.
         </description>
+        <input>
+
+          <parameter name="Cause" mandatory="false" version="2.18">
+            <description>
+              The cause that will be contained within the {{event|#.Boot!}}
+              Event. By default the Device SHOULD set this value to
+              {{enum|RemoteFactoryReset}}.
+            </description>
+            <syntax>
+              <string>
+                <enumeration value="LocalFactoryReset">
+                  <description>
+                    A {{object|Device.|absolute}} Event that was the result of
+                    a factory reset triggered locally on the Device (NOT as a
+                    result of a {{command|.FactoryReset()|model}}} Command
+                    trigger by a remote trigger, e.g. another remote management
+                    protocol)
+                  </description>
+                </enumeration>
+                <enumeration value="RemoteFactoryReset">
+                  <description>
+                    A {{object|Device.|absolute}} Event that was the result of
+                    a factory reset triggered via the
+                    {{command|.FactoryReset()|model}} Command or other remote
+                    trigger, e.g. another remote management protocol
+                  </description>
+                </enumeration>
+              </string>
+            </syntax>
+          </parameter>
+
+          <parameter name="Reason" mandatory="false" version="2.18">
+            <description>
+              The reason of the boot (e.g. power on reset, watchdog, overheat,
+              FAN fault, web userinterface, ...).
+
+              When absent the implementation must set {{param}} to 'Unknown'.
+            </description>
+            <syntax>
+              <string/>
+            </syntax>
+          </parameter>
+        </input>
       </command>
 
-      <command name="SelfTestDiagnostics()" async="true">
+      <command name="SelfTestDiagnostics()" async="true" version="2.12">
         <description>
           This diagnostics test is vendor-specific and MAY include testing
           hardware, software, and/or firmware.
         </description>
         <output>
 
-          <parameter name="Status">
+          <parameter name="Status" version="2.13">
             <description>
               Indicates the availability of diagnostics data. {{enum}}
 
@@ -3780,7 +3907,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="Results">
+          <parameter name="Results" version="2.12">
             <description>
               Results of self-test (vendor specific).
             </description>
@@ -3793,14 +3920,14 @@
         </output>
       </command>
 
-      <command name="PacketCaptureDiagnostics()" async="true">
+      <command name="PacketCaptureDiagnostics()" async="true" version="2.13">
         <description>
           This diagnostic command is used to record packet capture data on a
           valid (layer 2 or above) interface in libpcap or pcapng format.
         </description>
         <input>
 
-          <parameter name="Interface">
+          <parameter name="Interface" version="2.13">
             <description>
               A reference to a (layer 2 or above) interface object that will be
               the target of this packet capture diagnostic.
@@ -3813,7 +3940,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="Format">
+          <parameter name="Format" version="2.13">
             <description>
               This indicates whether the network trace will be recorded in
               libpcap {{bibref|LIBPCAP}} or pcapng format, and is dependent on
@@ -3836,7 +3963,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="Duration">
+          <parameter name="Duration" version="2.13">
             <description>
               The duration in {{units}} to copy packets to the file target. The
               diagnostic completes when either the {{param}},
@@ -3850,7 +3977,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="PacketCount">
+          <parameter name="PacketCount" version="2.13">
             <description>
               The maximum number of packets to record to the file target. A
               value of zero (0) indicates no limit. The diagnostic completes
@@ -3862,7 +3989,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="ByteCount">
+          <parameter name="ByteCount" version="2.13">
             <description>
               The maximum number of bytes to record to the file target. A value
               of zero (0) indicates no limit. The diagnostic completes when
@@ -3874,7 +4001,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="FileTarget">
+          <parameter name="FileTarget" version="2.13">
             <description>
               The {{datatype}} specifying the destination file location. The
               HTTPS transport MUST be supported, and the HTTP transport MAY be
@@ -3885,7 +4012,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="FilterExpression">
+          <parameter name="FilterExpression" version="2.13">
             <description>
               A ({{bibref|BPF}}) formatted expression used to restrict the
               types of network packets that are recorded to
@@ -3898,7 +4025,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="Username">
+          <parameter name="Username" version="2.13">
             <description>
               Username to be used by the Agent to authenticate with the file
               location. This string is set to {{empty}} if no authentication is
@@ -3911,7 +4038,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="Password">
+          <parameter name="Password" version="2.13">
             <description>
               Password to be used by the Agent to authenticate with the file
               location. This string is set to {{empty}} if no authentication is
@@ -3994,7 +4121,7 @@
         </output>
       </command>
 
-      <command name="ScheduleTimer()" async="true">
+      <command name="ScheduleTimer()" async="true" version="2.12">
         <description>
           Schedule an async timer operation. A scheduled timer MUST persist
           across reboots.
@@ -4020,7 +4147,8 @@
         </input>
       </command>
 
-      <parameter name="IoTCapabilityNumberOfEntries" access="readOnly">
+      <parameter name="IoTCapabilityNumberOfEntries" access="readOnly"
+          version="2.13">
         <description>
           {{numentries}}
         </description>
@@ -4029,7 +4157,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="NodeNumberOfEntries" access="readOnly">
+      <parameter name="NodeNumberOfEntries" access="readOnly" version="2.13">
         <description>
           {{numentries}}
         </description>
@@ -4052,7 +4180,7 @@
         This object contains general device information.
       </description>
 
-      <parameter name="DeviceCategory" access="readOnly">
+      <parameter name="DeviceCategory" access="readOnly" version="2.8">
         <description>
           Each list item is a device category (e.g. "AV_TV" and "AV_Recorder"),
           or the value is {{empty}} if no such element is provided by the
@@ -4139,7 +4267,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ModelNumber" access="readOnly">
+      <parameter name="ModelNumber" access="readOnly" version="2.8">
         <description>
           The model number of the device (human readable string), or {{empty}}
           if no model number is provided by the device.
@@ -4228,7 +4356,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ActiveFirmwareImage" access="readOnly">
+      <parameter name="ActiveFirmwareImage" access="readOnly" version="2.12">
         <description>
           {{noreference}}A full path reference to the row in the
           {{object|FirmwareImage}} table representing the currently running
@@ -4242,7 +4370,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="BootFirmwareImage" access="readWrite">
+      <parameter name="BootFirmwareImage" access="readWrite" version="2.12">
         <description>
           {{noreference}}A full path reference to the row in the
           {{object|FirmwareImage}} table of the firmware image that is to be
@@ -4340,7 +4468,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="HostName" access="readWrite">
+      <parameter name="HostName" access="readWrite" version="2.16">
         <description>
           The hostname of the device {{bibref|RFC1123|Section 2 General
           issues}}. This can be either a Fully Qualified Domain Name (FQDN) or
@@ -4354,7 +4482,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="FirmwareImageNumberOfEntries" access="readOnly">
+      <parameter name="FirmwareImageNumberOfEntries" access="readOnly"
+          version="2.12">
         <description>
           {{numentries}}
         </description>
@@ -4372,7 +4501,22 @@
         </syntax>
       </parameter>
 
-      <parameter name="ProcessorNumberOfEntries" access="readOnly">
+      <parameter name="ProcessorNumberOfEntries" access="readOnly"
+          version="2.1" status="deprecated">
+        <description>
+          {{numentries}}
+
+          {{deprecated|2.18|because the only contained parameter,
+          {{param|Processor.{i}.Architecture}}, is no longer relevant for
+          modern devices.}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="LogRotateNumberOfEntries" access="readOnly"
+          version="2.17">
         <description>
           {{numentries}}
         </description>
@@ -4381,7 +4525,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="LogRotateNumberOfEntries" access="readOnly">
+      <parameter name="VendorLogFileNumberOfEntries" access="readOnly"
+          version="2.1">
         <description>
           {{numentries}}
         </description>
@@ -4390,16 +4535,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="VendorLogFileNumberOfEntries" access="readOnly">
-        <description>
-          {{numentries}}
-        </description>
-        <syntax>
-          <unsignedInt/>
-        </syntax>
-      </parameter>
-
-      <parameter name="LocationNumberOfEntries" access="readOnly">
+      <parameter name="LocationNumberOfEntries" access="readOnly"
+          version="2.4">
         <description>
           {{numentries}}
         </description>
@@ -4409,7 +4546,7 @@
       </parameter>
 
       <parameter name="DeviceImageNumberOfEntries" access="readOnly"
-          dmr:customNumEntriesParameter="true">
+          version="2.11" dmr:customNumEntriesParameter="true">
         <description>
           {{numentries}}
         </description>
@@ -4437,7 +4574,7 @@
         <description>
           Private Enterprise Number assigned and registered by IANA to the
           entity responsible for this Agent. Represented as a decimal encoding
-          of the IANA-assinged number.
+          of the IANA-assigned number.
 
           This value MUST remain fixed over the lifetime of the Agent,
           including across firmware updates. Any change would indicate that
@@ -4452,7 +4589,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="MaxNumberOfActivateTimeWindows" access="readOnly">
+      <parameter name="MaxNumberOfActivateTimeWindows" access="readOnly"
+          version="2.16">
         <description>
           The maximum number of time windows in a
           {{command|FirmwareImage.{i}.Activate()}} Command that the Device
@@ -4485,12 +4623,12 @@
         <parameter ref="Name"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -4555,22 +4693,22 @@
         </syntax>
       </parameter>
 
-      <parameter name="UseForBackupRestore" access="readOnly">
+      <parameter name="UseForBackupRestore" access="readOnly" version="2.7">
         <description>
           When {{true}}, this parameter indicates that this {{object}} instance
           is to be used for backup and restoration purposes.
 
           Note: The backup and restore operations may require the use of
           multiple {{object}} instances. In this scenario the mechanism for
-          detemining the order and combination of {{object}} instances used for
-          backup and restoration purposes is implementation specific.
+          determining the order and combination of {{object}} instances used
+          for backup and restoration purposes is implementation specific.
         </description>
         <syntax>
           <boolean/>
         </syntax>
       </parameter>
 
-      <command name="Backup()" async="true">
+      <command name="Backup()" async="true" version="2.12">
         <description>
           This command is issued to upload the configuration file specified by
           this {{object}} instance.
@@ -4631,7 +4769,7 @@
         </input>
       </command>
 
-      <command name="Restore()" async="true">
+      <command name="Restore()" async="true" version="2.12">
         <description>
           This command is issued to download a configuration file into this
           {{object}} instance.
@@ -4841,7 +4979,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="TotalPersistent" access="readOnly">
+      <parameter name="TotalPersistent" access="readOnly" version="2.15">
         <description>
           The sum total physical Non-Volatile Memory (NVM), in {{units}},
           installed on the device. This memory persists across reboots and can
@@ -4855,7 +4993,7 @@
       </parameter>
 
       <parameter name="FreePersistent" access="readOnly"
-          activeNotify="canDeny">
+          activeNotify="canDeny" version="2.15">
         <description>
           The sum total free physical Non-Volatile Memory (NVM), in {{units}},
           currently available on the device. This memory persists across
@@ -4870,6 +5008,199 @@
       </parameter>
     </object>
 
+    <object name="Device.DeviceInfo.MemoryStatus.MemoryMonitor."
+        access="readOnly" minEntries="1" maxEntries="1" version="2.18">
+      <description>
+        This object specifies information that the device has obtained via
+        sampling the memory utilization (RAM) on the device.
+      </description>
+
+      <parameter name="Enable" access="readWrite" version="2.18">
+        <description>
+          Indicates whether or not memory monitoring is enabled.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="implementation" value="false"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="MemUtilization" access="readOnly" version="2.18">
+        <description>
+          Memory utilization, in {{units}}, rounded to the nearest whole
+          {{units}}, is the percentage of memory used by the system which
+          cannot be spontaneously reclaimed or repurposed by the system in case
+          it is required. This metric is collected at the
+          {{param|PollingInterval}}. This value is used to determine if a
+          critical condition is reached i.e., the memory utilization exceeds
+          {{param|CriticalRiseThreshold}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range maxInclusive="100"/>
+            <units value="percent"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="PollingInterval" access="readWrite" version="2.18">
+        <description>
+          The interval, measured in {{units}}, in which the device polls the
+          memory utilization.
+
+          If the value is 0 then the device selects its own polling interval.
+
+          If the value is greater than 0 then the device MUST use this value as
+          the polling interval.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="CriticalRiseThreshold" access="readWrite"
+          version="2.18">
+        <description>
+          Memory utilization rise threshold {{units}} value. If the
+          {{param|MemUtilization}} exceeds the rise threshold value, and the
+          {{param|CriticalFallTimeStamp}} is greater than
+          {{param|CriticalRiseTimeStamp}} (indicating that critical condition
+          is reached), the following takes place:
+
+          * The {{param|CriticalRiseTimeStamp}} is updated to the current time.
+
+          * A log is generated into the vendor log file referenced by
+            {{param|VendorLogFileRef}} indicating critical condition is reached
+            if the {{param|EnableCriticalLog}} is {{true}}.
+
+          * A {{event|MemoryCriticalState!}} event is generated along with Mem
+            stats indicating critical condition is reached.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range maxInclusive="100"/>
+            <units value="percent"/>
+          </unsignedInt>
+          <default type="implementation" value="80"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="CriticalFallThreshold" access="readWrite"
+          version="2.18">
+        <description>
+          Memory utilization fall threshold {{units}} value. If the
+          {{param|MemUtilization}} falls below the fall threshold value and
+          {{param|CriticalRiseTimeStamp}} is greater than
+          {{param|CriticalFallTimeStamp}} (indicating that the critical
+          condition is no longer present), the following takes place:
+
+          * The {{param|CriticalFallTimeStamp}} is updated to current time.
+
+          * A log is generated into the vendor log file referenced by
+            {{object|.DeviceInfo.VendorLogFile}} indicating that the critical
+            condition is no longer present if the {{param|EnableCriticalLog}}
+            is {{true}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range maxInclusive="100"/>
+            <units value="percent"/>
+          </unsignedInt>
+          <default type="implementation" value="60"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="CriticalRiseTimeStamp" access="readOnly" version="2.18">
+        <description>
+          Last date and time when the critical condition was reached. See
+          {{param|CriticalRiseThreshold}} description for more details.
+        </description>
+        <syntax>
+          <dateTime/>
+        </syntax>
+      </parameter>
+
+      <parameter name="CriticalFallTimeStamp" access="readOnly" version="2.18">
+        <description>
+          Last date and time when the critical condition was no longer present.
+          See {{param|CriticalFallThreshold}} description for more details.
+        </description>
+        <syntax>
+          <dateTime/>
+        </syntax>
+      </parameter>
+
+      <parameter name="EnableCriticalLog" access="readWrite" version="2.18">
+        <description>
+          This parameter indicates whether a critical log needs to be generated
+          in the vendor log file.
+
+          * If the value of {{param}} is {{true}}, then a critical log is
+            generated in the vendor log file.
+
+          * If the value of {{param}} is {{false}}, then no critical log is
+            generated in the vendor log file.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="implementation" value="false"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="VendorLogFileRef" access="readOnly" version="2.18">
+        <description>
+          The reference to {{object|.DeviceInfo.VendorLogFile}} is
+          automatically constructed and the
+          {{object|.DeviceInfo.VendorLogFile}} is populated with the
+          information based on {{param|FilePath}}.
+
+          E.g. When {{param|FilePath}} = ''file:///var/log/messages''. The
+          following entry is automatically added to
+          {{object|.DeviceInfo.VendorLogFile}}: ''file:///var/log/messages''.
+        </description>
+        <syntax>
+          <string>
+            <pathRef refType="strong"
+                targetParent=".DeviceInfo.VendorLogFile." targetType="row"/>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="FilePath" access="readWrite" version="2.18">
+        <description>
+          Destination path and filename of where to create and keep the log
+          files which MUST use the file URI scheme {{bibref|RFC8089|The file
+          URI Scheme}}. This file is related to {{param|EnableCriticalLog}}.
+        </description>
+        <syntax>
+          <string/>
+        </syntax>
+      </parameter>
+
+      <event name="MemoryCriticalState!" version="2.18">
+        <description>
+          This event is generated indicating critical condition is reached
+          i.e., when {{param|MemUtilization}} exceeds the rise threshold, the
+          event is generated.
+        </description>
+
+        <parameter name="MemUtilization" version="2.18">
+          <description>
+            Memory utilization, in {{units}}, rounded to the nearest whole
+            {{units}}, collected at the polling interval.
+          </description>
+          <syntax>
+            <unsignedInt>
+              <range maxInclusive="100"/>
+              <units value="percent"/>
+            </unsignedInt>
+          </syntax>
+        </parameter>
+      </event>
+    </object>
+
     <object name="Device.DeviceInfo.ProcessStatus." access="readOnly"
         minEntries="1" maxEntries="1" version="2.0">
       <description>
@@ -4878,7 +5209,7 @@
 
       <parameter name="CPUUsage" access="readOnly" activeNotify="canDeny">
         <description>
-          The total amount of the CPU, in {{units}}, rounded up to the nearest
+          The total amount of the CPU, in {{units}}, rounded to the nearest
           whole {{units}}. In the case that multiple CPU are present, this
           value represents the average of all CPU.
         </description>
@@ -4898,6 +5229,337 @@
           <unsignedInt/>
         </syntax>
       </parameter>
+
+      <parameter name="CPUNumberOfEntries" access="readOnly" version="2.18">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object name="Device.DeviceInfo.ProcessStatus.CPU.{i}." access="readOnly"
+        numEntriesParameter="CPUNumberOfEntries" minEntries="0"
+        maxEntries="unbounded" dmr:fixedObject="true" version="2.18">
+      <description>
+        Each instance in the table represents a CPU on this device. Here CPU
+        can imply main CPU (where system software is executed) or
+        hardware/network acceleration CPU (responsible for data plane traffic).
+      </description>
+      <uniqueKey functional="true">
+        <parameter ref="Name"/>
+      </uniqueKey>
+      <uniqueKey functional="false">
+        <parameter ref="Alias"/>
+      </uniqueKey>
+
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.18">
+        <description>
+          {{datatype|expand}}
+        </description>
+        <syntax>
+          <dataType ref="_AliasUSP"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Name" access="readOnly" version="2.18">
+        <description>
+          Name of this CPU. This text MUST be sufficient to distinguish this
+          CPU from other CPUs.
+        </description>
+        <syntax>
+          <string>
+            <size maxLength="256"/>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="Enable" access="readWrite" version="2.18">
+        <description>
+          Enables or disables the CPU utilization monitoring.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="implementation" value="false"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="UpTime" access="readOnly" version="2.18">
+        <description>
+          Time in {{units}} since the CPU was last restarted.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="UserModeUtilization" access="readOnly" version="2.18">
+        <description>
+          CPU utilization, in {{units}}, rounded to the nearest whole
+          {{units}}, while executing at the user level. This includes
+          utilization across all cores.
+
+          This value is calculated the same way as {{param|CPUUtilization}}.
+          See {{param|CPUUtilization}} description for more details.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range maxInclusive="100"/>
+            <units value="percent"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="SystemModeUtilization" access="readOnly" version="2.18">
+        <description>
+          CPU utilization, in {{units}}, rounded to the nearest whole
+          {{units}}, while executing at the system/kernel level. Note that this
+          includes the time spent servicing interrupts as well. This includes
+          utilization across all cores.
+
+          This value is calculated the same way as {{param|CPUUtilization}}.
+          See {{param|CPUUtilization}} description for more details.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range maxInclusive="100"/>
+            <units value="percent"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="IdleModeUtilization" access="readOnly" version="2.18">
+        <description>
+          CPU utilization, in {{units}}, rounded to the nearest whole
+          {{units}}, while the CPU was idle.
+
+          This value is calculated the same way as {{param|CPUUtilization}}.
+          See {{param|CPUUtilization}} description for more details.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range maxInclusive="100"/>
+            <units value="percent"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="CPUUtilization" access="readOnly" version="2.18">
+        <description>
+          CPU utilization, in {{units}}, rounded to the nearest whole
+          {{units}}. The CPU Utilization is calculated as a moving window
+          average of {{param|NumSamples}} CPU utilization samples collected at
+          the {{param|PollInterval}}.
+
+          For example, the CPU utilization is calculated as follows: CPU
+          Utilization = (sample1 + sample2 + ... + sampleN)/N where N is the
+          number of CPU usage samples as represented by {{param|NumSamples}}
+          and sample1, sample2, ..., sampleN are CPU usage samples collected at
+          every {{param|PollInterval}} seconds.
+
+          This parameter, which reflects system and user mode CPU utilization,
+          is used to determine if the CPU is in critical condition. This value
+          includes system mode and user mode utilization i.e., everything
+          except idle mode utilization.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range maxInclusive="100"/>
+            <units value="percent"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="PollInterval" access="readWrite" version="2.18">
+        <description>
+          The interval, measured in {{units}}, over which the CPU usage is
+          polled.
+
+          If the value is 0 then the device selects its own polling interval.
+
+          If the value is greater than 0 then the device MUST use this value as
+          the poll interval.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+          <default type="implementation" value="5"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="NumSamples" access="readWrite" version="2.18">
+        <description>
+          This parameter indicates the number of CPU usage samples that is
+          needed to calculate the average CPU utilization and populate the
+          {{param|CPUUtilization}}
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range minInclusive="1" maxInclusive="300"/>
+          </unsignedInt>
+          <default type="implementation" value="30"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="CriticalRiseThreshold" access="readWrite"
+          version="2.18">
+        <description>
+          CPU utilization rise threshold {{units}} value. If the
+          {{param|CPUUtilization}} exceeds the rise threshold value and the
+          {{param|CriticalFallTimeStamp}} is greater than
+          {{param|CriticalRiseTimeStamp}} (indicating that critical condition
+          is reached), the following takes place:
+
+          * The {{param|CriticalRiseTimeStamp}} is updated to the current time
+
+          * A log is generated into the vendor log file referenced by
+            {{object|###.DeviceInfo.VendorLogFile}} indicating critical
+            condition is reached if the {{param|EnableCriticalLog}} is
+            {{true}}. The logs generated should indicate the {{param|Name}} as
+            well as the {{param|CriticalRiseTimeStamp}} of the CPU.
+
+          * A {{event|CPUCriticalState!}} event is generated along with CPU
+            Utilization indicating critical condition is reached.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range maxInclusive="100"/>
+            <units value="percent"/>
+          </unsignedInt>
+          <default type="implementation" value="80"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="CriticalFallThreshold" access="readWrite"
+          version="2.18">
+        <description>
+          CPU utilization fall threshold {{units}} value. If the
+          {{param|CPUUtilization}} falls below fall threshold value and
+          {{param|CriticalRiseTimeStamp}} is greater than
+          {{param|CriticalFallTimeStamp}} (indicating that critical condition
+          is no longer present), the following takes place:
+
+          * The {{param|CriticalFallTimeStamp}} is updated to current time
+
+          * A log is generated into the vendor log file referenced by
+            {{object|###.DeviceInfo.VendorLogFile}} indicating the clearing of
+            critical condition if the {{param|EnableCriticalLog}} is {{true}}.
+            The logs generated should indicate the {{param|Name}} as well as
+            the {{param|CriticalFallTimeStamp}} of the CPU.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range maxInclusive="100"/>
+            <units value="percent"/>
+          </unsignedInt>
+          <default type="implementation" value="60"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="CriticalRiseTimeStamp" access="readOnly" version="2.18">
+        <description>
+          Last date and time when the critical condition was reached. See
+          {{param|CriticalRiseThreshold}} description for more details.
+        </description>
+        <syntax>
+          <dateTime/>
+        </syntax>
+      </parameter>
+
+      <parameter name="CriticalFallTimeStamp" access="readOnly" version="2.18">
+        <description>
+          Last date and time when the critical condition is no longer present.
+          See {{param|CriticalFallThreshold}} description for more details.
+        </description>
+        <syntax>
+          <dateTime/>
+        </syntax>
+      </parameter>
+
+      <parameter name="EnableCriticalLog" access="readWrite" version="2.18">
+        <description>
+          This parameter indicates whether a critical log needs to be generated
+          in the vendor log file.
+
+          * If the value of {{param}} is {{true}}, then a critical log is
+            generated in the vendor log file.
+
+          * If the value of {{param}} is {{false}}, then no critical log is
+            generated in the vendor log file.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="implementation" value="false"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="VendorLogFileRef" access="readOnly" version="2.18">
+        <description>
+          The reference to {{object|###.DeviceInfo.VendorLogFile}} is
+          automatically constructed and the
+          {{object|###.DeviceInfo.VendorLogFile}} is populated with the
+          information based on {{param|FilePath}}.
+
+          E.g. When {{param|FilePath}} = ''file:///var/log/messages''. The
+          following entry is automatically added to
+          {{object|###.DeviceInfo.VendorLogFile}}:
+          ''file:///var/log/messages''.
+        </description>
+        <syntax>
+          <string>
+            <pathRef refType="strong"
+                targetParent=".DeviceInfo.VendorLogFile." targetType="row"/>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="FilePath" access="readWrite" version="2.18">
+        <description>
+          Destination path and filename of where to create and keep the log
+          files which MUST use the uri scheme file {{bibref|RFC8089|The file
+          URI Scheme}}. This file is related to {{param|EnableCriticalLog}}.
+        </description>
+        <syntax>
+          <string/>
+        </syntax>
+      </parameter>
+
+      <event name="CPUCriticalState!" version="2.18">
+        <description>
+          This event is generated indicating critical condition is reached
+          i.e., when the rise threshold is crossed, the event is generated.
+        </description>
+
+        <parameter name="CPUUtilization" version="2.18">
+          <description>
+            CPU utilization, in {{units}}, rounded to the nearest whole
+            {{units}}.
+          </description>
+          <syntax>
+            <unsignedInt>
+              <range maxInclusive="100"/>
+              <units value="percent"/>
+            </unsignedInt>
+          </syntax>
+        </parameter>
+
+        <parameter name="Name" version="2.18">
+          <description>
+            Name of this CPU. This text MUST be sufficient to distinguish this
+            CPU from other CPUs.
+          </description>
+          <syntax>
+            <string>
+              <size maxLength="256"/>
+            </string>
+          </syntax>
+        </parameter>
+      </event>
     </object>
 
     <object name="Device.DeviceInfo.ProcessStatus.Process.{i}."
@@ -5012,12 +5674,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.3">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -5055,7 +5717,8 @@
         </syntax>
       </parameter>
 
-      <command name="Reset()" dmr:previousParameter="Status" async="false">
+      <command name="Reset()" dmr:previousParameter="Status" version="2.12"
+          async="false">
         <description>
           Resets the temperature sensor.
         </description>
@@ -5231,7 +5894,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="PollingInterval" access="readWrite">
+      <parameter name="PollingInterval" access="readWrite" version="2.1">
         <description>
           The interval, measured in {{units}}, in which the device polls this
           {{object}}.
@@ -5326,21 +5989,24 @@
 
     <object name="Device.DeviceInfo.Processor.{i}." access="readOnly"
         numEntriesParameter="ProcessorNumberOfEntries" minEntries="0"
-        maxEntries="unbounded" dmr:noUniqueKeys="true" version="2.1">
+        maxEntries="unbounded" version="2.1" status="deprecated">
       <description>
         Each table entry represents a hardware or virtual processor that
         resides on this device.
+
+        {{deprecated|2.18|because the only contained parameter,
+        {{param|Architecture}}, is no longer relevant for modern devices.}}
       </description>
       <uniqueKey functional="false">
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.3">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -5395,12 +6061,12 @@
         <parameter ref="Name"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.17">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -5523,12 +6189,12 @@
         <parameter ref="Name"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.17">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -5583,12 +6249,12 @@
         <parameter ref="Name"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.1">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -5633,7 +6299,7 @@
         </syntax>
       </parameter>
 
-      <command name="Upload()" async="true">
+      <command name="Upload()" async="true" version="2.12">
         <description>
           This command is issued to upload the log file specified by this
           Vendor Log File instance.
@@ -5761,7 +6427,7 @@
               <description>{{empty}}</description>
             </enumeration>
             <enumeration value="CWMP"/>
-            <enumeration value="USP"/>
+            <enumeration value="USP" version="2.13"/>
             <enumeration value="OMA-DM"/>
             <enumeration value="SNMP"/>
             <enumeration value="UPnP"/>
@@ -5826,12 +6492,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.11">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -5876,12 +6542,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.12">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -5962,7 +6628,7 @@
                 firmware images, but only has a single image installed.
               </description>
             </enumeration>
-            <enumeration value="Active">
+            <enumeration value="Active" version="2.14">
               <description>
                 This Firmware Image instance is the currently active image.
               </description>
@@ -6032,7 +6698,7 @@
         </syntax>
       </parameter>
 
-      <command name="Download()" async="true">
+      <command name="Download()" async="true" version="2.12">
         <description>
           This command is issued to download a firmware into this Firmware
           Image instance.
@@ -6195,7 +6861,7 @@
         </input>
       </command>
 
-      <command name="Activate()" async="true">
+      <command name="Activate()" async="true" version="2.12">
         <description>
           This command is issued to activate this {{object}} instance.
 
@@ -6364,7 +7030,7 @@
 
       <parameter name="LastUpgradeCount" access="readOnly">
         <description>
-          Total number of Kernel faults which occured since last firmware
+          Total number of Kernel faults which occurred since last firmware
           upgrade.
         </description>
         <syntax>
@@ -6425,7 +7091,7 @@
         </syntax>
       </parameter>
 
-      <command name="RemoveAllKernelFaults()" async="true">
+      <command name="RemoveAllKernelFaults()" async="true" version="2.17">
         <description>
           This command removes all the {{object|KernelFault.{i}.}} from the
           device, together with all the associated Kernel fault data stored on
@@ -6436,8 +7102,7 @@
 
     <object name="Device.DeviceInfo.KernelFaults.KernelFault.{i}."
         access="readOnly" numEntriesParameter="KernelFaultNumberOfEntries"
-        minEntries="0" maxEntries="unbounded" dmr:noUniqueKeys="true"
-        version="2.17">
+        minEntries="0" maxEntries="unbounded" version="2.17">
       <description>
         Each table entry represents a Kernel fault that is stored on the
         device.
@@ -6446,12 +7111,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.17">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -6486,7 +7151,7 @@
 
       <parameter name="FirmwareVersion" access="readOnly">
         <description>
-          The firmeware version that triggered the Kernel fault.
+          The firmware version that triggered the Kernel fault.
         </description>
         <syntax>
           <string/>
@@ -6512,7 +7177,7 @@
         </syntax>
       </parameter>
 
-      <command name="Upload()" async="true">
+      <command name="Upload()" async="true" version="2.17">
         <description>
           This command is issued to upload the Kernel fault information
           specified by this KernelFault instance.
@@ -6573,7 +7238,7 @@
         </input>
       </command>
 
-      <command name="Remove()" async="true">
+      <command name="Remove()" async="true" version="2.17">
         <description>
           Remove this row from the table, together with the associated Kernel
           fault data stored on the device.
@@ -6600,7 +7265,7 @@
 
       <parameter name="LastUpgradeCount" access="readOnly">
         <description>
-          Total number of process faults which occured since last firmware
+          Total number of process faults which occurred since last firmware
           upgrade.
         </description>
         <syntax>
@@ -6661,7 +7326,7 @@
         </syntax>
       </parameter>
 
-      <command name="RemoveAllProcessFaults()" async="true">
+      <command name="RemoveAllProcessFaults()" async="true" version="2.17">
         <description>
           This command removes all the {{object|ProcessFault.{i}.}} from the
           device, together with all the associated faulty data stored on the
@@ -6672,8 +7337,7 @@
 
     <object name="Device.DeviceInfo.ProcessFaults.ProcessFault.{i}."
         access="readOnly" numEntriesParameter="ProcessFaultNumberOfEntries"
-        minEntries="0" maxEntries="unbounded" dmr:noUniqueKeys="true"
-        version="2.17">
+        minEntries="0" maxEntries="unbounded" version="2.17">
       <description>
         Each table entry represents a process fault that is stored on the
         device.
@@ -6682,12 +7346,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.17">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -6722,7 +7386,7 @@
 
       <parameter name="TimeStamp" access="readOnly">
         <description>
-          The time when the process fault occured.
+          The time when the process fault occurred.
         </description>
         <syntax>
           <dateTime/>
@@ -6731,7 +7395,7 @@
 
       <parameter name="FirmwareVersion" access="readOnly">
         <description>
-          The firmware version that triggered the the process fault.
+          The firmware version that triggered the process fault.
         </description>
         <syntax>
           <string/>
@@ -6756,7 +7420,7 @@
         </syntax>
       </parameter>
 
-      <command name="Upload()" async="true">
+      <command name="Upload()" async="true" version="2.17">
         <description>
           This command is issued to upload the Fault information specified by
           this Fault instance.
@@ -6817,7 +7481,7 @@
         </input>
       </command>
 
-      <command name="Remove()" async="true">
+      <command name="Remove()" async="true" version="2.17">
         <description>
           Remove this row from the table, together with the associated faulty
           data stored on the device.
@@ -6825,6 +7489,231 @@
       </command>
     </object>
 
+    <object name="Device.DeviceInfo.Reboots." access="readOnly" version="2.18">
+      <description>
+        The monitoring of reboot reasons is essential for diagnosing and
+        troubleshooting issues with applications and processes running on the
+        Device.
+      </description>
+
+      <parameter name="BootCount" access="readOnly">
+        <description>
+          The number of times the device has rebooted since the last factory
+          reset.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="CurrentVersionBootCount" access="readOnly">
+        <description>
+          The number of times the device has rebooted since the latest firmware
+          update.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="WatchdogBootCount" access="readOnly">
+        <description>
+          The number of times the device has rebooted by a sw/hw watchdog since
+          the last factory reset.
+
+          The watchdog is a component within the operating system kernel or
+          Device responsible for monitoring user-space activities. If it
+          detects non-responsiveness in user-space processes, it triggers a
+          reboot of the device.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ColdBootCount" access="readOnly">
+        <description>
+          The number of times the device has cold rebooted since the last
+          factory reset.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="WarmBootCount" access="readOnly">
+        <description>
+          The number of times the device has warm rebooted since the last
+          factory reset.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="MaxRebootEntries" access="readWrite">
+        <description>
+          The maximum number of entries available in the {{object|Reboot}}
+          table. Defines the maximum number of {{object|Reboot}} instances that
+          can be stored on the device.
+
+          When the maximum {{object|Reboot}} entries as indicated by {{param}}
+          are reached, the next boot entry overrides the object with the oldest
+          {{param|Reboot.{i}.TimeStamp}}.
+
+          Set this parameter to 0 to completely disable the creation of
+          {{object|Reboot}} instances.
+
+          Set this parameter to -1 to leave it open to the implementation to
+          decide the maximum number of {{object|Reboot}} instances that may be
+          stored on the device.
+
+          Reducing the {{param}} will cause for the implementation to delete
+          the oldest {{object|Reboot}} instances.
+
+          This setting does not affect the counting of reboots.
+        </description>
+        <syntax>
+          <int>
+            <range minInclusive="-1"/>
+          </int>
+        </syntax>
+      </parameter>
+
+      <parameter name="RebootNumberOfEntries" access="readOnly">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <command name="RemoveAllReboots()" async="true" version="2.18">
+        <description>
+          Removes all the {{object|Reboot.{i}.}} instances from the device,
+          together with the associated data stored on the device.
+        </description>
+      </command>
+    </object>
+
+    <object name="Device.DeviceInfo.Reboots.Reboot.{i}." access="readOnly"
+        numEntriesParameter="RebootNumberOfEntries" minEntries="0"
+        maxEntries="unbounded" version="2.18">
+      <description>
+        Each table entry represents a reboot reason that is stored on the
+        device.
+
+        When the maximum {{object}} entries as indicated by
+        {{param|#.MaxRebootEntries}} are reached, the next boot entry overrides
+        the object with the oldest {{param|TimeStamp}}.
+      </description>
+      <uniqueKey functional="false">
+        <parameter ref="Alias"/>
+      </uniqueKey>
+      <uniqueKey functional="true">
+        <parameter ref="TimeStamp"/>
+      </uniqueKey>
+
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.18">
+        <description>
+          {{datatype|expand}}
+        </description>
+        <syntax>
+          <dataType ref="_AliasUSP"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="TimeStamp" access="readOnly">
+        <description>
+          The time when the reboot occurred.
+        </description>
+        <syntax>
+          <dateTime/>
+        </syntax>
+      </parameter>
+
+      <parameter name="FirmwareUpdated" access="readOnly">
+        <description>
+          {{true}} if the Device was rebooted as a result of a firmware update;
+          otherwise {{false}}.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Cause">
+        <description>
+          The cause of the boot.
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="LocalReboot">
+              <description>
+                A {{object|Device.|absolute}} Event that was the result of a
+                reboot triggered locally on the Device (NOT as a result of a
+                {{command|.Reboot()|model}}}} Command triggered by a remote
+                trigger, e.g. another remote management protocol)
+              </description>
+            </enumeration>
+            <enumeration value="RemoteReboot">
+              <description>
+                A {{object|Device.|absolute}} Event that was the result of a
+                reboot triggered via the {{command|.Reboot()|model}}} Command
+                or other remote trigger, e.g. another remote management
+                protocol
+              </description>
+            </enumeration>
+            <enumeration value="FactoryReset" version="2.18">
+              <description>
+                A {{object|Device.|absolute}} Event that was the result of a
+                factory reset triggered locally on the Device or remotely (as a
+                result of a {{command|.FactoryReset()|model}}} Command or other
+                remote trigger, e.g. another remote management protocol), which
+                is to be used when the Agent cannot differentiate between local
+                and remote
+              </description>
+            </enumeration>
+            <enumeration value="LocalFactoryReset">
+              <description>
+                A {{object|Device.|absolute}} Event that was the result of a
+                factory reset triggered locally on the Device (NOT as a result
+                of a {{command|.FactoryReset()|model}}} Command triggered by a
+                remote trigger, e.g. another remote management protocol)
+              </description>
+            </enumeration>
+            <enumeration value="RemoteFactoryReset">
+              <description>
+                A {{object|Device.|absolute}} Event that was the result of a
+                factory reset triggered via the
+                {{command|.FactoryReset()|model}} Command or other remote
+                trigger, e.g. another remote management protocol
+              </description>
+            </enumeration>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="Reason" access="readOnly">
+        <description>
+          The reason of the boot (e.g. power on reset, watchdog, overheat, FAN
+          fault, web userinterface, ...).
+        </description>
+        <syntax>
+          <string/>
+          <default type="implementation" value="Unknown"/>
+        </syntax>
+      </parameter>
+
+      <command name="Remove()" async="true">
+        <description>
+          Remove this row from the table, together with the associated data
+          stored on the device.
+        </description>
+      </command>
+    </object>
+
     <object name="Device.Time." access="readOnly" minEntries="1"
         maxEntries="1" version="2.0">
       <description>
@@ -6875,10 +7764,12 @@
                 configure the time of the CPE.
               </description>
             </enumeration>
-            <enumeration value="Error_FailedToSynchronize" status="deprecated">
+            <enumeration value="Error_FailedToSynchronize" status="obsoleted">
               <description>
                 {{deprecated|2.16|due to the introduction of
                 {{object|Client}}}}
+
+                {{obsoleted|2.18}}
               </description>
             </enumeration>
             <enumeration value="Error" optional="true">
@@ -6892,11 +7783,13 @@
         </syntax>
       </parameter>
 
-      <parameter name="NTPServer1" access="readWrite" status="deprecated">
+      <parameter name="NTPServer1" access="readWrite" status="obsoleted">
         <description>
           First NTP timeserver. Either a host name or IP address.
 
           {{deprecated|2.16|due to the introduction of {{object|Client}}}}
+
+          {{obsoleted|2.18}}
         </description>
         <syntax>
           <string>
@@ -6905,11 +7798,13 @@
         </syntax>
       </parameter>
 
-      <parameter name="NTPServer2" access="readWrite" status="deprecated">
+      <parameter name="NTPServer2" access="readWrite" status="obsoleted">
         <description>
           Second NTP timeserver. Either a host name or IP address.
 
           {{deprecated|2.16|due to the introduction of {{object|Client}}}}
+
+          {{obsoleted|2.18}}
         </description>
         <syntax>
           <string>
@@ -6918,11 +7813,13 @@
         </syntax>
       </parameter>
 
-      <parameter name="NTPServer3" access="readWrite" status="deprecated">
+      <parameter name="NTPServer3" access="readWrite" status="obsoleted">
         <description>
           Third NTP timeserver. Either a host name or IP address.
 
           {{deprecated|2.16|due to the introduction of {{object|Client}}}}
+
+          {{obsoleted|2.18}}
         </description>
         <syntax>
           <string>
@@ -6931,11 +7828,13 @@
         </syntax>
       </parameter>
 
-      <parameter name="NTPServer4" access="readWrite" status="deprecated">
+      <parameter name="NTPServer4" access="readWrite" status="obsoleted">
         <description>
           Fourth NTP timeserver. Either a host name or IP address.
 
           {{deprecated|2.16|due to the introduction of {{object|Client}}}}
+
+          {{obsoleted|2.18}}
         </description>
         <syntax>
           <string>
@@ -6944,11 +7843,13 @@
         </syntax>
       </parameter>
 
-      <parameter name="NTPServer5" access="readWrite" status="deprecated">
+      <parameter name="NTPServer5" access="readWrite" status="obsoleted">
         <description>
           Fifth NTP timeserver. Either a host name or IP address.
 
           {{deprecated|2.16|due to the introduction of {{object|Client}}}}
+
+          {{obsoleted|2.18}}
         </description>
         <syntax>
           <string>
@@ -6981,7 +7882,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ClientNumberOfEntries" access="readOnly">
+      <parameter name="ClientNumberOfEntries" access="readOnly" version="2.16">
         <description>
           {{numentries}}
         </description>
@@ -6990,7 +7891,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ServerNumberOfEntries" access="readOnly">
+      <parameter name="ServerNumberOfEntries" access="readOnly" version="2.16">
         <description>
           {{numentries}}
         </description>
@@ -7052,12 +7953,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.16">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -7126,7 +8027,7 @@
         <syntax>
           <list/>
           <string/>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
@@ -7145,7 +8046,7 @@
       <parameter name="ResolveMaxAddresses" access="readWrite">
         <description>
           When {{param|ResolveAddresses}} is enabled, This parameter specifies
-          the maxium number of IP addresses that the NTP client can resolve. 0
+          the maximum number of IP addresses that the NTP client can resolve. 0
           means that all addresses must be resolved.
         </description>
         <syntax>
@@ -7393,12 +8294,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.16">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -7569,13 +8470,13 @@
           Points to a CSV list of NTP servers. A NTP server can either be
           specified as an IP address or a host name. When used the NTS-KE
           server will tell the remote NTS-KE client the NTP hostname or address
-          of the NTP server(s) that should be used. This allows to seperate the
+          of the NTP server(s) that should be used. This allows to separate the
           NTP server and NTS-KE server implementation.
         </description>
         <syntax>
           <list/>
           <string/>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
     </object>
@@ -7636,7 +8537,7 @@
         CPE.
       </description>
 
-      <parameter name="Enable" access="readWrite">
+      <parameter name="Enable" access="readWrite" version="2.11">
         <description>
           Enables and disables the CPE's user interface.
         </description>
@@ -7677,7 +8578,7 @@
       </parameter>
 
       <command name="PasswordReset()" async="false"
-          dmr:previousParameter="PasswordUserSelectable">
+          dmr:previousParameter="PasswordUserSelectable" version="2.12">
         <description>
           Present only if the Agent provides a password-protected LAN-side user
           interface and supports LAN-side Auto-Configuration.
@@ -7892,7 +8793,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="HTTPAccessSupportedProtocols" access="readOnly">
+      <parameter name="HTTPAccessSupportedProtocols" access="readOnly"
+          version="2.16">
         <description>
           Indicates the protocols that are supported by the CPE for the purpose
           of remotely accessing the user interface.
@@ -7910,7 +8812,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="HTTPAccessNumberOfEntries" access="readOnly">
+      <parameter name="HTTPAccessNumberOfEntries" access="readOnly"
+          version="2.16">
         <description>
           {{numentries}}
         </description>
@@ -7926,7 +8829,7 @@
         maxEntries="unbounded" version="2.16">
       <description>
         HTTPAccess is used for modeling the different web interfaces that may
-        be either localy or remotely available in the device. For example with
+        be either locally or remotely available in the device. For example with
         Software Modules it is possible to install multiple services that embed
         a web interface like a ''Video service'' or ''Photo service''.
 
@@ -7952,12 +8855,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.16">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -8038,7 +8941,7 @@
             <pathRef refType="strong" targetParent=".Users.Role."
                 targetType="row"/>
           </string>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
@@ -8141,7 +9044,63 @@
         <syntax>
           <list/>
           <string/>
-          <default type="object" value="/"/>
+          <default type="object" value="[/]"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="AllowAllIPv4" access="readWrite" version="2.18">
+        <description>
+          Allow access from any IPv4 address. The source prefixes defined in
+          {{param|IPv4AllowedSourcePrefix}} will be ignored.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="object" value="false"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="IPv4AllowedSourcePrefix" access="readWrite"
+          version="2.18">
+        <description>
+          Allow only access from the provided list of IPv4 prefixes.
+
+          When {{param}} is set to {{empty}} and {{param|AllowAllIPv4}} is set
+          to ''false'', no incoming connections are allowed. When
+          {{param|AllowAllIPv4}} is set ''true'', {{param}} is ignored.
+        </description>
+        <syntax>
+          <list>
+            <size/>
+          </list>
+          <string/>
+        </syntax>
+      </parameter>
+
+      <parameter name="AllowAllIPv6" access="readWrite" version="2.18">
+        <description>
+          Allow access from any IPv6 address. The source prefixes defined in
+          {{param|IPv6AllowedSourcePrefix}} will be ignored.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="object" value="false"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="IPv6AllowedSourcePrefix" access="readWrite"
+          version="2.18">
+        <description>
+          Allow only access from the provided list of IPv6 prefixes.
+
+          When {{param}} is set to {{empty}} and {{param|AllowAllIPv6}} is set
+          to ''false'', no incoming connections are allowed. When
+          {{param|AllowAllIPv6}} is set ''true'', {{param}} is ignored.
+        </description>
+        <syntax>
+          <list>
+            <size/>
+          </list>
+          <string/>
         </syntax>
       </parameter>
 
@@ -8198,7 +9157,7 @@
         </syntax>
       </parameter>
 
-      <command name="CreateWebSession()" async="false">
+      <command name="CreateWebSession()" async="false" version="2.16">
         <description>
           This command creates a time-limited web session. The web session will
           be terminated when the life time of the session exceeds
@@ -8261,7 +9220,7 @@
     </object>
 
     <object name="Device.UserInterface.HTTPAccess.{i}.Session.{i}."
-        access="readWrite" numEntriesParameter="SessionNumberOfEntries"
+        access="readOnly" numEntriesParameter="SessionNumberOfEntries"
         minEntries="0" maxEntries="unbounded" version="2.16">
       <description>
         Web server session list.
@@ -8298,7 +9257,6 @@
             <pathRef refType="strong" targetParent=".Users.User."
                 targetType="row"/>
           </string>
-          <default type="object" value=""/>
         </syntax>
       </parameter>
 
@@ -8351,7 +9309,7 @@
     </object>
 
     <object name="Device.UserInterface.RemoteAccess." access="readOnly"
-        minEntries="1" maxEntries="1" version="2.0" status="deprecated">
+        minEntries="1" maxEntries="1" version="2.0" status="obsoleted">
       <description>
         This object contains parameters relating to remotely accessing the
         CPE's user interface.
@@ -8364,6 +9322,8 @@
         instance that has "RemoteAccessCapable" set to {{true}}.
 
         {{deprecated|2.16|due to the introduction of {{object|#.HTTPAccess}}}}
+
+        {{obsoleted|2.18}}
       </description>
 
       <parameter name="Enable" access="readWrite">
@@ -8672,12 +9632,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.3">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -8810,7 +9770,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="EnableDataGathering" access="readWrite">
+      <parameter name="EnableDataGathering" access="readWrite" version="2.8">
         <description>
           Enables or disables data gathering on the DSL line.
         </description>
@@ -8859,12 +9819,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -9016,7 +9976,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="XTSE" access="readOnly">
+      <parameter name="XTSE" access="readOnly" version="2.8">
         <description>
           This configuration parameter defines the transmission system types to
           be allowed by the xTU on this {{object}} instance. Each bit is 0 if
@@ -9057,7 +10017,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="XTSUsed" access="readOnly">
+      <parameter name="XTSUsed" access="readOnly" version="2.8">
         <description>
           This parameter indicates which DSL standard and recommendation are
           currently in use by the {{object}} instance. Only one bit is set, as
@@ -9199,7 +10159,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="UPBOKLER" access="readOnly">
+      <parameter name="UPBOKLER" access="readOnly" version="2.8">
         <description>
           This parameter contains the estimated electrical loop length
           estimated by the VTU-R expressed in {{units}} at 1MHz (see O-UPDATE
@@ -9218,7 +10178,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="UPBOKLEPb" access="readOnly">
+      <parameter name="UPBOKLEPb" access="readOnly" version="2.8">
         <description>
           VTU-O estimated upstream power back-off electrical length per band.
 
@@ -9244,7 +10204,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="UPBOKLERPb" access="readOnly">
+      <parameter name="UPBOKLERPb" access="readOnly" version="2.8">
         <description>
           VTU-R estimated upstream power back-off electrical length per band.
 
@@ -9274,7 +10234,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="RXTHRSHds" access="readOnly">
+      <parameter name="RXTHRSHds" access="readOnly" version="2.8">
         <description>
           UPBO downstream receiver signal level threshold.
 
@@ -9296,7 +10256,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ACTRAMODEds" access="readOnly">
+      <parameter name="ACTRAMODEds" access="readOnly" version="2.8">
         <description>
           This parameter indicates the actual active rate adaptation mode in
           the downstream direction.
@@ -9322,7 +10282,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ACTRAMODEus" access="readOnly">
+      <parameter name="ACTRAMODEus" access="readOnly" version="2.8">
         <description>
           This parameter indicates the actual active rate adaptation mode in
           the upstream direction.
@@ -9348,7 +10308,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ACTINPROCds" access="readOnly">
+      <parameter name="ACTINPROCds" access="readOnly" version="2.8">
         <description>
           This parameter reports the actual impulse noise protection (INP) of
           the robust overhead channel (ROC) in the downstream direction. The
@@ -9363,7 +10323,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ACTINPROCus" access="readOnly">
+      <parameter name="ACTINPROCus" access="readOnly" version="2.8">
         <description>
           This parameter reports the actual impulse noise protection (INP) of
           the robust overhead channel (ROC) in the upstream direction. The
@@ -9378,7 +10338,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SNRMROCds" access="readOnly">
+      <parameter name="SNRMROCds" access="readOnly" version="2.8">
         <description>
           This parameter reports the actual signal-to-noise margin of the
           robust overhead channel (ROC) in the downstream direction (expressed
@@ -9395,7 +10355,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SNRMROCus" access="readOnly">
+      <parameter name="SNRMROCus" access="readOnly" version="2.8">
         <description>
           This parameter reports the actual signal-to-noise margin of the
           robust overhead channel (ROC) in the upstream direction (expressed in
@@ -9873,7 +10833,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="XTURVersion" access="readOnly">
+      <parameter name="XTURVersion" access="readOnly" version="2.17">
         <description>
           xTU-R version field as defined in {{bibref|G.997.1|Section 7.4.6}}.
           It shall contain the xTU-R firmware version and the xTU-R model,
@@ -9887,7 +10847,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="XTURSerial" access="readOnly">
+      <parameter name="XTURSerial" access="readOnly" version="2.17">
         <description>
           xTU-R serial number as defined in {{bibref|G.997.1|Section 7.4.8}}.
           It shall contain the equipment serial number, the equipment model and
@@ -9922,7 +10882,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="XTURVendorSpecific" access="readOnly">
+      <parameter name="XTURVendorSpecific" access="readOnly" version="2.17">
         <description>
           xTU-R vendor-specific information as defined in {{bibref|G.994.1}}.
           This corresponds to the two-octet vendor-specific information, which
@@ -9962,7 +10922,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="XTURSystemVendor" access="readOnly">
+      <parameter name="XTURSystemVendor" access="readOnly" version="2.17">
         <description>
           xTU-R system vendor identifier as defined in {{bibref|G.997.1|Section
           7.4.4}}. This corresponds to the four-octet provider code, which MUST
@@ -9976,7 +10936,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="XTURSystemVendorSpecific" access="readOnly">
+      <parameter name="XTURSystemVendorSpecific" access="readOnly"
+          version="2.17">
         <description>
           xTU-R system vendor-specific information as defined in
           {{bibref|G.997.1|Section 7.4.4}}. This corresponds to the two-octet
@@ -9993,7 +10954,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="XTURSystemCountry" access="readOnly">
+      <parameter name="XTURSystemCountry" access="readOnly" version="2.17">
         <description>
           T.35 country code of the xTU-R system vendor as defined in
           {{bibref|G.997.1|Section 7.4.4}}, where the two-octet value defined
@@ -10030,7 +10991,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="XTUCVersion" access="readOnly">
+      <parameter name="XTUCVersion" access="readOnly" version="2.17">
         <description>
           The xTU-C version number is the version number as inserted by the
           xTU-C in the overhead messages ({{bibref|G.992.3}},
@@ -10045,7 +11006,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="XTUCSerial" access="readOnly">
+      <parameter name="XTUCSerial" access="readOnly" version="2.17">
         <description>
           xTU-C serial number as defined in {{bibref|G.997.1|Section 7.4.7}}.
           This corresponds to the equipment serial number.
@@ -10074,7 +11035,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="XTUCVendorSpecific" access="readOnly">
+      <parameter name="XTUCVendorSpecific" access="readOnly" version="2.17">
         <description>
           xTU-C vendor-specific information as defined in
           {{bibref|G.997.1|Section 7.4.3}}. This corresponds to the two-octet
@@ -10105,7 +11066,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="XTUCSystemVendor" access="readOnly">
+      <parameter name="XTUCSystemVendor" access="readOnly" version="2.17">
         <description>
           xTU-C system vendor identifier as defined in {{bibref|G.997.1|Section
           7.4.3}}. This corresponds to the four-octet provider code, which MUST
@@ -10119,7 +11080,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="XTUCSystemVendorSpecific" access="readOnly">
+      <parameter name="XTUCSystemVendorSpecific" access="readOnly"
+          version="2.17">
         <description>
           xTU-C system vendor-specific information as defined in
           {{bibref|G.997.1|Section 7.4.4}}. This corresponds to the two-octet
@@ -10136,7 +11098,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="XTUCSystemCountry" access="readOnly">
+      <parameter name="XTUCSystemCountry" access="readOnly" version="2.17">
         <description>
           T.35 country code of the xTU-C system vendor as defined in
           {{bibref|G.997.1|Section 7.4.4}}, where the two-octet value defined
@@ -11139,12 +12101,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -11391,7 +12353,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ACTNDR" access="readOnly">
+      <parameter name="ACTNDR" access="readOnly" version="2.8">
         <description>
           Actual net data rate expressed in {{units}}. Independent whether
           retransmission is used or not in a given transmit direction:
@@ -11413,7 +12375,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ACTINPREIN" access="readOnly">
+      <parameter name="ACTINPREIN" access="readOnly" version="2.8">
         <description>
           Actual impulse noise protection against REIN, expressed in {{units}}.
 
@@ -12179,12 +13141,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -12453,12 +13415,12 @@
         <parameter ref="Channel"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -13514,14 +14476,14 @@
         The DSL Diagnostics object.
       </description>
 
-      <command name="ADSLLineTest()" async="true">
+      <command name="ADSLLineTest()" async="true" version="2.12">
         <description>
           This command is to provide diagnostic information for a CPE with an
           ADSL2 or ADSL2+ modem WAN interface, but MAY also be used for ADSL.
         </description>
         <input>
 
-          <parameter name="Interface" mandatory="true">
+          <parameter name="Interface" version="2.12" mandatory="true">
             <description>
               {{reference}} This is the interface over which the test is to be
               performed.
@@ -13537,7 +14499,7 @@
         </input>
         <output>
 
-          <parameter name="Status">
+          <parameter name="Status" version="2.13">
             <description>
               Indicates the availability of diagnostics data. {{enum}}
 
@@ -13556,7 +14518,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="ACTPSDds">
+          <parameter name="ACTPSDds" version="2.12">
             <description>
               Downstream actual power spectral density. Interpretation of the
               value is as defined in ITU-T Rec. G.997.1.
@@ -13568,7 +14530,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="ACTPSDus">
+          <parameter name="ACTPSDus" version="2.12">
             <description>
               Upstream actual power spectral density. Interpretation of the
               value is as defined in ITU-T Rec. G.997.1.
@@ -13580,7 +14542,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="ACTATPds">
+          <parameter name="ACTATPds" version="2.12">
             <description>
               Downstream actual aggregate transmitter power. Interpretation of
               the value is as defined in ITU-T Rec. G.997.1.
@@ -13592,7 +14554,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="ACTATPus">
+          <parameter name="ACTATPus" version="2.12">
             <description>
               Upstream actual aggregate transmitter power. Interpretation of
               the value is as defined in ITU-T Rec. G.997.1.
@@ -13604,7 +14566,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="HLINSCds">
+          <parameter name="HLINSCds" version="2.12">
             <description>
               Downstream linear representation scale. Interpretation of the
               value is as defined in ITU-T Rec. G.997.1.
@@ -13618,7 +14580,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="HLINSCus">
+          <parameter name="HLINSCus" version="2.12">
             <description>
               Scaling used to represent the upstream linear channel
               characteristics. Interpretation of the value is as defined in
@@ -13633,7 +14595,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="HLINGds">
+          <parameter name="HLINGds" version="2.12">
             <description>
               Number of sub-carriers per sub-carrier group in the downstream
               direction for {{param|HLINpsds}}. Valid values are 1, 2, 4, and
@@ -13648,7 +14610,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="HLINGus">
+          <parameter name="HLINGus" version="2.12">
             <description>
               Number of sub-carriers per sub-carrier group in the downstream
               direction for {{param|HLINpsus}}. Valid values are 1, 2, 4, and
@@ -13663,7 +14625,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="HLOGGds">
+          <parameter name="HLOGGds" version="2.12">
             <description>
               Number of sub-carriers per sub-carrier group in the downstream
               direction for {{param|HLOGpsds}}. Valid values are 1, 2, 4, and
@@ -13678,7 +14640,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="HLOGGus">
+          <parameter name="HLOGGus" version="2.12">
             <description>
               Number of sub-carriers per sub-carrier group in the upstream
               direction for {{param|HLOGpsus}}. Valid values are 1, 2, 4, and
@@ -13693,7 +14655,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="HLOGpsds">
+          <parameter name="HLOGpsds" version="2.12">
             <description>
               {{list}} List items represent downstream logarithmic channel
               characteristics per sub-carrier group. The maximum number of
@@ -13717,7 +14679,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="HLOGpsus">
+          <parameter name="HLOGpsus" version="2.12">
             <description>
               {{list}} List items represent upstream logarithmic channel
               characteristics per sub-carrier group. The maximum number of
@@ -13741,7 +14703,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="HLOGMTds">
+          <parameter name="HLOGMTds" version="2.12">
             <description>
               Indicates the number of symbols over which {{param|HLOGpsds}} was
               measured.
@@ -13755,7 +14717,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="HLOGMTus">
+          <parameter name="HLOGMTus" version="2.12">
             <description>
               Indicates the number of symbols over which {{param|HLOGpsus}} was
               measured.
@@ -13769,7 +14731,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="LATNpbds">
+          <parameter name="LATNpbds" version="2.12">
             <description>
               {{list}} List items represent downstream line attenuation per
               usable band, as computed during initialization. Number of
@@ -13787,7 +14749,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="LATNpbus">
+          <parameter name="LATNpbus" version="2.12">
             <description>
               {{list}} List items represent upstream line attenuation per
               usable band, as computed during initialization. Number of
@@ -13805,7 +14767,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="SATNds">
+          <parameter name="SATNds" version="2.12">
             <description>
               {{list}} List items represent downstream signal attenuation per
               usable band, as computed during the L0 (i.e., Showtime) state.
@@ -13823,7 +14785,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="SATNus">
+          <parameter name="SATNus" version="2.12">
             <description>
               {{list}} List items represent upstream signal attenuation per
               usable band, as computed during the L0 (i.e., Showtime) state.
@@ -13841,7 +14803,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="HLINpsds">
+          <parameter name="HLINpsds" version="2.12">
             <description>
               {{list}} List items represent downstream linear channel
               characteristics per subcarrier group. Maximum number of complex
@@ -13864,7 +14826,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="HLINpsus">
+          <parameter name="HLINpsus" version="2.12">
             <description>
               {{list}} List items represent upstream linear channel
               characteristics per sub-carrier group. Maximum number of complex
@@ -13887,7 +14849,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="QLNGds">
+          <parameter name="QLNGds" version="2.12">
             <description>
               Number of sub-carriers per sub-carrier group in the downstream
               direction for {{param|QLNpsds}}. Valid values are 1, 2, 4, and 8.
@@ -13901,7 +14863,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="QLNGus">
+          <parameter name="QLNGus" version="2.12">
             <description>
               Number of sub-carriers per sub-carrier group in the upstream
               direction for {{param|QLNpsus}}. Valid values are 1, 2, 4, and 8.
@@ -13915,7 +14877,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="QLNpsds">
+          <parameter name="QLNpsds" version="2.12">
             <description>
               {{list}} List items represent downstream quiet line noise per
               subcarrier group. Maximum number of elements is 256 for G.992.3,
@@ -13937,7 +14899,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="QLNpsus">
+          <parameter name="QLNpsus" version="2.12">
             <description>
               {{list}} List items represent upstream quiet line noise per
               subcarrier group. The maximum number of elements is 64 for
@@ -13959,7 +14921,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="QLNMTds">
+          <parameter name="QLNMTds" version="2.12">
             <description>
               Indicates the number of symbols over which {{param|QLNpsds}} was
               measured.
@@ -13973,7 +14935,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="QLNMTus">
+          <parameter name="QLNMTus" version="2.12">
             <description>
               Indicates the number of symbols over which {{param|QLNpsus}} was
               measured.
@@ -13987,7 +14949,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="SNRGds">
+          <parameter name="SNRGds" version="2.12">
             <description>
               Number of sub-carriers per sub-carrier group in the downstream
               direction for {{param|SNRpsds}}. Valid values are 1, 2, 4, and 8.
@@ -14001,7 +14963,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="SNRGus">
+          <parameter name="SNRGus" version="2.12">
             <description>
               Number of sub-carriers per sub-carrier group in the upstream
               direction for {{param|SNRpsus}}. Valid values are 1, 2, 4, and 8.
@@ -14015,7 +14977,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="SNRpsds">
+          <parameter name="SNRpsds" version="2.12">
             <description>
               {{list}} List items represent downstream SNR per subcarrier
               group. Maximum number of elements is 256 for G.992.3, 512 for
@@ -14038,7 +15000,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="SNRpsus">
+          <parameter name="SNRpsus" version="2.12">
             <description>
               {{list}} List items represent upstream SNR per subcarrier group.
               The maximum number of elements is 64 for G.992.3, and G.992.5.
@@ -14060,7 +15022,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="SNRMTds">
+          <parameter name="SNRMTds" version="2.12">
             <description>
               Indicates the number of symbols over which {{param|SNRpsds}} was
               measured.
@@ -14074,7 +15036,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="SNRMTus">
+          <parameter name="SNRMTus" version="2.12">
             <description>
               Indicates the number of symbols over which {{param|SNRpsus}} was
               measured.
@@ -14088,7 +15050,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="BITSpsds">
+          <parameter name="BITSpsds" version="2.12">
             <description>
               {{list}} List items represent downstream bit allocation per
               subcarrier group. Maximum number of elements is 256 for G.992.3,
@@ -14103,7 +15065,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="BITSpsus">
+          <parameter name="BITSpsus" version="2.12">
             <description>
               {{list}} List items represent upstream bit allocation per
               subcarrier group. Maximum number of elements is 256 for G.992.3,
@@ -14120,7 +15082,7 @@
         </output>
       </command>
 
-      <command name="SELTUER()" async="true">
+      <command name="SELTUER()" async="true" version="2.13">
         <description>
           This command performs a DSL Single Ended Line Test - Physical Medium
           Dependent (SELT-PMD) Uncalibrated Echo Response (UER).
@@ -14133,7 +15095,7 @@
         </description>
         <input>
 
-          <parameter name="Interface">
+          <parameter name="Interface" version="2.13">
             <description>
               {{reference}} This is the interface over which the test is to be
               performed.
@@ -14147,7 +15109,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="UERMaxMeasurementDuration">
+          <parameter name="UERMaxMeasurementDuration" version="2.13">
             <description>
               This parameter is the SELT UER maximum measurement duration (MMD)
               measured in {{units}}.
@@ -14182,7 +15144,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="ExtendedBandwidthOperation">
+          <parameter name="ExtendedBandwidthOperation" version="2.13">
             <description>
               This parameter indicates if the option for extended bandwidth
               SELT is applied ({{true}}) or not applied ({{false}}).
@@ -14202,7 +15164,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="UER">
+          <parameter name="UER" version="2.13">
             <description>
               The Uncalibrated Echo Response (UER) [a(0),b(0)], [a(1),b(1)],
               ...
@@ -14212,8 +15174,8 @@
               {{datatype|expand}}
 
               The value of UER at frequency i*{{param|UERGroupSize}}*Df =
-              ({{param|UERScaleFactor}}/(2^31))*(a(i)+j*b(i))/(2^31) where Df =
-              4.3125 kHz.
+              ({{param|UERScaleFactor}}/(2^31^))*(a(i)+j*b(i))/(2^31^) where Df
+              = 4.3125 kHz.
 
               This parameter is defined as CPE SELT uncalibrated echo response
               (SELT-UER-R) in ITU-T Recommendation {{bibref|G.996.2|Clause
@@ -14225,7 +15187,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="UERScaleFactor">
+          <parameter name="UERScaleFactor" version="2.13">
             <description>
               The Uncalibrated Echo Response (UER) scale factor.
 
@@ -14234,7 +15196,7 @@
               {{bibref|G.996.2|Clause A.2.2.1}}.
 
               Note that the scale factor is chosen such that max(abs(a(i)),
-              abs(b(i))) over all i is equal to 2^31 - 1, which doesn't allow
+              abs(b(i))) over all i is equal to 2^31^ - 1, which doesn't allow
               {{param}} to be zero.
             </description>
             <syntax>
@@ -14242,7 +15204,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="UERGroupSize">
+          <parameter name="UERGroupSize" version="2.13">
             <description>
               The Uncalibrated Echo Response (UER) group size, UER_G. In units
               of {{units}}.
@@ -14260,7 +15222,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="UERVar">
+          <parameter name="UERVar" version="2.13">
             <description>
               This parameter represents the variance of the {{param|UER}}. List
               items represent v(i), for values of i starting at i=0. The
@@ -14279,7 +15241,7 @@
         </output>
       </command>
 
-      <command name="SELTQLN()" async="true">
+      <command name="SELTQLN()" async="true" version="2.13">
         <description>
           This command performs a DSL Single Ended Line Test - Physical Medium
           Dependent (SELT-PMD) Quiet Line Noise (QLN).
@@ -14292,7 +15254,7 @@
         </description>
         <input>
 
-          <parameter name="Interface">
+          <parameter name="Interface" version="2.13">
             <description>
               {{reference}} This is the interface over which the test is to be
               performed.
@@ -14306,7 +15268,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="QLNMaxMeasurementDuration">
+          <parameter name="QLNMaxMeasurementDuration" version="2.13">
             <description>
               This parameter is the SELT QLN maximum measurement duration (MMD)
               measured in {{units}}.
@@ -14341,7 +15303,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="ExtendedBandwidthOperation">
+          <parameter name="ExtendedBandwidthOperation" version="2.13">
             <description>
               This parameter indicates if the option for extended bandwidth
               SELT is applied ({{true}}) or not applied ({{false}}).
@@ -14361,7 +15323,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="QLN">
+          <parameter name="QLN" version="2.13">
             <description>
               {{list}} List items represent SELT quiet line noise (QLN) per
               subcarrier group.
@@ -14383,7 +15345,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="QLNGroupSize">
+          <parameter name="QLNGroupSize" version="2.13">
             <description>
               This parameter represents the Quiet Line Noise (QLN) group size.
               In units of {{units}}.
@@ -14402,7 +15364,7 @@
         </output>
       </command>
 
-      <command name="SELTP()" async="true">
+      <command name="SELTP()" async="true" version="2.13">
         <description>
           This command performs a DSL Single-Ended Line Test - Processed
           (SELT-P).
@@ -14414,7 +15376,7 @@
         </description>
         <input>
 
-          <parameter name="Interface">
+          <parameter name="Interface" version="2.13">
             <description>
               {{reference}} This is the interface over which the test is to be
               performed.
@@ -14428,7 +15390,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="CapacityEstimateEnabling">
+          <parameter name="CapacityEstimateEnabling" version="2.13">
             <description>
               Capacity estimate calculation enabling: This parameter is
               expressed as a boolean and takes the value {{false}} if xDSL
@@ -14442,7 +15404,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="CapacitySignalPSD">
+          <parameter name="CapacitySignalPSD" version="2.13">
             <description>
               The capacity estimate signal Power Spectral Density (PSD):
 
@@ -14459,7 +15421,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="CapacityNoisePSD">
+          <parameter name="CapacityNoisePSD" version="2.13">
             <description>
               The capacity estimate noise Power Spectral Density (PSD):
 
@@ -14476,7 +15438,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="CapacityTargetMargin">
+          <parameter name="CapacityTargetMargin" version="2.13">
             <description>
               The capacity estimate target noise margin. The range of valid
               values is 0 to 31 dB, in steps of {{units}}.
@@ -14511,7 +15473,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="LoopTermination">
+          <parameter name="LoopTermination" version="2.13">
             <description>
               Loop termination indicator. {{enum}}
 
@@ -14536,7 +15498,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="LoopLength">
+          <parameter name="LoopLength" version="2.13">
             <description>
               This parameter is the loop length with units of {{units}}.
 
@@ -14551,7 +15513,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="LoopTopology">
+          <parameter name="LoopTopology" version="2.13">
             <description>
               {{list}} List items represent paired parameters [LOOP_SEG_LEN,
               LOOP_SEG_BTAP] representing a concatenation of loop segment
@@ -14575,7 +15537,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="AttenuationCharacteristics">
+          <parameter name="AttenuationCharacteristics" version="2.13">
             <description>
               Specifies the list of attenuation characteristics.
 
@@ -14599,7 +15561,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="TFlogGroupSize">
+          <parameter name="TFlogGroupSize" version="2.14">
             <description>
               This parameter represents the Transfer Function Log (TFlog) group
               size. In units of {{units}}.
@@ -14617,7 +15579,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="MissingFilter">
+          <parameter name="MissingFilter" version="2.13">
             <description>
               Missing micro-filter or splitter: This parameter is a binary
               indication of a missing or incorrectly installed splitter or
@@ -14632,7 +15594,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="CapacityEstimate">
+          <parameter name="CapacityEstimate" version="2.13">
             <description>
               Capacity Estimate: {{list}} This parameter represents the
               downstream and/or upstream capacity estimates in {{units}}.
@@ -14740,12 +15702,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.11">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -16501,7 +17463,7 @@
 
       <parameter name="Status" access="readOnly">
         <description>
-          The current operational state of the optical interface (see
+          The current operational state of the interface (see
           {{bibref|TR-181i2|Section 4.2.2}}). {{enum}}
 
           When {{param|Enable}} is {{false}} then {{param}} SHOULD normally be
@@ -16539,18 +17501,18 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.4">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
       <parameter name="Name" access="readOnly">
         <description>
-          The textual name of the optical interface as assigned by the CPE.
+          The textual name of the interface as assigned by the CPE.
         </description>
         <syntax>
           <string>
@@ -16561,8 +17523,8 @@
 
       <parameter name="LastChange" access="readOnly" activeNotify="canDeny">
         <description>
-          The accumulated time in {{units}} since the optical interface entered
-          its current operational state.
+          The accumulated time in {{units}} since the interface entered its
+          current operational state.
         </description>
         <syntax>
           <unsignedInt>
@@ -16610,6 +17572,21 @@
         </syntax>
       </parameter>
 
+      <parameter name="MaxBitRate" access="readWrite" version="2.18">
+        <description>
+          The maximum upstream and downstream PHY bit rate supported by this
+          interface (expressed in {{units}}).
+
+          A value of -1 indicates automatic selection of the maximum bit rate.
+        </description>
+        <syntax>
+          <int>
+            <range minInclusive="-1"/>
+            <units value="Mbps"/>
+          </int>
+        </syntax>
+      </parameter>
+
       <parameter name="OpticalSignalLevel" access="readOnly">
         <description>
           Current measurement of total downstream optical signal level.
@@ -16630,7 +17607,7 @@
       </parameter>
 
       <parameter name="LowerOpticalThreshold" access="readOnly"
-          status="obsoleted">
+          status="deleted">
         <description>
           Optical level that is used to declare the downstream low received
           optical power alarm.
@@ -16648,6 +17625,8 @@
           an optical power alarm.}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <dataType ref="Dbm1000">
@@ -16657,7 +17636,7 @@
       </parameter>
 
       <parameter name="UpperOpticalThreshold" access="readOnly"
-          status="obsoleted">
+          status="deleted">
         <description>
           Optical level that is used to declare the downstream high received
           optical power alarm.
@@ -16675,6 +17654,8 @@
           an optical power alarm.}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <dataType ref="Dbm1000">
@@ -16703,7 +17684,7 @@
       </parameter>
 
       <parameter name="LowerTransmitPowerThreshold" access="readOnly"
-          status="obsoleted">
+          status="deleted">
         <description>
           Minimum mean optical launch power that is used to declare the low
           transmit optical power alarm.
@@ -16721,6 +17702,8 @@
           an optical power alarm.}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <dataType ref="Dbm1000">
@@ -16730,7 +17713,7 @@
       </parameter>
 
       <parameter name="UpperTransmitPowerThreshold" access="readOnly"
-          status="obsoleted">
+          status="deleted">
         <description>
           Maximum mean optical launch power that is used to declare the high
           transmit optical power alarm.
@@ -16748,6 +17731,8 @@
           an optical power alarm.}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <dataType ref="Dbm1000">
@@ -16773,13 +17758,19 @@
         4.2.2}}.
       </description>
 
+      <command name="Reset()" async="false" version="2.18">
+        <description>
+          Reset all this object's statistics counters to zero.
+        </description>
+      </command>
+
       <parameter name="BytesSent" access="readOnly" activeNotify="canDeny">
         <description>
           The total number of bytes transmitted out of the interface, including
           framing characters.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
@@ -16789,7 +17780,7 @@
           framing characters.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
@@ -16798,7 +17789,7 @@
           The total number of packets transmitted out of the interface.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
@@ -16808,7 +17799,7 @@
           The total number of packets received on the interface.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
@@ -16818,7 +17809,7 @@
           because of errors.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="StatsCounter32"/>
         </syntax>
       </parameter>
 
@@ -16829,7 +17820,7 @@
           them from being delivered to a higher-layer protocol.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="StatsCounter32"/>
         </syntax>
       </parameter>
 
@@ -16842,7 +17833,7 @@
           could be to free up buffer space.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="StatsCounter32"/>
         </syntax>
       </parameter>
 
@@ -16855,7 +17846,7 @@
           to free up buffer space.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="StatsCounter32"/>
         </syntax>
       </parameter>
     </object>
@@ -16989,12 +17980,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.8">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -17095,7 +18086,7 @@
             <enumeration value="CDMA2000OneX"/>
             <enumeration value="CDMA2000HRPD"/>
             <enumeration value="LTE"/>
-            <enumeration value="NR">
+            <enumeration value="NR" version="2.14">
               <description>5G New Radio</description>
             </enumeration>
           </string>
@@ -17192,7 +18183,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="RSRP" access="readOnly" activeNotify="canDeny">
+      <parameter name="RSRP" access="readOnly" activeNotify="canDeny"
+          version="2.14">
         <description>
           The Reference Signal Received Power in {{units}} for
           {{enum|LTE|SupportedAccessTechnologies}},
@@ -17209,7 +18201,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="RSRQ" access="readOnly" activeNotify="canDeny">
+      <parameter name="RSRQ" access="readOnly" activeNotify="canDeny"
+          version="2.14">
         <description>
           The Reference Signal Received Quality in {{units}} for
           {{enum|LTE|SupportedAccessTechnologies}},
@@ -17604,12 +18597,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.8">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -17722,7 +18715,7 @@
 
       <parameter name="Enable" access="readWrite">
         <description>
-          Enables or disables the link.
+          Enables or disables the interface.
 
           This parameter is based on ''ifAdminStatus'' from {{bibref|RFC2863}}.
         </description>
@@ -17734,7 +18727,7 @@
 
       <parameter name="Status" access="readOnly">
         <description>
-          The current operational state of the link (see
+          The current operational state of the interface (see
           {{bibref|TR-181i2|Section 4.2.2}}). {{enum}}
 
           When {{param|Enable}} is {{false}} then {{param}} SHOULD normally be
@@ -17773,18 +18766,18 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
       <parameter name="Name" access="readOnly">
         <description>
-          The textual name of the link as assigned by the CPE.
+          The textual name of the interface as assigned by the CPE.
         </description>
         <syntax>
           <string>
@@ -17795,8 +18788,8 @@
 
       <parameter name="LastChange" access="readOnly" activeNotify="canDeny">
         <description>
-          The accumulated time in {{units}} since the link entered its current
-          operational state.
+          The accumulated time in {{units}} since the interface entered its
+          current operational state.
         </description>
         <syntax>
           <unsignedInt>
@@ -17817,7 +18810,7 @@
           <string>
             <pathRef refType="strong" targetType="row"/>
           </string>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
@@ -17952,13 +18945,19 @@
         4.2.2}}.
       </description>
 
+      <command name="Reset()" async="false" version="2.18">
+        <description>
+          Reset all this object's statistics counters to zero.
+        </description>
+      </command>
+
       <parameter name="BytesSent" access="readOnly" activeNotify="canDeny">
         <description>
           The total number of bytes transmitted out of the interface, including
           framing characters.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
@@ -17968,7 +18967,7 @@
           framing characters.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
@@ -17977,7 +18976,7 @@
           The total number of packets transmitted out of the interface.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
@@ -17987,7 +18986,7 @@
           The total number of packets received on the interface.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
@@ -17997,7 +18996,7 @@
           because of errors.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="StatsCounter32"/>
         </syntax>
       </parameter>
 
@@ -18008,31 +19007,19 @@
           them from being delivered to a higher-layer protocol.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="StatsCounter32"/>
         </syntax>
       </parameter>
 
       <parameter name="UnicastPacketsSent" access="readOnly"
-          activeNotify="canDeny">
+          activeNotify="canDeny" dmr:previousParameter="ErrorsReceived">
         <description>
           The total number of packets requested for transmission which were not
           addressed to a multicast or broadcast address at this layer,
           including those that were discarded or not sent.
         </description>
         <syntax>
-          <unsignedLong/>
-        </syntax>
-      </parameter>
-
-      <parameter name="UnicastPacketsReceived" access="readOnly"
-          activeNotify="canDeny">
-        <description>
-          The total number of received packets, delivered by this layer to a
-          higher layer, which were not addressed to a multicast or broadcast
-          address at this layer.
-        </description>
-        <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
@@ -18045,7 +19032,7 @@
           could be to free up buffer space.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="StatsCounter32"/>
         </syntax>
       </parameter>
 
@@ -18058,19 +19045,31 @@
           to free up buffer space.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="StatsCounter32"/>
         </syntax>
       </parameter>
 
       <parameter name="MulticastPacketsSent" access="readOnly"
-          activeNotify="canDeny">
+          activeNotify="canDeny" dmr:previousParameter="DiscardPacketsReceived">
         <description>
           The total number of packets that higher-level protocols requested for
           transmission and which were addressed to a multicast address at this
           layer, including those that were discarded or not sent.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="UnicastPacketsReceived" access="readOnly"
+          activeNotify="canDeny">
+        <description>
+          The total number of received packets, delivered by this layer to a
+          higher layer, which were not addressed to a multicast or broadcast
+          address at this layer.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
@@ -18082,31 +19081,29 @@
           layer.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
-      <parameter name="BroadcastPacketsSent" access="readOnly"
-          activeNotify="canDeny">
+      <parameter name="BroadcastPacketsSent" access="readOnly">
         <description>
           The total number of packets that higher-level protocols requested for
           transmission and which were addressed to a broadcast address at this
           layer, including those that were discarded or not sent.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
-      <parameter name="BroadcastPacketsReceived" access="readOnly"
-          activeNotify="canDeny">
+      <parameter name="BroadcastPacketsReceived" access="readOnly">
         <description>
           The total number of received packets, delivered by this layer to a
           higher layer, which were addressed to a broadcast address at this
           layer.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
@@ -18117,7 +19114,7 @@
           discarded because of an unknown or unsupported protocol.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="StatsCounter32"/>
         </syntax>
       </parameter>
 
@@ -18228,13 +19225,13 @@
         The ATM Diagnostics object.
       </description>
 
-      <command name="F5Loopback()" async="true">
+      <command name="F5Loopback()" async="true" version="2.12">
         <description>
           This command provides access to an ATM-layer F5 OAM loopback test.
         </description>
         <input>
 
-          <parameter name="Interface" mandatory="true">
+          <parameter name="Interface" mandatory="true" version="2.12">
             <description>
               {{reference}} This is the interface over which the test is to be
               performed.
@@ -18248,7 +19245,8 @@
             </syntax>
           </parameter>
 
-          <parameter name="NumberOfRepetitions" mandatory="true">
+          <parameter name="NumberOfRepetitions" mandatory="true"
+              version="2.12">
             <description>
               Number of repetitions of the ping test to perform before
               reporting the results.
@@ -18260,7 +19258,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="Timeout" mandatory="true">
+          <parameter name="Timeout" mandatory="true" version="2.12">
             <description>
               Timeout in {{units}} for the ping test.
             </description>
@@ -18274,7 +19272,7 @@
         </input>
         <output>
 
-          <parameter name="Status">
+          <parameter name="Status" version="2.13">
             <description>
               Indicates the availability of diagnostics data. {{enum}}
 
@@ -18293,7 +19291,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="SuccessCount">
+          <parameter name="SuccessCount" version="2.12">
             <description>
               Result parameter indicating the number of successful pings (those
               in which a successful response was received prior to the timeout)
@@ -18304,7 +19302,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="FailureCount">
+          <parameter name="FailureCount" version="2.12">
             <description>
               Result parameter indicating the number of failed pings in the
               most recent ping test.
@@ -18314,7 +19312,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="AverageResponseTime">
+          <parameter name="AverageResponseTime" version="2.12">
             <description>
               Result parameter indicating the average response time in
               {{units}} over all repetitions with successful responses of the
@@ -18328,7 +19326,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="MinimumResponseTime">
+          <parameter name="MinimumResponseTime" version="2.12">
             <description>
               Result parameter indicating the minimum response time in
               {{units}} over all repetitions with successful responses of the
@@ -18342,7 +19340,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="MaximumResponseTime">
+          <parameter name="MaximumResponseTime" version="2.12">
             <description>
               Result parameter indicating the maximum response time in
               {{units}} over all repetitions with successful responses of the
@@ -18508,12 +19506,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.15">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -18877,12 +19875,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.15">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -19195,12 +20193,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.15">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -19575,12 +20573,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.15">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -19948,12 +20946,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.15">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -20919,12 +21917,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -20963,7 +21961,7 @@
           <string>
             <pathRef refType="strong" targetType="row"/>
           </string>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
@@ -21182,7 +22180,7 @@
         receive and send frames with a configured VLANID.
       </description>
 
-      <parameter name="WoLSupported" access="readOnly">
+      <parameter name="WoLSupported" access="readOnly" version="2.13">
         <description>
           Indicates that WoL (Wake on LAN) over Ethernet is supported.
         </description>
@@ -21191,7 +22189,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="FlowControlSupported" access="readOnly">
+      <parameter name="FlowControlSupported" access="readOnly" version="2.14">
         <description>
           Indicates that Flow Control over Ethernet is supported, as per
           {{bibref|802.3-2015}}.
@@ -21228,7 +22226,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="RMONStatsNumberOfEntries" access="readOnly">
+      <parameter name="LAGNumberOfEntries" access="readOnly" version="2.12">
         <description>
           {{numentries}}
         </description>
@@ -21237,7 +22235,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="LAGNumberOfEntries" access="readOnly">
+      <parameter name="RMONStatsNumberOfEntries" access="readOnly"
+          version="2.4">
         <description>
           {{numentries}}
         </description>
@@ -21315,12 +22314,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -21386,6 +22385,21 @@
         </syntax>
       </parameter>
 
+      <parameter name="MaxBitRate" access="readWrite">
+        <description>
+          The maximum upstream and downstream PHY bit rate supported by this
+          interface (expressed in {{units}}).
+
+          A value of -1 indicates automatic selection of the maximum bit rate.
+        </description>
+        <syntax>
+          <int>
+            <range minInclusive="-1"/>
+            <units value="Mbps"/>
+          </int>
+        </syntax>
+      </parameter>
+
       <parameter name="MACAddress" access="readOnly">
         <description>
           The unique manufacturer-assigned Ethernet hardware address of the
@@ -21402,19 +22416,23 @@
         </syntax>
       </parameter>
 
-      <parameter name="SupportedLinkModes" access="readOnly">
+      <parameter name="SupportedLinkModes" access="readOnly" version="2.16">
         <description>
           Reports the supported link modes. MUST be reported in a compliant way
           as defined in {{bibref|IANAMauMIB|IANAifMauTypeListBits}}. For
           example, IANAifMauTypeListBits defines the following link mode types:
 
-          * ''11'' (10BASE-T full duplex mode)
-
-          * ''14'' (100BASE-T4)
-
-          * ''15'' (100BASE-TX half duplex mode)
-
           * ''16'' (100BASE-TX full duplex mode)
+
+          * ''26'' (1000BASE-SX full duplex mode)
+
+          * ''30'' (1000BASE-T full duplex mode)
+
+          * ''54'' (10GBASE-T)
+
+          * ''103'' (2.5GBASE-T)
+
+          * ''104'' (5GBASE-T)
         </description>
         <syntax>
           <list/>
@@ -21422,23 +22440,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="MaxBitRate" access="readWrite">
-        <description>
-          The maximum upstream and downstream PHY bit rate supported by this
-          interface (expressed in {{units}}).
-
-          A value of -1 indicates automatic selection of the maximum bit rate.
-        </description>
-        <syntax>
-          <int>
-            <range minInclusive="-1"/>
-            <units value="Mbps"/>
-          </int>
-        </syntax>
-      </parameter>
-
       <parameter name="CurrentBitRate" access="readOnly"
-          activeNotify="canDeny">
+          activeNotify="canDeny" version="2.7">
         <description>
           The current upstream and downstream PHY bit rate on this interface
           (expressed in {{units}}).
@@ -21454,7 +22457,7 @@
 
       <parameter name="DuplexMode" access="readWrite">
         <description>
-          The duplex mode available to this connection.
+          The duplex mode requested for this connection.
         </description>
         <syntax>
           <string>
@@ -21465,7 +22468,20 @@
         </syntax>
       </parameter>
 
-      <parameter name="EEECapability" access="readOnly">
+      <parameter name="CurrentDuplexMode" access="readOnly" version="2.18">
+        <description>
+          The duplex mode currently in use by this connection.
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="Unknown"/>
+            <enumeration value="Half"/>
+            <enumeration value="Full"/>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="EEECapability" access="readOnly" version="2.8">
         <description>
           Indicates whether this physical ethernet port supports Energy
           Efficient Ethernet as specified in
@@ -21476,7 +22492,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="EEEEnable" access="readWrite">
+      <parameter name="EEEEnable" access="readWrite" version="2.8">
         <description>
           Whether Energy Efficient Ethernet
           {{bibref|802.3-2012_section6|Section 78}} support is currently
@@ -21488,7 +22504,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="EEEStatus" access="readOnly">
+      <parameter name="EEEStatus" access="readOnly" version="2.17">
         <description>
           Indicates the active state of Energy Efficient Ethernet
           {{bibref|802.3-2012_section6|Section 78}}.
@@ -21518,6 +22534,36 @@
           </string>
         </syntax>
       </parameter>
+
+      <parameter name="MDIX" access="readWrite" version="2.18">
+        <description>
+          Configure the Medium Dependent Interface crossover functionality on
+          the interface.
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="Auto"/>
+            <enumeration value="On"/>
+            <enumeration value="Off"/>
+          </string>
+          <default type="factory" value="Auto"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="CurrentMDIX" access="readOnly" version="2.18">
+        <description>
+          The current Medium Dependent Interface crossover setting in use on
+          the interface.
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="Unsupported"/>
+            <enumeration value="Unknown"/>
+            <enumeration value="On"/>
+            <enumeration value="Off"/>
+          </string>
+        </syntax>
+      </parameter>
     </object>
 
     <object name="Device.Ethernet.Interface.{i}.Stats." access="readOnly"
@@ -21536,13 +22582,19 @@
         4.2.2}}.
       </description>
 
+      <command name="Reset()" async="false" version="2.18">
+        <description>
+          Reset all this object's statistics counters to zero.
+        </description>
+      </command>
+
       <parameter name="BytesSent" access="readOnly" activeNotify="canDeny">
         <description>
           The total number of bytes transmitted out of the interface, including
           framing characters.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
@@ -21552,158 +22604,164 @@
           framing characters.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
       <parameter name="PacketsSent" access="readOnly" activeNotify="canDeny">
         <description>
-          The total number of Ethernet frames transmitted out of the interface.
+          The total number of packets transmitted out of the interface.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
       <parameter name="PacketsReceived" access="readOnly"
           activeNotify="canDeny">
         <description>
-          The total number of Ethernet frames received on the interface.
+          The total number of packets received on the interface.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
       <parameter name="ErrorsSent" access="readOnly" activeNotify="canDeny">
         <description>
-          The total number of outbound Ethernet frames that could not be
-          transmitted because of errors.
+          The total number of outbound packets that could not be transmitted
+          because of errors.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="StatsCounter32"/>
         </syntax>
       </parameter>
 
       <parameter name="ErrorsReceived" access="readOnly"
           activeNotify="canDeny">
         <description>
-          The total number of inbound Ethernet frames that contained errors
-          preventing them from being delivered to a higher-layer protocol.
+          The total number of inbound packets that contained errors preventing
+          them from being delivered to a higher-layer protocol.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="StatsCounter32"/>
         </syntax>
       </parameter>
 
       <parameter name="UnicastPacketsSent" access="readOnly"
-          activeNotify="canDeny">
+          activeNotify="canDeny" dmr:previousParameter="ErrorsReceived">
         <description>
-          The total number of Ethernet frames requested for transmission which
-          were not addressed to a multicast or broadcast address at this layer,
+          The total number of packets requested for transmission which were not
+          addressed to a multicast or broadcast address at this layer,
           including those that were discarded or not sent.
         </description>
         <syntax>
-          <unsignedLong/>
-        </syntax>
-      </parameter>
-
-      <parameter name="UnicastPacketsReceived" access="readOnly"
-          activeNotify="canDeny">
-        <description>
-          The total number of Ethernet frames packets, delivered by this layer
-          to a higher layer, which were not addressed to a multicast or
-          broadcast address at this layer.
-        </description>
-        <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
       <parameter name="DiscardPacketsSent" access="readOnly"
           activeNotify="canDeny">
         <description>
-          The total number of outbound Ethernet frames which were chosen to be
+          The total number of outbound packets which were chosen to be
           discarded even though no errors had been detected to prevent their
           being transmitted. One possible reason for discarding such a packet
           could be to free up buffer space.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="StatsCounter32"/>
         </syntax>
       </parameter>
 
       <parameter name="DiscardPacketsReceived" access="readOnly"
           activeNotify="canDeny">
         <description>
-          The total number of inbound Ethernet frames which were chosen to be
-          discarded even though no errors had been detected to prevent their
-          being delivered. One possible reason for discarding such a packet
-          could be to free up buffer space.
+          The total number of inbound packets which were chosen to be discarded
+          even though no errors had been detected to prevent their being
+          delivered. One possible reason for discarding such a packet could be
+          to free up buffer space.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="StatsCounter32"/>
         </syntax>
       </parameter>
 
       <parameter name="MulticastPacketsSent" access="readOnly"
-          activeNotify="canDeny">
+          activeNotify="canDeny" dmr:previousParameter="DiscardPacketsReceived">
         <description>
-          The total number of Ethernet frames that higher-level protocols
-          requested for transmission and which were addressed to a multicast
-          address at this layer, including those that were discarded or not
-          sent.
+          The total number of packets that higher-level protocols requested for
+          transmission and which were addressed to a multicast address at this
+          layer, including those that were discarded or not sent.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="UnicastPacketsReceived" access="readOnly"
+          activeNotify="canDeny">
+        <description>
+          The total number of received packets, delivered by this layer to a
+          higher layer, which were not addressed to a multicast or broadcast
+          address at this layer.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
       <parameter name="MulticastPacketsReceived" access="readOnly"
           activeNotify="canDeny">
         <description>
-          The total number of received Ethernet frames, delivered by this layer
-          to a higher layer, which were addressed to a multicast address at
-          this layer.
+          The total number of received packets, delivered by this layer to a
+          higher layer, which were addressed to a multicast address at this
+          layer.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
-      <parameter name="BroadcastPacketsSent" access="readOnly"
-          activeNotify="canDeny">
+      <parameter name="BroadcastPacketsSent" access="readOnly">
         <description>
-          The total number of Ethernet frames that higher-level protocols
-          requested for transmission and which were addressed to a broadcast
-          address at this layer, including those that were discarded or not
-          sent.
+          The total number of packets that higher-level protocols requested for
+          transmission and which were addressed to a broadcast address at this
+          layer, including those that were discarded or not sent.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
-      <parameter name="BroadcastPacketsReceived" access="readOnly"
-          activeNotify="canDeny">
+      <parameter name="BroadcastPacketsReceived" access="readOnly">
         <description>
-          The total number of received Ethernet frames, delivered by this layer
-          to a higher layer, which were addressed to a broadcast address at
-          this layer.
+          The total number of received packets, delivered by this layer to a
+          higher layer, which were addressed to a broadcast address at this
+          layer.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
       <parameter name="UnknownProtoPacketsReceived" access="readOnly"
           activeNotify="canDeny">
         <description>
-          The total number of Ethernet frames received via the interface which
-          were discarded because of an unknown or unsupported protocol.
+          The total number of packets received via the interface which were
+          discarded because of an unknown or unsupported protocol.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Collisions" access="readOnly" activeNotify="canDeny"
+          version="2.18">
+        <description>
+          The total number of collisions on the interface.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
     </object>
@@ -21730,7 +22788,7 @@
 
       <parameter name="Enable" access="readWrite">
         <description>
-          Enables or disables the link.
+          Enables or disables the interface.
 
           This parameter is based on ''ifAdminStatus'' from {{bibref|RFC2863}}.
         </description>
@@ -21742,7 +22800,7 @@
 
       <parameter name="Status" access="readOnly">
         <description>
-          The current operational state of the link (see
+          The current operational state of the interface (see
           {{bibref|TR-181i2|Section 4.2.2}}). {{enum}}
 
           When {{param|Enable}} is {{false}} then {{param}} SHOULD normally be
@@ -21781,18 +22839,18 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
       <parameter name="Name" access="readOnly">
         <description>
-          The textual name of the link as assigned by the CPE.
+          The textual name of the interface as assigned by the CPE.
         </description>
         <syntax>
           <string>
@@ -21803,8 +22861,8 @@
 
       <parameter name="LastChange" access="readOnly" activeNotify="canDeny">
         <description>
-          The accumulated time in {{units}} since the link entered its current
-          operational state.
+          The accumulated time in {{units}} since the interface entered its
+          current operational state.
         </description>
         <syntax>
           <unsignedInt>
@@ -21825,7 +22883,20 @@
           <string>
             <pathRef refType="strong" targetType="row"/>
           </string>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="MTU" access="readWrite" version="2.18"
+          dmr:previousParameter="LowerLayers">
+        <description>
+          Maximum Transmission Unit for this interface (expressed in
+          {{units}}).
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="bytes"/>
+          </unsignedInt>
         </syntax>
       </parameter>
 
@@ -21861,7 +22932,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="FlowControl" access="readWrite">
+      <parameter name="FlowControl" access="readWrite" version="2.14">
         <description>
           Configures Flow Control on given Ethernet port. When set to {{true}},
           it activates the exchange of pause-resume flow control frames.
@@ -21871,191 +22942,226 @@
           <default type="object" value="false"/>
         </syntax>
       </parameter>
+
+      <parameter name="NoARP" access="readWrite" version="2.18">
+        <description>
+          Disables or enables sending of ARP messages on the Ethernet link. If
+          {{true}}, the kernel will not send ARP requests and won't send ARP
+          replies.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="object" value="false"/>
+        </syntax>
+      </parameter>
     </object>
 
     <object name="Device.Ethernet.Link.{i}.Stats." access="readOnly"
         minEntries="1" maxEntries="1" version="2.0">
       <description>
-        Throughput statistics for this link.
+        Throughput statistics for this interface.
 
-        The CPE MUST reset the link's Stats parameters (unless otherwise stated
-        in individual object or parameter descriptions) either when the link
-        becomes operationally down due to a previous administrative down (i.e.
-        the link's {{param|#.Status}} parameter transitions to a down state
-        after the link is disabled) or when the link becomes administratively
-        up (i.e. the link's {{param|#.Enable}} parameter transitions from
-        {{false}} to {{true}}). Administrative and operational link status is
-        discussed in {{bibref|TR-181i2|section 4.2.2}}.
+        The CPE MUST reset the interface's Stats parameters (unless otherwise
+        stated in individual object or parameter descriptions) either when the
+        interface becomes operationally down due to a previous administrative
+        down (i.e. the interface's {{param|#.Status}} parameter transitions to
+        a down state after the interface is disabled) or when the interface
+        becomes administratively up (i.e. the interface's {{param|#.Enable}}
+        parameter transitions from {{false}} to {{true}}). Administrative and
+        operational interface status is discussed in {{bibref|TR-181i2|section
+        4.2.2}}.
       </description>
 
+      <command name="Reset()" async="false" version="2.18">
+        <description>
+          Reset all this object's statistics counters to zero.
+        </description>
+      </command>
+
       <parameter name="BytesSent" access="readOnly" activeNotify="canDeny">
         <description>
-          The total number of bytes transmitted out of the link, including
+          The total number of bytes transmitted out of the interface, including
           framing characters.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
       <parameter name="BytesReceived" access="readOnly" activeNotify="canDeny">
         <description>
-          The total number of bytes received on the link, including framing
-          characters.
+          The total number of bytes received on the interface, including
+          framing characters.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
       <parameter name="PacketsSent" access="readOnly" activeNotify="canDeny">
         <description>
-          The total number of Ethernet frames transmitted out of the link.
+          The total number of packets transmitted out of the interface.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
       <parameter name="PacketsReceived" access="readOnly"
           activeNotify="canDeny">
         <description>
-          The total number of Ethernet frames received on the link.
+          The total number of packets received on the interface.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
       <parameter name="ErrorsSent" access="readOnly" activeNotify="canDeny">
         <description>
-          The total number of outbound Ethernet frames that could not be
-          transmitted because of errors.
+          The total number of outbound packets that could not be transmitted
+          because of errors.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="StatsCounter32"/>
         </syntax>
       </parameter>
 
       <parameter name="ErrorsReceived" access="readOnly"
           activeNotify="canDeny">
         <description>
-          The total number of inbound Ethernet frames that contained errors
-          preventing them from being delivered to a higher-layer protocol.
+          The total number of inbound packets that contained errors preventing
+          them from being delivered to a higher-layer protocol.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="StatsCounter32"/>
         </syntax>
       </parameter>
 
       <parameter name="UnicastPacketsSent" access="readOnly"
-          activeNotify="canDeny">
+          activeNotify="canDeny" dmr:previousParameter="ErrorsReceived">
         <description>
-          The total number of Ethernet frames requested for transmission which
-          were not addressed to a multicast or broadcast address at this layer,
+          The total number of packets requested for transmission which were not
+          addressed to a multicast or broadcast address at this layer,
           including those that were discarded or not sent.
         </description>
         <syntax>
-          <unsignedLong/>
-        </syntax>
-      </parameter>
-
-      <parameter name="UnicastPacketsReceived" access="readOnly"
-          activeNotify="canDeny">
-        <description>
-          The total number of received Ethernet frames, delivered by this layer
-          to a higher layer, which were not addressed to a multicast or
-          broadcast address at this layer.
-        </description>
-        <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
       <parameter name="DiscardPacketsSent" access="readOnly"
           activeNotify="canDeny">
         <description>
-          The total number of outbound Ethernet frames which were chosen to be
+          The total number of outbound packets which were chosen to be
           discarded even though no errors had been detected to prevent their
           being transmitted. One possible reason for discarding such a packet
           could be to free up buffer space.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="StatsCounter32"/>
         </syntax>
       </parameter>
 
       <parameter name="DiscardPacketsReceived" access="readOnly"
           activeNotify="canDeny">
         <description>
-          The total number of inbound Ethernet frames which were chosen to be
-          discarded even though no errors had been detected to prevent their
-          being delivered. One possible reason for discarding such a packet
-          could be to free up buffer space.
+          The total number of inbound packets which were chosen to be discarded
+          even though no errors had been detected to prevent their being
+          delivered. One possible reason for discarding such a packet could be
+          to free up buffer space.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="StatsCounter32"/>
         </syntax>
       </parameter>
 
       <parameter name="MulticastPacketsSent" access="readOnly"
-          activeNotify="canDeny">
+          activeNotify="canDeny" dmr:previousParameter="DiscardPacketsReceived">
         <description>
-          The total number of Ethernet frames that higher-level protocols
-          requested for transmission and which were addressed to a multicast
-          address at this layer, including those that were discarded or not
-          sent.
+          The total number of packets that higher-level protocols requested for
+          transmission and which were addressed to a multicast address at this
+          layer, including those that were discarded or not sent.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="UnicastPacketsReceived" access="readOnly"
+          activeNotify="canDeny">
+        <description>
+          The total number of received packets, delivered by this layer to a
+          higher layer, which were not addressed to a multicast or broadcast
+          address at this layer.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
       <parameter name="MulticastPacketsReceived" access="readOnly"
           activeNotify="canDeny">
         <description>
-          The total number of received Ethernet frames, delivered by this layer
-          to a higher layer, which were addressed to a multicast address at
-          this layer.
+          The total number of received packets, delivered by this layer to a
+          higher layer, which were addressed to a multicast address at this
+          layer.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
-      <parameter name="BroadcastPacketsSent" access="readOnly"
-          activeNotify="canDeny">
+      <parameter name="BroadcastPacketsSent" access="readOnly">
         <description>
-          The total number of Ethernet frames that higher-level protocols
-          requested for transmission and which were addressed to a broadcast
-          address at this layer, including those that were discarded or not
-          sent.
+          The total number of packets that higher-level protocols requested for
+          transmission and which were addressed to a broadcast address at this
+          layer, including those that were discarded or not sent.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
-      <parameter name="BroadcastPacketsReceived" access="readOnly"
-          activeNotify="canDeny">
+      <parameter name="BroadcastPacketsReceived" access="readOnly">
         <description>
-          The total number of received Ethernet frames, delivered by this layer
-          to a higher layer, which were addressed to a broadcast address at
-          this layer.
+          The total number of received packets, delivered by this layer to a
+          higher layer, which were addressed to a broadcast address at this
+          layer.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
       <parameter name="UnknownProtoPacketsReceived" access="readOnly"
           activeNotify="canDeny">
         <description>
-          The total number of Ethernet frames received via the link which were
+          The total number of packets received via the interface which were
           discarded because of an unknown or unsupported protocol.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="PausePacketsSent" access="readOnly"
+          activeNotify="canDeny" version="2.18">
+        <description>
+          The total number of Ethernet pause frames sent on the link.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter64"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="PausePacketsReceived" access="readOnly"
+          activeNotify="canDeny" version="2.18">
+        <description>
+          The total number of Ethernet pause frames received on the link.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
     </object>
@@ -22079,7 +23185,7 @@
 
       <parameter name="Enable" access="readWrite">
         <description>
-          Enables or disables the VLANTermination entry.
+          Enables or disables the interface.
 
           This parameter is based on ''ifAdminStatus'' from {{bibref|RFC2863}}.
         </description>
@@ -22091,7 +23197,7 @@
 
       <parameter name="Status" access="readOnly">
         <description>
-          The current operational state of the VLANTermination entry (see
+          The current operational state of the interface (see
           {{bibref|TR-181i2|Section 4.2.2}}). {{enum}}
 
           When {{param|Enable}} is {{false}} then {{param}} SHOULD normally be
@@ -22130,18 +23236,18 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
       <parameter name="Name" access="readOnly">
         <description>
-          The textual name of the VLANTermination entry as assigned by the CPE.
+          The textual name of the interface as assigned by the CPE.
         </description>
         <syntax>
           <string>
@@ -22152,8 +23258,8 @@
 
       <parameter name="LastChange" access="readOnly" activeNotify="canDeny">
         <description>
-          The accumulated time in {{units}} since the VLANTermination entered
-          its current operational state.
+          The accumulated time in {{units}} since the interface entered its
+          current operational state.
         </description>
         <syntax>
           <unsignedInt>
@@ -22174,7 +23280,7 @@
           <string>
             <pathRef refType="strong" targetType="row"/>
           </string>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
@@ -22192,7 +23298,23 @@
         </syntax>
       </parameter>
 
-      <parameter name="TPID" access="readWrite">
+      <parameter name="VLANPriority" access="readWrite" version="2.18">
+        <description>
+          The VLAN Priority for this {{object}} entry, also known as 802.1p
+          Priority, is a 3-bit field used to indicate the priority of network
+          traffic within a VLAN.
+
+          A value of ''-1'' indicates that the VLAN priority should not be
+          changed for this {{object}}.
+        </description>
+        <syntax>
+          <int>
+            <range minInclusive="-1" maxInclusive="7"/>
+          </int>
+        </syntax>
+      </parameter>
+
+      <parameter name="TPID" access="readWrite" version="2.7">
         <description>
           The Tag Protocol Identifier (TPID) assigned to this {{object}}. The
           TPID is an EtherType value used to identify the frame as a tagged
@@ -22231,13 +23353,19 @@
         4.2.2}}.
       </description>
 
+      <command name="Reset()" async="false" version="2.18">
+        <description>
+          Reset all this object's statistics counters to zero.
+        </description>
+      </command>
+
       <parameter name="BytesSent" access="readOnly" activeNotify="canDeny">
         <description>
           The total number of bytes transmitted out of the interface, including
           framing characters.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
@@ -22247,7 +23375,7 @@
           framing characters.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
@@ -22256,7 +23384,7 @@
           The total number of packets transmitted out of the interface.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
@@ -22266,7 +23394,7 @@
           The total number of packets received on the interface.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
@@ -22276,7 +23404,7 @@
           because of errors.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="StatsCounter32"/>
         </syntax>
       </parameter>
 
@@ -22287,31 +23415,19 @@
           them from being delivered to a higher-layer protocol.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="StatsCounter32"/>
         </syntax>
       </parameter>
 
       <parameter name="UnicastPacketsSent" access="readOnly"
-          activeNotify="canDeny">
+          activeNotify="canDeny" dmr:previousParameter="ErrorsReceived">
         <description>
           The total number of packets requested for transmission which were not
           addressed to a multicast or broadcast address at this layer,
           including those that were discarded or not sent.
         </description>
         <syntax>
-          <unsignedLong/>
-        </syntax>
-      </parameter>
-
-      <parameter name="UnicastPacketsReceived" access="readOnly"
-          activeNotify="canDeny">
-        <description>
-          The total number of received packets, delivered by this layer to a
-          higher layer, which were not addressed to a multicast or broadcast
-          address at this layer.
-        </description>
-        <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
@@ -22324,7 +23440,7 @@
           could be to free up buffer space.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="StatsCounter32"/>
         </syntax>
       </parameter>
 
@@ -22337,19 +23453,31 @@
           to free up buffer space.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="StatsCounter32"/>
         </syntax>
       </parameter>
 
       <parameter name="MulticastPacketsSent" access="readOnly"
-          activeNotify="canDeny">
+          activeNotify="canDeny" dmr:previousParameter="DiscardPacketsReceived">
         <description>
           The total number of packets that higher-level protocols requested for
           transmission and which were addressed to a multicast address at this
           layer, including those that were discarded or not sent.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="UnicastPacketsReceived" access="readOnly"
+          activeNotify="canDeny">
+        <description>
+          The total number of received packets, delivered by this layer to a
+          higher layer, which were not addressed to a multicast or broadcast
+          address at this layer.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
@@ -22361,31 +23489,29 @@
           layer.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
-      <parameter name="BroadcastPacketsSent" access="readOnly"
-          activeNotify="canDeny">
+      <parameter name="BroadcastPacketsSent" access="readOnly">
         <description>
           The total number of packets that higher-level protocols requested for
           transmission and which were addressed to a broadcast address at this
           layer, including those that were discarded or not sent.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
-      <parameter name="BroadcastPacketsReceived" access="readOnly"
-          activeNotify="canDeny">
+      <parameter name="BroadcastPacketsReceived" access="readOnly">
         <description>
           The total number of received packets, delivered by this layer to a
           higher layer, which were addressed to a broadcast address at this
           layer.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
@@ -22396,7 +23522,336 @@
           discarded because of an unknown or unsupported protocol.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object name="Device.Ethernet.LAG.{i}." access="readWrite"
+        numEntriesParameter="LAGNumberOfEntries" enableParameter="Enable"
+        minEntries="0" maxEntries="unbounded" version="2.12">
+      <description>
+        Ethernet Link Aggregation Group (LAG) table (a stackable interface
+        object as described in {{bibref|TR-181i2|Section 4.2}}). Table entries
+        model the Link Aggregation Sub-Layer as defined in
+        {{bibref|802.3-2015}} and {{bibref|802.1AX-2014}}. It is expected that
+        a {{object}} interface can only be stacked above {{object|#.Interface}}
+        interfaces. The CPE can reject creation of additional LAG instances if
+        this would exceed its capabilities.
+      </description>
+      <uniqueKey functional="false">
+        <parameter ref="Alias"/>
+      </uniqueKey>
+      <uniqueKey functional="false">
+        <parameter ref="Name"/>
+      </uniqueKey>
+      <uniqueKey functional="true">
+        <parameter ref="MACAddress"/>
+      </uniqueKey>
+
+      <parameter name="Enable" access="readWrite">
+        <description>
+          Enables or disables the interface.
+
+          This parameter is based on ''ifAdminStatus'' from {{bibref|RFC2863}}.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="object" value="false"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Status" access="readOnly">
+        <description>
+          The current operational state of the interface (see
+          {{bibref|TR-181i2|Section 4.2.2}}). {{enum}}
+
+          When {{param|Enable}} is {{false}} then {{param}} SHOULD normally be
+          {{enum|Down}} (or {{enum|NotPresent}} or {{enum|Error}} if there is a
+          fault condition on the interface).
+
+          When {{param|Enable}} is changed to {{true}} then {{param}} SHOULD
+          change to {{enum|Up}} if and only if the interface is able to
+          transmit and receive network traffic; it SHOULD change to
+          {{enum|Dormant}} if and only if the interface is operable but is
+          waiting for external actions before it can transmit and receive
+          network traffic (and subsequently change to {{enum|Up}} if still
+          operable when the expected actions have completed); it SHOULD change
+          to {{enum|LowerLayerDown}} if and only if the interface is prevented
+          from entering the {{enum|Up}} state because one or more of the
+          interfaces beneath it is down; it SHOULD remain in the {{enum|Error}}
+          state if there is an error or other fault condition detected on the
+          interface; it SHOULD remain in the {{enum|NotPresent}} state if the
+          interface has missing (typically hardware) components; it SHOULD
+          change to {{enum|Unknown}} if the state of the interface can not be
+          determined for some reason.
+
+          This parameter is based on ''ifOperStatus'' from {{bibref|RFC2863}}.
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="Up"/>
+            <enumeration value="Down"/>
+            <enumeration value="Unknown"/>
+            <enumeration value="Dormant"/>
+            <enumeration value="NotPresent"/>
+            <enumeration value="LowerLayerDown"/>
+            <enumeration value="Error" optional="true"/>
+          </string>
+          <default type="object" value="Down"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.12">
+        <description>
+          {{datatype|expand}}
+        </description>
+        <syntax>
+          <dataType ref="_AliasUSP"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Name" access="readOnly">
+        <description>
+          The textual name of the interface as assigned by the CPE.
+        </description>
+        <syntax>
+          <string>
+            <size maxLength="64"/>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="LastChange" access="readOnly" activeNotify="canDeny">
+        <description>
+          The accumulated time in {{units}} since the interface entered its
+          current operational state.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="LowerLayers" access="readWrite">
+        <description>
+          {{list}} {{reference|an interface object that is stacked immediately
+          below this interface object}} See {{bibref|TR-181i2|Section 4.2.1}}.
+
+          {{param}} must reference to Device.Ethernet.Interface instances where
+          Link Aggregation Group is configured by the CPE.
+
+          For example, "Device.Ethernet.Interface.1,
+          Device.Ethernet.Interface.2"
+        </description>
+        <syntax>
+          <list>
+            <size maxLength="1024"/>
+          </list>
+          <string>
+            <pathRef refType="strong" targetType="row"/>
+          </string>
+          <default type="object" value="[]"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="MACAddress" access="readWrite">
+        <description>
+          MAC address of the Link Aggregation Interface.
+        </description>
+        <syntax>
+          <dataType ref="MACAddress"/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object name="Device.Ethernet.LAG.{i}.Stats." access="readOnly"
+        minEntries="1" maxEntries="1" version="2.12">
+      <description>
+        Throughput statistics for this interface.
+
+        The CPE MUST reset the interface's Stats parameters (unless otherwise
+        stated in individual object or parameter descriptions) either when the
+        interface becomes operationally down due to a previous administrative
+        down (i.e. the interface's {{param|#.Status}} parameter transitions to
+        a down state after the interface is disabled) or when the interface
+        becomes administratively up (i.e. the interface's {{param|#.Enable}}
+        parameter transitions from {{false}} to {{true}}). Administrative and
+        operational interface status is discussed in {{bibref|TR-181i2|section
+        4.2.2}}.
+      </description>
+
+      <command name="Reset()" async="false" version="2.18">
+        <description>
+          Reset all this object's statistics counters to zero.
+        </description>
+      </command>
+
+      <parameter name="BytesSent" access="readOnly" activeNotify="canDeny">
+        <description>
+          The total number of bytes transmitted out of the interface, including
+          framing characters.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter64"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="BytesReceived" access="readOnly" activeNotify="canDeny">
+        <description>
+          The total number of bytes received on the interface, including
+          framing characters.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter64"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="PacketsSent" access="readOnly" activeNotify="canDeny">
+        <description>
+          The total number of packets transmitted out of the interface.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter64"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="PacketsReceived" access="readOnly"
+          activeNotify="canDeny">
+        <description>
+          The total number of packets received on the interface.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter64"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ErrorsSent" access="readOnly" activeNotify="canDeny">
+        <description>
+          The total number of outbound packets that could not be transmitted
+          because of errors.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ErrorsReceived" access="readOnly"
+          activeNotify="canDeny">
+        <description>
+          The total number of inbound packets that contained errors preventing
+          them from being delivered to a higher-layer protocol.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="UnicastPacketsSent" access="readOnly"
+          activeNotify="canDeny" dmr:previousParameter="ErrorsReceived">
+        <description>
+          The total number of packets requested for transmission which were not
+          addressed to a multicast or broadcast address at this layer,
+          including those that were discarded or not sent.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter64"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="DiscardPacketsSent" access="readOnly"
+          activeNotify="canDeny">
+        <description>
+          The total number of outbound packets which were chosen to be
+          discarded even though no errors had been detected to prevent their
+          being transmitted. One possible reason for discarding such a packet
+          could be to free up buffer space.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="DiscardPacketsReceived" access="readOnly"
+          activeNotify="canDeny">
+        <description>
+          The total number of inbound packets which were chosen to be discarded
+          even though no errors had been detected to prevent their being
+          delivered. One possible reason for discarding such a packet could be
+          to free up buffer space.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="MulticastPacketsSent" access="readOnly"
+          activeNotify="canDeny" dmr:previousParameter="DiscardPacketsReceived">
+        <description>
+          The total number of packets that higher-level protocols requested for
+          transmission and which were addressed to a multicast address at this
+          layer, including those that were discarded or not sent.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter64"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="UnicastPacketsReceived" access="readOnly"
+          activeNotify="canDeny">
+        <description>
+          The total number of received packets, delivered by this layer to a
+          higher layer, which were not addressed to a multicast or broadcast
+          address at this layer.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter64"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="MulticastPacketsReceived" access="readOnly"
+          activeNotify="canDeny">
+        <description>
+          The total number of received packets, delivered by this layer to a
+          higher layer, which were addressed to a multicast address at this
+          layer.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter64"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="BroadcastPacketsSent" access="readOnly">
+        <description>
+          The total number of packets that higher-level protocols requested for
+          transmission and which were addressed to a broadcast address at this
+          layer, including those that were discarded or not sent.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter64"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="BroadcastPacketsReceived" access="readOnly">
+        <description>
+          The total number of received packets, delivered by this layer to a
+          higher layer, which were addressed to a broadcast address at this
+          layer.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter64"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="UnknownProtoPacketsReceived" access="readOnly"
+          activeNotify="canDeny">
+        <description>
+          The total number of packets received via the interface which were
+          discarded because of an unknown or unsupported protocol.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
         </syntax>
       </parameter>
     </object>
@@ -22500,12 +23955,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.4">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -22839,7 +24294,7 @@
     <object name="Device.Ethernet.WoL." access="readOnly" minEntries="1"
         maxEntries="1" version="2.13">
       <description>
-        This object provides access to the WoL (Wake on LAN) funtionality.
+        This object provides access to the WoL (Wake on LAN) functionality.
       </description>
 
       <command name="SendMagicPacket()" async="false">
@@ -22849,7 +24304,7 @@
         </description>
         <input>
 
-          <parameter name="MACAddress">
+          <parameter name="MACAddress" version="2.13">
             <description>
               MAC address target of the magic packet.
             </description>
@@ -22858,7 +24313,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="Password">
+          <parameter name="Password" version="2.13">
             <description>
               The SecureOn password. The parameter value can be empty or, if
               present, can contain either 4 bytes or 6 bytes.
@@ -22871,328 +24326,6 @@
       </command>
     </object>
 
-    <object name="Device.Ethernet.LAG.{i}." access="readWrite"
-        numEntriesParameter="LAGNumberOfEntries" enableParameter="Enable"
-        minEntries="0" maxEntries="unbounded" version="2.12">
-      <description>
-        Ethernet Link Aggregation Group (LAG) table (a stackable interface
-        object as described in {{bibref|TR-181i2|Section 4.2}}). Table entries
-        model the Link Aggregation Sub-Layer as defined in
-        {{bibref|802.3-2015}} and {{bibref|802.1AX-2014}}. It is expected that
-        a {{object}} interface can only be stacked above {{object|#.Interface}}
-        interfaces. The CPE can reject creation of additional LAG instances if
-        this would exceed its capabilities.
-      </description>
-      <uniqueKey functional="false">
-        <parameter ref="Alias"/>
-      </uniqueKey>
-      <uniqueKey functional="false">
-        <parameter ref="Name"/>
-      </uniqueKey>
-      <uniqueKey functional="true">
-        <parameter ref="MACAddress"/>
-      </uniqueKey>
-
-      <parameter name="Enable" access="readWrite">
-        <description>
-          Enables or disables the interface.
-
-          This parameter is based on ''ifAdminStatus'' from {{bibref|RFC2863}}.
-        </description>
-        <syntax>
-          <boolean/>
-        </syntax>
-      </parameter>
-
-      <parameter name="Status" access="readOnly">
-        <description>
-          The current operational state of the interface (see
-          {{bibref|TR-181i2|Section 4.2.2}}). {{enum}}
-
-          When {{param|Enable}} is {{false}} then {{param}} SHOULD normally be
-          {{enum|Down}} (or {{enum|NotPresent}} or {{enum|Error}} if there is a
-          fault condition on the interface).
-
-          When {{param|Enable}} is changed to {{true}} then {{param}} SHOULD
-          change to {{enum|Up}} if and only if the interface is able to
-          transmit and receive network traffic; it SHOULD change to
-          {{enum|Dormant}} if and only if the interface is operable but is
-          waiting for external actions before it can transmit and receive
-          network traffic (and subsequently change to {{enum|Up}} if still
-          operable when the expected actions have completed); it SHOULD change
-          to {{enum|LowerLayerDown}} if and only if the interface is prevented
-          from entering the {{enum|Up}} state because one or more of the
-          interfaces beneath it is down; it SHOULD remain in the {{enum|Error}}
-          state if there is an error or other fault condition detected on the
-          interface; it SHOULD remain in the {{enum|NotPresent}} state if the
-          interface has missing (typically hardware) components; it SHOULD
-          change to {{enum|Unknown}} if the state of the interface can not be
-          determined for some reason.
-
-          This parameter is based on ''ifOperStatus'' from {{bibref|RFC2863}}.
-        </description>
-        <syntax>
-          <string>
-            <enumeration value="Up"/>
-            <enumeration value="Down"/>
-            <enumeration value="Unknown"/>
-            <enumeration value="Dormant"/>
-            <enumeration value="NotPresent"/>
-            <enumeration value="LowerLayerDown"/>
-            <enumeration value="Error" optional="true"/>
-          </string>
-        </syntax>
-      </parameter>
-
-      <parameter name="Alias" access="writeOnceReadOnly">
-        <description>
-          {{datatype|expand}}
-        </description>
-        <syntax>
-          <dataType ref="Alias"/>
-        </syntax>
-      </parameter>
-
-      <parameter name="Name" access="readOnly">
-        <description>
-          The textual name of the LAG interface as assigned by the CPE.
-        </description>
-        <syntax>
-          <string>
-            <size maxLength="64"/>
-          </string>
-        </syntax>
-      </parameter>
-
-      <parameter name="LastChange" access="readOnly" activeNotify="canDeny">
-        <description>
-          The accumulated time in {{units}} since the interface entered its
-          current operational state.
-        </description>
-        <syntax>
-          <unsignedInt>
-            <units value="seconds"/>
-          </unsignedInt>
-        </syntax>
-      </parameter>
-
-      <parameter name="LowerLayers" access="readWrite">
-        <description>
-          {{list}} {{reference|an interface object that is stacked immediately
-          below this interface object}}. See {{bibref|TR-181i2|Section 4.2.1}}.
-
-          {{param}} must reference to Device.Ethernet.Interface instances where
-          Link Aggregation Group is configured by the CPE.
-
-          For example, "Device.Ethernet.Interface.1,
-          Device.Ethernet.Interface.2"
-        </description>
-        <syntax>
-          <list>
-            <size maxLength="1024"/>
-          </list>
-          <string>
-            <pathRef refType="strong" targetType="row"/>
-          </string>
-        </syntax>
-      </parameter>
-
-      <parameter name="MACAddress" access="readWrite">
-        <description>
-          MAC address of the Link Aggregation Interface.
-        </description>
-        <syntax>
-          <dataType ref="MACAddress"/>
-        </syntax>
-      </parameter>
-    </object>
-
-    <object name="Device.Ethernet.LAG.{i}.Stats." access="readOnly"
-        minEntries="1" maxEntries="1" version="2.12">
-      <description>
-        Throughput statistics for this interface.
-
-        The CPE MUST reset the interface's Stats parameters (unless otherwise
-        stated in individual object or parameter descriptions) either when the
-        interface becomes operationally down due to a previous administrative
-        down (i.e. the interface's {{param|#.Status}} parameter transitions to
-        a down state after the interface is disabled) or when the interface
-        becomes administratively up (i.e. the interface's {{param|#.Enable}}
-        parameter transitions from {{false}} to {{true}}). Administrative and
-        operational interface status is discussed in {{bibref|TR-181i2|section
-        4.2.2}}.
-      </description>
-
-      <parameter name="BytesSent" access="readOnly" activeNotify="canDeny">
-        <description>
-          The total number of bytes transmitted out of the interface, including
-          framing characters.
-        </description>
-        <syntax>
-          <dataType ref="StatsCounter64"/>
-        </syntax>
-      </parameter>
-
-      <parameter name="BytesReceived" access="readOnly" activeNotify="canDeny">
-        <description>
-          The total number of bytes received on the interface, including
-          framing characters.
-        </description>
-        <syntax>
-          <dataType ref="StatsCounter64"/>
-        </syntax>
-      </parameter>
-
-      <parameter name="PacketsSent" access="readOnly" activeNotify="canDeny">
-        <description>
-          The total number of packets transmitted out of the interface.
-        </description>
-        <syntax>
-          <dataType ref="StatsCounter64"/>
-        </syntax>
-      </parameter>
-
-      <parameter name="PacketsReceived" access="readOnly"
-          activeNotify="canDeny">
-        <description>
-          The total number of packets received on the interface.
-        </description>
-        <syntax>
-          <dataType ref="StatsCounter64"/>
-        </syntax>
-      </parameter>
-
-      <parameter name="ErrorsSent" access="readOnly" activeNotify="canDeny">
-        <description>
-          The total number of outbound packets that could not be transmitted
-          because of errors.
-        </description>
-        <syntax>
-          <dataType ref="StatsCounter32"/>
-        </syntax>
-      </parameter>
-
-      <parameter name="ErrorsReceived" access="readOnly"
-          activeNotify="canDeny">
-        <description>
-          The total number of inbound packets that contained errors preventing
-          them from being delivered to a higher-layer protocol.
-        </description>
-        <syntax>
-          <dataType ref="StatsCounter32"/>
-        </syntax>
-      </parameter>
-
-      <parameter name="UnicastPacketsSent" access="readOnly"
-          activeNotify="canDeny">
-        <description>
-          The total number of packets requested for transmission which were not
-          addressed to a multicast or broadcast address at this layer,
-          including those that were discarded or not sent.
-        </description>
-        <syntax>
-          <dataType ref="StatsCounter64"/>
-        </syntax>
-      </parameter>
-
-      <parameter name="UnicastPacketsReceived" access="readOnly"
-          activeNotify="canDeny">
-        <description>
-          The total number of received packets, delivered by this layer to a
-          higher layer, which were not addressed to a multicast or broadcast
-          address at this layer.
-        </description>
-        <syntax>
-          <dataType ref="StatsCounter64"/>
-        </syntax>
-      </parameter>
-
-      <parameter name="DiscardPacketsSent" access="readOnly"
-          activeNotify="canDeny">
-        <description>
-          The total number of outbound packets which were chosen to be
-          discarded even though no errors had been detected to prevent their
-          being transmitted. One possible reason for discarding such a packet
-          could be to free up buffer space.
-        </description>
-        <syntax>
-          <dataType ref="StatsCounter32"/>
-        </syntax>
-      </parameter>
-
-      <parameter name="DiscardPacketsReceived" access="readOnly"
-          activeNotify="canDeny">
-        <description>
-          The total number of inbound packets which were chosen to be discarded
-          even though no errors had been detected to prevent their being
-          delivered. One possible reason for discarding such a packet could be
-          to free up buffer space.
-        </description>
-        <syntax>
-          <dataType ref="StatsCounter32"/>
-        </syntax>
-      </parameter>
-
-      <parameter name="MulticastPacketsSent" access="readOnly"
-          activeNotify="canDeny">
-        <description>
-          The total number of packets that higher-level protocols requested for
-          transmission and which were addressed to a multicast address at this
-          layer, including those that were discarded or not sent.
-        </description>
-        <syntax>
-          <dataType ref="StatsCounter64"/>
-        </syntax>
-      </parameter>
-
-      <parameter name="MulticastPacketsReceived" access="readOnly"
-          activeNotify="canDeny">
-        <description>
-          The total number of received packets, delivered by this layer to a
-          higher layer, which were addressed to a multicast address at this
-          layer.
-        </description>
-        <syntax>
-          <dataType ref="StatsCounter64"/>
-        </syntax>
-      </parameter>
-
-      <parameter name="BroadcastPacketsSent" access="readOnly"
-          activeNotify="canDeny">
-        <description>
-          The total number of packets that higher-level protocols requested for
-          transmission and which were addressed to a broadcast address at this
-          layer, including those that were discarded or not sent.
-        </description>
-        <syntax>
-          <dataType ref="StatsCounter64"/>
-        </syntax>
-      </parameter>
-
-      <parameter name="BroadcastPacketsReceived" access="readOnly"
-          activeNotify="canDeny">
-        <description>
-          The total number of received packets, delivered by this layer to a
-          higher layer, which were addressed to a broadcast address at this
-          layer.
-        </description>
-        <syntax>
-          <dataType ref="StatsCounter64"/>
-        </syntax>
-      </parameter>
-
-      <parameter name="UnknownProtoPacketsReceived" access="readOnly"
-          activeNotify="canDeny">
-        <description>
-          The total number of packets received via the interface which were
-          discarded because of an unknown or unsupported protocol.
-        </description>
-        <syntax>
-          <dataType ref="StatsCounter32"/>
-        </syntax>
-      </parameter>
-    </object>
-
     <object name="Device.USB." access="readOnly" minEntries="1" maxEntries="1"
         version="2.0">
       <description>
@@ -23287,12 +24420,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -23598,12 +24731,12 @@
         <parameter ref="Name"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -23735,12 +24868,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.3">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -23786,7 +24919,8 @@
         </syntax>
       </parameter>
 
-      <command name="Reset()" dmr:previousParameter="Type" async="false">
+      <command name="Reset()" dmr:previousParameter="Type" version="2.12"
+          async="false">
         <description>
           Reset the Host Controller and apply the reset signaling (see
           {{bibref|USB2.0|Chapter 7.1.7.5}}) to all of the Host Controller Hub
@@ -24260,12 +25394,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -24841,12 +25975,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -24860,7 +25994,7 @@
             <size maxLength="256"/>
           </list>
           <unsignedInt/>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
@@ -25112,7 +26246,7 @@
         The HPNA Diagnostics object.
       </description>
 
-      <command name="PHYThroughput()" async="true">
+      <command name="PHYThroughput()" async="true" version="2.12">
         <description>
           HPNA PHY throughput diagnostics configuration and results.
 
@@ -25122,7 +26256,7 @@
         </description>
         <input>
 
-          <parameter name="Interface" mandatory="true">
+          <parameter name="Interface" mandatory="true" version="2.12">
             <description>
               {{reference}} This is the interface over which the test is to be
               performed.
@@ -25136,7 +26270,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="NumPacketsInBurst" mandatory="true">
+          <parameter name="NumPacketsInBurst" mandatory="true" version="2.12">
             <description>
               Number of test packet in burst to be send during PHY diagnostics
               test from each HPNA device to other HPNA device in the HPNA
@@ -25147,7 +26281,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="BurstInterval" mandatory="true">
+          <parameter name="BurstInterval" mandatory="true" version="2.12">
             <description>
               Test packet burst interval length (expressed in {{units}}).
             </description>
@@ -25158,7 +26292,8 @@
             </syntax>
           </parameter>
 
-          <parameter name="TestPacketPayloadLength" mandatory="true">
+          <parameter name="TestPacketPayloadLength" mandatory="true"
+              version="2.12">
             <description>
               Payload length in the test packets.
             </description>
@@ -25169,7 +26304,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="PayloadEncoding" mandatory="true">
+          <parameter name="PayloadEncoding" mandatory="true" version="2.12">
             <description>
               HPNA payload encoding in PHY diagnostics. 0 is used for
               negotiated payload between devices according to line conditions.
@@ -25179,7 +26314,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="PayloadDataGen" mandatory="true">
+          <parameter name="PayloadDataGen" mandatory="true" version="2.12">
             <description>
               Test packets payload data generator value.
             </description>
@@ -25188,7 +26323,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="PayloadType" mandatory="true">
+          <parameter name="PayloadType" mandatory="true" version="2.12">
             <description>
               Test packets payload type. {{enum}}
 
@@ -25206,7 +26341,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="PriorityLevel" mandatory="true">
+          <parameter name="PriorityLevel" mandatory="true" version="2.12">
             <description>
               Priority level of PHY diagnostics packets (0 lowest -7 highest).
             </description>
@@ -25219,7 +26354,7 @@
         </input>
         <output>
 
-          <parameter name="Status">
+          <parameter name="Status" version="2.13">
             <description>
               Indicates the availability of diagnostics data. {{enum}}
 
@@ -25334,7 +26469,7 @@
         </output>
       </command>
 
-      <command name="PerformanceMonitoring()" async="true">
+      <command name="PerformanceMonitoring()" async="true" version="2.12">
         <description>
           HPNA performance monitoring configuration and results.
 
@@ -25345,7 +26480,7 @@
         </description>
         <input>
 
-          <parameter name="Interface" mandatory="true">
+          <parameter name="Interface" mandatory="true" version="2.12">
             <description>
               {{reference}} This is the interface over which the test is to be
               performed.
@@ -25359,7 +26494,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="SampleInterval" mandatory="true">
+          <parameter name="SampleInterval" mandatory="true" version="2.12">
             <description>
               Time in {{units}} between automatic collection of performance
               monitoring data. A value of zero disables automatic collection of
@@ -25384,7 +26519,7 @@
         </input>
         <output>
 
-          <parameter name="Status">
+          <parameter name="Status" version="2.13">
             <description>
               Indicates the availability of diagnostics data. {{enum}}
 
@@ -25911,7 +27046,8 @@
         <parameter ref="Name"/>
       </uniqueKey>
 
-      <parameter name="AccessControlNumberOfEntries" access="readOnly">
+      <parameter name="AccessControlNumberOfEntries" access="readOnly"
+          version="2.17">
         <description>
           {{numentries}}
         </description>
@@ -25920,7 +27056,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="RlapmNumberOfEntries" access="readOnly">
+      <parameter name="RlapmNumberOfEntries" access="readOnly" version="2.17">
         <description>
           {{numentries}}
         </description>
@@ -25929,7 +27065,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SapmNumberOfEntries" access="readOnly">
+      <parameter name="SapmNumberOfEntries" access="readOnly" version="2.17">
         <description>
           {{numentries}}
         </description>
@@ -25938,7 +27074,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="MeshNumberOfEntries" access="readOnly">
+      <parameter name="MeshNumberOfEntries" access="readOnly" version="2.17">
         <description>
           {{numentries}}
         </description>
@@ -25947,7 +27083,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="BridgeNumberOfEntries" access="readOnly">
+      <parameter name="BridgeNumberOfEntries" access="readOnly" version="2.17">
         <description>
           {{numentries}}
         </description>
@@ -25956,7 +27092,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="MeshScModNumberOfEntries" access="readOnly">
+      <parameter name="MeshScModNumberOfEntries" access="readOnly"
+          version="2.17">
         <description>
           {{numentries}}
         </description>
@@ -26019,12 +27156,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -26248,7 +27385,7 @@
       </parameter>
 
       <parameter name="NumNodes" access="readOnly"
-          id="mocaIfNumNodes/1.3.6.1.4.1.31621.1.2.1.7.1.9">
+          id="mocaIfNumNodes/1.3.6.1.4.1.31621.1.2.1.7.1.9" version="2.17">
         <description>
           The numbers of 1's in the GCD_BITMASK field reported in Type I Probe
           Reports. This value corresponds to the number of MoCA Nodes that this
@@ -26325,7 +27462,7 @@
       </parameter>
 
       <parameter name="AccessControlEnable" access="readWrite"
-          id="mocaIfAccessEnable/1.3.6.1.4.1.31621.1.2.1.1.1.10">
+          id="mocaIfAccessEnable/1.3.6.1.4.1.31621.1.2.1.1.1.10" version="2.17">
         <description>
           Enable MAC address access control on the MoCA interface if this value
           is {{true}}. Disable MAC address access control on the MoCA interface
@@ -26340,7 +27477,7 @@
       </parameter>
 
       <parameter name="PhyThreshold" access="readWrite"
-          id="mocaIfPhyThreshold/1.3.6.1.4.1.31621.1.2.1.1.1.11"
+          id="mocaIfPhyThreshold/1.3.6.1.4.1.31621.1.2.1.1.1.11" version="2.17"
           dmr:previousParameter="PacketAggregationCapability">
         <description>
           The minimum PHY rate.
@@ -26366,7 +27503,8 @@
       </parameter>
 
       <parameter name="PhyThresholdTrapEnable" access="readWrite"
-          id="mocaIfPhyThresholdEnable/1.3.6.1.4.1.31621.1.2.1.1.1.12">
+          id="mocaIfPhyThresholdEnable/1.3.6.1.4.1.31621.1.2.1.1.1.12"
+          version="2.17">
         <description>
           If transmit PHY rate between all pairs of MoCA Nodes are greater than
           or equal to {{param|PhyThreshold}}, and subsequently the transmit PHY
@@ -26394,7 +27532,8 @@
       </parameter>
 
       <parameter name="StatusChangeEnable" access="readWrite"
-          id="mocaIfStatusChangeEnable/1.3.6.1.4.1.31621.1.2.1.1.1.13">
+          id="mocaIfStatusChangeEnable/1.3.6.1.4.1.31621.1.2.1.1.1.13"
+          version="2.17">
         <description>
           If {{param}} is {{true}} and {{param|Status}} changes, then the trap
           {{event|StatusChangeTrap!}} is sent.
@@ -26406,7 +27545,8 @@
       </parameter>
 
       <parameter name="NumNodesChangeEnable" access="readWrite"
-          id="mocaIfNumNodesChangeEnable/1.3.6.1.4.1.31621.1.2.1.1.1.14">
+          id="mocaIfNumNodesChangeEnable/1.3.6.1.4.1.31621.1.2.1.1.1.14"
+          version="2.17">
         <description>
           If {{param}} is {{true}} and {{param|NumNodes}} changes, then the
           trap {{event|NumNodesChangeTrap!}} is sent.
@@ -26421,7 +27561,8 @@
       </parameter>
 
       <parameter name="TpcTargetRateNper" access="readWrite"
-          id="mocaIfTpcTargetRateNper/1.3.6.1.4.1.31621.1.2.1.1.1.15">
+          id="mocaIfTpcTargetRateNper/1.3.6.1.4.1.31621.1.2.1.1.1.15"
+          version="2.17">
         <description>
           The Target PHY Rate of the receiving MoCA 2.0 Node in order to
           optimize the long-term PHY rate and transmit power level between the
@@ -26434,7 +27575,7 @@
       </parameter>
 
       <parameter name="Band" access="readWrite"
-          id="mocaIfBand/1.3.6.1.4.1.31621.1.2.1.1.1.16">
+          id="mocaIfBand/1.3.6.1.4.1.31621.1.2.1.1.1.16" version="2.17">
         <description>
           Configure the band or sub-band for the MoCA Node to operate in (BND
           Managed Parameter). See {{bibref|MoCAv2.0|section 15}}.
@@ -26445,7 +27586,8 @@
       </parameter>
 
       <parameter name="LastOperFreqUpdateEnable" access="readWrite"
-          id="mocaIfLofUpdateEnable/1.3.6.1.4.1.31621.1.2.1.1.1.17">
+          id="mocaIfLofUpdateEnable/1.3.6.1.4.1.31621.1.2.1.1.1.17"
+          version="2.17">
         <description>
           Controls whether the LOF is updated when joining a network
           (LOF_UPDATE_EN Managed Parameter). See {{bibref|MoCAv2.0|section
@@ -26529,7 +27671,7 @@
       </parameter>
 
       <parameter name="TpcEnable" access="readWrite"
-          id="mocaIfTpcEnable/1.3.6.1.4.1.31621.1.2.1.1.1.3">
+          id="mocaIfTpcEnable/1.3.6.1.4.1.31621.1.2.1.1.1.3" version="2.17">
         <description>
           Enable automatic power control if this value is {{true}}. Use a fixed
           transmit power level if this value is {{false}}.
@@ -26560,7 +27702,7 @@
       </parameter>
 
       <parameter name="PerMode" access="readWrite"
-          id="mocaIfPerMode/1.3.6.1.4.1.31621.1.2.1.1.1.20">
+          id="mocaIfPerMode/1.3.6.1.4.1.31621.1.2.1.1.1.20" version="2.17">
         <description>
           Controls which transmission PER mode the MoCA Node uses for MPDUs not
           belonging to PQoS Flows, where a value of 0 indicates NPER and 1
@@ -26575,7 +27717,8 @@
       </parameter>
 
       <parameter name="TurboModeEnable" access="readWrite"
-          id="mocaIfTurboModeEnable/1.3.6.1.4.1.31621.1.2.1.1.1.21">
+          id="mocaIfTurboModeEnable/1.3.6.1.4.1.31621.1.2.1.1.1.21"
+          version="2.17">
         <description>
           Controls whether the MoCA Node operates in point-to-point Turbo Mode
           or not.
@@ -26592,7 +27735,8 @@
       </parameter>
 
       <parameter name="PolicingEnable" access="readWrite"
-          id="mocaIfPolicingEnable/1.3.6.1.4.1.31621.1.2.1.1.1.22">
+          id="mocaIfPolicingEnable/1.3.6.1.4.1.31621.1.2.1.1.1.22"
+          version="2.17">
         <description>
           Controls whether policing of PQoS Flows is enabled or disabled. When
           {{false}} the policy is disabled, and when {{true}} the policy is
@@ -26607,7 +27751,7 @@
       </parameter>
 
       <parameter name="TlpMin" access="readWrite"
-          id="mocaIfTlpMin/1.3.6.1.4.1.31621.1.2.1.1.1.23">
+          id="mocaIfTlpMin/1.3.6.1.4.1.31621.1.2.1.1.1.23" version="2.17">
         <description>
           The minimum time (in milliseconds) a MoCA Node is required to stay in
           the Listening Phase of the Network Search (TLP_MIN Managed
@@ -26622,7 +27766,7 @@
       </parameter>
 
       <parameter name="TlpMax" access="readWrite"
-          id="mocaIfTlpMax/1.3.6.1.4.1.31621.1.2.1.1.1.24">
+          id="mocaIfTlpMax/1.3.6.1.4.1.31621.1.2.1.1.1.24" version="2.17">
         <description>
           The maximum time (in milliseconds) a MoCA Node is required to stay in
           the Listening Phase of the Network Search (TLP_MAX Managed
@@ -26649,7 +27793,7 @@
       </parameter>
 
       <parameter name="RlapmEnable" access="readWrite"
-          id="mocaIfRlapmEnable/1.3.6.1.4.1.31621.1.2.1.1.1.25">
+          id="mocaIfRlapmEnable/1.3.6.1.4.1.31621.1.2.1.1.1.25" version="2.17">
         <description>
           Controls whether the RLAPM (Receive Level Added PHY Margin) function
           is enabled and the MoCA Node needs to apply it, or disabled and the
@@ -26671,7 +27815,8 @@
       </parameter>
 
       <parameter name="RlapmProfileSelect" access="readWrite"
-          id="mocaIfRlapmProfileSelect/1.3.6.1.4.1.31621.1.2.1.1.1.26">
+          id="mocaIfRlapmProfileSelect/1.3.6.1.4.1.31621.1.2.1.1.1.26"
+          version="2.17">
         <description>
           Controls which RLAPM (Receive Level Added PHY Margin) profile is
           Active.
@@ -26684,7 +27829,7 @@
       </parameter>
 
       <parameter name="SapmEnable" access="readWrite"
-          id="mocaIfSapmEnable/1.3.6.1.4.1.31621.1.2.1.1.1.27">
+          id="mocaIfSapmEnable/1.3.6.1.4.1.31621.1.2.1.1.1.27" version="2.17">
         <description>
           Controls whether the SAPM (Subcarrier Added PHY Margin) function is
           enabled and the MoCA Node needs to apply it, or disabled and the MoCA
@@ -26707,7 +27852,8 @@
       </parameter>
 
       <parameter name="SapmProfileSelect" access="readWrite"
-          id="mocaIfSapmProfileSelect/1.3.6.1.4.1.31621.1.2.1.1.1.28">
+          id="mocaIfSapmProfileSelect/1.3.6.1.4.1.31621.1.2.1.1.1.28"
+          version="2.17">
         <description>
           Controls which SAPM (Subcarrier Added PHY Margin) profile is Active.
 
@@ -26719,7 +27865,8 @@
       </parameter>
 
       <parameter name="PowerStateRequest" access="readWrite"
-          id="mocaIfPowerStateRequest/1.3.6.1.4.1.31621.1.2.1.1.1.29">
+          id="mocaIfPowerStateRequest/1.3.6.1.4.1.31621.1.2.1.1.1.29"
+          version="2.17">
         <description>
           Carries a request to the MoCA Node to transition into a specified
           Power State (POWER_STATE_REQ Managed Parameter).
@@ -26733,7 +27880,7 @@
       </parameter>
 
       <parameter name="SeqNumMr" access="readWrite"
-          id="mocaIfSeqNumMr/1.3.6.1.4.1.31621.1.2.1.1.1.30">
+          id="mocaIfSeqNumMr/1.3.6.1.4.1.31621.1.2.1.1.1.30" version="2.17">
         <description>
           Sequence Number used by the MR Transaction (SEQ_NUM_MR Managed
           Parameter).
@@ -26749,7 +27896,8 @@
       </parameter>
 
       <parameter name="PowerStateTrapEnable" access="readWrite"
-          id="mocaIfPowerStateTrapEnable/1.3.6.1.4.1.31621.1.2.1.1.1.31">
+          id="mocaIfPowerStateTrapEnable/1.3.6.1.4.1.31621.1.2.1.1.1.31"
+          version="2.17">
         <description>
           Used for power state message trap.
 
@@ -26768,7 +27916,8 @@
       </parameter>
 
       <parameter name="LmoTrapEnable" access="readWrite"
-          id="mocaIfLmoTrapEnable/1.3.6.1.4.1.31621.1.2.1.1.1.32">
+          id="mocaIfLmoTrapEnable/1.3.6.1.4.1.31621.1.2.1.1.1.32"
+          version="2.17">
         <description>
           Used for LMO (Link Maintenance Operation) message trap.
 
@@ -26787,7 +27936,8 @@
       </parameter>
 
       <parameter name="PrimaryOffset" access="readWrite"
-          id="mocaIfPrimaryOffset/1.3.6.1.4.1.31621.1.2.1.1.1.33">
+          id="mocaIfPrimaryOffset/1.3.6.1.4.1.31621.1.2.1.1.1.33"
+          version="2.17">
         <description>
           The offset in {{units}} of the primary channel relative to the beacon
           channel (PRIMARY_OFFSET Managed Parameter).
@@ -26801,7 +27951,8 @@
       </parameter>
 
       <parameter name="SecondaryOffset" access="readWrite"
-          id="mocaIfSecondaryOffset/1.3.6.1.4.1.31621.1.2.1.1.1.34">
+          id="mocaIfSecondaryOffset/1.3.6.1.4.1.31621.1.2.1.1.1.34"
+          version="2.17">
         <description>
           The offset in {{units}} of the secondary channel relative to the
           beacon channel (SECONDARY_OFFSET Managed Parameter).
@@ -26817,7 +27968,8 @@
       </parameter>
 
       <parameter name="BeaconPowerDistributed" access="readWrite"
-          id="moca25IfBeaconPowerDistributed/1.3.6.1.4.1.31621.1.3.1.1.1.1">
+          id="moca25IfBeaconPowerDistributed/1.3.6.1.4.1.31621.1.3.1.1.1.1"
+          version="2.17">
         <description>
           The networkwide (see {{param|BeaconPowerMePie}}) value of Beacon
           transmit power in {{units}} sent by the NC (Network Coordinator) in
@@ -26837,7 +27989,8 @@
       </parameter>
 
       <parameter name="BeaconPowerLocal" access="readWrite"
-          id="moca25IfBeaconPowerLocal/1.3.6.1.4.1.31621.1.3.1.1.1.2">
+          id="moca25IfBeaconPowerLocal/1.3.6.1.4.1.31621.1.3.1.1.1.2"
+          version="2.17">
         <description>
           The value of Beacon transmit power in {{units}} used by the Node when
           it transmits beacons.
@@ -26851,7 +28004,8 @@
       </parameter>
 
       <parameter name="BeaconPowerMePie" access="readWrite"
-          id="moca25IfBeaconPowerMePie/1.3.6.1.4.1.31621.1.3.1.1.1.3">
+          id="moca25IfBeaconPowerMePie/1.3.6.1.4.1.31621.1.3.1.1.1.3"
+          version="2.17">
         <description>
           The Beacon Power PIE (Power Information Element) that the ME
           (Management Entity) wants the NC (Network Coordinator) to send to
@@ -26872,7 +28026,8 @@
       </parameter>
 
       <parameter name="BeaconPowerMePieSend" access="readWrite"
-          id="moca25IfBeaconPowerMePieSend/1.3.6.1.4.1.31621.1.3.1.1.1.4">
+          id="moca25IfBeaconPowerMePieSend/1.3.6.1.4.1.31621.1.3.1.1.1.4"
+          version="2.17">
         <description>
           When this parameter is written, instructs the Node (in case of
           Network Coordinator) to send a set of Beacon Power PIEs (Power
@@ -26887,7 +28042,8 @@
       </parameter>
 
       <parameter name="BeaconPowerNetConfig" access="readWrite"
-          id="moca25IfBeaconPowerNetConfig/1.3.6.1.4.1.31621.1.3.1.1.1.5">
+          id="moca25IfBeaconPowerNetConfig/1.3.6.1.4.1.31621.1.3.1.1.1.5"
+          version="2.17">
         <description>
           Controls whether the Node is allowed to configure its Beacon power
           (both Beacon Power Distributed and Beacon Power Local) according to
@@ -26907,7 +28063,8 @@
       </parameter>
 
       <parameter name="EnhancedPassword" access="readWrite"
-          id="moca25IfEnhancedPassword/1.3.6.1.4.1.31621.1.3.1.1.1.6">
+          id="moca25IfEnhancedPassword/1.3.6.1.4.1.31621.1.3.1.1.1.6"
+          version="2.17">
         <description>
           The MoCA Enhanced Password using an ASCII printable character.
 
@@ -26924,7 +28081,7 @@
 
           See {{bibref|MoCAv2.5|section 11.3.1}}.
         </description>
-        <syntax hidden="true">
+        <syntax secured="true">
           <string>
             <size minLength="12" maxLength="64"/>
             <size minLength="0" maxLength="0"/>
@@ -26934,7 +28091,7 @@
       </parameter>
 
       <parameter name="FirstOffset" access="readWrite"
-          id="moca25IfFirstOffset/1.3.6.1.4.1.31621.1.3.1.1.1.7">
+          id="moca25IfFirstOffset/1.3.6.1.4.1.31621.1.3.1.1.1.7" version="2.17">
         <description>
           The offset of the First Channel's center frequency below the center
           frequency of the Primary Channel. Valid values are -4 to 0.
@@ -26949,7 +28106,8 @@
       </parameter>
 
       <parameter name="HandoffToLowerVersionEnable" access="readWrite"
-          id="moca25IfHandoffToLowerVersionEnable/1.3.6.1.4.1.31621.1.3.1.1.1.8">
+          id="moca25IfHandoffToLowerVersionEnable/1.3.6.1.4.1.31621.1.3.1.1.1.8"
+          version="2.17">
         <description>
           Enable handoff to a MoCA 2 or MoCA 1 Node if this value is {{true}}.
           Disable handoff to a MoCA 2 or MoCA 1 Node if this value is
@@ -26964,7 +28122,8 @@
       </parameter>
 
       <parameter name="MgntEntityNetIePayloadRespTimeout" access="readWrite"
-          id="moca25IfMgntEntityNetIePayloadRespTimeout/1.3.6.1.4.1.31621.1.3.1.1.1.9">
+          id="moca25IfMgntEntityNetIePayloadRespTimeout/1.3.6.1.4.1.31621.1.3.1.1.1.9"
+          version="2.17">
         <description>
           The number of Discovery Request transmission opportunities a NN has
           to wait for a response to a Management Entity Response Network IE
@@ -26979,7 +28138,8 @@
       </parameter>
 
       <parameter name="MgntEntityNetIePayloadTx" access="readWrite"
-          id="moca25IfMgntEntityNetIePayloadTx/1.3.6.1.4.1.31621.1.3.1.1.1.10">
+          id="moca25IfMgntEntityNetIePayloadTx/1.3.6.1.4.1.31621.1.3.1.1.1.10"
+          version="2.17">
         <description>
           The payload of the Management Entity Request Network IE (when the
           Node is trying to join the network), or of the Management Entity
@@ -26987,9 +28147,9 @@
 
           See {{bibref|MoCAv2.5|section 8.3.3 and Table 17-1}}.
 
-           struct moca25IfMgntEntityNetIePayload { short vendorId; // 2 octets
-           (MoCA Vendor ID) char information[60]; // 60 octets (Up to 60 bytes
-           of vendor specific information) }
+              struct moca25IfMgntEntityNetIePayload { short vendorId; // 2
+              octets (MoCA Vendor ID) char information[60]; // 60 octets (Up to
+              60 bytes of vendor specific information) }
         </description>
         <syntax>
           <hexBinary>
@@ -26999,7 +28159,8 @@
       </parameter>
 
       <parameter name="MpsPrivacyDown" access="readWrite"
-          id="moca25IfMpsPrivacyDown/1.3.6.1.4.1.31621.1.3.1.1.1.11">
+          id="moca25IfMpsPrivacyDown/1.3.6.1.4.1.31621.1.3.1.1.1.11"
+          version="2.17">
         <description>
           Controls whether the Node, during its MPS (MoCA Protected Setup)
           session, is allowed to accept privacy setting of Privacy Disabled
@@ -27016,7 +28177,8 @@
       </parameter>
 
       <parameter name="MpsPrivacyReceive" access="readWrite"
-          id="moca25IfMpsPrivacyReceive/1.3.6.1.4.1.31621.1.3.1.1.1.12">
+          id="moca25IfMpsPrivacyReceive/1.3.6.1.4.1.31621.1.3.1.1.1.12"
+          version="2.17">
         <description>
           Controls whether the Node, during its MPS (MoCA Protected Setup)
           session, is allowed to accept privacy settings (Privacy Enabled /
@@ -27032,7 +28194,7 @@
       </parameter>
 
       <parameter name="MpsReset" access="readWrite"
-          id="moca25IfMpsReset/1.3.6.1.4.1.31621.1.3.1.1.1.13">
+          id="moca25IfMpsReset/1.3.6.1.4.1.31621.1.3.1.1.1.13" version="2.17">
         <description>
           Resets the MPS (MoCA Protected Setup) state of the Node
           {{param|MpsState}} to un-Paired and reinitializes MPS local variables
@@ -27046,7 +28208,8 @@
       </parameter>
 
       <parameter name="MpsTriggered" access="readWrite"
-          id="moca25IfMpsTriggered/1.3.6.1.4.1.31621.1.3.1.1.1.14">
+          id="moca25IfMpsTriggered/1.3.6.1.4.1.31621.1.3.1.1.1.14"
+          version="2.17">
         <description>
           Signals the Node in Power State M0 (Active) or M1 (Low Power Idle)
           that MPS (MoCA Protected Setup) was triggered when this parameter is
@@ -27060,7 +28223,8 @@
       </parameter>
 
       <parameter name="MpsUnpairedTime" access="readWrite"
-          id="moca25IfMpsUnpairedTime/1.3.6.1.4.1.31621.1.3.1.1.1.15">
+          id="moca25IfMpsUnpairedTime/1.3.6.1.4.1.31621.1.3.1.1.1.15"
+          version="2.17">
         <description>
           The minimum time in {{units}} the Node is required to stay in the
           un-Paired state after it starts network search if the Node creates or
@@ -27077,7 +28241,8 @@
       </parameter>
 
       <parameter name="MpsWalkTime" access="readWrite"
-          id="moca25IfMpsWalkTime/1.3.6.1.4.1.31621.1.3.1.1.1.16">
+          id="moca25IfMpsWalkTime/1.3.6.1.4.1.31621.1.3.1.1.1.16"
+          version="2.17">
         <description>
           The allowed time interval in {{units}} to trigger MPS (MoCA Protected
           Setup) on two Nodes.
@@ -27094,7 +28259,8 @@
       </parameter>
 
       <parameter name="NetworkJoin" access="readWrite"
-          id="moca25IfNetworkJoin/1.3.6.1.4.1.31621.1.3.1.1.1.17">
+          id="moca25IfNetworkJoin/1.3.6.1.4.1.31621.1.3.1.1.1.17"
+          version="2.17">
         <description>
           Instructs the NN to join the latest network from which the NN
           forwarded a Management Entity Response Network IE: Yes if this value
@@ -27108,7 +28274,8 @@
       </parameter>
 
       <parameter name="NetworkNameAdmissionRule" access="readWrite"
-          id="moca25IfNetworkNameAdmissionRule/1.3.6.1.4.1.31621.1.3.1.1.1.18">
+          id="moca25IfNetworkNameAdmissionRule/1.3.6.1.4.1.31621.1.3.1.1.1.18"
+          version="2.17">
         <description>
           Controls which Admission rule to follow.
 
@@ -27140,7 +28307,8 @@
       </parameter>
 
       <parameter name="NetworkNameNcNn" access="readWrite"
-          id="moca25IfNetworkNameNcNn/1.3.6.1.4.1.31621.1.3.1.1.1.19">
+          id="moca25IfNetworkNameNcNn/1.3.6.1.4.1.31621.1.3.1.1.1.19"
+          version="2.17">
         <description>
           The Network Name the Node is to use for any MoCA network it creates.
 
@@ -27156,7 +28324,8 @@
       </parameter>
 
       <parameter name="NumChannels" access="readWrite"
-          id="moca25IfNumChannels/1.3.6.1.4.1.31621.1.3.1.1.1.20">
+          id="moca25IfNumChannels/1.3.6.1.4.1.31621.1.3.1.1.1.20"
+          version="2.17">
         <description>
           The maximum number of 100MHz channels the Node uses when the Node
           forms the network.
@@ -27172,7 +28341,7 @@
       </parameter>
 
       <parameter name="Per25Mode" access="readWrite"
-          id="moca25IfPer25Mode/1.3.6.1.4.1.31621.1.3.1.1.1.21">
+          id="moca25IfPer25Mode/1.3.6.1.4.1.31621.1.3.1.1.1.21" version="2.17">
         <description>
           Controls which PER mode the receiver Node uses for calculating the
           bitloading of MoCA 2.5 Unicast profiles, where a value of 0 indicates
@@ -27187,7 +28356,8 @@
       </parameter>
 
       <parameter name="PrivacySupported" access="readWrite"
-          id="moca25IfPrivacySupported/1.3.6.1.4.1.31621.1.3.1.1.1.22">
+          id="moca25IfPrivacySupported/1.3.6.1.4.1.31621.1.3.1.1.1.22"
+          version="2.17">
         <description>
           Controls whether MoCA 2 Enhanced Privacy, MoCA 2.0 privacy, and MoCA
           1 privacy are supported when privacy is enabled.
@@ -27198,12 +28368,13 @@
           <list/>
           <dataType ref="MocaPrivacy"/>
           <default type="factory"
-              value="moca1Privacy,moca20Privacy,moca2EnhancedPrivacy"/>
+              value="[moca1Privacy,moca20Privacy,moca2EnhancedPrivacy]"/>
         </syntax>
       </parameter>
 
       <parameter name="TrafficPermissionEthertype" access="readWrite"
-          id="moca25IfTrafficPermissionEthertype/1.3.6.1.4.1.31621.1.3.1.1.1.23">
+          id="moca25IfTrafficPermissionEthertype/1.3.6.1.4.1.31621.1.3.1.1.1.23"
+          version="2.17">
         <description>
           The EtherType value of MSDUs that are allowed to transmit/receive
           to/from a Non-Secured Admitted Node.
@@ -27219,7 +28390,8 @@
       </parameter>
 
       <parameter name="TrafficPermissionLink" access="readWrite"
-          id="moca25IfTrafficPermissionLink/1.3.6.1.4.1.31621.1.3.1.1.1.24">
+          id="moca25IfTrafficPermissionLink/1.3.6.1.4.1.31621.1.3.1.1.1.24"
+          version="2.17">
         <description>
           Up to 15 pairs of {Node ID, SOURCE_NODE_BITMASK} where
           SOURCE_NODE_BITMASK is the value for SOURCE_NODE_BITMASK for the Node
@@ -27230,12 +28402,12 @@
 
           See {{bibref|MoCAv2.5|Section 11.7 and Table 17-1}}.
 
-           struct moca25IfTrafficPermissionLink { long nodeIdVector; // 8
-           octets; Bit value in the ith bit position indicates NodeID=(i)
-           (LSB=bit0) int numNodes; // 4 octets (Number of Node IDs indicated
-           in the NodeIdVector) struct { short SrcNodeBitmask; // 2 octets
-           (SOURCE_NODE_BITMASK in the latest Authorized Link PIE) }[numNodes];
-           };
+              struct moca25IfTrafficPermissionLink { long nodeIdVector; // 8
+              octets; Bit value in the ith bit position indicates NodeID=(i)
+              (LSB=bit0) int numNodes; // 4 octets (Number of Node IDs
+              indicated in the NodeIdVector) struct { short SrcNodeBitmask; //
+              2 octets (SOURCE_NODE_BITMASK in the latest Authorized Link PIE)
+              }[numNodes]; };
         </description>
         <syntax>
           <hexBinary/>
@@ -27243,7 +28415,8 @@
       </parameter>
 
       <parameter name="ConnectedNodesChangeTrapEn" access="readWrite"
-          id="moca25IfConnectedNodesChangeTrapEn/1.3.6.1.4.1.31621.1.3.1.1.1.25">
+          id="moca25IfConnectedNodesChangeTrapEn/1.3.6.1.4.1.31621.1.3.1.1.1.25"
+          version="2.17">
         <description>
           Used to enable {{event|ConnectedNodesChangeTrap!}}.
 
@@ -27260,7 +28433,8 @@
       </parameter>
 
       <parameter name="MgntEntityNetwIePayloadRecTrapEn" access="readWrite"
-          id="moca25IfMgntEntityNetwIePayloadRecTrapEn/1.3.6.1.4.1.31621.1.3.1.1.1.26">
+          id="moca25IfMgntEntityNetwIePayloadRecTrapEn/1.3.6.1.4.1.31621.1.3.1.1.1.26"
+          version="2.17">
         <description>
           Used to enable {{event|MgntEntityNetwIePayloadRecTrap!}}.
 
@@ -27277,7 +28451,7 @@
       </parameter>
 
       <parameter name="MpsTrapEn" access="readWrite"
-          id="moca25IfMpsTrapEn/1.3.6.1.4.1.31621.1.3.1.1.1.27">
+          id="moca25IfMpsTrapEn/1.3.6.1.4.1.31621.1.3.1.1.1.27" version="2.17">
         <description>
           Used to enable the MPS-related traps: {{event|MpsInitScanRecTrap!}},
           {{event|MpsPairFailTrap!}}, and {{event|MpsPrivacyChangedTrap!}}.
@@ -27289,7 +28463,8 @@
       </parameter>
 
       <parameter name="NcPrivSupportedRecTrapEn" access="readWrite"
-          id="moca25IfNcPrivSupportedRecTrapEn/1.3.6.1.4.1.31621.1.3.1.1.1.28">
+          id="moca25IfNcPrivSupportedRecTrapEn/1.3.6.1.4.1.31621.1.3.1.1.1.28"
+          version="2.17">
         <description>
           Used to enable {{event|NcPrivacySupportedRecTrap!}}.
 
@@ -27306,7 +28481,8 @@
       </parameter>
 
       <parameter name="NetworkNameRecTrapEn" access="readWrite"
-          id="moca25IfNetworkNameRecTrapEn/1.3.6.1.4.1.31621.1.3.1.1.1.29">
+          id="moca25IfNetworkNameRecTrapEn/1.3.6.1.4.1.31621.1.3.1.1.1.29"
+          version="2.17">
         <description>
           Used to enable {{event|NetworkNameRecTrap!}}.
 
@@ -27323,7 +28499,8 @@
       </parameter>
 
       <parameter name="NodeDropTrapEn" access="readWrite"
-          id="moca25IfNodeDropTrapEn/1.3.6.1.4.1.31621.1.3.1.1.1.30">
+          id="moca25IfNodeDropTrapEn/1.3.6.1.4.1.31621.1.3.1.1.1.30"
+          version="2.17">
         <description>
           Used to enable {{event|NodeDropAdmFailureTrap!}},
           {{event|NodeDropNcTrap!}}, {{event|NodeDropMpsTriggeredTrap!}}, and
@@ -27422,7 +28599,8 @@
       </parameter>
 
       <parameter name="SupportedBands" access="readOnly"
-          id="mocaIfSupportedBands/1.3.6.1.4.1.31621.1.2.1.7.1.15">
+          id="mocaIfSupportedBands/1.3.6.1.4.1.31621.1.2.1.7.1.15"
+          version="2.17">
         <description>
           Lists all the supported bands and sub-bands by this device.
         </description>
@@ -27505,7 +28683,7 @@
       </parameter>
 
       <parameter name="PasswordHash" access="readOnly"
-          id="mocaIfPasswordHash/1.3.6.1.4.1.31621.1.2.1.7.1.21">
+          id="mocaIfPasswordHash/1.3.6.1.4.1.31621.1.2.1.7.1.21" version="2.17">
         <description>
           The 16 LSBs of a SHA1 performed on a 0-extended password
           ({{param|KeyPassphrase}}) concatenated with the SALT string
@@ -27521,7 +28699,8 @@
       </parameter>
 
       <parameter name="AggregationSize" access="readOnly"
-          id="mocaIfAggregationSize/1.3.6.1.4.1.31621.1.2.1.7.1.23">
+          id="mocaIfAggregationSize/1.3.6.1.4.1.31621.1.2.1.7.1.23"
+          version="2.17">
         <description>
           The maximum number of bytes in one aggregate which can be received by
           the MoCA Node.
@@ -27532,7 +28711,7 @@
       </parameter>
 
       <parameter name="AeNumber" access="readOnly"
-          id="mocaIfAeNumber/1.3.6.1.4.1.31621.1.2.1.7.1.24">
+          id="mocaIfAeNumber/1.3.6.1.4.1.31621.1.2.1.7.1.24" version="2.17">
         <description>
           Maximum number of allocation elements, excluding the TAUs and the
           Dummy DAUs, in one MAP the MoCA Node can process.
@@ -27543,7 +28722,8 @@
       </parameter>
 
       <parameter name="SupportedIngressPqosFlows" access="readOnly"
-          id="mocaIfSupportedIngressPqosFlows/1.3.6.1.4.1.31621.1.2.1.7.1.25">
+          id="mocaIfSupportedIngressPqosFlows/1.3.6.1.4.1.31621.1.2.1.7.1.25"
+          version="2.17">
         <description>
           Maximum number of Ingress PQoS Flows supported by the MoCA Node.
         </description>
@@ -27553,7 +28733,8 @@
       </parameter>
 
       <parameter name="SupportedEgressPqosFlows" access="readOnly"
-          id="mocaIfSupportedEgressPqosFlows/1.3.6.1.4.1.31621.1.2.1.7.1.26">
+          id="mocaIfSupportedEgressPqosFlows/1.3.6.1.4.1.31621.1.2.1.7.1.26"
+          version="2.17">
         <description>
           Maximum number of Egress PQoS Flows supported by the MoCA Node.
         </description>
@@ -27563,7 +28744,8 @@
       </parameter>
 
       <parameter name="PowerStateCap" access="readOnly"
-          id="mocaIfPowerStateCap/1.3.6.1.4.1.31621.1.2.1.7.1.27">
+          id="mocaIfPowerStateCap/1.3.6.1.4.1.31621.1.2.1.7.1.27"
+          version="2.17">
         <description>
           The Power State capabilities of the MoCA Node (e.g., which Power
           States it can transition to) (POWER_STATE_CAP Managed Parameter).
@@ -27576,7 +28758,7 @@
       </parameter>
 
       <parameter name="AvbSupport" access="readOnly"
-          id="mocaIfAvbSupport/1.3.6.1.4.1.31621.1.2.1.7.1.28">
+          id="mocaIfAvbSupport/1.3.6.1.4.1.31621.1.2.1.7.1.28" version="2.17">
         <description>
           The support of the MoCA Node for the IEEE 802.1 Audio Video Bridge
           specification. AVB is supported if this value is {{true}}. AVB is not
@@ -27588,7 +28770,7 @@
       </parameter>
 
       <parameter name="ResetCount" access="readOnly"
-          id="mocaIfResetCount/1.3.6.1.4.1.31621.1.2.1.7.1.29">
+          id="mocaIfResetCount/1.3.6.1.4.1.31621.1.2.1.7.1.29" version="2.17">
         <description>
           Count of MoCA resets since the interface was enabled for this MoCA
           Node.
@@ -27599,7 +28781,8 @@
       </parameter>
 
       <parameter name="LinkDownCount" access="readOnly"
-          id="mocaIfLinkDownCount/1.3.6.1.4.1.31621.1.2.1.7.1.30">
+          id="mocaIfLinkDownCount/1.3.6.1.4.1.31621.1.2.1.7.1.30"
+          version="2.17">
         <description>
           The number of times that this MoCA Node has lost link with the MoCA
           network since the interface was enabled.
@@ -27610,7 +28793,7 @@
       </parameter>
 
       <parameter name="LmoNodeID" access="readOnly"
-          id="mocaIfLmoNodeID/1.3.6.1.4.1.31621.1.2.1.7.1.31">
+          id="mocaIfLmoNodeID/1.3.6.1.4.1.31621.1.2.1.7.1.31" version="2.17">
         <description>
           The ID of the MoCA Node currently undergoing LMO (Link Maintenance
           Operation), i.e. the LMO node.
@@ -27621,97 +28804,207 @@
       </parameter>
 
       <parameter name="NetworkState" access="readOnly"
-          id="mocaIfNetworkState/1.3.6.1.4.1.31621.1.2.1.7.1.32">
+          id="mocaIfNetworkState/1.3.6.1.4.1.31621.1.2.1.7.1.32" version="2.17">
         <description>
-          The current MoCA network state of the MoCA Node.
+          The current Link control state in the MoCA network for the MoCA Node.
+          This network state is a MAC parameter determined by the NC (Network
+          Coordinator) and broadcasted in the MAP to the rest of nodes.
 
           {{enum|beginNodeAdmissionState}},
           {{enum|newNodeTypeOneProbeTxState}},
           {{enum|newNodeTypeOneProbeRxState}},
           {{enum|newGcdDistributionState}}, {{enum|beginPhyProfileState}},
           {{enum|steadyState}} refer to the Node Admission (see
-          {{bibref|MoCAv2.0|Section 8.3}}).
+          {{bibref|MoCAv2.5|Section 8.3}}). The admission process of a new MoCA
+          node depends on the operation mode of the MoCA Network that it is
+          going to join (MoCA 1 mode, MoCA 2.0 mode or Mixed Mode). The Node
+          Admission process is completed when the NC (Network Controller)
+          changes the network state to Steady State ({{enum|steadyState}}) at
+          the end of the Node Admission process.
 
           {{enum|typeThreeProbeState}}, {{enum|lmoTypeOneProbeState}},
           {{enum|lmoNodeGcdDistributionState}},
           {{enum|beginLmoPhyProfileState}},
-          {{enum|lmoGcdTypeOneProbeLinkState}} refer to the Regular Link
-          Maintenance Operation (see {{bibref|MoCAv2.0|Section 8.9.1}}).
+          {{enum|lmoGcdTypeOneProbeLinkState}}, {{enum|steadyState}} refer to
+          the Regular Link Maintenance Operation (see {{bibref|MoCAv2.5|Section
+          8.9.1}}).
 
           {{enum|alternateChannelQuietLineState}},
           {{enum|alternateChannelEvmProbeState}},
           {{enum|unsolicitedProbeReportState}},
           {{enum|beginUnsolicitedPhyProfileState}},
           {{enum|rxDeterminedProbeState}}, {{enum|steadyState}} refer to the
-          On-Demand Link Maintenance Operation (see {{bibref|MoCAv2.0|Section
+          On-Demand Link Maintenance Operation (see {{bibref|MoCAv2.5|Section
           8.9.2}}).
 
-          {{enum|calibrationState}} refer to the Network Operation after a
-          Network Coordinator handoff or failover (see
-          {{bibref|MoCAv2.0|Section 8.14}}).
+          {{enum|calibrationState}} refer to the Network Operation after a NC
+          handoff or failover (see {{bibref|MoCAv2.5|Section 8.14}}).
         </description>
         <syntax>
           <string>
             <enumeration value="beginNodeAdmissionState">
-              <description>{{bibref|MoCAv2.0|Section 8.3.3}}</description>
+              <description>
+                "Begin Node Admission State" starts after completing the
+                pre-admission discovery message exchange with the NC, then the
+                joining node sends an admission request frame to the NC. During
+                this state, the EVM (Error Vector Magnitude) probes and link
+                acknowledgments are exchanged between the new node, the NC and
+                the existing nodes in the network. Refer to
+                {{bibref|MoCAv2.5|Section 8.3.4}} for details.
+              </description>
             </enumeration>
             <enumeration value="newNodeTypeOneProbeTxState">
-              <description>{{bibref|MoCAv2.0|Section 8.3.4}}</description>
+              <description>
+                The NC advances the network state to "New Node Type I Probe Tx
+                State" after receiving next link state indication from all the
+                nodes. During this state, the Beacon Channel (in the presence
+                of MoCA 1 nodes) from the MoCA 2 new nodes to all other
+                existing nodes (including the NC) is characterized and the
+                modulation used on this channel is optimized. The Primary
+                Channel, MoCA 2.x bonded channels from the MoCA 2 new nodes to
+                all other MoCA 2 Nodes (including NC) are characterized and the
+                modulation on these channels is optimized. Refer to
+                {{bibref|MoCAv2.5|Section 8.3.5}} for details.
+              </description>
             </enumeration>
             <enumeration value="newNodeTypeOneProbeRxState">
-              <description>{{bibref|MoCAv2.0|Section 8.3.5}}</description>
+              <description>
+                The NC advances the network state to "New Node Type I Probe Rx
+                State" after relaying Type I Probe Reports of all nodes, and
+                after it has received next state indication from each node.
+                Refer to {{bibref|MoCAv2.5|Section 8.3.6}} for details.
+              </description>
             </enumeration>
             <enumeration value="newGcdDistributionState">
-              <description>{{bibref|MoCAv2.0|Section 8.3.6}}</description>
+              <description>
+                The NC advances the network state to "New Node GCD Distribution
+                State" once it has received the next state indication from each
+                node to "New Node GCD Distribution State". In this state, the
+                GCD (Greater Common Denominator) Distribution Reports are
+                distributed. Refer to {{bibref|MoCAv2.5|Section 8.3.7}} for
+                details.
+              </description>
             </enumeration>
             <enumeration value="beginPhyProfileState">
-              <description>{{bibref|MoCAv2.0|Section 8.3.7}}</description>
+              <description>
+                The NC advances the network state to "Begin PHY Profile State"
+                when all nodes indicate “Begin PHY Profile State” in their RR
+                (Reservation Request). Upon reception of this state, the node
+                (new or existing) activates the new computed PHY profiles.
+                Refer to {{bibref|MoCAv2.5|Section 8.3.8}} for details.
+              </description>
             </enumeration>
             <enumeration value="steadyState">
               <description>
-                {{bibref|MoCAv2.0|Section 8.3.8}} {{bibref|MoCAv2.0|Section
-                8.9.2.2.3}}
+                The node advances to "Steady State" after waiting for T15 or
+                T16 (NC) in {{enum|beginPhyProfileState}}. Refer to
+                {{bibref|MoCAv2.5|Section 8.3.9}} for details.
+
+                The node advances to "Steady State" after waiting for T15 in
+                {{enum|beginUnsolicitedPhyProfileState}} or, in case of NC,
+                after receiving “Steady State” indication from each node. Refer
+                to {{bibref|MoCAv2.5|Section 8.9.2.2.3}}.
+
+                The node advances to "Steady State" after waiting for T15 or
+                T16 (NC) in {{enum|beginLmoPhyProfileState}}. Refer to [Section
+                8.9.1.7/MoCAv2.5] for details.
               </description>
             </enumeration>
             <enumeration value="typeThreeProbeState">
-              <description>{{bibref|MoCAv2.0|Section 8.9.1.2}}</description>
+              <description>
+                During this first state of the Regular LMO, Type III Probes are
+                exchanged between the LMO node and the rest of nodes. Refer to
+                {{bibref|MoCAv2.5|Section 8.9.1.2}} for details.
+              </description>
             </enumeration>
             <enumeration value="lmoTypeOneProbeState">
-              <description>{{bibref|MoCAv2.0|Section 8.9.1.3}}</description>
+              <description>
+                After the exchange of the EVM Reports during the state
+                {{enum|typeThreeProbeState}}, Type I Probes are exchanged
+                between the LMO node and and all other 1.x nodes. This state
+                finalizes after the LMO node receives the Composite OFDMA
+                Probes from the MoCA 2 Nodes. Refer to
+                {{bibref|MoCAv2.5|Section 8.9.1.3}} for details.
+              </description>
             </enumeration>
             <enumeration value="lmoNodeGcdDistributionState">
-              <description>{{bibref|MoCAv2.0|Section 8.9.1.5}}</description>
+              <description>
+                After state {{enum|lmoGcdTypeOneProbeLinkState}}, the LMO node
+                distributes the new GCD Report to all nodes. Refer to
+                {{bibref|MoCAv2.5|Section 8.9.1.5}} for details.
+              </description>
             </enumeration>
             <enumeration value="beginLmoPhyProfileState">
-              <description>{{bibref|MoCAv2.0|Section 8.9.1.6}}</description>
+              <description>
+                The NC advances the network state to "Begin LMO PHY Profile
+                State". When a node receives the "Begin LMO PHY Profile" Link
+                Control state notification, it can start using the newly
+                computed PHY profiles. Refer to {{bibref|MoCAv2.5|Section
+                8.9.1.6}} for details.
+              </description>
             </enumeration>
             <enumeration value="lmoGcdTypeOneProbeLinkState">
-              <description>{{bibref|MoCAv2.0|Section 8.9.1.4}}</description>
+              <description>
+                The NC advances the network state to "GCD Type I Probe Link
+                State". In this state, the LMO node broadcasts GCD Type I
+                Probes to all nodes. For details, refer to
+                {{bibref|MoCAv2.5|Section 8.9.1.4}}.
+              </description>
             </enumeration>
             <enumeration value="alternateChannelQuietLineState">
-              <description>{{bibref|MoCAv2.0|Section 8.9.2.5}}</description>
+              <description>
+                The node moves into the "Alternate Channel Quite Line State" to
+                measure quiet line noise and interference levels in the
+                alternate MoCA channel. Refer to {{bibref|MoCAv2.5|Section
+                8.9.2.5}} for details.
+              </description>
             </enumeration>
             <enumeration value="alternateChannelEvmProbeState">
-              <description>{{bibref|MoCAv2.0|Section 8.9.2.5}}</description>
+              <description>
+                The node moves into the "Alternate Channel EVM Probe State" to
+                measure EVM Probe signal level in the alternate MoCA channel.
+                Refer to {{bibref|MoCAv2.5|Section 8.9.2.5}} for details.
+              </description>
             </enumeration>
             <enumeration value="unsolicitedProbeReportState">
-              <description>{{bibref|MoCAv2.0|Section 8.9.2.2.1}}</description>
+              <description>
+                The NC sets the network state to "Unsolicited Probe Report
+                State" after a node request to move to this state in order to
+                update a PHY Profile. Refer to {{bibref|MoCAv2.5|Section
+                8.9.2.2.1}} for details.
+              </description>
             </enumeration>
             <enumeration value="beginUnsolicitedPhyProfileState">
-              <description>{{bibref|MoCAv2.0|Section 8.9.2.2.2}}</description>
+              <description>
+                After state {{enum|unsolicitedProbeReportState}}, a node can
+                begin using the new PHY profiles once the NC sets the network
+                state to "Begin Unsolicited PHY
+                Profile".{{bibref|MoCAv2.5|Section 8.9.2.2.2}}
+              </description>
             </enumeration>
             <enumeration value="rxDeterminedProbeState">
-              <description>{{bibref|MoCAv2.0|Section 8.9.2.1}}</description>
+              <description>
+                In order to use Receiver-Determined probes, the receiver must
+                move from {{enum|steadyState}} to "Rx Determined Probe State".
+                Refer to {{bibref|MoCAv2.5|Section 8.9.2.1}} for details.
+              </description>
             </enumeration>
             <enumeration value="calibrationState">
-              <description>{{bibref|MoCAv2.0|Section 8.14.1}}</description>
+              <description>
+                During network operations after switching to a new NC, the NC
+                node sets the network state to "Calibration State". During this
+                state, any node can request time to perform calibration by
+                sending probes. Refer to {{bibref|MoCAv2.5|Section 8.14.1}} and
+                {{bibref|MoCAv2.5|Section 8.14.2}}.
+              </description>
             </enumeration>
           </string>
         </syntax>
       </parameter>
 
       <parameter name="PrimaryChannelOffset" access="readOnly"
-          id="mocaIfPrimaryChannelOffset/1.3.6.1.4.1.31621.1.2.1.7.1.33">
+          id="mocaIfPrimaryChannelOffset/1.3.6.1.4.1.31621.1.2.1.7.1.33"
+          version="2.17">
         <description>
           The offset in MHz of the primary channel relative to the beacon
           channel. The allowed values are -25, 0, and +25.
@@ -27722,7 +29015,8 @@
       </parameter>
 
       <parameter name="SecondaryChannelOffset" access="readOnly"
-          id="mocaIfSecondaryChannelOffset/1.3.6.1.4.1.31621.1.2.1.7.1.34">
+          id="mocaIfSecondaryChannelOffset/1.3.6.1.4.1.31621.1.2.1.7.1.34"
+          version="2.17">
         <description>
           The offset in MHz of the secondary channel relative to the beacon
           channel. The allowed values are -125 and +125. A value of 0 indicates
@@ -27734,7 +29028,7 @@
       </parameter>
 
       <parameter name="ResetReason" access="readOnly"
-          id="mocaIfResetReason/1.3.6.1.4.1.31621.1.2.1.7.1.35">
+          id="mocaIfResetReason/1.3.6.1.4.1.31621.1.2.1.7.1.35" version="2.17">
         <description>
           Describes the reason for a MoCA link reset or failure to join a
           network.
@@ -27747,7 +29041,7 @@
       </parameter>
 
       <parameter name="NcVersion" access="readOnly"
-          id="mocaIfNcVersion/1.3.6.1.4.1.31621.1.2.1.7.1.36">
+          id="mocaIfNcVersion/1.3.6.1.4.1.31621.1.2.1.7.1.36" version="2.17">
         <description>
           Indicates the MoCA version of the NC.
 
@@ -27766,17 +29060,17 @@
       </parameter>
 
       <parameter name="LinkState" access="readOnly"
-          id="mocaIfLinkState/1.3.6.1.4.1.31621.1.2.1.7.1.37">
+          id="mocaIfLinkState/1.3.6.1.4.1.31621.1.2.1.7.1.37" version="2.17">
         <description>
           This parameter is meaningful only after a Link Failure to indicate
           the state of the network the at the time of the Link failure. Each of
           the three chars (bytes) is represented as two hexadecimal digits.
 
-           struct mocaLinkState { char LINK_STATE; // LINK_STATE_II from the
-           Tx/Rx MAP at the // time of the Link Failure char ACF_TYPE; //
-           ACF_TYPE from the Tx/Rx BEACON // at the time of the Link Failure
-           char ADD_ACF_TYPE; // ADDITIONAL_ACF_TYPE from the Tx/Rx // BEACON
-           at the time of the Link Failure };
+              struct mocaLinkState { char LINK_STATE; // LINK_STATE_II from the
+              Tx/Rx MAP at the // time of the Link Failure char ACF_TYPE; //
+              ACF_TYPE from the Tx/Rx BEACON // at the time of the Link Failure
+              char ADD_ACF_TYPE; // ADDITIONAL_ACF_TYPE from the Tx/Rx //
+              BEACON at the time of the Link Failure };
         </description>
         <syntax>
           <hexBinary>
@@ -27786,18 +29080,20 @@
       </parameter>
 
       <parameter name="ConnectedNodesInfo" access="readOnly"
-          id="moca25IfConnectedNodesInfo/1.3.6.1.4.1.31621.1.3.1.2.1.1">
+          id="moca25IfConnectedNodesInfo/1.3.6.1.4.1.31621.1.3.1.2.1.1"
+          version="2.17">
         <description>
           Indicates the information for each node connected in the network for
           up to 16 nodes.
 
           See {{bibref|MoCAv2.5|Table 17-1}}.
 
-           struct moca25ConnectedNodesInfo { long nodeIdVector; // 8 octets;
-           Bit value in the ith bit position indicates NodeID=(i) (LSB=bit0)
-           int numNodes; // 4 octets (Number of Node IDs indicated in the
-           NodeIdVector) struct { char guid[8]; // 8 octets (Node GUID MAC
-           Address) char mocaVersion; // 1 octet (MoCA Version) }[numNodes]; };
+              struct moca25ConnectedNodesInfo { long nodeIdVector; // 8 octets;
+              Bit value in the ith bit position indicates NodeID=(i) (LSB=bit0)
+              int numNodes; // 4 octets (Number of Node IDs indicated in the
+              NodeIdVector) struct { char guid[8]; // 8 octets (Node GUID MAC
+              Address) char mocaVersion; // 1 octet (MoCA Version) }[numNodes];
+              };
         </description>
         <syntax>
           <hexBinary>
@@ -27807,16 +29103,17 @@
       </parameter>
 
       <parameter name="MgntEntityNetIePayloadRx" access="readOnly"
-          id="moca25IfMgntEntityNetIePayloadRx/1.3.6.1.4.1.31621.1.3.1.2.1.2">
+          id="moca25IfMgntEntityNetIePayloadRx/1.3.6.1.4.1.31621.1.3.1.2.1.2"
+          version="2.17">
         <description>
           Indicates the payload of the latest received Management Entity
           Request Network IE, or Management Entity Response Network IE.
 
           See {{bibref|MoCAv2.5|Table 17-1}}.
 
-           struct moca25IfMgntEntityNetIePayload { short vendorId; // 2 octets
-           (MoCA Vendor ID) char information[60]; // 60 octets (Up to 60 bytes
-           of vendor specific information) };
+              struct moca25IfMgntEntityNetIePayload { short vendorId; // 2
+              octets (MoCA Vendor ID) char information[60]; // 60 octets (Up to
+              60 bytes of vendor specific information) };
         </description>
         <syntax>
           <hexBinary>
@@ -27826,7 +29123,8 @@
       </parameter>
 
       <parameter name="Moca25PhyCapable" access="readOnly"
-          id="moca25IfMoca25PhyCapable/1.3.6.1.4.1.31621.1.3.1.2.1.3">
+          id="moca25IfMoca25PhyCapable/1.3.6.1.4.1.31621.1.3.1.2.1.3"
+          version="2.17">
         <description>
           Indicate the MoCA Node supports MoCA 2.5 PHY if the value is
           {{true}}.
@@ -27842,7 +29140,8 @@
       </parameter>
 
       <parameter name="MpsInitScanPayload" access="readOnly"
-          id="moca25IfMpsInitScanPayload/1.3.6.1.4.1.31621.1.3.1.2.1.4">
+          id="moca25IfMpsInitScanPayload/1.3.6.1.4.1.31621.1.3.1.2.1.4"
+          version="2.17">
         <description>
           Reports the channel number, NC's (Network Coordinators) MoCA version,
           Network MPS (MoCA Protected Setup) trigger, and Network MPS
@@ -27860,7 +29159,7 @@
       </parameter>
 
       <parameter name="MpsState" access="readOnly"
-          id="moca25IfMpsState/1.3.6.1.4.1.31621.1.3.1.2.1.5">
+          id="moca25IfMpsState/1.3.6.1.4.1.31621.1.3.1.2.1.5" version="2.17">
         <description>
           Indicates the MPS (MoCA Protected Setup) state of the Node: paired if
           the value is {{true}} and un-Paired if the value is {{false}}.
@@ -27873,7 +29172,8 @@
       </parameter>
 
       <parameter name="NetworkNamePayload" access="readOnly"
-          id="moca25IfNetworkNamePayload/1.3.6.1.4.1.31621.1.3.1.2.1.6">
+          id="moca25IfNetworkNamePayload/1.3.6.1.4.1.31621.1.3.1.2.1.6"
+          version="2.17">
         <description>
           The payload of the latest received Network Name from the NC.
 
@@ -27887,7 +29187,7 @@
       </parameter>
 
       <parameter name="PrivacyNc" access="readOnly"
-          id="moca25IfPrivacyNc/1.3.6.1.4.1.31621.1.3.1.2.1.7">
+          id="moca25IfPrivacyNc/1.3.6.1.4.1.31621.1.3.1.2.1.7" version="2.17">
         <description>
           The latest NC_PRIVACY_SUPPORTED value received from the NC. Before
           any NC_PRIVACY_SUPPORTED is received, reflects the value of
@@ -27902,7 +29202,8 @@
       </parameter>
 
       <parameter name="PowerStateResp" access="readOnly"
-          id="moca25IfPowerStateResp/1.3.6.1.4.1.31621.1.3.1.2.1.8">
+          id="moca25IfPowerStateResp/1.3.6.1.4.1.31621.1.3.1.2.1.8"
+          version="2.17">
         <description>
           Carries the response of the MoCA Node to a request (through
           POWER_STATEREQ) to transition into a desired Power State: yes if the
@@ -27916,7 +29217,8 @@
       </parameter>
 
       <parameter name="PowerStateStatus" access="readOnly"
-          id="moca25IfPowerStateStatus/1.3.6.1.4.1.31621.1.3.1.2.1.9">
+          id="moca25IfPowerStateStatus/1.3.6.1.4.1.31621.1.3.1.2.1.9"
+          version="2.17">
         <description>
           Reports the current Power State of the Node (POWER_STATE_STATUS
           Managed Parameter).
@@ -27927,7 +29229,8 @@
       </parameter>
 
       <parameter name="ConnectedNodesDropReason" access="readOnly"
-          id="moca25IfConnectedNodesDropReason/1.3.6.1.4.1.31621.1.3.1.2.1.10">
+          id="moca25IfConnectedNodesDropReason/1.3.6.1.4.1.31621.1.3.1.2.1.10"
+          version="2.17">
         <description>
           Reports the GUID(s) of the dropped EN(s) and the reason of node drop
           for up to 15 nodes.
@@ -27936,13 +29239,13 @@
 
           See {{bibref|MoCAv2.5|Table 17-1}}.
 
-           struct moca25IfConnectedNodesDropReason { int numNodes; // 4 octets
-           (Number of dropped nodes) struct { char guid[8]; // 8 octets (Node
-           GUID MAC Address) char dropReason; // 1 octet (Reason of node drop:
-           // 0x00 Admission Failure // 0x01 Key Response Timeout // 0x02
-           Heartbeat Transmission Timeout // 0x03 Power State M0 Transition
-           Timeout // 0x04 Disadvantaged Node // 0x05 RR Transmission Timeout)
-           }[numNodes]; };
+              struct moca25IfConnectedNodesDropReason { int numNodes; // 4
+              octets (Number of dropped nodes) struct { char guid[8]; // 8
+              octets (Node GUID MAC Address) char dropReason; // 1 octet
+              (Reason of node drop: // 0x00 Admission Failure // 0x01 Key
+              Response Timeout // 0x02 Heartbeat Transmission Timeout // 0x03
+              Power State M0 Transition Timeout // 0x04 Disadvantaged Node //
+              0x05 RR Transmission Timeout) }[numNodes]; };
         </description>
         <syntax>
           <hexBinary/>
@@ -27950,7 +29253,8 @@
       </parameter>
 
       <event name="BelowPhyThresholdTrap!"
-          id="mocaBelowPhyThresholdTrap/1.3.6.1.4.1.31621.1.2.0.1">
+          id="mocaBelowPhyThresholdTrap/1.3.6.1.4.1.31621.1.2.0.1"
+          version="2.17">
         <description>
           If transmit PHY rate between all pairs of MoCA Nodes are greater than
           or equal to {{param|PhyThreshold}}, and subsequently the transmit PHY
@@ -27987,7 +29291,8 @@
       </event>
 
       <event name="AbovePhyThresholdTrap!"
-          id="mocaTrapAbovePhyThreshold/1.3.6.1.4.1.31621.1.2.0.2">
+          id="mocaTrapAbovePhyThreshold/1.3.6.1.4.1.31621.1.2.0.2"
+          version="2.17">
         <description>
           If transmit PHY rate between one or more pairs of MoCA Nodes are less
           than {{param|PhyThreshold}}, and subsequently the transmit PHY rate
@@ -28001,7 +29306,7 @@
       </event>
 
       <event name="StatusChangeTrap!"
-          id="mocaStatusChangeTrap/1.3.6.1.4.1.31621.1.2.0.3">
+          id="mocaStatusChangeTrap/1.3.6.1.4.1.31621.1.2.0.3" version="2.17">
         <description>
           This trap is sent when {{param|StatusChangeEnable}} is {{true}} and
           {{param|#.Status}} changes value.
@@ -28021,7 +29326,8 @@
       </event>
 
       <event name="NumNodesChangeTrap!"
-          id="mocaTrapIfNumNodesChange/1.3.6.1.4.1.31621.1.2.0.4">
+          id="mocaTrapIfNumNodesChange/1.3.6.1.4.1.31621.1.2.0.4"
+          version="2.17">
         <description>
           This trap is sent when {{param|NumNodesChangeEnable}} is {{true}} and
           {{param|#.NumNodes}} changes value.
@@ -28043,7 +29349,7 @@
       </event>
 
       <event name="MrRstSuccessTrap!"
-          id="mocaTrapMrRstSuccess/1.3.6.1.4.1.31621.1.2.0.5">
+          id="mocaTrapMrRstSuccess/1.3.6.1.4.1.31621.1.2.0.5" version="2.17">
         <description>
           An MR Entry Node reports that the network got reset successfully
           (MRRST_SUCCESS Event).
@@ -28054,7 +29360,7 @@
       </event>
 
       <event name="MrRstFailTrap!"
-          id="mocaTrapMrRstFail/1.3.6.1.4.1.31621.1.2.0.6">
+          id="mocaTrapMrRstFail/1.3.6.1.4.1.31621.1.2.0.6" version="2.17">
         <description>
           An MR Entry Node reports that the network reset did not complete
           successfully (MRRST_FAIL Event).
@@ -28065,7 +29371,8 @@
       </event>
 
       <event name="MrNetworkSuccessTrap!"
-          id="mocaTrapMrNetworkSuccess/1.3.6.1.4.1.31621.1.2.0.7">
+          id="mocaTrapMrNetworkSuccess/1.3.6.1.4.1.31621.1.2.0.7"
+          version="2.17">
         <description>
           An MR Entry Node reports that the network got reformed successfully
           following the MR transaction (MRNETWORK_SUCCESS Event).
@@ -28076,7 +29383,7 @@
       </event>
 
       <event name="MrNetworkFailTrap!"
-          id="mocaTrapMrNetworkFail/1.3.6.1.4.1.31621.1.2.0.8">
+          id="mocaTrapMrNetworkFail/1.3.6.1.4.1.31621.1.2.0.8" version="2.17">
         <description>
           An MR Entry Node reports that the MR transaction failed, and the
           network did not get reformed (MRNETWORK_FAIL Event).
@@ -28087,7 +29394,8 @@
       </event>
 
       <event name="PowerStateBcstRecTrap!"
-          id="mocaTrapPowerStateBcstRec/1.3.6.1.4.1.31621.1.2.0.9">
+          id="mocaTrapPowerStateBcstRec/1.3.6.1.4.1.31621.1.2.0.9"
+          version="2.17">
         <description>
           When the MoCA Node is in Power State M1 or M2, indicates that the
           MoCA Node has received a Broadcast data MSDU, which is available at
@@ -28099,7 +29407,7 @@
       </event>
 
       <event name="PowerStateM0NcTrap!"
-          id="mocaTrapPowerStateM0Nc/1.3.6.1.4.1.31621.1.2.0.10">
+          id="mocaTrapPowerStateM0Nc/1.3.6.1.4.1.31621.1.2.0.10" version="2.17">
         <description>
           When a MoCA Node is in Power State M1, indicates that it is going to
           move to Power State M0 due to the NCs instruction.
@@ -28110,7 +29418,7 @@
       </event>
 
       <event name="PowerStateNc1xTrap!"
-          id="mocaTrapPowerStateNc1x/1.3.6.1.4.1.31621.1.2.0.11">
+          id="mocaTrapPowerStateNc1x/1.3.6.1.4.1.31621.1.2.0.11" version="2.17">
         <description>
           When the MoCA Node is in Power State M1/M2/M3, indicates that MoCA 1
           Node is the NC (POWER_STATENC_1X Event).
@@ -28121,7 +29429,8 @@
       </event>
 
       <event name="PowerStateNetVerTrap!"
-          id="mocaTrapPowerStateNetVer/1.3.6.1.4.1.31621.1.2.0.12">
+          id="mocaTrapPowerStateNetVer/1.3.6.1.4.1.31621.1.2.0.12"
+          version="2.17">
         <description>
           When the MoCA Node is in Power State M2 or M3, indicates that the
           network MoCA version is changed (POWER_STATENET_VER Event).
@@ -28132,7 +29441,7 @@
       </event>
 
       <event name="PowerStateRespTrap!"
-          id="mocaTrapPowerStateResp/1.3.6.1.4.1.31621.1.2.0.13">
+          id="mocaTrapPowerStateResp/1.3.6.1.4.1.31621.1.2.0.13" version="2.17">
         <description>
           Carries the response of the MoCA Node to a request (through
           POWER_STATEREQ) to transition into a desired Power State
@@ -28144,7 +29453,8 @@
       </event>
 
       <event name="PowerStateUcstPenTrap!"
-          id="mocaTrapPowerStateUcstPen/1.3.6.1.4.1.31621.1.2.0.14">
+          id="mocaTrapPowerStateUcstPen/1.3.6.1.4.1.31621.1.2.0.14"
+          version="2.17">
         <description>
           When the MoCA Node is in Power State M2, indicates that a Unicast
           data MSDU destined to the MoCA Node is pending (POWER_STATEUCST_PEN
@@ -28156,7 +29466,8 @@
       </event>
 
       <event name="PowerStateTrnsReqTrap!"
-          id="mocaTrapPowerStateTrnsReq/1.3.6.1.4.1.31621.1.2.0.15">
+          id="mocaTrapPowerStateTrnsReq/1.3.6.1.4.1.31621.1.2.0.15"
+          version="2.17">
         <description>
           When a MoCA Node is in Power State M1 or M2, requests to transition
           to Power State M0 (POWER_STATETRNS_REQ Event).
@@ -28167,7 +29478,8 @@
       </event>
 
       <event name="PowerStateWupUrTrap!"
-          id="mocaTrapPowerStateWupUr/1.3.6.1.4.1.31621.1.2.0.16">
+          id="mocaTrapPowerStateWupUr/1.3.6.1.4.1.31621.1.2.0.16"
+          version="2.17">
         <description>
           When the MoCA Node is in Power State M2, this reports a wakeup
           request from NC due to unspecified reasons (POWER_STATEWUP_UR Event).
@@ -28178,7 +29490,7 @@
       </event>
 
       <event name="LmoStatusTrap!"
-          id="mocaTrapLmoStatus/1.3.6.1.4.1.31621.1.2.0.17">
+          id="mocaTrapLmoStatus/1.3.6.1.4.1.31621.1.2.0.17" version="2.17">
         <description>
           When {{param|LmoTrapEnable}} is enabled, reports that the MoCA Node
           is starting LMO (Link Maintenance Operation).
@@ -28189,7 +29501,7 @@
       </event>
 
       <event name="LinkFailureTrap!"
-          id="mocaTrapLinkFailure/1.3.6.1.4.1.31621.1.2.0.18">
+          id="mocaTrapLinkFailure/1.3.6.1.4.1.31621.1.2.0.18" version="2.17">
         <description>
           Indicates a link failure. If the failure was an Admission or LMO
           failure, {{param|LinkState}} indicates when the link was dropped
@@ -28201,7 +29513,8 @@
       </event>
 
       <event name="ConnectedNodesChangeTrap!"
-          id="moca25TrapConnectedNodesChange/1.3.6.1.4.1.31621.1.3.0.1">
+          id="moca25TrapConnectedNodesChange/1.3.6.1.4.1.31621.1.3.0.1"
+          version="2.17">
         <description>
           This trap is sent when {{param|ConnectedNodesChangeTrapEn}} is
           {{true}} and {{param|#.ConnectedNodesInfo}} changes value.
@@ -28223,7 +29536,8 @@
       </event>
 
       <event name="MgntEntityNetwIePayloadRecTrap!"
-          id="moca25TrapMgntEntityNetwIePayloadRec/1.3.6.1.4.1.31621.1.3.0.2">
+          id="moca25TrapMgntEntityNetwIePayloadRec/1.3.6.1.4.1.31621.1.3.0.2"
+          version="2.17">
         <description>
           This trap is sent when {{param|MgntEntityNetwIePayloadRecTrapEn}} is
           {{true}} and {{param|MgntEntityNetIePayloadRx}} changes value.
@@ -28234,7 +29548,8 @@
       </event>
 
       <event name="MpsInitScanRecTrap!"
-          id="moca25TrapMpsInitScanRec/1.3.6.1.4.1.31621.1.3.0.3">
+          id="moca25TrapMpsInitScanRec/1.3.6.1.4.1.31621.1.3.0.3"
+          version="2.17">
         <description>
           This trap is sent when {{param|MpsTrapEn}} is {{true}} and
           {{param|MpsInitScanPayload}} changes value.
@@ -28256,7 +29571,7 @@
       </event>
 
       <event name="MpsPairFailTrap!"
-          id="moca25TrapMpsPairFail/1.3.6.1.4.1.31621.1.3.0.4">
+          id="moca25TrapMpsPairFail/1.3.6.1.4.1.31621.1.3.0.4" version="2.17">
         <description>
           This trap is sent when {{param|MpsTrapEn}} is {{true}}, indicates a
           MPS pairing failure.
@@ -28267,7 +29582,8 @@
       </event>
 
       <event name="MpsPrivacyChangedTrap!"
-          id="moca25TrapMpsPrivacyChanged/1.3.6.1.4.1.31621.1.3.0.5">
+          id="moca25TrapMpsPrivacyChanged/1.3.6.1.4.1.31621.1.3.0.5"
+          version="2.17">
         <description>
           This trap is sent when {{param|MpsTrapEn}} is {{true}}, indicates
           that the Node's privacy settings (PRIVACYEN and/or PSWD) have been
@@ -28279,7 +29595,8 @@
       </event>
 
       <event name="NcPrivacySupportedRecTrap!"
-          id="moca25TrapNcPrivacySupportedRec/1.3.6.1.4.1.31621.1.3.0.6">
+          id="moca25TrapNcPrivacySupportedRec/1.3.6.1.4.1.31621.1.3.0.6"
+          version="2.17">
         <description>
           This trap is sent when {{param|NcPrivSupportedRecTrapEn}} is {{true}}
           and {{param|PrivacyNc}} changes value.
@@ -28299,7 +29616,8 @@
       </event>
 
       <event name="NetworkNameRecTrap!"
-          id="moca25TrapNetworkNameRec/1.3.6.1.4.1.31621.1.3.0.7">
+          id="moca25TrapNetworkNameRec/1.3.6.1.4.1.31621.1.3.0.7"
+          version="2.17">
         <description>
           This trap is sent when {{param|NetworkNameRecTrapEn}} is {{true}} and
           {{param|NetworkNamePayload}} changes value.
@@ -28321,7 +29639,8 @@
       </event>
 
       <event name="NodeDropAdmFailureTrap!"
-          id="moca25TrapNodeDropAdmFailure/1.3.6.1.4.1.31621.1.3.0.8">
+          id="moca25TrapNodeDropAdmFailure/1.3.6.1.4.1.31621.1.3.0.8"
+          version="2.17">
         <description>
           This trap is sent when {{param|NodeDropTrapEn}} is {{true}},
           indicates that the Node drops from the network due to admission
@@ -28333,7 +29652,8 @@
       </event>
 
       <event name="NodeDropNcTrap!"
-          id="moca25TrapTrapNodeDropNc/1.3.6.1.4.1.31621.1.3.0.9">
+          id="moca25TrapTrapNodeDropNc/1.3.6.1.4.1.31621.1.3.0.9"
+          version="2.17">
         <description>
           This trap is sent when {{param|NodeDropTrapEn}} is {{true}},
           indicates that the Node is dropped by the NC as indicated in the
@@ -28345,7 +29665,8 @@
       </event>
 
       <event name="NodeDropMpsTriggeredTrap!"
-          id="moca25TrapNodeDropMpsTriggered/1.3.6.1.4.1.31621.1.3.0.10">
+          id="moca25TrapNodeDropMpsTriggered/1.3.6.1.4.1.31621.1.3.0.10"
+          version="2.17">
         <description>
           This trap is sent when {{param|NodeDropTrapEn}} is {{true}},
           indicates that MPS is locally triggered when the Node is un-Paired.
@@ -28356,7 +29677,8 @@
       </event>
 
       <event name="NodeDropNcChgTrap!"
-          id="moca25TrapNodeDropNcChg/1.3.6.1.4.1.31621.1.3.0.11">
+          id="moca25TrapNodeDropNcChg/1.3.6.1.4.1.31621.1.3.0.11"
+          version="2.17">
         <description>
           This trap is sent when {{param|NodeDropTrapEn}} is {{true}}},
           indicates that there is a NC change when the Node is Non-Secured
@@ -28837,7 +30159,8 @@
 
       <parameter name="RxCorrectedErrors" access="readOnly"
           activeNotify="canDeny"
-          id="mocaIfRxCorrectedErrors/1.3.6.1.4.1.31621.1.2.1.8.1.4">
+          id="mocaIfRxCorrectedErrors/1.3.6.1.4.1.31621.1.2.1.8.1.4"
+          version="2.17">
         <description>
           The number of received Ethernet packets that have errors and are
           corrected by this MoCA interface.
@@ -29127,7 +30450,7 @@
       </parameter>
 
       <parameter name="Tag" access="readOnly"
-          id="mocaIfFlowTag/1.3.6.1.4.1.31621.1.2.1.9.1.7">
+          id="mocaIfFlowTag/1.3.6.1.4.1.31621.1.2.1.9.1.7" version="2.17">
         <description>
           The FLOW_TAG of the PQoS flow identified by {{param|FlowID}} in which
           this MoCA interface is an Ingress Node for this PQoS flow. The
@@ -29171,7 +30494,8 @@
       </parameter>
 
       <parameter name="IngressGuid" access="readOnly"
-          id="mocaIfFlowStatsIngressGuid/1.3.6.1.4.1.31621.1.2.1.9.1.10">
+          id="mocaIfFlowStatsIngressGuid/1.3.6.1.4.1.31621.1.2.1.9.1.10"
+          version="2.17">
         <description>
           The MAC address of the MoCA Node specified by the INGRESS_NODE_ID
           parameter of the flow.
@@ -29184,7 +30508,8 @@
       </parameter>
 
       <parameter name="EgressGuid" access="readOnly"
-          id="mocaIfFlowStatsEgressGuid/1.3.6.1.4.1.31621.1.2.1.9.1.11">
+          id="mocaIfFlowStatsEgressGuid/1.3.6.1.4.1.31621.1.2.1.9.1.11"
+          version="2.17">
         <description>
           The MAC address of the MoCA Node specified by the EGRESS_NODE_ID
           parameter of the flow.
@@ -29197,7 +30522,8 @@
       </parameter>
 
       <parameter name="MaximumLatency" access="readOnly"
-          id="mocaIfFlowStatsMaximumLatency/1.3.6.1.4.1.31621.1.2.1.9.1.12">
+          id="mocaIfFlowStatsMaximumLatency/1.3.6.1.4.1.31621.1.2.1.9.1.12"
+          version="2.17">
         <description>
           The MAXIMUM_LATENCY parameter of the flow in units of milliseconds. A
           value of 0 indicates no value available.
@@ -29210,7 +30536,8 @@
       </parameter>
 
       <parameter name="ShortTermAvgRatio" access="readOnly"
-          id="mocaIfFlowStatsShortTermAvgRatio/1.3.6.1.4.1.31621.1.2.1.9.1.13">
+          id="mocaIfFlowStatsShortTermAvgRatio/1.3.6.1.4.1.31621.1.2.1.9.1.13"
+          version="2.17">
         <description>
           The SHORT_TERM_AVERAGE_RATIO parameter of the flow.
 
@@ -29222,7 +30549,8 @@
       </parameter>
 
       <parameter name="FlowPer" access="readOnly"
-          id="mocaIfFlowStatsFlowPer/1.3.6.1.4.1.31621.1.2.1.9.1.15">
+          id="mocaIfFlowStatsFlowPer/1.3.6.1.4.1.31621.1.2.1.9.1.15"
+          version="2.17">
         <description>
           The FLOW_PER parameter of this flow, where a value of 0 indicates
           NPER and 1 indicates VLPER.
@@ -29235,7 +30563,8 @@
       </parameter>
 
       <parameter name="IngressClassify" access="readOnly"
-          id="mocaIfFlowStatsIngressClassify/1.3.6.1.4.1.31621.1.2.1.9.1.16">
+          id="mocaIfFlowStatsIngressClassify/1.3.6.1.4.1.31621.1.2.1.9.1.16"
+          version="2.17">
         <description>
           The INGRESS_CLASSIFICATION_RULE parameter of the flow.
 
@@ -29247,7 +30576,8 @@
       </parameter>
 
       <parameter name="VlanTag" access="readOnly"
-          id="mocaIfFlowStatsVlanTag/1.3.6.1.4.1.31621.1.2.1.9.1.17">
+          id="mocaIfFlowStatsVlanTag/1.3.6.1.4.1.31621.1.2.1.9.1.17"
+          version="2.17">
         <description>
           The VLAN_TAG parameter of the flow.
 
@@ -29259,7 +30589,8 @@
       </parameter>
 
       <parameter name="DscpMoca" access="readOnly"
-          id="mocaIfFlowStatsDscpMoca/1.3.6.1.4.1.31621.1.2.1.9.1.18">
+          id="mocaIfFlowStatsDscpMoca/1.3.6.1.4.1.31621.1.2.1.9.1.18"
+          version="2.17">
         <description>
           The DSCP_MOCA parameter of the flow.
 
@@ -29271,7 +30602,8 @@
       </parameter>
 
       <parameter name="Dfid" access="readOnly"
-          id="mocaIfFlowStatsDfid/1.3.6.1.4.1.31621.1.2.1.9.1.19">
+          id="mocaIfFlowStatsDfid/1.3.6.1.4.1.31621.1.2.1.9.1.19"
+          version="2.17">
         <description>
           The destination flow ID of the flow assigned by the Ingress Node.
 
@@ -29467,7 +30799,7 @@
       </parameter>
 
       <parameter name="TxDrops" access="readOnly"
-          id="mocaLinkTxDrops/1.3.6.1.4.1.31621.1.2.1.10.1.3">
+          id="mocaLinkTxDrops/1.3.6.1.4.1.31621.1.2.1.10.1.3" version="2.17">
         <description>
           The number of Unicast EPDUs received at the ECL, destined to the
           associated MoCA Node, and not transmitted by this MoCA interface.
@@ -29492,7 +30824,8 @@
       </parameter>
 
       <parameter name="RxCorrected" access="readOnly"
-          id="mocaNodeRxCorrected/1.3.6.1.4.1.31621.1.2.1.11.1.12">
+          id="mocaNodeRxCorrected/1.3.6.1.4.1.31621.1.2.1.11.1.12"
+          version="2.17">
         <description>
           The number of Ethernet packets received by this MoCA interface that
           have errors and are corrected from the MoCA Node identified by
@@ -29518,7 +30851,8 @@
       </parameter>
 
       <parameter name="BondingCapable" access="readOnly"
-          id="mocaNodeBondingCapable/1.3.6.1.4.1.31621.1.2.1.11.1.9">
+          id="mocaNodeBondingCapable/1.3.6.1.4.1.31621.1.2.1.11.1.9"
+          version="2.17">
         <description>
           The MoCA Node identified by {{param|MACAddress}} supports Bonding if
           the value is {{true}}. The MoCA Node identified by
@@ -29601,7 +30935,8 @@
       </parameter>
 
       <parameter name="SupportedIngressPqosFlows" access="readOnly"
-          id="mocaNodeSupportedIngressPqosFlows/1.3.6.1.4.1.31621.1.2.1.11.1.15">
+          id="mocaNodeSupportedIngressPqosFlows/1.3.6.1.4.1.31621.1.2.1.11.1.15"
+          version="2.17">
         <description>
           The number of Ingress PQoS Flows supported by this MoCA interface
           from the MoCA Node identified by {{param|MACAddress}}.
@@ -29612,7 +30947,8 @@
       </parameter>
 
       <parameter name="SupportedEgressPqosFlows" access="readOnly"
-          id="mocaNodeSupportedEgressPqosFlows/1.3.6.1.4.1.31621.1.2.1.11.1.16">
+          id="mocaNodeSupportedEgressPqosFlows/1.3.6.1.4.1.31621.1.2.1.11.1.16"
+          version="2.17">
         <description>
           The number of Egress PQoS Flows supported by this MoCA interface from
           the MoCA Node identified by {{param|MACAddress}}.
@@ -29623,7 +30959,8 @@
       </parameter>
 
       <parameter name="AggregationSize" access="readOnly"
-          id="mocaNodeAggregationSize/1.3.6.1.4.1.31621.1.2.1.11.1.17">
+          id="mocaNodeAggregationSize/1.3.6.1.4.1.31621.1.2.1.11.1.17"
+          version="2.17">
         <description>
           The maximum number of bytes that can be aggregated in a MoCA frame
           that this MoCA Node supports.
@@ -29634,7 +30971,7 @@
       </parameter>
 
       <parameter name="AeNumber" access="readOnly"
-          id="mocaNodeAeNumber/1.3.6.1.4.1.31621.1.2.1.11.1.18">
+          id="mocaNodeAeNumber/1.3.6.1.4.1.31621.1.2.1.11.1.18" version="2.17">
         <description>
           The maximum number of allocation elements, excluding the TAUs and the
           Dummy DAUs, in one MAP that this MoCA Node supports.
@@ -29645,7 +30982,8 @@
       </parameter>
 
       <parameter name="PowerState" access="readOnly"
-          id="mocaNodePowerState/1.3.6.1.4.1.31621.1.2.1.11.1.19">
+          id="mocaNodePowerState/1.3.6.1.4.1.31621.1.2.1.11.1.19"
+          version="2.17">
         <description>
           Power State of the MoCA Node identified by the {{param|MACAddress}}.
         </description>
@@ -29655,7 +30993,8 @@
       </parameter>
 
       <parameter name="PowerStateCapability" access="readOnly"
-          id="mocaNodePowerStateCapability/1.3.6.1.4.1.31621.1.2.1.11.1.20">
+          id="mocaNodePowerStateCapability/1.3.6.1.4.1.31621.1.2.1.11.1.20"
+          version="2.17">
         <description>
           Power State capability of the MoCA Node identified by the
           {{param|MACAddress}}.
@@ -29666,7 +31005,7 @@
       </parameter>
 
       <parameter name="PDelay" access="readOnly"
-          id="mocaNodePDelay/1.3.6.1.4.1.31621.1.2.1.11.1.21">
+          id="mocaNodePDelay/1.3.6.1.4.1.31621.1.2.1.11.1.21" version="2.17">
         <description>
           Propagation delay measured in units of 10ns between the local MoCA
           Node and the MoCA Node identified by the {{param|MACAddress}}.
@@ -29677,7 +31016,8 @@
       </parameter>
 
       <parameter name="EnhancedPrivacyCapable" access="readOnly"
-          id="moca25NodeEnhancedPrivacyCapable/1.3.6.1.4.1.31621.1.3.1.3.1.2">
+          id="moca25NodeEnhancedPrivacyCapable/1.3.6.1.4.1.31621.1.3.1.3.1.2"
+          version="2.17">
         <description>
           Indicates the MoCA Node identified by {{param|MACAddress}} supports
           MoCA 2 Enhanced Privacy if the value is {{true}}. Indicates the MoCA
@@ -29690,7 +31030,7 @@
       </parameter>
 
       <parameter name="LinkType" access="readOnly"
-          id="moca25NodeLinkType/1.3.6.1.4.1.31621.1.3.1.3.1.3">
+          id="moca25NodeLinkType/1.3.6.1.4.1.31621.1.3.1.3.1.3" version="2.17">
         <description>
           Indicates the type of link used for unicast data transmissions
           between the managed MoCA Node and the MoCA Node identified by
@@ -29721,7 +31061,8 @@
       </parameter>
 
       <parameter name="Moca25PhyCapable" access="readOnly"
-          id="moca25NodeMoca25PhyCapable/1.3.6.1.4.1.31621.1.3.1.3.1.4">
+          id="moca25NodeMoca25PhyCapable/1.3.6.1.4.1.31621.1.3.1.3.1.4"
+          version="2.17">
         <description>
           Indicates the MoCA Node identified by {{param|MACAddress}} supports
           MoCA 2.5 PHY if the value is {{true}}. Indicates the MoCA Node
@@ -29734,7 +31075,7 @@
       </parameter>
 
       <parameter name="RxPwrList" access="readOnly"
-          id="moca25NodeRxPwrList/1.3.6.1.4.1.31621.1.3.1.3.1.5">
+          id="moca25NodeRxPwrList/1.3.6.1.4.1.31621.1.3.1.3.1.5" version="2.17">
         <description>
           Per channel list of Receive power levels in dBm from the MoCA Node
           identified by {{param|MACAddress}} to the managed MoCA Node.
@@ -29759,9 +31100,9 @@
 
           * 500 MHz MoCA 2.5 PHY - 5
 
-           struct moca25NodePowerList { char numValues; // 1 octet (Number of
-           Values to follow) struct { char power; // 1 octet (Rx Power Level in
-           dBm) } [numValues]; };
+              struct moca25NodePowerList { char numValues; // 1 octet (Number
+              of Values to follow) struct { char power; // 1 octet (Rx Power
+              Level in dBm) } [numValues]; };
         </description>
         <syntax>
           <string>
@@ -29771,7 +31112,7 @@
       </parameter>
 
       <parameter name="RxSNRList" access="readOnly"
-          id="moca25NodeRxSNRList/1.3.6.1.4.1.31621.1.3.1.3.1.6">
+          id="moca25NodeRxSNRList/1.3.6.1.4.1.31621.1.3.1.3.1.6" version="2.17">
         <description>
           Per channel list of Average Receive Signal to Noise Ratio (SNR)
           across all available subcarriers based on the EVM probe from the MoCA
@@ -29791,9 +31132,9 @@
 
           * 500 MHz MoCA 2.5 PHY - 5
 
-           struct moca25NodeRxSNRList { char numValues; // 1 octet (Number of
-           Values to follow) struct { char snr; // 1 octet (Rx SNR in dB) }
-           [numValues]; };
+              struct moca25NodeRxSNRList { char numValues; // 1 octet (Number
+              of Values to follow) struct { char snr; // 1 octet (Rx SNR in dB)
+              } [numValues]; };
         </description>
         <syntax>
           <string>
@@ -29803,7 +31144,7 @@
       </parameter>
 
       <parameter name="TxPwrList" access="readOnly"
-          id="moca25NodeTxPwrList/1.3.6.1.4.1.31621.1.3.1.3.1.7">
+          id="moca25NodeTxPwrList/1.3.6.1.4.1.31621.1.3.1.3.1.7" version="2.17">
         <description>
           Per channel list of Transmit power levels in dBm from the managed
           MoCA Node to the MoCA Node identified by {{param|MACAddress}}. The
@@ -29824,9 +31165,9 @@
 
           * 500 MHz MoCA 2.5 PHY - 5
 
-           struct moca25NodePowerList { char numValues; // 1 octet (Number of
-           Values to follow) struct { char power; // 1 octet (Tx Power Level in
-           dBm) } [numValues]; };
+              struct moca25NodePowerList { char numValues; // 1 octet (Number
+              of Values to follow) struct { char power; // 1 octet (Tx Power
+              Level in dBm) } [numValues]; };
         </description>
         <syntax>
           <string>
@@ -29836,7 +31177,8 @@
       </parameter>
 
       <parameter name="TxPwrReductionList" access="readOnly"
-          id="moca25NodeTxPwrReductionList/1.3.6.1.4.1.31621.1.3.1.3.1.8">
+          id="moca25NodeTxPwrReductionList/1.3.6.1.4.1.31621.1.3.1.3.1.8"
+          version="2.17">
         <description>
           Per channel list of Transmit Power Control (TPC) back-off in dB used
           for unicast transmissions from the managed MoCA Node to the MoCA Node
@@ -29859,9 +31201,9 @@
 
           * 500 MHz MoCA 2.5 PHY - 5
 
-           struct moca25NodeTxPwrReductionList { char numValues; // 1 octet
-           (Number of Values to follow) struct { char tpc; // 1 octet (TPC in
-           dB) } [numValues]; };
+              struct moca25NodeTxPwrReductionList { char numValues; // 1 octet
+              (Number of Values to follow) struct { char tpc; // 1 octet (TPC
+              in dB) } [numValues]; };
         </description>
         <syntax>
           <string>
@@ -29871,7 +31213,8 @@
       </parameter>
 
       <parameter name="EgressNodeNumFlows" access="readOnly"
-          id="mocaLinkEgressNodeNumFlows/1.3.6.1.4.1.31621.1.2.1.10.1.4">
+          id="mocaLinkEgressNodeNumFlows/1.3.6.1.4.1.31621.1.2.1.10.1.4"
+          version="2.17">
         <description>
           The number of PQoS flows in which this MoCA interface is an Egress
           Node for these PQoS flows.
@@ -29882,7 +31225,8 @@
       </parameter>
 
       <parameter name="IngressNodeNumFlows" access="readOnly"
-          id="mocaLinkIngressNodeNumFlows/1.3.6.1.4.1.31621.1.2.1.10.1.5">
+          id="mocaLinkIngressNodeNumFlows/1.3.6.1.4.1.31621.1.2.1.10.1.5"
+          version="2.17">
         <description>
           The number of PQoS flows in which this MoCA interface is an Ingress
           Node for these PQoS flows.
@@ -30021,9 +31365,9 @@
 
           * {{enum|bonded|LinkType}} - 2
 
-           struct mocaPower { char numValues; // 1 octet (Number of Values to
-           follow) { char power; // 1 octet (Tx or Rx Power Level in dB) }
-           [numValues]; };
+              struct mocaPower { char numValues; // 1 octet (Number of Values
+              to follow) { char power; // 1 octet (Tx or Rx Power Level in dB)
+              } [numValues]; };
 
           This parameter is only used for MoCA 2.0.
         </description>
@@ -30057,9 +31401,9 @@
 
           * {{enum|bonded|LinkType}} - 2
 
-           struct mocaPowerReduction { char numValues; // 1 octet (Number of
-           Values to follow) { char tpc; // 1 octet (TPC in dB) } [numValues];
-           };
+              struct mocaPowerReduction { char numValues; // 1 octet (Number of
+              Values to follow) { char tpc; // 1 octet (TPC in dB) }
+              [numValues]; };
 
           This parameter is only used for MoCA 2.0.
         </description>
@@ -30089,8 +31433,9 @@
 
           * {{enum|bonded|LinkType}} - 2
 
-           struct mocaRxSNR { char numValues; // 1 octet (Number of Values to
-           follow) { char rx_snr; // 1 octet (Rx SNR in dB) } [numValues]; };
+              struct mocaRxSNR { char numValues; // 1 octet (Number of Values
+              to follow) { char rx_snr; // 1 octet (Rx SNR in dB) }
+              [numValues]; };
 
           This parameter is only used for MoCA 2.0.
         </description>
@@ -30358,12 +31703,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.4">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -30473,7 +31818,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="MaxTransmitRate" access="readOnly">
+      <parameter name="MaxTransmitRate" access="readOnly" version="2.8">
         <description>
           The maximum PHY data rate that the interface is capable of
           transmitting (expressed in {{units}}).
@@ -30571,7 +31916,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="DMRequested" access="readWrite">
+      <parameter name="DMRequested" access="readWrite" version="2.8">
         <description>
           Indicates a request to force the role of the G.hn interface to Domain
           Master (DM) for the G.hn domain it is connected to. The selection of
@@ -30583,7 +31928,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="IsDM" access="readOnly">
+      <parameter name="IsDM" access="readOnly" version="2.8">
         <description>
           Indicates whether this G.hn interface is currently the Domain Master
           (DM) for the G.hn domain it is connected to, as described in
@@ -30604,7 +31949,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SCRequested" access="readWrite">
+      <parameter name="SCRequested" access="readWrite" version="2.8">
         <description>
           Indicates a request to force the role of the G.hn interface to
           Security Controller (SC) for the G.hn domain it is connected to. The
@@ -30616,7 +31961,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="IsSC" access="readOnly">
+      <parameter name="IsSC" access="readOnly" version="2.8">
         <description>
           Indicates whether this G.hn interface is currently the Security
           Controller (SC) for the G.hn domain it is connected to, as described
@@ -30627,7 +31972,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="StandardVersions" access="readOnly">
+      <parameter name="StandardVersions" access="readOnly" version="2.8">
         <description>
           The standard versions that the interface supports. The list MUST have
           an even number of items. The first item of each pair represents an
@@ -30646,7 +31991,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="MaxBandPlan" access="readOnly">
+      <parameter name="MaxBandPlan" access="readOnly" version="2.8">
         <description>
           The largest bandplan that the interface can support, as defined in
           {{bibref|G.9961|Clause 8.8.5.5}}.
@@ -30656,7 +32001,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="MediumType" access="readOnly">
+      <parameter name="MediumType" access="readOnly" version="2.8">
         <description>
           The medium type that the interface currently operates on. Refer to
           {{bibref|G.9962|Table 7-5}}.
@@ -30672,7 +32017,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="TAIFG" access="readOnly">
+      <parameter name="TAIFG" access="readOnly" version="2.8">
         <description>
           The Acknowledgement InterFrame Gap, or TAIFG, as defined in
           {{bibref|G.9961|Clause 8.4}}. It is represented as multiples of
@@ -30685,7 +32030,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="NotchedAmateurRadioBands" access="readWrite">
+      <parameter name="NotchedAmateurRadioBands" access="readWrite"
+          version="2.8">
         <description>
           A bit map representing usage of international amateur bands (0 =
           masked, 1 = unmasked). The LSB represents the lowest band (1.8-2.0
@@ -30705,7 +32051,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="PHYThroughputDiagnosticsEnable" access="readWrite">
+      <parameter name="PHYThroughputDiagnosticsEnable" access="readWrite"
+          version="2.8">
         <description>
           {{nolist}}
 
@@ -30720,7 +32067,7 @@
       </parameter>
 
       <parameter name="PerformanceMonitoringDiagnosticsEnable"
-          access="readWrite">
+          access="readWrite" version="2.8">
         <description>
           {{nolist}}
 
@@ -30735,7 +32082,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="SMMaskedBandNumberOfEntries" access="readOnly">
+      <parameter name="SMMaskedBandNumberOfEntries" access="readOnly"
+          version="2.8">
         <description>
           {{numentries}}
         </description>
@@ -30794,7 +32142,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="PSM" access="readWrite">
+      <parameter name="PSM" access="readWrite" version="2.12">
         <description>
           Specifies the list of PSD shaping mask (PSM) breakpoints to be
           applied to the G.hn interface.
@@ -31090,7 +32438,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="MgmtBytesSent" access="readOnly" activeNotify="canDeny">
+      <parameter name="MgmtBytesSent" access="readOnly" activeNotify="canDeny"
+          version="2.8">
         <description>
           The total number of MPDU bytes transmitted by the node through a
           physical medium, which correspond to management LPDUs and framing
@@ -31102,7 +32451,7 @@
       </parameter>
 
       <parameter name="MgmtBytesReceived" access="readOnly"
-          activeNotify="canDeny">
+          activeNotify="canDeny" version="2.8">
         <description>
           The total number of MPDU bytes received by the node through a
           physical medium, which correspond to management LPDUs and framing
@@ -31114,7 +32463,7 @@
       </parameter>
 
       <parameter name="MgmtPacketsSent" access="readOnly"
-          activeNotify="canDeny">
+          activeNotify="canDeny" version="2.8">
         <description>
           The total number of LCDUs requested for transmission by a management
           layer (i.e., outbound LCDUs generated in LLC defined in
@@ -31127,7 +32476,7 @@
       </parameter>
 
       <parameter name="MgmtPacketsReceived" access="readOnly"
-          activeNotify="canDeny">
+          activeNotify="canDeny" version="2.8">
         <description>
           The total number of LCDUs delivered to a management layer (i.e.,
           inbound LCDUs) that were received by the node through a physical
@@ -31138,7 +32487,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="BlocksSent" access="readOnly" activeNotify="canDeny">
+      <parameter name="BlocksSent" access="readOnly" activeNotify="canDeny"
+          version="2.8">
         <description>
           The total number of LPDUs that were transmitted by the node through a
           physical medium, regardless of new or retransmitted LPDUs.
@@ -31149,7 +32499,7 @@
       </parameter>
 
       <parameter name="BlocksReceived" access="readOnly"
-          activeNotify="canDeny">
+          activeNotify="canDeny" version="2.8">
         <description>
           The total number of LPDUs that were received by the node through a
           physical medium, with or without errors.
@@ -31159,7 +32509,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="BlocksResent" access="readOnly" activeNotify="canDeny">
+      <parameter name="BlocksResent" access="readOnly" activeNotify="canDeny"
+          version="2.8">
         <description>
           The total number of LPDUs that were retransmitted.
         </description>
@@ -31169,7 +32520,7 @@
       </parameter>
 
       <parameter name="BlocksErrorsReceived" access="readOnly"
-          activeNotify="canDeny">
+          activeNotify="canDeny" version="2.8">
         <description>
           The total number of received LPDUs that contained errors.
 
@@ -31532,7 +32883,7 @@
         The G.hn Diagnostics object.
       </description>
 
-      <command name="PHYThroughput()" async="true">
+      <command name="PHYThroughput()" async="true" version="2.12">
         <description>
           G.hn PHY throughput diagnostics configuration and results.
 
@@ -31542,7 +32893,7 @@
         </description>
         <input>
 
-          <parameter name="Interface" mandatory="true">
+          <parameter name="Interface" mandatory="true" version="2.12">
             <description>
               The interface over which the test is to be performed.
             </description>
@@ -31554,7 +32905,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="DiagnoseMACAddress" mandatory="true">
+          <parameter name="DiagnoseMACAddress" mandatory="true" version="2.12">
             <description>
               The MAC address of the originating G.hn interface of the link
               that is being diagnosed.
@@ -31569,7 +32920,7 @@
         </input>
         <output>
 
-          <parameter name="Status">
+          <parameter name="Status" version="2.13">
             <description>
               Indicates the availability of diagnostics data. {{enum}}
 
@@ -31667,7 +33018,7 @@
         </output>
       </command>
 
-      <command name="PerformanceMonitoring()" async="true">
+      <command name="PerformanceMonitoring()" async="true" version="2.12">
         <description>
           G.hn Performance Monitoring diagnostics configuration and results.
 
@@ -31677,7 +33028,7 @@
         </description>
         <input>
 
-          <parameter name="Interface" mandatory="true">
+          <parameter name="Interface" mandatory="true" version="2.12">
             <description>
               The interface over which the test is to be performed.
             </description>
@@ -31689,7 +33040,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="DiagnoseMACAddress" mandatory="true">
+          <parameter name="DiagnoseMACAddress" mandatory="true" version="2.12">
             <description>
               The MAC address of the originating G.hn interface of the link
               that is being diagnosed.
@@ -31702,7 +33053,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="SampleInterval" mandatory="true">
+          <parameter name="SampleInterval" mandatory="true" version="2.12">
             <description>
               Time in {{units}} between automatic collection of performance
               monitoring data. A value of zero disables automatic collection of
@@ -31725,7 +33076,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="SNRGroupLength" mandatory="true">
+          <parameter name="SNRGroupLength" mandatory="true" version="2.12">
             <description>
               The number of sub-carriers in a group to be used for averaging
               SNR values when providing SNR information for a channel.
@@ -31747,7 +33098,7 @@
         </input>
         <output>
 
-          <parameter name="Status">
+          <parameter name="Status" version="2.13">
             <description>
               Indicates the availability of diagnostics data. {{enum}}
 
@@ -32277,12 +33628,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -32895,12 +34246,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -33492,12 +34843,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -33558,12 +34909,12 @@
         <parameter ref="MACAddress"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -33594,7 +34945,7 @@
         The UPA Diagnostics object.
       </description>
 
-      <command name="InterfaceMeasurement()" async="true">
+      <command name="InterfaceMeasurement()" async="true" version="2.12">
         <description>
           This command provides access to either a Signal-to-Noise-Ratio (SNR)
           Port Measurement test or a Channel Frequency Response (CFR) Port
@@ -33606,7 +34957,7 @@
         </description>
         <input>
 
-          <parameter name="Type" mandatory="true">
+          <parameter name="Type" mandatory="true" version="2.12">
             <description>
               Indicates the type of port measurement test to be carried out.
               {{enum}}.
@@ -33623,7 +34974,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="Interface" mandatory="true">
+          <parameter name="Interface" mandatory="true" version="2.12">
             <description>
               {{reference}} This is the local UPA interface from which the test
               is to be performed.
@@ -33637,7 +34988,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="Port" mandatory="true">
+          <parameter name="Port" mandatory="true" version="2.12">
             <description>
               PLC port being measured. This identifies which PLC connection to
               measure between the local interface (indicated by
@@ -33653,7 +35004,7 @@
         </input>
         <output>
 
-          <parameter name="Status">
+          <parameter name="Status" version="2.13">
             <description>
               Indicates the availability of diagnostics data. {{enum}}
 
@@ -33671,7 +35022,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="Measurements">
+          <parameter name="Measurements" version="2.12">
             <description>
               {{list}} Result of Signal-to-Noise-Ratio measurement (if
               {{param|Type}} is {{enum|SNR|Type}}) or Channel Frequency
@@ -33690,7 +35041,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="RxGain">
+          <parameter name="RxGain" version="2.12">
             <description>
               Reception gain of the adapter (expresssed in {{units}}).
             </description>
@@ -33749,7 +35100,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ResetCounter" access="readOnly">
+      <parameter name="ResetCounter" access="readOnly" version="2.12">
         <description>
           This parameter counts the number of WiFi host or driver resets since
           the last device reset. This parameter is reset to zero after the
@@ -33761,7 +35112,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ResetCause" access="readOnly">
+      <parameter name="ResetCause" access="readOnly" version="2.14">
         <description>
           Reports the cause for the previous Wi-Fi driver reset.
         </description>
@@ -33789,14 +35140,14 @@
         </syntax>
       </parameter>
 
-      <command name="NeighboringWiFiDiagnostic()" async="true">
+      <command name="NeighboringWiFiDiagnostic()" async="true" version="2.12">
         <description>
           This command defines access to other WiFi SSIDs that this device is
           able to receive.
         </description>
         <output>
 
-          <parameter name="Status">
+          <parameter name="Status" version="2.13">
             <description>
               Indicates the availability of diagnostics data. {{enum}}
 
@@ -33923,7 +35274,7 @@
                   <enumeration value="WPA3-SAE"/>
                   <enumeration value="WPA2-PSK-WPA3-SAE"/>
                   <enumeration value="WPA3-Enterprise"/>
-                  <enumeration value="OWE"/>
+                  <enumeration value="OWE" version="2.16"/>
                 </string>
               </syntax>
             </parameter>
@@ -33956,7 +35307,7 @@
                 <string>
                   <enumeration value="2.4GHz"/>
                   <enumeration value="5GHz"/>
-                  <enumeration value="6GHz"/>
+                  <enumeration value="6GHz" version="2.16"/>
                 </string>
               </syntax>
             </parameter>
@@ -34003,7 +35354,7 @@
                   <enumeration value="ax">
                     <description>{{bibref|802.11ax}}</description>
                   </enumeration>
-                  <enumeration value="be">
+                  <enumeration value="be" version="2.17">
                     <description>{{bibref|802.11be}}</description>
                   </enumeration>
                 </string>
@@ -34055,8 +35406,8 @@
                   <enumeration value="40MHz"/>
                   <enumeration value="80MHz"/>
                   <enumeration value="160MHz"/>
-                  <enumeration value="320MHz-1"/>
-                  <enumeration value="320MHz-2"/>
+                  <enumeration value="320MHz-1" version="2.17"/>
+                  <enumeration value="320MHz-2" version="2.17"/>
                   <enumeration value="Auto"/>
                 </string>
               </syntax>
@@ -34133,7 +35484,7 @@
         </output>
       </command>
 
-      <command name="Reset()" async="false">
+      <command name="Reset()" version="2.12" async="false">
         <description>
           This command represents a request to reset or reboot the Wi-Fi
           sub-system without resetting or rebooting the device.
@@ -34142,7 +35493,7 @@
     </object>
 
     <object name="Device.WiFi.MultiAP." access="readOnly" minEntries="1"
-        maxEntries="1" status="obsoleted" version="2.13">
+        maxEntries="1" status="deleted" version="2.13">
       <description>
         This object describes a Wi-Fi network containing 1 or more Access Point
         devices.
@@ -34161,10 +35512,12 @@
         {{object|##.WiFi.DataElements.Network}} MultiAP objects}}
 
         {{obsoleted|2.17}}
+
+        {{deleted|2.18}}
       </description>
 
       <parameter name="APDeviceNumberOfEntries" access="readOnly"
-          status="obsoleted">
+          status="deleted">
         <description>
           {{numentries}}
 
@@ -34172,6 +35525,8 @@
           deprecated}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <unsignedInt/>
@@ -34180,7 +35535,7 @@
     </object>
 
     <object name="Device.WiFi.MultiAP.SteeringSummaryStats." access="readOnly"
-        minEntries="1" maxEntries="1" status="obsoleted" version="2.13">
+        minEntries="1" maxEntries="1" status="deleted" version="2.13">
       <description>
         The summary of statistics related to Multi-AP Steering for the Wi-Fi
         network.
@@ -34191,6 +35546,8 @@
         {{object|##.DataElements.Network.MultiAPSteeringSummaryStats}}}}
 
         {{obsoleted|2.17}}
+
+        {{deleted|2.18}}
       </description>
 
       <parameter name="NoCandidateAPFailures" access="readOnly">
@@ -34273,7 +35630,7 @@
 
     <object name="Device.WiFi.MultiAP.APDevice.{i}." access="readOnly"
         numEntriesParameter="APDeviceNumberOfEntries" minEntries="0"
-        maxEntries="unbounded" status="obsoleted" version="2.13">
+        maxEntries="unbounded" status="deleted" version="2.13">
       <description>
         Each instance of this object represents an individual Access Point
         device in the Wi-Fi network.
@@ -34288,12 +35645,14 @@
         deprecated as noted}}
 
         {{obsoleted|2.17}}
+
+        {{deleted|2.18}}
       </description>
       <uniqueKey functional="true">
         <parameter ref="MACAddress"/>
       </uniqueKey>
 
-      <parameter name="MACAddress" access="readOnly" status="obsoleted">
+      <parameter name="MACAddress" access="readOnly" status="deleted">
         <description>
           A unique identifier for this particular device within the Wi-Fi
           network.
@@ -34302,13 +35661,15 @@
           {{param|##.DataElements.Network.Device.{i}.ID}}}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <dataType ref="MACAddress"/>
         </syntax>
       </parameter>
 
-      <parameter name="Manufacturer" access="readOnly" status="obsoleted">
+      <parameter name="Manufacturer" access="readOnly" status="deleted">
         <description>
           The manufacturer of the Access Point device (human readable string).
 
@@ -34316,6 +35677,8 @@
           Elements R2}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <string/>
@@ -34341,7 +35704,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ProductClass" access="readOnly" status="obsoleted">
+      <parameter name="ProductClass" access="readOnly" status="deleted">
         <description>
           Identifier of the class of product for which the serial number
           applies. That is, for a given manufacturer, this parameter is used to
@@ -34355,6 +35718,8 @@
           Elements R2}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <string>
@@ -34363,7 +35728,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SerialNumber" access="readOnly" status="obsoleted">
+      <parameter name="SerialNumber" access="readOnly" status="deleted">
         <description>
           Identifier of the particular Access Point device that is unique for
           the indicated class of product and manufacturer.
@@ -34375,6 +35740,8 @@
           Elements R2}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <string>
@@ -34383,7 +35750,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SoftwareVersion" access="readOnly" status="obsoleted">
+      <parameter name="SoftwareVersion" access="readOnly" status="deleted">
         <description>
           A string identifying the software version currently installed in the
           Access Point device (i.e. version of the overall firmware).
@@ -34397,6 +35764,8 @@
           Elements R2}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <string>
@@ -34520,7 +35889,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="RadarDetections" access="readOnly">
+      <parameter name="RadarDetections" access="readOnly" version="2.14">
         <description>
           {{list}} List items represent channels in the non-occupancy list due
           to radars detected by Dynamic Frequency Selection (DFS) Channel
@@ -34534,7 +35903,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="DFSEnable" access="readWrite" status="obsoleted">
+      <parameter name="DFSEnable" access="readWrite" version="2.14"
+          status="deleted">
         <description>
           Enables or disables Dynamic Frequency Selection (DFS).
 
@@ -34542,6 +35912,8 @@
           Elements R2}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <boolean/>
@@ -34549,7 +35921,7 @@
       </parameter>
 
       <parameter name="RadioNumberOfEntries" access="readOnly"
-          status="obsoleted">
+          status="deleted">
         <description>
           {{numentries}}
 
@@ -34557,6 +35929,8 @@
           deprecated}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <unsignedInt/>
@@ -34566,7 +35940,7 @@
 
     <object name="Device.WiFi.MultiAP.APDevice.{i}.Radio.{i}."
         access="readOnly" numEntriesParameter="RadioNumberOfEntries"
-        minEntries="0" maxEntries="unbounded" status="obsoleted" version="2.13">
+        minEntries="0" maxEntries="unbounded" status="deleted" version="2.13">
       <description>
         This object represents all of the individual Radios contained within
         the identified Access Point device known to the controller.
@@ -34582,12 +35956,14 @@
         The remaining parameters deprecated as noted}}
 
         {{obsoleted|2.17}}
+
+        {{deleted|2.18}}
       </description>
       <uniqueKey functional="true">
         <parameter ref="MACAddress"/>
       </uniqueKey>
 
-      <parameter name="MACAddress" access="readOnly" status="obsoleted">
+      <parameter name="MACAddress" access="readOnly" status="deleted">
         <description>
           A unique identifier for this particular Radio within the identified
           Access Point.
@@ -34596,6 +35972,8 @@
           {{param|###.DataElements.Network.Device.{i}.Radio.{i}.ID}}}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <dataType ref="MACAddress"/>
@@ -34603,7 +35981,7 @@
       </parameter>
 
       <parameter name="OperatingFrequencyBand" access="readOnly"
-          status="obsoleted">
+          status="deleted">
         <description>
           Indicates the frequency band at which the radio is operating.
           {{enum}}
@@ -34612,18 +35990,19 @@
           {{param|###.DataElements.Network.Device.{i}.Radio.{i}.CurrentOperatingClassProfile.{i}.Class}}}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <string>
             <enumeration value="2.4GHz"/>
             <enumeration value="5GHz"/>
-            <enumeration value="6GHz"/>
+            <enumeration value="6GHz" version="2.16"/>
           </string>
         </syntax>
       </parameter>
 
-      <parameter name="OperatingStandards" access="readOnly"
-          status="obsoleted">
+      <parameter name="OperatingStandards" access="readOnly" status="deleted">
         <description>
           {{list}} List items indicate which IEEE 802.11 standard this
           {{object}} instance is configured for. {{enum}}
@@ -34649,6 +36028,8 @@
           EasyMesh}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <list/>
@@ -34675,7 +36056,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Channel" access="readWrite" status="obsoleted">
+      <parameter name="Channel" access="readWrite" status="deleted">
         <description>
           The current radio channel used by the connection.
 
@@ -34699,6 +36080,8 @@
           {{param|###.DataElements.Network.Device.{i}.Radio.{i}.CurrentOperatingClassProfile.{i}.Channel}}}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <unsignedInt>
@@ -34707,7 +36090,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ExtensionChannel" access="readOnly" status="obsoleted">
+      <parameter name="ExtensionChannel" access="readOnly" status="deleted">
         <description>
           The secondary extension channel position, applicable when operating
           in wide channel mode (i.e. when
@@ -34723,6 +36106,8 @@
           EasyMesh}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <string>
@@ -34733,7 +36118,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="PossibleChannels" access="readOnly" status="obsoleted">
+      <parameter name="PossibleChannels" access="readOnly" status="deleted"
+          version="2.14">
         <description>
           {{list}} List items represent possible radio channels for the
           wireless standard (a, b, g, n, ac, ax) and the regulatory domain.
@@ -34745,6 +36131,8 @@
           {{deprecated|2.15|because it is not available via EasyMesh}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <list>
@@ -34755,13 +36143,15 @@
       </parameter>
 
       <parameter name="CurrentOperatingChannelBandwidth" access="readOnly"
-          status="obsoleted">
+          status="deleted">
         <description>
           The channel bandwidth currently in use. {{enum}}
 
           {{deprecated|2.15|because it is not available via EasyMesh}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <string>
@@ -34773,7 +36163,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="MCS" access="readOnly" status="obsoleted">
+      <parameter name="MCS" access="readOnly" status="deleted">
         <description>
           The Modulation Coding Scheme index (applicable to 802.11n and
           802.11ac specifications only). Values from 0 to 15 MUST be supported
@@ -34784,6 +36174,8 @@
           EasyMesh}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <int>
@@ -34793,7 +36185,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="TransmitPower" access="readOnly" status="obsoleted">
+      <parameter name="TransmitPower" access="readOnly" status="deleted">
         <description>
           Indicates the current transmit power level as a {{units}} of full
           power.
@@ -34802,6 +36194,8 @@
           {{param|###.DataElements.Network.Device.{i}.Radio.{i}.CurrentOperatingClassProfile.{i}.TxPower}}}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <int>
@@ -34811,8 +36205,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="TransmitPowerLimit" access="readWrite"
-          status="obsoleted">
+      <parameter name="TransmitPowerLimit" access="readWrite" status="deleted"
+          version="2.14">
         <description>
           Indicates the maximum Effective Isotropic Radiated Power (EIRP) per
           20 MHz bandwidth representing the nominal transmit power limit for
@@ -34822,6 +36216,8 @@
           {{deprecated|2.15|because it is not available in EasyMesh}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <int>
@@ -34831,7 +36227,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="APNumberOfEntries" access="readOnly" status="obsoleted">
+      <parameter name="APNumberOfEntries" access="readOnly" status="deleted">
         <description>
           {{numentries}}
 
@@ -34839,6 +36235,8 @@
           deprecated}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <unsignedInt/>
@@ -34848,7 +36246,7 @@
 
     <object name="Device.WiFi.MultiAP.APDevice.{i}.Radio.{i}.AP.{i}."
         access="readOnly" numEntriesParameter="APNumberOfEntries"
-        minEntries="0" maxEntries="unbounded" status="obsoleted" version="2.13">
+        minEntries="0" maxEntries="unbounded" status="deleted" version="2.13">
       <description>
         A single logical Access Point operating on this radio.
 
@@ -34858,6 +36256,8 @@
         {{object|####.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.}}}}
 
         {{obsoleted|2.17}}
+
+        {{deleted|2.18}}
       </description>
       <uniqueKey functional="true">
         <parameter ref="BSSID"/>
@@ -34916,7 +36316,7 @@
       </parameter>
 
       <parameter name="AssociatedDeviceNumberOfEntries" access="readOnly"
-          status="obsoleted">
+          status="deleted">
         <description>
           {{numentries}}
 
@@ -34924,6 +36324,8 @@
           being deprecated}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <unsignedInt/>
@@ -34934,7 +36336,7 @@
     <object
         name="Device.WiFi.MultiAP.APDevice.{i}.Radio.{i}.AP.{i}.AssociatedDevice.{i}."
         access="readOnly" numEntriesParameter="AssociatedDeviceNumberOfEntries"
-        minEntries="0" maxEntries="unbounded" status="obsoleted" version="2.13">
+        minEntries="0" maxEntries="unbounded" status="deleted" version="2.13">
       <description>
         Object describing a single Associated Device (STA).
 
@@ -34946,6 +36348,8 @@
         except {{param|OperatingStandard}} which was deprecated as noted}}
 
         {{obsoleted|2.17}}
+
+        {{deleted|2.18}}
       </description>
       <uniqueKey functional="true">
         <parameter ref="MACAddress"/>
@@ -34960,7 +36364,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="OperatingStandard" access="readOnly" status="obsoleted">
+      <parameter name="OperatingStandard" access="readOnly" status="deleted">
         <description>
           The operating standard that this associated device is connected with.
           {{enum}}
@@ -34969,6 +36373,8 @@
           EasyMesh}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <string>
@@ -34994,7 +36400,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Active" access="readOnly" status="obsoleted">
+      <parameter name="Active" access="readOnly" status="deleted">
         <description>
           Whether or not this associated device is currently present on the
           Wi-Fi Access Point device.
@@ -35008,6 +36414,8 @@
           EasyMesh}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <boolean/>
@@ -35079,7 +36487,7 @@
       </parameter>
 
       <parameter name="SteeringHistoryNumberOfEntries" access="readOnly"
-          status="obsoleted">
+          status="deleted">
         <description>
           {{numentries}}
 
@@ -35088,6 +36496,8 @@
           is being deprecated}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <unsignedInt/>
@@ -35097,7 +36507,7 @@
 
     <object
         name="Device.WiFi.MultiAP.APDevice.{i}.Radio.{i}.AP.{i}.AssociatedDevice.{i}.Stats."
-        access="readOnly" minEntries="1" maxEntries="1" status="obsoleted"
+        access="readOnly" minEntries="1" maxEntries="1" status="deleted"
         version="2.13">
       <description>
         Object describing the Statistics for a single Associated Device (STA).
@@ -35106,6 +36516,8 @@
         {{object|######.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.}}}}
 
         {{obsoleted|2.17}}
+
+        {{deleted|2.18}}
       </description>
 
       <parameter name="BytesSent" access="readOnly">
@@ -35179,7 +36591,7 @@
 
     <object
         name="Device.WiFi.MultiAP.APDevice.{i}.Radio.{i}.AP.{i}.AssociatedDevice.{i}.SteeringSummaryStats."
-        access="readOnly" minEntries="1" maxEntries="1" status="obsoleted"
+        access="readOnly" minEntries="1" maxEntries="1" status="deleted"
         version="2.13">
       <description>
         The summary of statistics related to Multi-AP Steering for an
@@ -35191,6 +36603,8 @@
         {{object|######.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.MultiAPSTA.SteeringSummaryStats.}}}}
 
         {{obsoleted|2.17}}
+
+        {{deleted|2.18}}
       </description>
 
       <parameter name="NoCandidateAPFailures" access="readOnly">
@@ -35289,7 +36703,7 @@
     <object
         name="Device.WiFi.MultiAP.APDevice.{i}.Radio.{i}.AP.{i}.AssociatedDevice.{i}.SteeringHistory.{i}."
         access="readOnly" numEntriesParameter="SteeringHistoryNumberOfEntries"
-        minEntries="0" maxEntries="unbounded" status="obsoleted" version="2.13">
+        minEntries="0" maxEntries="unbounded" status="deleted" version="2.13">
       <description>
         The history of Multi-AP Steering for an individual STA on the Wi-Fi
         network.
@@ -35300,6 +36714,8 @@
         {{object|######.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.MultiAPSTA.SteeringHistory.{i}.}}}}
 
         {{obsoleted|2.17}}
+
+        {{deleted|2.18}}
       </description>
       <uniqueKey functional="true">
         <parameter ref="Time"/>
@@ -35411,7 +36827,7 @@
           string format as defined in {{bibref|RFC3339|Section 3}}.
         </description>
         <syntax>
-          <string/>
+          <dateTime/>
         </syntax>
       </parameter>
 
@@ -35433,7 +36849,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="MSCSDisallowedStaList" access="readOnly">
+      <parameter name="MSCSDisallowedStaList" access="readOnly" version="2.15">
         <description>
           List of STAs for which Mirrored Stream Classification Service (MSCS)
           operation is disallowed.
@@ -35444,7 +36860,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SCSDisallowedStaList" access="readOnly">
+      <parameter name="SCSDisallowedStaList" access="readOnly" version="2.15">
         <description>
           List of STAs for which Stream Classification Service (SCS) operation
           is disallowed.
@@ -35455,7 +36871,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ColocatedAgentID" access="readOnly">
+      <parameter name="ColocatedAgentID" access="readOnly" version="2.17">
         <description>
           AL MAC address of the EasyMesh Agent that is co-located in the same
           device with the Wi-Fi EasyMesh Controller.
@@ -35467,7 +36883,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SSIDNumberOfEntries" access="readOnly">
+      <parameter name="SSIDNumberOfEntries" access="readOnly" version="2.15">
         <description>
           {{numentries}}
         </description>
@@ -35476,7 +36892,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="STABlockNumberOfEntries" access="readOnly">
+      <parameter name="STABlockNumberOfEntries" access="readOnly"
+          version="2.17">
         <description>
           {{numentries}}
         </description>
@@ -35485,7 +36902,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="PreferredBackhaulsNumberOfEntries" access="readOnly">
+      <parameter name="PreferredBackhaulsNumberOfEntries" access="readOnly"
+          version="2.17">
         <description>
           {{numentries}}
         </description>
@@ -35494,7 +36912,7 @@
         </syntax>
       </parameter>
 
-      <command name="SetTrafficSeparation()" async="true">
+      <command name="SetTrafficSeparation()" async="true" version="2.15">
         <description>
           This command allows or disallows EasyMesh traffic separation
           {{bibref|EasyMesh|Section 19.1}}. If {{param|Enable}} is {{true}}
@@ -35513,7 +36931,7 @@
         </description>
         <input>
 
-          <parameter name="Enable" mandatory="true">
+          <parameter name="Enable" mandatory="true" version="2.15">
             <description>
               : {{true}}: EasyMesh traffic separation is allowed.
 
@@ -35583,7 +37001,7 @@
         </output>
       </command>
 
-      <command name="SetServicePrioritization()" async="true">
+      <command name="SetServicePrioritization()" async="true" version="2.15">
         <description>
           This command allows or disallows EasyMesh service prioritization
           {{bibref|EasyMesh|Section 20}}. If {{param|Enable}} is {{true}} then
@@ -35602,7 +37020,7 @@
         </description>
         <input>
 
-          <parameter name="Enable" mandatory="true">
+          <parameter name="Enable" mandatory="true" version="2.15">
             <description>
               : {{true}}: EasyMesh service prioritization is allowed.
 
@@ -35613,62 +37031,7 @@
             </syntax>
           </parameter>
 
-          <object name="SPRule.{i}." minEntries="0" maxEntries="unbounded"
-              version="2.15">
-            <description>
-              This object describes a list of service prioritization (SP) rules
-              {{bibref|EasyMesh}}.
-
-              If this input is not provided, then existing
-              {{object|##.Device.{i}.SPRule.{i}.}} apply.
-            </description>
-            <uniqueKey functional="true">
-              <parameter ref="ID"/>
-            </uniqueKey>
-
-            <parameter name="ID">
-              <description>
-                Service prioritization rule Identifier.
-              </description>
-              <syntax>
-                <unsignedInt/>
-              </syntax>
-            </parameter>
-
-            <parameter name="Precedence">
-              <description>
-                Rule Precedence - higher number means higher priority.
-              </description>
-              <syntax>
-                <unsignedInt>
-                  <range maxInclusive="254"/>
-                </unsignedInt>
-              </syntax>
-            </parameter>
-
-            <parameter name="Output">
-              <description>
-                Rule Output. The value of, or method used to select the 802.1Q
-                C-TAG Priority Code Point (PCP) output value.
-              </description>
-              <syntax>
-                <unsignedInt>
-                  <range maxInclusive="9"/>
-                </unsignedInt>
-              </syntax>
-            </parameter>
-
-            <parameter name="AlwaysMatch">
-              <description>
-                Indicates if the rule always matches.
-              </description>
-              <syntax>
-                <boolean/>
-              </syntax>
-            </parameter>
-          </object>
-
-          <parameter name="DSCPMap">
+          <parameter name="DSCPMap" version="2.15">
             <description>
               A hexadecimal string of 64 PCP values (one octet per value)
               corresponding to the DSCP markings 0x00 to 0x3F, ordered by
@@ -35685,6 +37048,61 @@
               </hexBinary>
             </syntax>
           </parameter>
+
+          <object name="SPRule.{i}." minEntries="0" maxEntries="unbounded"
+              version="2.15">
+            <description>
+              This object describes a list of service prioritization (SP) rules
+              {{bibref|EasyMesh}}.
+
+              If this input is not provided, then existing
+              {{object|##.Device.{i}.SPRule.{i}.}} apply.
+            </description>
+            <uniqueKey functional="true">
+              <parameter ref="ID"/>
+            </uniqueKey>
+
+            <parameter name="ID" version="2.15">
+              <description>
+                Service prioritization rule Identifier.
+              </description>
+              <syntax>
+                <unsignedInt/>
+              </syntax>
+            </parameter>
+
+            <parameter name="Precedence" version="2.15">
+              <description>
+                Rule Precedence - higher number means higher priority.
+              </description>
+              <syntax>
+                <unsignedInt>
+                  <range maxInclusive="254"/>
+                </unsignedInt>
+              </syntax>
+            </parameter>
+
+            <parameter name="Output" version="2.15">
+              <description>
+                Rule Output. The value of, or method used to select the 802.1Q
+                C-TAG Priority Code Point (PCP) output value.
+              </description>
+              <syntax>
+                <unsignedInt>
+                  <range maxInclusive="9"/>
+                </unsignedInt>
+              </syntax>
+            </parameter>
+
+            <parameter name="AlwaysMatch" version="2.15">
+              <description>
+                Indicates if the rule always matches.
+              </description>
+              <syntax>
+                <boolean/>
+              </syntax>
+            </parameter>
+          </object>
         </input>
         <output>
 
@@ -35710,7 +37128,7 @@
         </output>
       </command>
 
-      <command name="SetPreferredBackhauls()" async="true">
+      <command name="SetPreferredBackhauls()" async="true" version="2.15">
         <description>
           This command sets preferred backhaul links for EasyMesh
           {{bibref|EasyMesh}} backhaul.
@@ -35745,7 +37163,8 @@
               </syntax>
             </parameter>
 
-            <parameter name="bSTAMACAddress" mandatory="true">
+            <parameter name="bSTAMACAddress" mandatory="true"
+                dmr:noNameCheck="true">
               <description>
                 The MAC address of the backhaul STA (bSTA), or similar Ethernet
                 interface, on this preferred backhaul link.
@@ -35780,7 +37199,7 @@
         </output>
       </command>
 
-      <command name="SetSSID()" async="true">
+      <command name="SetSSID()" async="true" version="2.15">
         <description>
           This command specifies an {{param|SSID}} for use across this Wi-Fi
           Multi-AP network, or on this single-AP. Also specifies the
@@ -35812,7 +37231,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="Enable">
+          <parameter name="Enable" version="2.17">
             <description>
               Enable or disable this {{param|SSID}}. Disable stops the use of
               this {{param|SSID}}, but the object is retained.
@@ -35826,7 +37245,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="AddRemoveChange" mandatory="true">
+          <parameter name="AddRemoveChange" mandatory="true" version="2.17">
             <description>
               Indicates whether to add, remove or change this {{param|SSID}}.
               {{enum}}
@@ -35928,7 +37347,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="AKMsAllowed">
+          <parameter name="AKMsAllowed" version="2.17">
             <description>
               {{list}} List items indicate Authentication and Key Management
               (AKM) suites/security modes allowed on this BSS. {{enum}}
@@ -35970,7 +37389,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="SuiteSelector">
+          <parameter name="SuiteSelector" version="2.17">
             <description>
               AKM suite selector, the AKM suite selector (OUI and type) is
               encoded as a 4-octet hex-encoded value without internal
@@ -35986,7 +37405,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="AdvertisementEnabled">
+          <parameter name="AdvertisementEnabled" version="2.17">
             <description>
               Indicates if the SSID is advertised in beacons, or not.
 
@@ -36000,7 +37419,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="MFPConfig">
+          <parameter name="MFPConfig" version="2.17">
             <description>
               Management Frame Protection (MFP) configuration. {{enum}}
             </description>
@@ -36013,7 +37432,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="MobilityDomain">
+          <parameter name="MobilityDomain" version="2.17">
             <description>
               The IEEE 802.11 mobility domain {{bibref|802.11-2020|Section
               9.4.2.46}}.
@@ -36024,7 +37443,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="HaulType">
+          <parameter name="HaulType" version="2.17">
             <description>
               Indicates the use of this {{param|SSID}}. {{enum}}
             </description>
@@ -36061,7 +37480,7 @@
         </output>
       </command>
 
-      <command name="SetMSCSDisallowed()" async="true">
+      <command name="SetMSCSDisallowed()" async="true" version="2.15">
         <description>
           This command disallows Mirrored Stream Classification Service (MSCS)
           service prioritization to particular STA(s). {{bibref|EasyMesh}}
@@ -36073,7 +37492,8 @@
         </description>
         <input>
 
-          <parameter name="MSCSDisallowedStaList" mandatory="true">
+          <parameter name="MSCSDisallowedStaList" mandatory="true"
+              version="2.15">
             <description>
               List of STAs for which MSCS operation is disallowed.
             </description>
@@ -36102,7 +37522,7 @@
         </output>
       </command>
 
-      <command name="SetSCSDisallowed()" async="true">
+      <command name="SetSCSDisallowed()" async="true" version="2.15">
         <description>
           This command disallows Stream Classification Service (SCS) service
           prioritization to particular STA(s). {{bibref|EasyMesh}}
@@ -36114,7 +37534,8 @@
         </description>
         <input>
 
-          <parameter name="SCSDisallowedStaList" mandatory="true">
+          <parameter name="SCSDisallowedStaList" mandatory="true"
+              version="2.15">
             <description>
               List of STAs for which SCS operation is disallowed.
             </description>
@@ -36152,8 +37573,8 @@
         Wi-Fi Multi-AP network, or on this single-AP. Also specifies the
         {{param|Band}} for each {{param|SSID}}.
 
-         Note that VLAN IDs (VIDs) can be configured per SSID with
-         {{object|#.Device.{i}.SSIDtoVIDMapping.{i}}}.
+        Note that VLAN IDs (VIDs) can be configured per SSID with
+        {{object|#.Device.{i}.SSIDtoVIDMapping.{i}}}.
       </description>
       <uniqueKey functional="false">
         <parameter ref="SSID"/>
@@ -36217,7 +37638,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Enable" access="readOnly">
+      <parameter name="Enable" access="readOnly" version="2.17">
         <description>
           Enable or disable of this {{param|SSID}}. Disable stops the use of
           this {{param|SSID}}, but the object is retained.
@@ -36231,7 +37652,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="AKMsAllowed" access="readOnly">
+      <parameter name="AKMsAllowed" access="readOnly" version="2.17">
         <description>
           {{list}} List items indicate Authentication and Key Management (AKM)
           suites/security modes allowed on this BSS. {{enum}}
@@ -36273,7 +37694,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SuiteSelector" access="readOnly">
+      <parameter name="SuiteSelector" access="readOnly" version="2.17">
         <description>
           AKM suite selector, the AKM suite selector (OUI and type) is encoded
           as a 4-octet hex-encoded value without internal delimiters, e.g.
@@ -36289,7 +37710,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="AdvertisementEnabled" access="readOnly">
+      <parameter name="AdvertisementEnabled" access="readOnly" version="2.17">
         <description>
           Indicates if the SSID is advertised in beacons, or not.
 
@@ -36302,7 +37723,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="MFPConfig" access="readOnly">
+      <parameter name="MFPConfig" access="readOnly" version="2.17">
         <description>
           Management Frame Protection (MFP) configuration. {{enum}}
         </description>
@@ -36315,7 +37736,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="MobilityDomain" access="readOnly">
+      <parameter name="MobilityDomain" access="readOnly" version="2.17">
         <description>
           The IEEE 802.11 mobility domain {{bibref|802.11-2020|Section
           9.4.2.46}}.
@@ -36325,7 +37746,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="HaulType" access="readOnly">
+      <parameter name="HaulType" access="readOnly" version="2.17">
         <description>
           Indicates the use of this {{param|SSID}}. {{enum}}
         </description>
@@ -36378,7 +37799,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="ScheduleNumberOfEntries" access="readOnly">
+      <parameter name="ScheduleNumberOfEntries" access="readOnly"
+          version="2.17">
         <description>
           {{numentries}}
         </description>
@@ -36400,12 +37822,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.17">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -36593,7 +38015,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="ReportUnsuccessfulAssociations" access="readWrite">
+      <parameter name="ReportUnsuccessfulAssociations" access="readWrite"
+          version="2.15">
         <description>
           Indicates whether the Multi-AP Agent or the single AP reports
           unsuccessful association attempts of client Stations (STAs) to the
@@ -36604,7 +38027,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="MaxReportingRate" access="readOnly">
+      <parameter name="MaxReportingRate" access="readOnly" version="2.15">
         <description>
           Maximum rate for reporting unsuccessful association attempts in
           {{units}}.
@@ -36616,7 +38039,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="APMetricsReportingInterval" access="readWrite">
+      <parameter name="APMetricsReportingInterval" access="readWrite"
+          version="2.15">
         <description>
           AP Metrics Reporting Interval.
 
@@ -36632,7 +38056,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="AssociatedSTAReportingInterval" access="readWrite">
+      <parameter name="AssociatedSTAReportingInterval" access="readWrite"
+          version="2.17">
         <description>
           Associated STA Reporting Interval.
 
@@ -36648,7 +38073,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Manufacturer" access="readOnly">
+      <parameter name="Manufacturer" access="readOnly" version="2.15">
         <description>
           Identifier of the manufacturer of the device.
 
@@ -36661,7 +38086,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SerialNumber" access="readOnly">
+      <parameter name="SerialNumber" access="readOnly" version="2.15">
         <description>
           Identifier of the particular Access Point device that is unique for
           the indicated model and manufacturer.
@@ -36678,7 +38103,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ManufacturerModel" access="readOnly">
+      <parameter name="ManufacturerModel" access="readOnly" version="2.15">
         <description>
           Identifier of the manufacturer model to help the user more easily
           identify a particular piece of equipment.
@@ -36692,7 +38117,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SoftwareVersion" access="readOnly">
+      <parameter name="SoftwareVersion" access="readOnly" version="2.15">
         <description>
           Identifier of the software version currently installed in the Access
           Point device (i.e. version of the overall firmware).
@@ -36706,7 +38131,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ExecutionEnv" access="readOnly">
+      <parameter name="ExecutionEnv" access="readOnly" version="2.15">
         <description>
           Identifier of the execution environment (operating system) in the
           device. This parameter can be an entry in the table
@@ -36721,7 +38146,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="DSCPMap" access="readOnly">
+      <parameter name="DSCPMap" access="readOnly" version="2.15">
         <description>
           A hexadecimal string of 64 Priority Code Point (PCP) values (one
           octet per value) corresponding to the Differentiated Services Code
@@ -36736,7 +38161,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="MaxPrioritizationRules" access="readOnly">
+      <parameter name="MaxPrioritizationRules" access="readOnly"
+          version="2.15">
         <description>
           The maximum total number of service prioritization rules supported by
           the Agent.
@@ -36748,7 +38174,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="PrioritizationSupport" access="readOnly">
+      <parameter name="PrioritizationSupport" access="readOnly" version="2.15">
         <description>
           Indicates support for Service Prioritization.
         </description>
@@ -36757,7 +38183,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="MaxVIDs" access="readOnly">
+      <parameter name="MaxVIDs" access="readOnly" version="2.15">
         <description>
           Max Total Number of unique VLAN IDs (VIDs) the Multi-AP Agent
           supports.
@@ -36767,7 +38193,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="APMetricsWiFi6" access="readOnly" status="deprecated">
+      <parameter name="APMetricsWiFi6" access="readOnly" version="2.15"
+          status="obsoleted">
         <description>
           Associated Wi-Fi6 STA Status Inclusion Policy.
 
@@ -36779,13 +38206,15 @@
 
           {{deprecated|2.16|because it was the same as
           {{param|Radio.{i}.APMetricsWiFi6}}.}}
+
+          {{obsoleted|2.18}}
         </description>
         <syntax>
           <boolean/>
         </syntax>
       </parameter>
 
-      <parameter name="CountryCode" access="readOnly">
+      <parameter name="CountryCode" access="readOnly" version="2.15">
         <description>
           Two-character country code in which the Multi-AP Agent is operating
           according to {{bibref|ISO3166-1}}. The characters are encoded as
@@ -36802,7 +38231,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="LocalSteeringDisallowedSTAList" access="readWrite">
+      <parameter name="LocalSteeringDisallowedSTAList" access="readWrite"
+          version="2.15">
         <description>
           {{list}} The STAs for which local steering is disallowed.
         </description>
@@ -36812,7 +38242,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="BTMSteeringDisallowedSTAList" access="readWrite">
+      <parameter name="BTMSteeringDisallowedSTAList" access="readWrite"
+          version="2.15">
         <description>
           {{list}} The STAs for which BSS Transition Management (BTM) steering
           is disallowed.
@@ -36823,7 +38254,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="DFSEnable" access="readOnly">
+      <parameter name="DFSEnable" access="readOnly" version="2.15">
         <description>
           Indicates if Dynamic Frequency Selection (DFS) is enabled or
           disabled.
@@ -36833,7 +38264,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="ReportIndependentScans" access="readWrite">
+      <parameter name="ReportIndependentScans" access="readWrite"
+          version="2.15">
         <description>
           Channel Scan Reporting Policy, Report Independent Channel Scans
 
@@ -36848,7 +38280,7 @@
       </parameter>
 
       <parameter name="AssociatedSTAinAPMetricsWiFi6" access="readWrite"
-          status="deprecated">
+          version="2.15" status="obsoleted">
         <description>
           For EasyMesh {{bibref|EasyMesh}}, this is the Associated Wi-Fi6 STA
           Status Inclusion Policy.
@@ -36861,6 +38293,8 @@
 
           {{deprecated|2.16|because it was the same as
           {{param|Radio.{i}.APMetricsWiFi6}}.}}
+
+          {{obsoleted|2.18}}
         </description>
         <syntax>
           <boolean/>
@@ -36868,7 +38302,7 @@
       </parameter>
 
       <parameter name="MaxUnsuccessfulAssociationReportingRate"
-          access="readWrite">
+          access="readWrite" version="2.15">
         <description>
           For EasyMesh {{bibref|EasyMesh}}, this is the maximum rate for
           reporting unsuccessful association attempts (in attempts per
@@ -36881,7 +38315,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="STASteeringState" access="readOnly">
+      <parameter name="STASteeringState" access="readOnly" version="2.15">
         <description>
           Indicates if EasyMesh {{bibref|EasyMesh}} controller-initiated
           station steering is disallowed or allowed on this device.
@@ -36896,7 +38330,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="CoordinatedCACAllowed" access="readWrite">
+      <parameter name="CoordinatedCACAllowed" access="readWrite"
+          version="2.15">
         <description>
           Allow or disallow the use of EasyMesh {{bibref|EasyMesh}} Coordinated
           Channel Availability Check (CAC) on this device.
@@ -36910,7 +38345,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="TrafficSeparationAllowed" access="readOnly">
+      <parameter name="TrafficSeparationAllowed" access="readOnly"
+          version="2.15">
         <description>
           This parameter indicates if EasyMesh traffic separation
           {{bibref|EasyMesh|Section 19.1}} is allowed or disallowed.
@@ -36920,7 +38356,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="ServicePrioritizationAllowed" access="readOnly">
+      <parameter name="ServicePrioritizationAllowed" access="readOnly"
+          version="2.15">
         <description>
           This parameter indicates if EasyMesh service prioritization
           {{bibref|EasyMesh|Section 20}} is allowed or disallowed.
@@ -36930,7 +38367,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="ControllerOperationMode" access="readOnly">
+      <parameter name="ControllerOperationMode" access="readOnly"
+          version="2.17">
         <description>
           This parameter represents the status of Wi-Fi EasyMesh controller
           functionality. {{enum}}
@@ -36954,7 +38392,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="BackhaulMACAddress" access="readOnly">
+      <parameter name="BackhaulMACAddress" access="readOnly" version="2.17">
         <description>
           The MAC address of the interface on the network that is providing the
           backhaul for this EasyMesh Agent. For Wi-Fi backhaul, this is the
@@ -36965,7 +38403,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="BackhaulALID" access="readOnly">
+      <parameter name="BackhaulALID" access="readOnly" version="2.17">
         <description>
           The IEEE 1905 {{bibref|IEEE1905.1a}} Abstraction-Layer ID (ALID) of
           the EasyMesh Agent on the network that is providing the backhaul for
@@ -36976,7 +38414,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="BackhaulDownMACAddress" access="readOnly">
+      <parameter name="BackhaulDownMACAddress" access="readOnly"
+          version="2.17">
         <description>
           {{list}} Each MAC address is that of a downstream EasyMesh agent's
           backhaul link.
@@ -36987,7 +38426,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="BackhaulMediaType" access="readOnly">
+      <parameter name="BackhaulMediaType" access="readOnly" version="2.17">
         <description>
           Media type of the backhaul link of this EasyMesh Agent.
 
@@ -37047,7 +38486,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="BackhaulPHYRate" access="readOnly">
+      <parameter name="BackhaulPHYRate" access="readOnly" version="2.17">
         <description>
           The Physical Layer (PHY) rate in {{units}} on the backhaul link of
           this EasyMesh agent.
@@ -37059,7 +38498,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="TrafficSeparationCapability" access="readOnly">
+      <parameter name="TrafficSeparationCapability" access="readOnly"
+          version="2.17">
         <description>
           Indicator of EasyMesh Agent capability to support EasyMesh
           {{bibref|EasyMesh}} 802.1Q C-TAG Traffic Separation.
@@ -37069,7 +38509,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="EasyConnectCapability" access="readOnly">
+      <parameter name="EasyConnectCapability" access="readOnly" version="2.17">
         <description>
           Indicator of the device capability to support Wi-Fi Easy Connect
           onboarding.
@@ -37082,7 +38522,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="TestCapabilities" access="readOnly">
+      <parameter name="TestCapabilities" access="readOnly" version="2.17">
         <description>
           Indicates EasyMesh agent support for running a throughput or latency
           test.
@@ -37113,7 +38553,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="Default8021QNumberOfEntries" access="readOnly">
+      <parameter name="Default8021QNumberOfEntries" access="readOnly"
+          version="2.15">
         <description>
           {{numentries}}
         </description>
@@ -37122,7 +38563,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="SSIDtoVIDMappingNumberOfEntries" access="readOnly">
+      <parameter name="SSIDtoVIDMappingNumberOfEntries" access="readOnly"
+          version="2.15">
         <description>
           {{numentries}}
         </description>
@@ -37131,7 +38573,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="CACStatusNumberOfEntries" access="readOnly">
+      <parameter name="CACStatusNumberOfEntries" access="readOnly"
+          version="2.15">
         <description>
           {{numentries}}
         </description>
@@ -37140,7 +38583,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="IEEE1905SecurityNumberOfEntries" access="readOnly">
+      <parameter name="IEEE1905SecurityNumberOfEntries" access="readOnly"
+          version="2.15">
         <description>
           {{numentries}}
         </description>
@@ -37149,7 +38593,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SPRuleNumberOfEntries" access="readOnly">
+      <parameter name="SPRuleNumberOfEntries" access="readOnly" version="2.15">
         <description>
           {{numentries}}
         </description>
@@ -37158,7 +38602,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="AnticipatedChannelsNumberOfEntries" access="readOnly">
+      <parameter name="AnticipatedChannelsNumberOfEntries" access="readOnly"
+          version="2.15">
         <description>
           {{numentries}}
         </description>
@@ -37168,7 +38613,7 @@
       </parameter>
 
       <parameter name="AnticipatedChannelUsageNumberOfEntries"
-          access="readOnly">
+          access="readOnly" version="2.15">
         <description>
           {{numentries}}
         </description>
@@ -37177,7 +38622,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="MaxNumMLDs" access="readOnly">
+      <parameter name="MaxNumMLDs" access="readOnly" version="2.17">
         <description>
           The maximum number of MLDs that the EasyMesh Agent can support.
           {{bibref|EasyMesh}} source: Wi-Fi 7 Agent Capabilities TLV.
@@ -37187,7 +38632,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="APMLDMaxLinks" access="readOnly">
+      <parameter name="APMLDMaxLinks" access="readOnly" version="2.17">
         <description>
           The maximum number of affiliated APs supported by any APMLD on this
           EasyMesh Agent. Set to a value between 0 and 14, which is the number
@@ -37201,7 +38646,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="bSTAMLDMaxLinks" access="readOnly">
+      <parameter name="bSTAMLDMaxLinks" access="readOnly" version="2.17"
+          dmr:noNameCheck="true">
         <description>
           The maximum number of affiliated bSTAs supported by the bSTAMLD on
           this EasyMesh Agent. Set to a value between 0 and 14, which is the
@@ -37215,7 +38661,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="TIDLinkMapCapability" access="readOnly">
+      <parameter name="TIDLinkMapCapability" access="readOnly" version="2.17">
         <description>
           Indicates the EasyMesh Agent support for TID to Link mapping.
           {{bibref|EasyMesh}} source: Wi-Fi 7 Agent Capabilities TLV. {{enum}}
@@ -37243,7 +38689,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="APMLDNumberOfEntries" access="readOnly">
+      <parameter name="APMLDNumberOfEntries" access="readOnly" version="2.17">
         <description>
           {{numentries}}
         </description>
@@ -37252,7 +38698,7 @@
         </syntax>
       </parameter>
 
-      <command name="SetSTASteeringState()" async="true">
+      <command name="SetSTASteeringState()" async="true" version="2.15">
         <description>
           Disallow or allow EasyMesh {{bibref|EasyMesh}} controller-initiated
           station (STA) steering on this device.
@@ -37261,7 +38707,7 @@
         </description>
         <input>
 
-          <parameter name="Disallowed" mandatory="true">
+          <parameter name="Disallowed" mandatory="true" version="2.15">
             <description>
               : {{true}}: EasyMesh controller-initiated station steering
                 disallowed;
@@ -37293,7 +38739,7 @@
         </output>
       </command>
 
-      <command name="SetDFSState()" async="true">
+      <command name="SetDFSState()" async="true" version="2.15">
         <description>
           Enables/disables the use of Dynamic Frequency Selection (DFS)
           channels on this device.
@@ -37302,7 +38748,7 @@
         </description>
         <input>
 
-          <parameter name="DFSEnable" mandatory="true">
+          <parameter name="DFSEnable" mandatory="true" version="2.15">
             <description>
               : {{true}}: the use of Dynamic Frequency Selection (DFS) channels
                 is allowed;
@@ -37334,7 +38780,8 @@
         </output>
       </command>
 
-      <command name="SetAnticipatedChannelPreference()" async="true">
+      <command name="SetAnticipatedChannelPreference()" async="true"
+          version="2.15">
         <description>
           This command requests to set the Anticipated Channel Preference. The
           operating classes, and list of channels for each operating class, are
@@ -37387,7 +38834,7 @@
         </output>
       </command>
 
-      <command name="InitiateWPSPBC()" async="true">
+      <command name="InitiateWPSPBC()" async="true" version="2.17">
         <description>
           Initiates a Wi-Fi Protected Setup (WPS) Push Button Configuration
           (PBC) process as defined in {{bibref|WPS 2.0}} .
@@ -37470,7 +38917,7 @@
         <parameter ref="SSID"/>
       </uniqueKey>
 
-      <parameter name="SSID" access="readOnly">
+      <parameter name="SSID" access="readOnly" version="2.15">
         <description>
           The SSID.
         </description>
@@ -37481,7 +38928,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="VID" access="readOnly">
+      <parameter name="VID" access="readOnly" version="2.15">
         <description>
           The VLAN ID (VID).
         </description>
@@ -37552,6 +38999,7 @@
       </description>
       <uniqueKey functional="true">
         <parameter ref="OpClass"/>
+        <parameter ref="Channel"/>
       </uniqueKey>
 
       <parameter name="OpClass" access="readOnly">
@@ -37603,6 +39051,7 @@
       </description>
       <uniqueKey functional="true">
         <parameter ref="OpClass"/>
+        <parameter ref="Channel"/>
       </uniqueKey>
 
       <parameter name="OpClass" access="readOnly">
@@ -37653,6 +39102,7 @@
       </description>
       <uniqueKey functional="true">
         <parameter ref="OpClass"/>
+        <parameter ref="Channel"/>
       </uniqueKey>
 
       <parameter name="OpClass" access="readOnly">
@@ -37701,7 +39151,7 @@
         <parameter ref="ID"/>
       </uniqueKey>
 
-      <parameter name="ID" access="readOnly">
+      <parameter name="ID" access="readOnly" version="2.15">
         <description>
           Service prioritization rule Identifier.
         </description>
@@ -37710,7 +39160,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Precedence" access="readOnly">
+      <parameter name="Precedence" access="readOnly" version="2.15">
         <description>
           Rule Precedence - higher number means higher priority.
         </description>
@@ -37721,7 +39171,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Output" access="readOnly">
+      <parameter name="Output" access="readOnly" version="2.15">
         <description>
           Rule Output. The value of, or method used to select, the 802.1Q C-TAG
           Priority Code Point (PCP) output value.
@@ -37733,7 +39183,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="AlwaysMatch" access="readOnly">
+      <parameter name="AlwaysMatch" access="readOnly" version="2.15">
         <description>
           Indicates if the rule always matches.
         </description>
@@ -37806,7 +39256,7 @@
         <parameter ref="OpClass"/>
       </uniqueKey>
 
-      <parameter name="OpClass" access="readOnly">
+      <parameter name="OpClass" access="readOnly" version="2.15">
         <description>
           The Operating Class per {{bibref|802.11-2020|Table E-4}}.
 
@@ -37819,7 +39269,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ChannelList" access="readOnly">
+      <parameter name="ChannelList" access="readOnly" version="2.15">
         <description>
           {{list}} The channel numbers in this Operating Class which have
           anticipated channel preference.
@@ -37936,7 +39386,7 @@
 
           : 0 = single burst,
 
-          : 2^32-1 = indefinite/unknown.
+          : 2^32^-1 = indefinite/unknown.
         </description>
         <syntax>
           <unsignedInt/>
@@ -38051,7 +39501,7 @@
         This object represents an individual Access Point device.
       </description>
 
-      <parameter name="ManufacturerOUI" access="readOnly">
+      <parameter name="ManufacturerOUI" access="readOnly" status="deprecated">
         <description>
           Organizationally unique identifier of the Access Point device
           manufacturer. Represented as a six hexadecimal-digit value using all
@@ -38065,6 +39515,9 @@
           If the instance of this {{object}} is the same as {{object|Device.}},
           then this parameter is the same as
           {{param|Device.DeviceInfo.ManufacturerOUI}}.
+
+          {{deprecated|2.18|because it was essentially the same as
+          {{param|#.Manufacturer}}.}}
         </description>
         <syntax>
           <string>
@@ -38101,10 +39554,14 @@
         </syntax>
       </parameter>
 
-      <parameter name="EasyMeshControllerOperationMode" access="readOnly">
+      <parameter name="EasyMeshControllerOperationMode" access="readOnly"
+          status="deprecated">
         <description>
           This parameter represents the status of Wi-Fi CERTIFIED EasyMeshTM
           controller functionality. {{enum}}
+
+          {{deprecated|2.18|because it was the same as
+          {{param|#.ControllerOperationMode}}.}}
         </description>
         <syntax>
           <string>
@@ -38158,23 +39615,23 @@
         The endpoints of the backhaul interface are represented by the
         (Device's ID and interface MAC Address). This object represents the
         upward view of the backhaul interface. The two endpoints of the
-        backhaul interface are - ({{param|BackhaulDeviceID}},
-        {{param|BackhaulMACAddress}}) of the uplinked Backhaul Device -
-        {{param|MACAddress}} of this Access Point Device
-
-            {{param|BackhaulDeviceID}} / {{param|BackhaulMACAddress}} &lt;--
-            {{param|LinkType}} --- &lt; {{param|MACAddress}}
+        backhaul interface are - ({{param|BackhaulDeviceID|deprecated}},
+        {{param|BackhaulMACAddress|deprecated}}) of the uplinked Backhaul
+        Device - {{param|MACAddress|deprecated}} of this Access Point Device.
 
         {{empty}} is reserved for the {{object}} instance that represents the
         Multi-AP Controller.
       </description>
 
-      <parameter name="LinkType" access="readOnly">
+      <parameter name="LinkType" access="readOnly" status="deprecated">
         <description>
           The medium being used to backhaul this Access Point Device to the
           Backhaul Access Point Device. The {{enum|None}} value is reserved for
           the {{object}} instance that represents the Multi-AP Controller.
           {{enum}}
+
+          {{deprecated|2.18|because it was essentially the same as
+          {{param|##.BackhaulMediaType}}.}}
         </description>
         <syntax>
           <string>
@@ -38190,37 +39647,47 @@
         </syntax>
       </parameter>
 
-      <parameter name="BackhaulMACAddress" access="readOnly">
+      <parameter name="BackhaulMACAddress" access="readOnly"
+          status="deprecated">
         <description>
           The MAC Address at the far end of the backhaul link of the interface
           on the network that is providing a backhaul for this Access Point
-          Device. This along with {{param|BackhaulDeviceID}}, helps to identfy
-          the backhaul interface endpoint.
+          Device. This along with {{param|BackhaulDeviceID|deprecated}}, helps
+          to identify the backhaul interface endpoint.
 
           {{empty}} is reserved for the {{object}} instance that represents the
           Multi-AP Controller.
+
+          {{deprecated|2.18|because it was the same as
+          {{param|##.BackhaulMACAddress}}.}}
         </description>
         <syntax>
           <dataType ref="MACAddress"/>
         </syntax>
       </parameter>
 
-      <parameter name="BackhaulDeviceID" access="readOnly">
+      <parameter name="BackhaulDeviceID" access="readOnly" status="deprecated">
         <description>
           The Device's ID of the Device on the network that is providing a
           Backhaul Link for this Access Point Device.
+
+          {{deprecated|2.18|because it was essentially the same as
+          {{param|##.BackhaulALID}}.}}
         </description>
         <syntax>
           <dataType ref="MACAddress"/>
         </syntax>
       </parameter>
 
-      <parameter name="MACAddress" access="readOnly">
+      <parameter name="MACAddress" access="readOnly" status="deprecated">
         <description>
           The MAC Address at the near end of the backhaul link of this Access
           Point Device's backhaul interface that is connecting via
-          {{param|LinkType}} to {{param|BackhaulMACAddress}} of the Backhaul
-          Device identified by {{param|BackhaulDeviceID}}.
+          {{param|##.BackhaulMediaType}} to {{param|BackhaulMACAddress}} of the
+          Backhaul Device identified by {{param|BackhaulDeviceID}}.
+
+          {{deprecated|2.18|because it was the same as
+          {{param|##.Radio.{i}.BackhaulSta.MACAddress}}.}}
         </description>
         <syntax>
           <dataType ref="MACAddress"/>
@@ -38237,7 +39704,7 @@
         </syntax>
       </parameter>
 
-      <command name="SteerWiFiBackhaul()" async="true">
+      <command name="SteerWiFiBackhaul()" async="true" version="2.15">
         <description>
           This command requests the Wi-Fi backhaul link to be steered to
           associate to a different BSS when the device is working as a bridge
@@ -38249,7 +39716,7 @@
         </description>
         <input>
 
-          <parameter name="TargetBSS" mandatory="true">
+          <parameter name="TargetBSS" mandatory="true" version="2.15">
             <description>
               Basic Service Set Identifier (BSSID) of the target BSS which the
               associated device(s) is to be associated to.
@@ -38259,7 +39726,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="Channel">
+          <parameter name="Channel" version="2.15">
             <description>
               The number of the Wi-Fi channel the backhaul BSS is to be
               associated to. If {{param}} is not specified, then the radio is
@@ -38271,7 +39738,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="TimeOut" mandatory="true">
+          <parameter name="TimeOut" mandatory="true" version="2.15">
             <description>
               The maximum timeout for this backhaul steering to occur in
               {{units}}.
@@ -38383,8 +39850,8 @@
       <parameter name="BytesSent" access="readOnly">
         <description>
           The total number of bytes transmitted across the backhaul medium (as
-          identified by the value of the {{param|#.LinkType}} parameter),
-          including framing characters.
+          identified by the value of the {{param|###.BackhaulMediaType}}}}
+          parameter), including framing characters.
         </description>
         <syntax>
           <dataType ref="StatsCounter64"/>
@@ -38394,8 +39861,8 @@
       <parameter name="BytesReceived" access="readOnly">
         <description>
           The total number of bytes received across the backhaul medium (as
-          identified by the value of the {{param|#.LinkType}} parameter),
-          including framing characters.
+          identified by the value of the {{param|###.BackhaulMediaType}}
+          parameter), including framing characters.
         </description>
         <syntax>
           <dataType ref="StatsCounter64"/>
@@ -38405,8 +39872,8 @@
       <parameter name="PacketsSent" access="readOnly">
         <description>
           The total number of packets transmitted across the backhaul medium
-          (as identified by the value of the {{param|#.LinkType}} parameter),
-          including framing characters.
+          (as identified by the value of the {{param|###.BackhaulMediaType}}
+          parameter), including framing characters.
         </description>
         <syntax>
           <dataType ref="StatsCounter64"/>
@@ -38416,8 +39883,8 @@
       <parameter name="PacketsReceived" access="readOnly">
         <description>
           The total number of packets received across the backhaul medium (as
-          identified by the value of the {{param|#.LinkType}} parameter),
-          including framing characters.
+          identified by the value of the {{param|###.BackhaulMediaType}}
+          parameter), including framing characters.
         </description>
         <syntax>
           <dataType ref="StatsCounter64"/>
@@ -38447,10 +39914,10 @@
       <parameter name="LinkUtilization" access="readOnly">
         <description>
           Current utilization (expressed in {{units}}) of the medium (as
-          identified by the value of the {{param|#.LinkType}} parameter) being
-          used to backhaul this Access Point device to the Multi-AP Controller.
-          A value of 0 is used for the {{object}} instance that represents the
-          Access Point on the Multi-AP Controller.
+          identified by the value of the {{param|###.BackhaulMediaType}}
+          parameter) being used to backhaul this Access Point device to the
+          Multi-AP Controller. A value of 0 is used for the {{object}} instance
+          that represents the Access Point on the Multi-AP Controller.
         </description>
         <syntax>
           <unsignedInt>
@@ -38466,8 +39933,8 @@
           Access Point (AP) to the Multi-AP Controller, measured in {{units}}.
           RCPI is encoded per {{bibref|802.11-2020|Table 9-176}}. The value of
           this parameter is indeterminate if the value of the
-          {{param|#.LinkType}} parameter is anything other than
-          {{enum|Wi-Fi|#.LinkType}}.
+          {{param|###.BackhaulMediaType}} parameter is anything other than a
+          type of IEEE 802.11 Wi-Fi.
         </description>
         <syntax>
           <unsignedInt>
@@ -38572,7 +40039,7 @@
           with 255 representing 100%) that the Access Point device sensed the
           medium was busy, as indicated by either the physical or virtual
           carier sense (CS) mechanism. This is essentially the amount of time
-          spent transmiting (both successful and failed transmissions),
+          spent transmitting (both successful and failed transmissions),
           receiving (both local and non-local transmissions), and processing
           noise {{bibref|802.11-2020|Section 9.4.2.27}}.
 
@@ -38630,7 +40097,7 @@
           (linearly scaled with 255 representing 100%) that the radio has spent
           on receiving individually or group addressed non-local transmissions
           (i.e. valid IEEE 802.11 PPDUs that are not associated with any BSS
-          operatin gon this radio).
+          operating on this radio).
 
           When more than one channel is in use for the BSS operating on the
           radio, the {{param}} value is calculated only for the primary
@@ -38643,7 +40110,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="TrafficSeparationCombinedFronthaul" access="readOnly">
+      <parameter name="TrafficSeparationCombinedFronthaul" access="readOnly"
+          version="2.15">
         <description>
           Indicates traffic separation on combined fronthaul and Profile-1
           backhaul support {{bibref|EasyMesh}}.
@@ -38653,7 +40121,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="TrafficSeparationCombinedBackhaul" access="readOnly">
+      <parameter name="TrafficSeparationCombinedBackhaul" access="readOnly"
+          version="2.15">
         <description>
           Indicates traffic separation on combined Profile-1 backhaul and
           Profile-2 backhaul support {{bibref|EasyMesh}}.
@@ -38663,7 +40132,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SteeringPolicy" access="readWrite">
+      <parameter name="SteeringPolicy" access="readWrite" version="2.15">
         <description>
           Steering Policy:
 
@@ -38681,7 +40150,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="ChannelUtilizationThreshold" access="readWrite">
+      <parameter name="ChannelUtilizationThreshold" access="readWrite"
+          version="2.15">
         <description>
           Channel Utilization Threshold (defined per Basic Service Set (BSS)
           Load element {{bibref|802.11-2020|Section 9.4.2.27}}.).
@@ -38693,7 +40163,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="RCPISteeringThreshold" access="readWrite">
+      <parameter name="RCPISteeringThreshold" access="readWrite"
+          version="2.15">
         <description>
           RCPI Steering Threshold (encoded per {{bibref|802.11-2020|Table
           9-176}}).
@@ -38705,7 +40176,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="STAReportingRCPIThreshold" access="readWrite">
+      <parameter name="STAReportingRCPIThreshold" access="readWrite"
+          version="2.15">
         <description>
           Station (STA) Metrics Reporting RCPI Threshold.
 
@@ -38722,7 +40194,7 @@
       </parameter>
 
       <parameter name="STAReportingRCPIHysteresisMarginOverride"
-          access="readWrite">
+          access="readWrite" version="2.15">
         <description>
           STA Metrics Reporting RCPI Hysteresis Margin Override.
 
@@ -38740,7 +40212,7 @@
       </parameter>
 
       <parameter name="ChannelUtilizationReportingThreshold"
-          access="readWrite">
+          access="readWrite" version="2.15">
         <description>
           AP Metrics Channel Utilization Reporting Threshold.
 
@@ -38756,7 +40228,7 @@
       </parameter>
 
       <parameter name="AssociatedSTATrafficStatsInclusionPolicy"
-          access="readWrite">
+          access="readWrite" version="2.15">
         <description>
           Associated STA Traffic Stats Inclusion Policy.
 
@@ -38772,7 +40244,7 @@
       </parameter>
 
       <parameter name="AssociatedSTALinkMetricsInclusionPolicy"
-          access="readWrite">
+          access="readWrite" version="2.15">
         <description>
           Associated STA Link Metrics Inclusion Policy.
 
@@ -38787,7 +40259,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ChipsetVendor" access="readOnly">
+      <parameter name="ChipsetVendor" access="readOnly" version="2.15">
         <description>
           A string identifying the Wi-Fi chip vendor of this radio in the
           device.
@@ -38797,7 +40269,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="APMetricsWiFi6" access="readWrite">
+      <parameter name="APMetricsWiFi6" access="readWrite" version="2.15">
         <description>
           Associated Wi-Fi6 STA Status Inclusion Policy.
 
@@ -38840,7 +40312,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="ScanResultNumberOfEntries" access="readOnly">
+      <parameter name="ScanResultNumberOfEntries" access="readOnly"
+          version="2.14">
         <description>
           {{numentries}}
         </description>
@@ -38850,7 +40323,7 @@
       </parameter>
 
       <parameter name="DisAllowedOpClassChannelsNumberOfEntries"
-          access="readOnly">
+          access="readOnly" version="2.15">
         <description>
           {{numentries}}
         </description>
@@ -38859,7 +40332,7 @@
         </syntax>
       </parameter>
 
-      <command name="ChannelScanRequest()" async="true">
+      <command name="ChannelScanRequest()" async="true" version="2.15">
         <description>
           Request to initiate a channel scan. The operating classes, and list
           of channels for each operating class, are input. If no operating
@@ -38902,7 +40375,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="ScanType">
+          <parameter name="ScanType" version="2.17">
             <description>
               Indicates the type of scan to perform. If this is omitted, or is
               not supported by the device, then it should be ignored. {{enum}}
@@ -38917,7 +40390,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="DwellTime">
+          <parameter name="DwellTime" version="2.17">
             <description>
               The duration of the time to scan each channel in {{units}}. A
               value of 50 {{units}} is suggested.
@@ -38932,7 +40405,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="DFSDwellTime">
+          <parameter name="DFSDwellTime" version="2.17">
             <description>
               The duration of time to scan each Dynamic Frequency Selection
               (DFS) channel in {{units}}. Note that this is the time to scan
@@ -38949,7 +40422,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="HomeTime">
+          <parameter name="HomeTime" version="2.17">
             <description>
               The time in {{units}} after which the driver has to go back to
               the original channel before scanning the next channel to avoid
@@ -38984,7 +40457,7 @@
         </output>
       </command>
 
-      <command name="RadioEnable()" async="true">
+      <command name="RadioEnable()" async="true" version="2.15">
         <description>
           Request to enable or disable this radio.
 
@@ -38996,7 +40469,7 @@
         </description>
         <input>
 
-          <parameter name="Enable" mandatory="true">
+          <parameter name="Enable" mandatory="true" version="2.15">
             <description>
               : {{true}}: this radio is to be enabled.
 
@@ -39026,7 +40499,7 @@
         </output>
       </command>
 
-      <command name="SetTxPowerLimit()" async="true">
+      <command name="SetTxPowerLimit()" async="true" version="2.15">
         <description>
           This command sets the upper limit on transmit power
           {{param|TransmitPowerLimit}} for this radio and
@@ -39084,7 +40557,7 @@
         </output>
       </command>
 
-      <command name="SetSpatialReuse()" async="true">
+      <command name="SetSpatialReuse()" async="true" version="2.15">
         <description>
           This command sets the spatial reuse configuration of this radio.
           Applies only to Wi-Fi 6 and possibly later generations of radios.
@@ -39268,7 +40741,7 @@
         </output>
       </command>
 
-      <command name="WiFiRestart()" async="true">
+      <command name="WiFiRestart()" async="true" version="2.15">
         <description>
           Request a restart of the Wi-Fi subsystem.
         </description>
@@ -39308,11 +40781,11 @@
           string format as defined in {{bibref|RFC3339|Section 3}}.
         </description>
         <syntax>
-          <string/>
+          <dateTime/>
         </syntax>
       </parameter>
 
-      <parameter name="AggregateScanDuration" access="readOnly">
+      <parameter name="AggregateScanDuration" access="readOnly" version="2.17">
         <description>
           Total time spent performing the scan of this channel in {{units}}.
         </description>
@@ -39323,7 +40796,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ScanType" access="readOnly">
+      <parameter name="ScanType" access="readOnly" version="2.17">
         <description>
           Indicates whether the scan was performed passively (false) or with
           active probing (true).
@@ -39411,7 +40884,7 @@
           3}}.
         </description>
         <syntax>
-          <string/>
+          <dateTime/>
         </syntax>
       </parameter>
 
@@ -39442,7 +40915,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ScanStatus" access="readOnly">
+      <parameter name="ScanStatus" access="readOnly" version="2.17">
         <description>
           Status code to indicate whether a scan has been performed and if not
           the reason for failure {{enum}}
@@ -39571,7 +41044,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="MLDMACAddress" access="readOnly">
+      <parameter name="MLDMACAddress" access="readOnly" version="2.17">
         <description>
           The Multi-Link Device (MLD) MAC address of the Multi-Link Operation
           (MLO) capable access point this neighboring BSS is affiliated to.
@@ -39582,7 +41055,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ReportingBSSID" access="readOnly">
+      <parameter name="ReportingBSSID" access="readOnly" version="2.17">
         <description>
           The BSSID of the reporting BSSID if different from {{param|BSSID}}.
           This will be set if the NeigborBSS was discovered through, for
@@ -39594,7 +41067,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="MultiBSSID" access="readOnly">
+      <parameter name="MultiBSSID" access="readOnly" version="2.17">
         <description>
           Indicates if the neighboring BSS is part of a MultiBSSID set and may
           be a non-transmitted BSSID.
@@ -39604,7 +41077,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="BSSLoadElementPresent" access="readOnly">
+      <parameter name="BSSLoadElementPresent" access="readOnly" version="2.17">
         <description>
           Set to true if the neighbour BSS Beacon/Probe Responses include a
           BSSLoad Element as defined in {{bibref|802.11-2020|Section
@@ -39615,7 +41088,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="BSSColor" access="readOnly">
+      <parameter name="BSSColor" access="readOnly" version="2.17">
         <description>
           Set to the BSS Color from the BSS Color Information field in the
           BSS's HE Operation element.
@@ -39654,7 +41127,7 @@
         This object describes the channel scan capabilities of a radio.
       </description>
 
-      <parameter name="OnBootOnly" access="readOnly">
+      <parameter name="OnBootOnly" access="readOnly" version="2.15">
         <description>
           On boot only flag, Indicates whether the specified radio is capable
           only of On boot scans.
@@ -39664,7 +41137,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Impact" access="readOnly">
+      <parameter name="Impact" access="readOnly" version="2.15">
         <description>
           Scan Impact of using this radio to perform a scan.
 
@@ -39678,12 +41151,12 @@
         </description>
         <syntax>
           <unsignedInt>
-            <range maxInclusive="3"/>
+            <range minInclusive="1" maxInclusive="4"/>
           </unsignedInt>
         </syntax>
       </parameter>
 
-      <parameter name="MinimumInterval" access="readOnly">
+      <parameter name="MinimumInterval" access="readOnly" version="2.15">
         <description>
           Minimum Scan Interval, the minimum interval in {{units}} between the
           start of two consecutive channel scans on this radio.
@@ -39718,7 +41191,7 @@
         <parameter ref="OpClass"/>
       </uniqueKey>
 
-      <parameter name="OpClass" access="readOnly">
+      <parameter name="OpClass" access="readOnly" version="2.15">
         <description>
           The Operating Class per {{bibref|802.11-2020|Table E-4}} For 2.4GHz
           and 5GHz bands, only 20MHz Operating Classes are valid.
@@ -39888,7 +41361,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="HECapabilities" access="readOnly" status="obsoleted">
+      <parameter name="HECapabilities" access="readOnly" status="deleted">
         <description>
           Describes the HE capabilities of the radio as defined by the
           HECapabilities TLV {{bibref|EasyMesh|Section 17.2.10}}.
@@ -39897,6 +41370,8 @@
           and {{object|WiFi6bSTARole}}}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <base64>
@@ -39905,7 +41380,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="MSCSCapability" access="readOnly">
+      <parameter name="MSCSCapability" access="readOnly" version="2.17">
         <description>
           This parameter indicates support for Mirrored Stream Classification
           Service (MSCS) and EasyMesh configuration of MSCS
@@ -39916,7 +41391,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SCSCapability" access="readOnly">
+      <parameter name="SCSCapability" access="readOnly" version="2.17">
         <description>
           This parameter indicates support for Stream Classification Service
           (SCS) and EasyMesh {{bibref|EasyMesh}} configuration of SCS
@@ -39927,7 +41402,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="QoSMapCapability" access="readOnly">
+      <parameter name="QoSMapCapability" access="readOnly" version="2.17">
         <description>
           This parameter indicates support for QoS Map {{bibref|EasyMesh|AP
           Radio Advanced Capabilities TLV}}.
@@ -39937,7 +41412,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="DSCPPolicyCapability" access="readOnly">
+      <parameter name="DSCPPolicyCapability" access="readOnly" version="2.17">
         <description>
           This parameter indicates support for DSCP Mapping Table TLV based
           DSCP-to-UP mapping and EasyMesh distribution of QoS Map elements to
@@ -39949,7 +41424,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="SCSTrafficDescriptionCapability" access="readOnly">
+      <parameter name="SCSTrafficDescriptionCapability" access="readOnly"
+          version="2.17">
         <description>
           This parameter indicates support for QoS Management Stream
           Classification Service (SCS) Traffic Description and EasyMesh
@@ -39971,7 +41447,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="AKMFrontHaulNumberOfEntries" access="readOnly">
+      <parameter name="AKMFrontHaulNumberOfEntries" access="readOnly"
+          version="2.15">
         <description>
           {{numentries}}
         </description>
@@ -39980,7 +41457,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="AKMBackhaulNumberOfEntries" access="readOnly">
+      <parameter name="AKMBackhaulNumberOfEntries" access="readOnly"
+          version="2.15">
         <description>
           {{numentries}}
         </description>
@@ -40096,7 +41574,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="DLOFDMA" access="readOnly">
+      <parameter name="DLOFDMA" access="readOnly" version="2.17">
         <description>
           Indicates support for Downlink (DL) Orthogonal Frequency Division
           Multiplexing (OFDMA).
@@ -40334,7 +41812,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="DLOFDMA" access="readOnly">
+      <parameter name="DLOFDMA" access="readOnly" version="2.17">
         <description>
           Indicates support for Downlink (DL) Orthogonal Frequency Division
           Multiplexing (OFDMA).
@@ -40989,7 +42467,7 @@
         <parameter ref="OUI"/>
       </uniqueKey>
 
-      <parameter name="OUI" access="readOnly">
+      <parameter name="OUI" access="readOnly" version="2.15">
         <description>
           Any Organizationally Unique Identifier (OUI) value specified in
           {{bibref|802.11-2020|Table 9-151}}).
@@ -41023,7 +42501,7 @@
         <parameter ref="OUI"/>
       </uniqueKey>
 
-      <parameter name="OUI" access="readOnly">
+      <parameter name="OUI" access="readOnly" version="2.15">
         <description>
           Any Organizationally Unique Identifier (OUI) value specified in
           {{bibref|802.11-2020|Table 9-151}}).
@@ -41172,7 +42650,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="TransmitPowerLimit" access="readOnly">
+      <parameter name="TransmitPowerLimit" access="readOnly" version="2.15">
         <description>
           This is the upper limit on nominal transmit Equivalent Isotropically
           Radiated Power (EIRP) that this radio is allowed to use for the
@@ -41193,7 +42671,7 @@
           string format as defined in {{bibref|RFC3339|Section 3}}.
         </description>
         <syntax>
-          <string/>
+          <dateTime/>
         </syntax>
       </parameter>
     </object>
@@ -41507,7 +42985,7 @@
           string format as defined in {{bibref|RFC3339|Section 3}}.
         </description>
         <syntax>
-          <string/>
+          <dateTime/>
         </syntax>
       </parameter>
 
@@ -41570,7 +43048,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ByteCounterUnits" access="readOnly">
+      <parameter name="ByteCounterUnits" access="readOnly" version="2.15">
         <description>
           Byte Counter Units.
 
@@ -41585,7 +43063,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="Profile1bSTAsDisallowed" access="readOnly">
+      <parameter name="Profile1bSTAsDisallowed" access="readOnly"
+          version="2.15">
         <description>
           Profile-1 Backhaul STA association disallowed.
 
@@ -41598,7 +43077,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="Profile2bSTAsDisallowed" access="readOnly">
+      <parameter name="Profile2bSTAsDisallowed" access="readOnly"
+          version="2.15">
         <description>
           Profile-2 Backhaul STA association disallowed.
 
@@ -41611,7 +43091,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="AssociationAllowanceStatus" access="readOnly">
+      <parameter name="AssociationAllowanceStatus" access="readOnly"
+          version="2.15">
         <description>
           The status of allowance of new client device associations on this
           BSS.
@@ -41679,7 +43160,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="BackhaulUse" access="readOnly">
+      <parameter name="BackhaulUse" access="readOnly" version="2.15">
         <description>
           Indicates that this BSS is in use as a backhaul BSS;
 
@@ -41694,7 +43175,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="FronthaulUse" access="readOnly">
+      <parameter name="FronthaulUse" access="readOnly" version="2.15">
         <description>
           Indicates that this BSS is in use as a fronthaul BSS;
 
@@ -41709,7 +43190,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="R1disallowed" access="readOnly">
+      <parameter name="R1disallowed" access="readOnly" version="2.15">
         <description>
           Multi-AP Profile-1 [3] (R1) disallowed status.
 
@@ -41724,7 +43205,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="R2disallowed" access="readOnly">
+      <parameter name="R2disallowed" access="readOnly" version="2.15">
         <description>
           Multi-AP Profile-2 [3] (R2) disallowed status.
 
@@ -41739,7 +43220,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="MultiBSSID" access="readOnly">
+      <parameter name="MultiBSSID" access="readOnly" version="2.15">
         <description>
           Multiple BSSID Set;
 
@@ -41754,7 +43235,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="TransmittedBSSID" access="readOnly">
+      <parameter name="TransmittedBSSID" access="readOnly" version="2.15">
         <description>
           Transmitted BSSID;
 
@@ -41769,7 +43250,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="FronthaulAKMsAllowed" access="readWrite">
+      <parameter name="FronthaulAKMsAllowed" access="readWrite" version="2.15">
         <description>
           {{list}} List items indicate Authentication and Key Management (AKM)
           suites/security modes allowed at this BSS for fronthaul. {{enum}}
@@ -41811,7 +43292,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="FronthaulSuiteSelector" access="readWrite">
+      <parameter name="FronthaulSuiteSelector" access="readWrite"
+          version="2.17">
         <description>
           AKM suite selector, the AKM suite selector (OUI and type) is encoded
           as a 4-octet hex-encoded value without internal delimiters, e.g.
@@ -41827,7 +43309,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="BackhaulAKMsAllowed" access="readWrite">
+      <parameter name="BackhaulAKMsAllowed" access="readWrite" version="2.15">
         <description>
           {{list}} List items indicate Authentication and Key Management (AKM)
           suites/security modes allowed at this BSS for backhaul. {{enum}}
@@ -41869,7 +43351,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="BackhaulSuiteSelector" access="readWrite">
+      <parameter name="BackhaulSuiteSelector" access="readWrite"
+          version="2.17">
         <description>
           AKM suite selector, the AKM suite selector (OUI and type) is encoded
           as a 4-octet hex-encoded value without internal delimiters, e.g.
@@ -41885,7 +43368,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="BasicDataTransmitRates" access="readOnly">
+      <parameter name="BasicDataTransmitRates" access="readOnly"
+          version="2.17">
         <description>
           {{list}} The current basic data rates; the set of data rates, in
           {{units}}, that have to be supported by all stations that desire to
@@ -41910,7 +43394,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="QMDescriptorNumberOfEntries" access="readOnly">
+      <parameter name="QMDescriptorNumberOfEntries" access="readOnly"
+          version="2.15">
         <description>
           {{numentries}}
         </description>
@@ -41919,7 +43404,7 @@
         </syntax>
       </parameter>
 
-      <command name="SetQMDescriptors()" async="true">
+      <command name="SetQMDescriptors()" async="true" version="2.15">
         <description>
           This command configures each of the descriptor elements for Mirrored
           Stream Classification Service (MSCS), Stream Classification Service
@@ -41946,7 +43431,7 @@
               <parameter ref="ClientMAC"/>
             </uniqueKey>
 
-            <parameter name="BSSID">
+            <parameter name="BSSID" version="2.17">
               <description>
                 The BSSID of BSS for which this descriptor applies.
               </description>
@@ -42004,7 +43489,7 @@
         </output>
       </command>
 
-      <command name="ThroughputTest()" async="true">
+      <command name="ThroughputTest()" version="2.17" async="true">
         <description>
           This command represents a request to initiate a throughput (speed)
           test from a BSS to a STA.
@@ -42093,7 +43578,7 @@
         </output>
       </command>
 
-      <command name="LatencyTest()" async="true">
+      <command name="LatencyTest()" async="true" version="2.17">
         <description>
           This command represents a request to initiate a latency (delay) test
           set from a BSS to a STA. Each latency test set includes a number of
@@ -42212,7 +43697,7 @@
         <parameter ref="ClientMAC"/>
       </uniqueKey>
 
-      <parameter name="BSSID" access="readOnly">
+      <parameter name="BSSID" access="readOnly" version="2.17">
         <description>
           The BSSID of BSS for which this descriptor applies.
         </description>
@@ -42876,7 +44361,7 @@
           string format as defined in {{bibref|RFC3339|Section 3}}.
         </description>
         <syntax>
-          <string/>
+          <dateTime/>
         </syntax>
       </parameter>
 
@@ -42902,7 +44387,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="HECapabilities" access="readOnly" status="obsoleted">
+      <parameter name="HECapabilities" access="readOnly" status="deleted">
         <description>
           Describes the HE capabilities of the Associated Device (STA).
 
@@ -42910,6 +44395,8 @@
           {{object|WiFi6Capabilities}}}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <base64>
@@ -42918,7 +44405,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ClientCapabilities" access="readOnly">
+      <parameter name="ClientCapabilities" access="readOnly" version="2.15">
         <description>
           The frame body of the most recently received (Re)Association Request
           frame from this client (STA), as defined in Table 9-34 and Table 9-36
@@ -43038,7 +44525,7 @@
 
       <parameter name="LastConnectTime" access="readOnly">
         <description>
-          The time in {{units}} since this Assocated Device (STA) was
+          The time in {{units}} since this Associated Device (STA) was
           associated.
         </description>
         <syntax>
@@ -43200,7 +44687,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="CellularDataPreference" access="readWrite">
+      <parameter name="CellularDataPreference" access="readWrite"
+          version="2.15">
         <description>
           This is the Cellular Data Preference for a Agile Multiband (AMB)
           capable STA This specifies the use of the cellular data connection.
@@ -43215,7 +44703,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ReAssociationDelay" access="readWrite">
+      <parameter name="ReAssociationDelay" access="readWrite" version="2.15">
         <description>
           Re-association Delay {{bibref|AMB}}. The time, in {{units}}, after a
           BTM steer from AP1 to AP2 during which the station cannot go back and
@@ -43229,7 +44717,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SleepMode" access="readOnly">
+      <parameter name="SleepMode" access="readOnly" version="2.17">
         <description>
           This parameter indicates the current operating sleep mode as recorded
           by the BSS {{bibref|802.11-2020}}. {{enum}}
@@ -43248,7 +44736,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SecurityAssociation" access="readOnly">
+      <parameter name="SecurityAssociation" access="readOnly" version="2.17">
         <description>
           This parameter indicates the current operating security state as
           defined in {{bibref|802.11-2020|Section 12.6.1.1}}. {{enum}}
@@ -43271,7 +44759,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="TIDQueueSizesNumberOfEntries" access="readOnly">
+      <parameter name="TIDQueueSizesNumberOfEntries" access="readOnly"
+          version="2.15">
         <description>
           {{numentries}}
         </description>
@@ -43280,7 +44769,7 @@
         </syntax>
       </parameter>
 
-      <command name="ClientSteer()" async="true">
+      <command name="ClientSteer()" async="true" version="2.17">
         <description>
           Initiates an EasyMesh {{bibref|EasyMesh}} Controller initiated
           steering mandate request to steer a STA from one EasyMesh agent to
@@ -43321,9 +44810,9 @@
                 </enumeration>
                 <enumeration value="Steering_Mandate">
                   <description>
-                     Request is a Steering Mandate to trigger steering for
-                     specific client STA(s), indicated by 1 in
-                     {{bibref|EasyMesh|Table 49}}.
+                    Request is a Steering Mandate to trigger steering for
+                    specific client STA(s), indicated by 1 in
+                    {{bibref|EasyMesh|Table 49}}.
                   </description>
                 </enumeration>
               </string>
@@ -43442,7 +44931,7 @@
         The counters contained in {{object}} are all reset on reboot.
       </description>
 
-      <parameter name="AssociationTime" access="readOnly">
+      <parameter name="AssociationTime" access="readOnly" status="deprecated">
         <description>
           Date and time in UTC when the device was associated.
 
@@ -43450,13 +44939,16 @@
           {{object|Device.WiFi.AccessPoint.{i}.AssociatedDevice.{i}.}}, then
           this parameter is the same as
           {{param|Device.WiFi.AccessPoint.{i}.AssociatedDevice.{i}.AssociationTime}}.
+
+          {{deprecated|2.18|because it was essentially the same as
+          {{param|#.LastConnectTime}}.}}
         </description>
         <syntax>
           <dateTime/>
         </syntax>
       </parameter>
 
-      <parameter name="Noise" access="readOnly">
+      <parameter name="Noise" access="readOnly" status="deprecated">
         <description>
           An indicator of the average radio noise plus interference power
           measured on the uplink from the Associated Device (STA) to the Access
@@ -43469,6 +44961,9 @@
           {{object|Device.WiFi.AccessPoint.{i}.AssociatedDevice.{i}.}}, then
           this parameter is the same as
           {{param|Device.WiFi.AccessPoint.{i}.AssociatedDevice.{i}.Noise}}.
+
+          {{deprecated|2.18|because it should be the same as
+          {{param|###.Noise}}.}}
         </description>
         <syntax>
           <unsignedInt>
@@ -43486,18 +44981,23 @@
         </syntax>
       </parameter>
 
-      <command name="Disassociate()" async="true">
+      <command name="Disassociate()" async="true" status="deprecated">
         <description>
           This command represents a request to disassociate this associated
           device.
+
+          {{deprecated|2.18|because {{command|#.ClientSteer()}} and
+          {{object|#####.STABlock.{i}.}} cover the use cases for this (client
+          steering and client blocking).}}
         </description>
         <input>
 
-          <parameter name="DisassociationTimer" mandatory="true">
+          <parameter name="DisassociationTimer" mandatory="true"
+              version="2.15">
             <description>
               The time for which the associated device is to be disassociated
               in {{units}}. If set to 0, then the associated device is blocked
-              indefinately.
+              indefinitely.
             </description>
             <syntax>
               <unsignedInt>
@@ -43506,7 +45006,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="ReasonCode" mandatory="true">
+          <parameter name="ReasonCode" mandatory="true" version="2.15">
             <description>
               The reason code for the request for the associated device to be
               disassociated, as defined in {{bibref|802.11-2020|Table 9-49}}.
@@ -43516,7 +45016,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="Silent">
+          <parameter name="Silent" version="2.15">
             <description>
               An optional input, if true then this is a request for a Silent
               Disassociate, whereby the AP is to remove the station from its
@@ -43551,15 +45051,19 @@
         </output>
       </command>
 
-      <command name="BTMRequest()" async="true">
+      <command name="BTMRequest()" async="true" status="deprecated">
         <description>
           This command requests initiation of a BSS Transition Management (BTM)
           request to influence this client's roaming behavior to another BSS as
           defined in {{bibref|802.11-2020|Section 9.6.13.9}}.
+
+          {{deprecated|2.18|because it is superseded by
+          {{command|#.ClientSteer()}}.}}
         </description>
         <input>
 
-          <parameter name="DisassociationImminent" mandatory="true">
+          <parameter name="DisassociationImminent" mandatory="true"
+              version="2.15">
             <description>
               Indicates if the disassociation is imminent, as defined in
               {{bibref|802.11-2020|Section 9.6.13.9}}.
@@ -43569,7 +45073,8 @@
             </syntax>
           </parameter>
 
-          <parameter name="DisassociationTimer" mandatory="true">
+          <parameter name="DisassociationTimer" mandatory="true"
+              version="2.15">
             <description>
               The number of {{units}} until the AP sends a disassociation frame
               to this station. If {{param}}=0 then {{param}} is not used.
@@ -43581,7 +45086,8 @@
             </syntax>
           </parameter>
 
-          <parameter name="BSSTerminationDuration" mandatory="true">
+          <parameter name="BSSTerminationDuration" mandatory="true"
+              version="2.15">
             <description>
               The number of {{units}} for which the BSS is not present. If
               {{param}}=0 or if this input in not provided, then {{param}} is
@@ -43594,7 +45100,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="ValidityInterval">
+          <parameter name="ValidityInterval" version="2.15">
             <description>
               The amount of time in {{units}} that the {{command}} is valid
               for. If {{param}}=0 or if this input in not provided, then
@@ -43607,7 +45113,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="SteeringTimer">
+          <parameter name="SteeringTimer" version="2.15">
             <description>
               The amount of time in {{units}} that this associated device is
               not allowed to return to the original BSS. If {{param}}=0 or if
@@ -43620,7 +45126,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="TargetBSS" mandatory="true">
+          <parameter name="TargetBSS" mandatory="true" version="2.15">
             <description>
               BSSID of the target BSS which the associated device(s) is to be
               associated to.
@@ -43951,7 +45457,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="DLOFDMA" access="readOnly">
+      <parameter name="DLOFDMA" access="readOnly" version="2.17">
         <description>
           Indicates support for Downlink (DL) Orthogonal Frequency Division
           Multiplexing (OFDMA).
@@ -44126,11 +45632,14 @@
         network.
       </description>
 
-      <parameter name="RadarDetections" access="readOnly">
+      <parameter name="RadarDetections" access="readOnly" status="deprecated">
         <description>
           {{list}} List items represent channels in the non-occupancy list due
           to radars detected by Dynamic Frequency Selection (DFS) Channel
           Availability Check (CAC).
+
+          {{deprecated|2.18|because it was superseded by
+          {{object|##.CACStatus.{i}.}}.}}
         </description>
         <syntax>
           <list>
@@ -44140,7 +45649,8 @@
         </syntax>
       </parameter>
 
-      <command name="FullScan()" async="true">
+      <command name="FullScan()" async="true" version="2.15"
+          status="deprecated">
         <description>
           This command represents a request to initiate a full scan on this
           radio, including all channels supported by this radio, for a specific
@@ -44152,10 +45662,14 @@
           {{object|Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}}},
           then this command is similar to,
           {{command|Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.ChannelScanRequest()}}.
+
+          {{deprecated|2.18|because is was superseded by
+          {{command|#.ChannelScanRequest()}} and performed the same function as
+          {{command|#####.Radio.{i}.FullScan()}}.}}
         </description>
         <input>
 
-          <parameter name="DwellTime" mandatory="true">
+          <parameter name="DwellTime" mandatory="true" version="2.15">
             <description>
               The duration of the time to scan each channel in {{units}}. A
               value of 50 {{units}} is suggested.
@@ -44167,7 +45681,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="DFSDwellTime" mandatory="true">
+          <parameter name="DFSDwellTime" mandatory="true" version="2.15">
             <description>
               The duration of time to scan each Dynamic Frequency Selection
               (DFS) channel in {{units}}. A value of at least one beacon
@@ -44180,7 +45694,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="HomeTime">
+          <parameter name="HomeTime" version="2.15">
             <description>
               The time in {{units}} after which the driver has to go back to
               the original channel before scanning the next channel to avoid
@@ -44194,7 +45708,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="SSID">
+          <parameter name="SSID" version="2.15">
             <description>
               The Service Set Identifier (SSID) to scan. If omitted, then all
               SSIDs are scanned.
@@ -44237,11 +45751,11 @@
                 {{bibref|RFC3339|Section 3}}.
               </description>
               <syntax>
-                <string/>
+                <dateTime/>
               </syntax>
             </parameter>
 
-            <parameter name="AggregateScanDuration">
+            <parameter name="AggregateScanDuration" version="2.17">
               <description>
                 Total time spent performing the scan of this channel in
                 {{units}}.
@@ -44253,7 +45767,7 @@
               </syntax>
             </parameter>
 
-            <parameter name="ScanType">
+            <parameter name="ScanType" version="2.17">
               <description>
                 Indicates whether the scan was performed passively (false) or
                 with active probing (true).
@@ -44320,7 +45834,7 @@
                 {{bibref|RFC3339|Section 3}}.
               </description>
               <syntax>
-                <string/>
+                <dateTime/>
               </syntax>
             </parameter>
 
@@ -44352,7 +45866,7 @@
               </syntax>
             </parameter>
 
-            <parameter name="ScanStatus">
+            <parameter name="ScanStatus" version="2.17">
               <description>
                 Status code to indicate whether a scan has been performed and
                 if not the reason for failure {{enum}}
@@ -44473,7 +45987,7 @@
               </syntax>
             </parameter>
 
-            <parameter name="MLDMACAddress">
+            <parameter name="MLDMACAddress" version="2.17">
               <description>
                 The Multi-Link Device (MLD) MAC address of the Multi-Link
                 Operation (MLO) capable access point this neighboring BSS is
@@ -44485,7 +45999,7 @@
               </syntax>
             </parameter>
 
-            <parameter name="ReportingBSSID">
+            <parameter name="ReportingBSSID" version="2.17">
               <description>
                 The BSSID of the reporting BSSID if different from
                 {{param|BSSID}}. This will be set if the NeigborBSS was
@@ -44497,7 +46011,7 @@
               </syntax>
             </parameter>
 
-            <parameter name="MultiBSSID">
+            <parameter name="MultiBSSID" version="2.17">
               <description>
                 Indicates if the neighboring BSS is part of a MultiBSSID set
                 and may be a non-transmitted BSSID.
@@ -44507,7 +46021,7 @@
               </syntax>
             </parameter>
 
-            <parameter name="BSSLoadElementPresent">
+            <parameter name="BSSLoadElementPresent" version="2.17">
               <description>
                 Set to true if the neighbour BSS Beacon/Probe Responses include
                 a BSSLoad Element as defined in {{bibref|802.11-2020|Section
@@ -44518,7 +46032,7 @@
               </syntax>
             </parameter>
 
-            <parameter name="BSSColor">
+            <parameter name="BSSColor" version="2.17">
               <description>
                 Set to the BSS Color from the BSS Color Information field in
                 the BSS's HE Operation element.
@@ -44560,7 +46074,7 @@
                   <enumeration value="WPA3-SAE"/>
                   <enumeration value="WPA2-PSK-WPA3-SAE"/>
                   <enumeration value="WPA3-Enterprise"/>
-                  <enumeration value="OWE"/>
+                  <enumeration value="OWE" version="2.16"/>
                 </string>
               </syntax>
             </parameter>
@@ -44613,7 +46127,7 @@
                   <enumeration value="ax">
                     <description>{{bibref|802.11ax}}</description>
                   </enumeration>
-                  <enumeration value="be">
+                  <enumeration value="be" version="2.17">
                     <description>{{bibref|802.11be}}</description>
                   </enumeration>
                 </string>
@@ -44709,7 +46223,8 @@
         </output>
       </command>
 
-      <command name="ChannelScan()" async="true">
+      <command name="ChannelScan()" async="true" version="2.15"
+          status="deprecated">
         <description>
           This parameter represents a request to initiate a channel scan on
           this radio on the given channel using a specific {{param|DwellTime}}.
@@ -44720,9 +46235,62 @@
           {{object|Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}}},
           then this command is similar to,
           {{command|Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.ChannelScanRequest()}}.
+
+          {{deprecated|2.18|because is was superseded by
+          {{command|#.ChannelScanRequest()}} and performed the same function as
+          {{command|#####.Radio.{i}.ChannelScan()}}.}}
         </description>
         <input>
 
+          <parameter name="DwellTime" mandatory="true" version="2.15">
+            <description>
+              The duration of the time to scan each channel in {{units}}. A
+              value of 50 {{units}} is suggested.
+            </description>
+            <syntax>
+              <unsignedInt>
+                <units value="milliseconds"/>
+              </unsignedInt>
+            </syntax>
+          </parameter>
+
+          <parameter name="DFSDwellTime" mandatory="true" version="2.15">
+            <description>
+              The duration of time to scan each Dynamic Frequency Selection
+              (DFS) channel in {{units}}. A value of at least one beacon
+              interval, typically 100 {{units}}, is suggested.
+            </description>
+            <syntax>
+              <unsignedInt>
+                <units value="milliseconds"/>
+              </unsignedInt>
+            </syntax>
+          </parameter>
+
+          <parameter name="HomeTime" version="2.15">
+            <description>
+              The time in {{units}} after which the driver has to go back to
+              the original channel before scanning the next channel to avoid
+              disruption. If this is omitted, or is not supported by the
+              device, then it should be ignored.
+            </description>
+            <syntax>
+              <unsignedInt>
+                <units value="milliseconds"/>
+              </unsignedInt>
+            </syntax>
+          </parameter>
+
+          <parameter name="SSID" version="2.15">
+            <description>
+              The Service Set Identifier (SSID) to scan. If omitted, then all
+              SSIDs are scanned.
+            </description>
+            <syntax>
+              <string/>
+            </syntax>
+          </parameter>
+
           <object name="OpClass.{i}." minEntries="0" maxEntries="unbounded"
               version="2.15">
             <description>
@@ -44762,55 +46330,6 @@
               </syntax>
             </parameter>
           </object>
-
-          <parameter name="DwellTime" mandatory="true">
-            <description>
-              The duration of the time to scan each channel in {{units}}. A
-              value of 50 {{units}} is suggested.
-            </description>
-            <syntax>
-              <unsignedInt>
-                <units value="milliseconds"/>
-              </unsignedInt>
-            </syntax>
-          </parameter>
-
-          <parameter name="DFSDwellTime" mandatory="true">
-            <description>
-              The duration of time to scan each Dynamic Frequency Selection
-              (DFS) channel in {{units}}. A value of at least one beacon
-              interval, typically 100 {{units}}, is suggested.
-            </description>
-            <syntax>
-              <unsignedInt>
-                <units value="milliseconds"/>
-              </unsignedInt>
-            </syntax>
-          </parameter>
-
-          <parameter name="HomeTime">
-            <description>
-              The time in {{units}} after which the driver has to go back to
-              the original channel before scanning the next channel to avoid
-              disruption. If this is omitted, or is not supported by the
-              device, then it should be ignored.
-            </description>
-            <syntax>
-              <unsignedInt>
-                <units value="milliseconds"/>
-              </unsignedInt>
-            </syntax>
-          </parameter>
-
-          <parameter name="SSID">
-            <description>
-              The Service Set Identifier (SSID) to scan. If omitted, then all
-              SSIDs are scanned.
-            </description>
-            <syntax>
-              <string/>
-            </syntax>
-          </parameter>
         </input>
         <output>
 
@@ -44845,11 +46364,11 @@
                 {{bibref|RFC3339|Section 3}}.
               </description>
               <syntax>
-                <string/>
+                <dateTime/>
               </syntax>
             </parameter>
 
-            <parameter name="AggregateScanDuration">
+            <parameter name="AggregateScanDuration" version="2.17">
               <description>
                 Total time spent performing the scan of this channel in
                 {{units}}.
@@ -44861,7 +46380,7 @@
               </syntax>
             </parameter>
 
-            <parameter name="ScanType">
+            <parameter name="ScanType" version="2.17">
               <description>
                 Indicates whether the scan was performed passively (false) or
                 with active probing (true).
@@ -44928,7 +46447,7 @@
                 {{bibref|RFC3339|Section 3}}.
               </description>
               <syntax>
-                <string/>
+                <dateTime/>
               </syntax>
             </parameter>
 
@@ -44960,7 +46479,7 @@
               </syntax>
             </parameter>
 
-            <parameter name="ScanStatus">
+            <parameter name="ScanStatus" version="2.17">
               <description>
                 Status code to indicate whether a scan has been performed and
                 if not the reason for failure {{enum}}
@@ -45081,7 +46600,7 @@
               </syntax>
             </parameter>
 
-            <parameter name="MLDMACAddress">
+            <parameter name="MLDMACAddress" version="2.17">
               <description>
                 The Multi-Link Device (MLD) MAC address of the Multi-Link
                 Operation (MLO) capable access point this neighboring BSS is
@@ -45093,7 +46612,7 @@
               </syntax>
             </parameter>
 
-            <parameter name="ReportingBSSID">
+            <parameter name="ReportingBSSID" version="2.17">
               <description>
                 The BSSID of the reporting BSSID if different from
                 {{param|BSSID}}. This will be set if the NeigborBSS was
@@ -45105,7 +46624,7 @@
               </syntax>
             </parameter>
 
-            <parameter name="MultiBSSID">
+            <parameter name="MultiBSSID" version="2.17">
               <description>
                 Indicates if the neighboring BSS is part of a MultiBSSID set
                 and may be a non-transmitted BSSID.
@@ -45115,7 +46634,7 @@
               </syntax>
             </parameter>
 
-            <parameter name="BSSLoadElementPresent">
+            <parameter name="BSSLoadElementPresent" version="2.17">
               <description>
                 Set to true if the neighbour BSS Beacon/Probe Responses include
                 a BSSLoad Element as defined in {{bibref|802.11-2020|Section
@@ -45126,7 +46645,7 @@
               </syntax>
             </parameter>
 
-            <parameter name="BSSColor">
+            <parameter name="BSSColor" version="2.17">
               <description>
                 Set to the BSS Color from the BSS Color Information field in
                 the BSS's HE Operation element.
@@ -45168,7 +46687,7 @@
                   <enumeration value="WPA3-SAE"/>
                   <enumeration value="WPA2-PSK-WPA3-SAE"/>
                   <enumeration value="WPA3-Enterprise"/>
-                  <enumeration value="OWE"/>
+                  <enumeration value="OWE" version="2.16"/>
                 </string>
               </syntax>
             </parameter>
@@ -45221,7 +46740,7 @@
                   <enumeration value="ax">
                     <description>{{bibref|802.11ax}}</description>
                   </enumeration>
-                  <enumeration value="be">
+                  <enumeration value="be" version="2.17">
                     <description>{{bibref|802.11be}}</description>
                   </enumeration>
                 </string>
@@ -45355,7 +46874,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="OperatingClass" access="readOnly">
+      <parameter name="OperatingClass" access="readOnly" version="2.17">
         <description>
           Operating class on which this unassociated STA was last detected, per
           {{bibref|802.11-2020|Table E-4}}.
@@ -45367,7 +46886,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Channel" access="readOnly">
+      <parameter name="Channel" access="readOnly" version="2.17">
         <description>
           Channel on which this unassociated STA was last detected.
         </description>
@@ -45898,8 +47417,8 @@
 
       <parameter name="PacketsSent" access="readOnly">
         <description>
-           The total number of packets transmitted to the client MLD STA.
-           {{bibref|EasyMesh}} source: Associated STA Traffic Stats TLV.
+          The total number of packets transmitted to the client MLD STA.
+          {{bibref|EasyMesh}} source: Associated STA Traffic Stats TLV.
         </description>
         <syntax>
           <dataType ref="StatsCounter32"/>
@@ -45970,9 +47489,7 @@
 
     <object
         name="Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.STAMLD.{i}.WiFi7Capabilities."
-        access="readOnly"
-        numEntriesParameter="WiFi7CapabilitiesNumberOfEntries" minEntries="1"
-        maxEntries="1" version="2.17">
+        access="readOnly" version="2.17">
       <description>
         This object describes the Wi-Fi 7 capabilities for this STAMLD
         including Multi-Link Operation (MLO) capabilities. {{bibref|EasyMesh}}
@@ -46209,8 +47726,8 @@
 
       <parameter name="PacketsSent" access="readOnly">
         <description>
-           The total number of packets transmitted to the affiliated STA.
-           {{bibref|EasyMesh}} source: Associated STA Traffic Stats TLV.
+          The total number of packets transmitted to the affiliated STA.
+          {{bibref|EasyMesh}} source: Associated STA Traffic Stats TLV.
         </description>
         <syntax>
           <dataType ref="StatsCounter32"/>
@@ -46331,7 +47848,8 @@
     </object>
 
     <object name="Device.WiFi.DataElements.Network.Device.{i}.bSTAMLD."
-        access="readOnly" minEntries="1" maxEntries="1" version="2.17">
+        access="readOnly" minEntries="1" maxEntries="1" version="2.17"
+        dmr:noNameCheck="true">
       <description>
         This object represents the Multi-Link Operation (MLO) capable backhaul
         station (bSTA) operating on this EasyMesh Agent. Only one MLO capable
@@ -46373,7 +47891,8 @@
 
     <object
         name="Device.WiFi.DataElements.Network.Device.{i}.bSTAMLD.bSTAMLDConfig."
-        access="readOnly" minEntries="1" maxEntries="1" version="2.17">
+        access="readOnly" minEntries="1" maxEntries="1" version="2.17"
+        dmr:noNameCheck="true">
       <description>
         This object describes the Multi-Link Operation (MLO) configuration of a
         Multi-Link Device (MLD) backhaul STA (bSTA). {{bibref|EasyMesh}}
@@ -46453,7 +47972,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="bSTAMACAddress" access="readOnly">
+      <parameter name="bSTAMACAddress" access="readOnly"
+          dmr:noNameCheck="true">
         <description>
           The MAC address of the backhaul Station STA (bSTA), or bSTAMLD, or
           similar Ethernet interface, on this preferred backhaul link.
@@ -46484,7 +48004,7 @@
         </syntax>
       </parameter>
 
-      <event name="Associated!">
+      <event name="Associated!" version="2.15">
         <description>
           The event is generated when an Associated Device (STA) associates to
           a BSS.
@@ -46496,7 +48016,7 @@
             string format as defined in {{bibref|RFC3339|Section 3}}.
           </description>
           <syntax>
-            <string/>
+            <dateTime/>
           </syntax>
         </parameter>
 
@@ -46552,12 +48072,14 @@
           </syntax>
         </parameter>
 
-        <parameter name="HECapabilities" status="deprecated">
+        <parameter name="HECapabilities" status="obsoleted">
           <description>
             Describes the HE capabilities of the Associated Device (STA).
 
             {{deprecated|2.16|because it is superseded by
             {{object|WiFi6Capabilities}}.}}
+
+            {{obsoleted|2.18}}
           </description>
           <syntax>
             <base64>
@@ -46566,7 +48088,7 @@
           </syntax>
         </parameter>
 
-        <parameter name="ClientCapabilities">
+        <parameter name="ClientCapabilities" version="2.16">
           <description>
             The frame body of the (Re)Association Request frame received from
             this client (STA), as defined in Table 9-34 and Table 9-36 of
@@ -46684,7 +48206,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="DLOFDMA">
+          <parameter name="DLOFDMA" version="2.17">
             <description>
               Indicates support for Downlink (DL) Orthogonal Frequency Division
               Multiplexing (OFDMA).
@@ -46838,7 +48360,7 @@
           format as defined in {{bibref|RFC3339|Section 3}}.
         </description>
         <syntax>
-          <string/>
+          <dateTime/>
         </syntax>
       </parameter>
 
@@ -46894,12 +48416,14 @@
         </syntax>
       </parameter>
 
-      <parameter name="HECapabilities" access="readOnly" status="deprecated">
+      <parameter name="HECapabilities" access="readOnly" status="obsoleted">
         <description>
           Describes the HE capabilities of the Associated Device (STA).
 
           {{deprecated|2.16|because it is superseded by
           {{object|WiFi6Capabilities}}.}}
+
+          {{obsoleted|2.18}}
         </description>
         <syntax>
           <base64>
@@ -46908,7 +48432,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ClientCapabilities" access="readOnly">
+      <parameter name="ClientCapabilities" access="readOnly" version="2.16">
         <description>
           The frame body of the (Re)Association Request frame received from
           this client (STA), as defined in Table 9-34 and Table 9-36 of
@@ -47031,7 +48555,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="DLOFDMA" access="readOnly">
+      <parameter name="DLOFDMA" access="readOnly" version="2.17">
         <description>
           Indicates support for Downlink (DL) Orthogonal Frequency Division
           Multiplexing (OFDMA).
@@ -47182,7 +48706,7 @@
         </syntax>
       </parameter>
 
-      <event name="Disassociated!">
+      <event name="Disassociated!" version="2.15">
         <description>
           The event is generated when an Associated Device (STA) disassociates
           from a BSS.
@@ -47302,11 +48826,11 @@
             string format as defined in {{bibref|RFC3339|Section 3}}.
           </description>
           <syntax>
-            <string/>
+            <dateTime/>
           </syntax>
         </parameter>
 
-        <parameter name="LastDataDownlinkRate">
+        <parameter name="LastDataDownlinkRate" version="2.17">
           <description>
             The data transmit rate in {{units}} that was most recently used for
             transmission of data from the access point to the Associated Device
@@ -47319,7 +48843,7 @@
           </syntax>
         </parameter>
 
-        <parameter name="LastDataUplinkRate">
+        <parameter name="LastDataUplinkRate" version="2.17">
           <description>
             The data transmit rate in {{units}} that was most recently used for
             transmission of data from the Associated Device (STA) to the access
@@ -47332,7 +48856,7 @@
           </syntax>
         </parameter>
 
-        <parameter name="UtilizationReceive">
+        <parameter name="UtilizationReceive" version="2.17">
           <description>
             The amount of time in {{units}} that the Radio has spent on the
             Channel receiving data from the Associated Device (STA).
@@ -47344,7 +48868,7 @@
           </syntax>
         </parameter>
 
-        <parameter name="UtilizationTransmit">
+        <parameter name="UtilizationTransmit" version="2.17">
           <description>
             The amount of time in {{units}} that the Radio has spent on the
             Channel transmitting data to the Associated Device (STA).
@@ -47356,7 +48880,7 @@
           </syntax>
         </parameter>
 
-        <parameter name="EstMACDataRateDownlink">
+        <parameter name="EstMACDataRateDownlink" version="2.17">
           <description>
             Estimate of the MAC layer throughput in {{units}} achievable in the
             downlink direction to the Associated Device (STA) if 100% of
@@ -47370,7 +48894,7 @@
           </syntax>
         </parameter>
 
-        <parameter name="EstMACDataRateUplink">
+        <parameter name="EstMACDataRateUplink" version="2.17">
           <description>
             Estimate of the MAC layer throughput in {{units}} achievable in the
             uplink direction from the Associated Device (STA) if 100% of
@@ -47384,7 +48908,7 @@
           </syntax>
         </parameter>
 
-        <parameter name="SignalStrength">
+        <parameter name="SignalStrength" version="2.17">
           <description>
             An indicator of radio signal strength of the uplink from the
             Associated Device (STA) to the access point - measured in
@@ -47400,9 +48924,9 @@
           </syntax>
         </parameter>
 
-        <parameter name="LastConnectTime">
+        <parameter name="LastConnectTime" version="2.17">
           <description>
-            The time in {{units}} since this Assocated Device (STA) was
+            The time in {{units}} since this Associated Device (STA) was
             associated.
           </description>
           <syntax>
@@ -47412,7 +48936,7 @@
           </syntax>
         </parameter>
 
-        <parameter name="Noise">
+        <parameter name="Noise" version="2.17">
           <description>
             An indicator of the average radio noise plus interference power at
             the access point measured for the primary operating channel to this
@@ -47428,7 +48952,7 @@
           </syntax>
         </parameter>
 
-        <parameter name="InitiatedBy">
+        <parameter name="InitiatedBy" version="2.17">
           <description>
             This parameter indicates the entity that initiated this
             Disassociation Event. {{enum}}
@@ -47640,11 +49164,11 @@
           format as defined in {{bibref|RFC3339|Section 3}}.
         </description>
         <syntax>
-          <string/>
+          <dateTime/>
         </syntax>
       </parameter>
 
-      <parameter name="LastDataDownlinkRate" access="readOnly">
+      <parameter name="LastDataDownlinkRate" access="readOnly" version="2.17">
         <description>
           The data transmit rate in {{units}} that was most recently used for
           transmission of data from the access point to the Associated Device
@@ -47657,7 +49181,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="LastDataUplinkRate" access="readOnly">
+      <parameter name="LastDataUplinkRate" access="readOnly" version="2.17">
         <description>
           The data transmit rate in {{units}} that was most recently used for
           transmission of data from the Associated Device (STA) to the access
@@ -47670,7 +49194,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="UtilizationReceive" access="readOnly">
+      <parameter name="UtilizationReceive" access="readOnly" version="2.17">
         <description>
           The amount of time in {{units}} that the Radio has spent on the
           Channel receiving data from the Associated Device (STA).
@@ -47682,7 +49206,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="UtilizationTransmit" access="readOnly">
+      <parameter name="UtilizationTransmit" access="readOnly" version="2.17">
         <description>
           The amount of time in {{units}} that the Radio has spent on the
           Channel transmitting data to the Associated Device (STA).
@@ -47694,7 +49218,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="EstMACDataRateDownlink" access="readOnly">
+      <parameter name="EstMACDataRateDownlink" access="readOnly"
+          version="2.17">
         <description>
           Estimate of the MAC layer throughput in {{units}} achievable in the
           downlink direction to the Associated Device (STA) if 100% of channel
@@ -47708,7 +49233,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="EstMACDataRateUplink" access="readOnly">
+      <parameter name="EstMACDataRateUplink" access="readOnly" version="2.17">
         <description>
           Estimate of the MAC layer throughput in {{units}} achievable in the
           uplink direction from the Associated Device (STA) if 100% of channel
@@ -47722,7 +49247,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SignalStrength" access="readOnly">
+      <parameter name="SignalStrength" access="readOnly" version="2.17">
         <description>
           An indicator of radio signal strength of the uplink from the
           Associated Device (STA) to the access point - measured in {{units}}.
@@ -47737,9 +49262,9 @@
         </syntax>
       </parameter>
 
-      <parameter name="LastConnectTime" access="readOnly">
+      <parameter name="LastConnectTime" access="readOnly" version="2.17">
         <description>
-          The time in {{units}} since this Assocated Device (STA) was
+          The time in {{units}} since this Associated Device (STA) was
           associated.
         </description>
         <syntax>
@@ -47749,7 +49274,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Noise" access="readOnly">
+      <parameter name="Noise" access="readOnly" version="2.17">
         <description>
           An indicator of the average radio noise plus interference power at
           the access point measured for the primary operating channel to this
@@ -47765,7 +49290,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="InitiatedBy" access="readOnly">
+      <parameter name="InitiatedBy" access="readOnly" version="2.17">
         <description>
           This parameter indicates the entity that initiated this
           Disassociation Event. {{enum}}
@@ -47802,13 +49327,13 @@
         </syntax>
       </parameter>
 
-      <event name="FailedConnection!">
+      <event name="FailedConnection!" version="2.15">
         <description>
           The event is generated when an Associated Device (STA) fails to
           connect to a BSS.
         </description>
 
-        <parameter name="BSSID">
+        <parameter name="BSSID" version="2.17">
           <description>
             The MAC Address of the logical BSS (BSSID) which is reporting the
             failed connection event.
@@ -47856,7 +49381,7 @@
             string format as defined in {{bibref|RFC3339|Section 3}}.
           </description>
           <syntax>
-            <string/>
+            <dateTime/>
           </syntax>
         </parameter>
       </event>
@@ -47875,7 +49400,7 @@
         instead}}
       </description>
 
-      <parameter name="BSSID" access="readOnly">
+      <parameter name="BSSID" access="readOnly" version="2.17">
         <description>
           The MAC Address of the logical BSS (BSSID) which is reporting the
           failed connection event.
@@ -47923,7 +49448,7 @@
           format as defined in {{bibref|RFC3339|Section 3}}.
         </description>
         <syntax>
-          <string/>
+          <dateTime/>
         </syntax>
       </parameter>
     </object>
@@ -48009,12 +49534,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -48113,7 +49638,7 @@
           <string>
             <enumeration value="2.4GHz"/>
             <enumeration value="5GHz"/>
-            <enumeration value="6GHz"/>
+            <enumeration value="6GHz" version="2.16"/>
           </string>
         </syntax>
       </parameter>
@@ -48175,7 +49700,7 @@
             <enumeration value="ax">
               <description>{{bibref|802.11ax}}</description>
             </enumeration>
-            <enumeration value="be">
+            <enumeration value="be" version="2.17">
               <description>{{bibref|802.11be}}</description>
             </enumeration>
           </string>
@@ -48330,7 +49855,7 @@
       </parameter>
 
       <parameter name="ChannelLastChange" access="readOnly"
-          activeNotify="canDeny">
+          activeNotify="canDeny" version="2.12">
         <description>
           The accumulated time in {{units}} since the current {{param|Channel}}
           came into use.
@@ -48342,7 +49867,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="ChannelLastSelectionReason" access="readOnly">
+      <parameter name="ChannelLastSelectionReason" access="readOnly"
+          version="2.12">
         <description>
           The cause of the last channel selection.
         </description>
@@ -48388,7 +49914,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="MaxSupportedSSIDs" access="readOnly">
+      <parameter name="MaxSupportedSSIDs" access="readOnly" version="2.12">
         <description>
           Maximum number of SSIDs supported on this radio.
         </description>
@@ -48399,7 +49925,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="MaxSupportedAssociations" access="readOnly">
+      <parameter name="MaxSupportedAssociations" access="readOnly"
+          version="2.12">
         <description>
           Maximum number of associated devices supported.
         </description>
@@ -48410,7 +49937,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="FirmwareVersion" access="readOnly">
+      <parameter name="FirmwareVersion" access="readOnly" version="2.12">
         <description>
           This radio's WiFi firmware version.
 
@@ -48426,7 +49953,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="SupportedOperatingChannelBandwidths" access="readOnly">
+      <parameter name="SupportedOperatingChannelBandwidths" access="readOnly"
+          version="2.12">
         <description>
           {{list}} These are the valid writable values for
           {{param|OperatingChannelBandwidth}}.
@@ -48449,12 +49977,12 @@
             <enumeration value="80+80MHz">
               <description>802.11ac, 802.11ax and 802.11be only</description>
             </enumeration>
-            <enumeration value="320MHz-1">
+            <enumeration value="320MHz-1" version="2.17">
               <description>
                 802.11be only - channel center frequency 31, 95, 159
               </description>
             </enumeration>
-            <enumeration value="320MHz-2">
+            <enumeration value="320MHz-2" version="2.17">
               <description>
                 802.11be only - channel center frequency 63, 127, 191
               </description>
@@ -48476,7 +50004,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="CurrentOperatingChannelBandwidth" access="readOnly">
+      <parameter name="CurrentOperatingChannelBandwidth" access="readOnly"
+          version="2.11">
         <description>
           The channel bandwidth currently in use. {{enum}}
         </description>
@@ -48487,8 +50016,8 @@
             <enumeration value="80MHz"/>
             <enumeration value="160MHz"/>
             <enumeration value="80+80MHz"/>
-            <enumeration value="320MHz-1"/>
-            <enumeration value="320MHz-2"/>
+            <enumeration value="320MHz-1" version="2.17"/>
+            <enumeration value="320MHz-2" version="2.17"/>
           </string>
         </syntax>
       </parameter>
@@ -48528,32 +50057,32 @@
                 only
               </description>
             </enumeration>
-            <enumeration value="1xLTF_0.8us">
+            <enumeration value="1xLTF_0.8us" version="2.14">
               <description>
                 applicable to 802.11ax and 802.11be specifications only
               </description>
             </enumeration>
-            <enumeration value="1xLTF_1.6us">
+            <enumeration value="1xLTF_1.6us" version="2.14">
               <description>
                 applicable to 802.11ax and 802.11be specifications only
               </description>
             </enumeration>
-            <enumeration value="2xLTF_0.8us">
+            <enumeration value="2xLTF_0.8us" version="2.14">
               <description>
                 applicable to 802.11ax and 802.11be specifications only
               </description>
             </enumeration>
-            <enumeration value="2xLTF_1.6us">
+            <enumeration value="2xLTF_1.6us" version="2.14">
               <description>
                 applicable to 802.11ax and 802.11be specifications only
               </description>
             </enumeration>
-            <enumeration value="4xLTF_0.8us">
+            <enumeration value="4xLTF_0.8us" version="2.14">
               <description>
                 applicable to 802.11ax and 802.11be specifications only
               </description>
             </enumeration>
-            <enumeration value="4xLTF_3.2us">
+            <enumeration value="4xLTF_3.2us" version="2.14">
               <description>
                 applicable to 802.11ax and 802.11be specifications only
               </description>
@@ -48564,7 +50093,7 @@
       </parameter>
 
       <parameter name="CenterFrequencySegement0" access="readWrite"
-          status="deleted">
+          status="deleted" version="2.13">
         <description>
           When operating in {{enum|80+80MHz|CurrentOperatingChannelBandwidth}},
           this parameter determines the Center Frequency Segment 0 for the
@@ -48584,7 +50113,7 @@
       </parameter>
 
       <parameter name="CenterFrequencySegement1" access="readWrite"
-          status="deleted">
+          status="deleted" version="2.13">
         <description>
           When operating in {{enum|80+80MHz|CurrentOperatingChannelBandwidth}},
           this parameter determines the Center Frequency Segment 1 for the
@@ -48603,7 +50132,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="CenterFrequencySegment0" access="readWrite">
+      <parameter name="CenterFrequencySegment0" access="readWrite"
+          version="2.14">
         <description>
           When operating in {{enum|80+80MHz|CurrentOperatingChannelBandwidth}},
           this parameter determines the Center Frequency Segment 0 for the
@@ -48615,7 +50145,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="CenterFrequencySegment1" access="readWrite">
+      <parameter name="CenterFrequencySegment1" access="readWrite"
+          version="2.14">
         <description>
           When operating in {{enum|80+80MHz|CurrentOperatingChannelBandwidth}},
           this parameter determines the Center Frequency Segment 1 for the
@@ -48736,7 +50267,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="RetryLimit" access="readWrite">
+      <parameter name="RetryLimit" access="readWrite" version="2.8">
         <description>
           The maximum number of retransmissions of a short packet i.e. a packet
           that is no longer than the {{param|RTSThreshold}}. This corresponds
@@ -48750,7 +50281,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="CCARequest" access="readWrite">
+      <parameter name="CCARequest" access="readWrite" version="2.8">
         <description>
           A request for the clear channel assessment (CCA) report in the format
           specified in {{bibref|802.11-2012|Clause 8.4.2.23.3}}.
@@ -48762,7 +50293,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="CCAReport" access="readOnly">
+      <parameter name="CCAReport" access="readOnly" version="2.8">
         <description>
           The clear channel assessment (CCA) report in the format specified in
           {{bibref|802.11-2012|Clause 8.4.2.24.3}}.
@@ -48781,7 +50312,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="RPIHistogramRequest" access="readWrite">
+      <parameter name="RPIHistogramRequest" access="readWrite" version="2.8">
         <description>
           A request for a received power indicator (RPI) histogram in the
           format specified in {{bibref|802.11-2012|Clause 8.4.2.23.4}}.
@@ -48793,7 +50324,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="RPIHistogramReport" access="readOnly">
+      <parameter name="RPIHistogramReport" access="readOnly" version="2.8">
         <description>
           Received power indicator (RPI) histogram report in the format
           specified in {{bibref|802.11-2012|Clause 8.4.2.24.4}}.
@@ -48805,7 +50336,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="FragmentationThreshold" access="readWrite">
+      <parameter name="FragmentationThreshold" access="readWrite"
+          version="2.8">
         <description>
           This specifies the current maximum size, in {{units}}, of the MPDU
           that can be delivered to the PHY. This parameter is based on
@@ -48818,7 +50350,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="RTSThreshold" access="readWrite">
+      <parameter name="RTSThreshold" access="readWrite" version="2.8">
         <description>
           This indicates the number of {{units}} in an MPDU, below which an
           RTS/CTS handshake is not performed. This parameter is based on
@@ -48831,7 +50363,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="LongRetryLimit" access="readWrite">
+      <parameter name="LongRetryLimit" access="readWrite" version="2.8">
         <description>
           This indicates the maximum number of transmission attempts of a
           frame, the length of which is greater than {{param|RTSThreshold}},
@@ -48844,7 +50376,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="BeaconPeriod" access="readWrite">
+      <parameter name="BeaconPeriod" access="readWrite" version="2.8">
         <description>
           Time interval between transmitting beacons (expressed in {{units}}).
           This parameter is based on ''dot11BeaconPeriod'' from
@@ -48857,7 +50389,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="DTIMPeriod" access="readWrite">
+      <parameter name="DTIMPeriod" access="readWrite" version="2.8">
         <description>
           This specifies the number of beacon intervals (measured in {{units}})
           that elapse between transmission of Beacon frames containing a TIM
@@ -48871,7 +50403,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="PacketAggregationEnable" access="readWrite">
+      <parameter name="PacketAggregationEnable" access="readWrite"
+          version="2.8">
         <description>
           This determines whether or not packet aggregation (commonly called
           "frame aggregation") is enabled. This applies only to 802.11n.
@@ -48881,7 +50414,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="PreambleType" access="readWrite">
+      <parameter name="PreambleType" access="readWrite" version="2.8">
         <description>
           The type of preamble. Longer preambles (more overhead) are needed by
           802.11g to coexist with legacy systems 802.11 and 802.11b.
@@ -48895,7 +50428,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="BasicDataTransmitRates" access="readWrite">
+      <parameter name="BasicDataTransmitRates" access="readWrite"
+          version="2.8">
         <description>
           {{list}} The set of data rates, in ''Mbps'', that have to be
           supported by all stations that desire to join this BSS. The stations
@@ -48910,7 +50444,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="SupportedDataTransmitRates" access="readOnly">
+      <parameter name="SupportedDataTransmitRates" access="readOnly"
+          version="2.8">
         <description>
           {{list}} Maximum radio data transmit rates in ''Mbps'' for unicast
           frames (a superset of {{param|BasicDataTransmitRates}}). Given the
@@ -48927,7 +50462,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="OperationalDataTransmitRates" access="readWrite">
+      <parameter name="OperationalDataTransmitRates" access="readWrite"
+          version="2.8">
         <description>
           {{list}} Data transmit rates in ''Mbps'' for unicast frames at which
           the radio will permit operation with any associated station (a subset
@@ -48948,7 +50484,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="EnableRRM" access="readWrite">
+      <parameter name="EnableRRM" access="readWrite" version="2.14">
         <description>
           Enables or disables 802.11k {{bibref|802.11k}} Radio Resource
           Management (RRM).
@@ -48958,7 +50494,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ManagementPacketRate" access="readWrite">
+      <parameter name="ManagementPacketRate" access="readWrite" version="2.15">
         <description>
           The rate of Wi-Fi management frames (expressed in {{units}}).
         </description>
@@ -48969,7 +50505,7 @@
         </syntax>
       </parameter>
 
-      <command name="RemoteMeasurementRequest()" async="true">
+      <command name="RemoteMeasurementRequest()" async="true" version="2.15">
         <description>
           This command requests initiation of a Remote Measurement request to
           retrieve measurement data from a BSS on this radio. Upon receipt of
@@ -48978,7 +50514,7 @@
         </description>
         <input>
 
-          <parameter name="TargetBSS" mandatory="true">
+          <parameter name="TargetBSS" mandatory="true" version="2.15">
             <description>
               The BSSID of the remote BSS.
             </description>
@@ -48987,7 +50523,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="Timeout" mandatory="true">
+          <parameter name="Timeout" mandatory="true" version="2.15">
             <description>
               The duration after which the request is timed out in {{units}}.
             </description>
@@ -48998,7 +50534,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="OperatingClass" mandatory="true">
+          <parameter name="OperatingClass" mandatory="true" version="2.15">
             <description>
               The Operating Class in {{bibref|802.11-2020|Table E-4}} for which
               the measurement is requested.
@@ -49010,7 +50546,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="Channel" mandatory="true">
+          <parameter name="Channel" mandatory="true" version="2.15">
             <description>
               The number of the channel for which the measurement is requested.
             </description>
@@ -49021,7 +50557,7 @@
         </input>
         <output>
 
-          <parameter name="SignalStrength">
+          <parameter name="SignalStrength" version="2.15">
             <description>
               The received signal strength (RSSI) as received by the radio
               measured in {{units}}. RSSI is encoded as per
@@ -49035,7 +50571,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="Noise">
+          <parameter name="Noise" version="2.15">
             <description>
               An indicator of the average radio noise plus interference power
               as received by the radio. Encoded as defined for ANPI in
@@ -49068,7 +50604,7 @@
         </output>
       </command>
 
-      <command name="InitiateCCAMeasurement()" async="true">
+      <command name="InitiateCCAMeasurement()" async="true" version="2.15">
         <description>
           This command represents a request to initiate a Clear Channel
           Assessment (CCA) measurement scan on this radio on the given channel
@@ -49076,7 +50612,7 @@
         </description>
         <input>
 
-          <parameter name="Channel" mandatory="true">
+          <parameter name="Channel" mandatory="true" version="2.15">
             <description>
               The number of the Wi-Fi channel the clear channel assessment
               (CCA) measurement is run on.
@@ -49086,7 +50622,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="Frequency" mandatory="true">
+          <parameter name="Frequency" mandatory="true" version="2.16">
             <description>
               Frequency of the channel the clear channel assessment (CCA)
               measurement is run on.
@@ -49095,12 +50631,12 @@
               <string>
                 <enumeration value="2.4GHz"/>
                 <enumeration value="5GHz"/>
-                <enumeration value="6GHz"/>
+                <enumeration value="6GHz" version="2.16"/>
               </string>
             </syntax>
           </parameter>
 
-          <parameter name="DwellTime" mandatory="true">
+          <parameter name="DwellTime" mandatory="true" version="2.15">
             <description>
               The duration of the CCA measurement in {{units}}.
             </description>
@@ -49113,7 +50649,7 @@
         </input>
         <output>
 
-          <parameter name="CCAReport">
+          <parameter name="CCAReport" version="2.15">
             <description>
               The clear channel assessment (CCA) report in the format specified
               in {{bibref|802.11-2020|Section 9.4.2.21.3}}.
@@ -49149,7 +50685,7 @@
         </output>
       </command>
 
-      <command name="FullScan()" async="true">
+      <command name="FullScan()" async="true" version="2.15">
         <description>
           This command represents a request to initiate a full scan on this
           radio, including all channels supported by this radio, for a specific
@@ -49164,7 +50700,7 @@
         </description>
         <input>
 
-          <parameter name="DwellTime" mandatory="true">
+          <parameter name="DwellTime" mandatory="true" version="2.15">
             <description>
               The duration of the time to scan each channel in {{units}}. A
               value of 50 {{units}} is suggested.
@@ -49176,7 +50712,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="DFSDwellTime" mandatory="true">
+          <parameter name="DFSDwellTime" mandatory="true" version="2.15">
             <description>
               The duration of time to scan each Dynamic Frequency Selection
               (DFS) channel in {{units}}. A value of at least one beacon
@@ -49189,7 +50725,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="HomeTime">
+          <parameter name="HomeTime" version="2.15">
             <description>
               The time in {{units}} after which the driver has to go back to
               the original channel before scanning the next channel to avoid
@@ -49203,7 +50739,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="SSID">
+          <parameter name="SSID" version="2.15">
             <description>
               The Service Set Identifier (SSID) to scan. If omitted, then all
               SSIDs are scanned.
@@ -49246,11 +50782,11 @@
                 {{bibref|RFC3339|Section 3}}.
               </description>
               <syntax>
-                <string/>
+                <dateTime/>
               </syntax>
             </parameter>
 
-            <parameter name="AggregateScanDuration">
+            <parameter name="AggregateScanDuration" version="2.17">
               <description>
                 Total time spent performing the scan of this channel in
                 {{units}}.
@@ -49262,7 +50798,7 @@
               </syntax>
             </parameter>
 
-            <parameter name="ScanType">
+            <parameter name="ScanType" version="2.17">
               <description>
                 Indicates whether the scan was performed passively (false) or
                 with active probing (true).
@@ -49329,7 +50865,7 @@
                 {{bibref|RFC3339|Section 3}}.
               </description>
               <syntax>
-                <string/>
+                <dateTime/>
               </syntax>
             </parameter>
 
@@ -49361,7 +50897,7 @@
               </syntax>
             </parameter>
 
-            <parameter name="ScanStatus">
+            <parameter name="ScanStatus" version="2.17">
               <description>
                 Status code to indicate whether a scan has been performed and
                 if not the reason for failure {{enum}}
@@ -49482,7 +51018,7 @@
               </syntax>
             </parameter>
 
-            <parameter name="MLDMACAddress">
+            <parameter name="MLDMACAddress" version="2.17">
               <description>
                 The Multi-Link Device (MLD) MAC address of the Multi-Link
                 Operation (MLO) capable access point this neighboring BSS is
@@ -49494,7 +51030,7 @@
               </syntax>
             </parameter>
 
-            <parameter name="ReportingBSSID">
+            <parameter name="ReportingBSSID" version="2.17">
               <description>
                 The BSSID of the reporting BSSID if different from
                 {{param|BSSID}}. This will be set if the NeigborBSS was
@@ -49506,7 +51042,7 @@
               </syntax>
             </parameter>
 
-            <parameter name="MultiBSSID">
+            <parameter name="MultiBSSID" version="2.17">
               <description>
                 Indicates if the neighboring BSS is part of a MultiBSSID set
                 and may be a non-transmitted BSSID.
@@ -49516,7 +51052,7 @@
               </syntax>
             </parameter>
 
-            <parameter name="BSSLoadElementPresent">
+            <parameter name="BSSLoadElementPresent" version="2.17">
               <description>
                 Set to true if the neighbour BSS Beacon/Probe Responses include
                 a BSSLoad Element as defined in {{bibref|802.11-2020|Section
@@ -49527,7 +51063,7 @@
               </syntax>
             </parameter>
 
-            <parameter name="BSSColor">
+            <parameter name="BSSColor" version="2.17">
               <description>
                 Set to the BSS Color from the BSS Color Information field in
                 the BSS's HE Operation element.
@@ -49569,7 +51105,7 @@
                   <enumeration value="WPA3-SAE"/>
                   <enumeration value="WPA2-PSK-WPA3-SAE"/>
                   <enumeration value="WPA3-Enterprise"/>
-                  <enumeration value="OWE"/>
+                  <enumeration value="OWE" version="2.16"/>
                 </string>
               </syntax>
             </parameter>
@@ -49622,7 +51158,7 @@
                   <enumeration value="ax">
                     <description>{{bibref|802.11ax}}</description>
                   </enumeration>
-                  <enumeration value="be">
+                  <enumeration value="be" version="2.17">
                     <description>{{bibref|802.11be}}</description>
                   </enumeration>
                 </string>
@@ -49718,7 +51254,7 @@
         </output>
       </command>
 
-      <command name="ChannelScan()" async="true">
+      <command name="ChannelScan()" async="true" version="2.15">
         <description>
           This parameter represents a request to initiate a channel scan on
           this radio on the given channel using a specific {{param|DwellTime}}.
@@ -49732,6 +51268,55 @@
         </description>
         <input>
 
+          <parameter name="DwellTime" mandatory="true" version="2.15">
+            <description>
+              The duration of the time to scan each channel in {{units}}. A
+              value of 50 {{units}} is suggested.
+            </description>
+            <syntax>
+              <unsignedInt>
+                <units value="milliseconds"/>
+              </unsignedInt>
+            </syntax>
+          </parameter>
+
+          <parameter name="DFSDwellTime" mandatory="true" version="2.15">
+            <description>
+              The duration of time to scan each Dynamic Frequency Selection
+              (DFS) channel in {{units}}. A value of at least one beacon
+              interval, typically 100 {{units}}, is suggested.
+            </description>
+            <syntax>
+              <unsignedInt>
+                <units value="milliseconds"/>
+              </unsignedInt>
+            </syntax>
+          </parameter>
+
+          <parameter name="HomeTime" version="2.15">
+            <description>
+              The time in {{units}} after which the driver has to go back to
+              the original channel before scanning the next channel to avoid
+              disruption. If this is omitted, or is not supported by the
+              device, then it should be ignored.
+            </description>
+            <syntax>
+              <unsignedInt>
+                <units value="milliseconds"/>
+              </unsignedInt>
+            </syntax>
+          </parameter>
+
+          <parameter name="SSID" version="2.15">
+            <description>
+              The Service Set Identifier (SSID) to scan. If omitted, then all
+              SSIDs are scanned.
+            </description>
+            <syntax>
+              <string/>
+            </syntax>
+          </parameter>
+
           <object name="OpClass.{i}." minEntries="0" maxEntries="unbounded"
               version="2.15">
             <description>
@@ -49771,55 +51356,6 @@
               </syntax>
             </parameter>
           </object>
-
-          <parameter name="DwellTime" mandatory="true">
-            <description>
-              The duration of the time to scan each channel in {{units}}. A
-              value of 50 {{units}} is suggested.
-            </description>
-            <syntax>
-              <unsignedInt>
-                <units value="milliseconds"/>
-              </unsignedInt>
-            </syntax>
-          </parameter>
-
-          <parameter name="DFSDwellTime" mandatory="true">
-            <description>
-              The duration of time to scan each Dynamic Frequency Selection
-              (DFS) channel in {{units}}. A value of at least one beacon
-              interval, typically 100 {{units}}, is suggested.
-            </description>
-            <syntax>
-              <unsignedInt>
-                <units value="milliseconds"/>
-              </unsignedInt>
-            </syntax>
-          </parameter>
-
-          <parameter name="HomeTime">
-            <description>
-              The time in {{units}} after which the driver has to go back to
-              the original channel before scanning the next channel to avoid
-              disruption. If this is omitted, or is not supported by the
-              device, then it should be ignored.
-            </description>
-            <syntax>
-              <unsignedInt>
-                <units value="milliseconds"/>
-              </unsignedInt>
-            </syntax>
-          </parameter>
-
-          <parameter name="SSID">
-            <description>
-              The Service Set Identifier (SSID) to scan. If omitted, then all
-              SSIDs are scanned.
-            </description>
-            <syntax>
-              <string/>
-            </syntax>
-          </parameter>
         </input>
         <output>
 
@@ -49854,11 +51390,11 @@
                 {{bibref|RFC3339|Section 3}}.
               </description>
               <syntax>
-                <string/>
+                <dateTime/>
               </syntax>
             </parameter>
 
-            <parameter name="AggregateScanDuration">
+            <parameter name="AggregateScanDuration" version="2.17">
               <description>
                 Total time spent performing the scan of this channel in
                 {{units}}.
@@ -49870,7 +51406,7 @@
               </syntax>
             </parameter>
 
-            <parameter name="ScanType">
+            <parameter name="ScanType" version="2.17">
               <description>
                 Indicates whether the scan was performed passively (false) or
                 with active probing (true).
@@ -49937,7 +51473,7 @@
                 {{bibref|RFC3339|Section 3}}.
               </description>
               <syntax>
-                <string/>
+                <dateTime/>
               </syntax>
             </parameter>
 
@@ -49969,7 +51505,7 @@
               </syntax>
             </parameter>
 
-            <parameter name="ScanStatus">
+            <parameter name="ScanStatus" version="2.17">
               <description>
                 Status code to indicate whether a scan has been performed and
                 if not the reason for failure {{enum}}
@@ -50090,7 +51626,7 @@
               </syntax>
             </parameter>
 
-            <parameter name="MLDMACAddress">
+            <parameter name="MLDMACAddress" version="2.17">
               <description>
                 The Multi-Link Device (MLD) MAC address of the Multi-Link
                 Operation (MLO) capable access point this neighboring BSS is
@@ -50102,7 +51638,7 @@
               </syntax>
             </parameter>
 
-            <parameter name="ReportingBSSID">
+            <parameter name="ReportingBSSID" version="2.17">
               <description>
                 The BSSID of the reporting BSSID if different from
                 {{param|BSSID}}. This will be set if the NeigborBSS was
@@ -50114,7 +51650,7 @@
               </syntax>
             </parameter>
 
-            <parameter name="MultiBSSID">
+            <parameter name="MultiBSSID" version="2.17">
               <description>
                 Indicates if the neighboring BSS is part of a MultiBSSID set
                 and may be a non-transmitted BSSID.
@@ -50124,7 +51660,7 @@
               </syntax>
             </parameter>
 
-            <parameter name="BSSLoadElementPresent">
+            <parameter name="BSSLoadElementPresent" version="2.17">
               <description>
                 Set to true if the neighbour BSS Beacon/Probe Responses include
                 a BSSLoad Element as defined in {{bibref|802.11-2020|Section
@@ -50135,7 +51671,7 @@
               </syntax>
             </parameter>
 
-            <parameter name="BSSColor">
+            <parameter name="BSSColor" version="2.17">
               <description>
                 Set to the BSS Color from the BSS Color Information field in
                 the BSS's HE Operation element.
@@ -50177,7 +51713,7 @@
                   <enumeration value="WPA3-SAE"/>
                   <enumeration value="WPA2-PSK-WPA3-SAE"/>
                   <enumeration value="WPA3-Enterprise"/>
-                  <enumeration value="OWE"/>
+                  <enumeration value="OWE" version="2.16"/>
                 </string>
               </syntax>
             </parameter>
@@ -50230,7 +51766,7 @@
                   <enumeration value="ax">
                     <description>{{bibref|802.11ax}}</description>
                   </enumeration>
-                  <enumeration value="be">
+                  <enumeration value="be" version="2.17">
                     <description>{{bibref|802.11be}}</description>
                   </enumeration>
                 </string>
@@ -50343,7 +51879,7 @@
         {{bibref|TR-181i2|Section 4.2.2}}.
       </description>
 
-      <parameter name="CtsReceived" access="readOnly">
+      <parameter name="CtsReceived" access="readOnly" version="2.14">
         <description>
           The total number of Request To Send (RTS) control frames that
           received a Clear To Send (CTS) response.
@@ -50353,7 +51889,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="NoCtsReceived" access="readOnly">
+      <parameter name="NoCtsReceived" access="readOnly" version="2.14">
         <description>
           The total number of Request To Send (RTS) control frames that did not
           receive a Clear To Send (CTS) response.
@@ -50363,7 +51899,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="FrameHeaderError" access="readOnly">
+      <parameter name="FrameHeaderError" access="readOnly" version="2.14">
         <description>
           The total number of received packets for which the PHY was able to
           correlate the preamble but not the header.
@@ -50373,7 +51909,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="GoodPLCPReceived" access="readOnly">
+      <parameter name="GoodPLCPReceived" access="readOnly" version="2.14">
         <description>
           The total number of received frames with a good Physical Layer
           Convergence Protocol (PLCP) header.
@@ -50383,7 +51919,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="DPacketOtherMACReceived" access="readOnly">
+      <parameter name="DPacketOtherMACReceived" access="readOnly"
+          version="2.14">
         <description>
           The total number of Wi-Fi data packets received from other Basic
           Service Sets (BSSs), with a good Frame Check Sequence (FCS) and not
@@ -50395,7 +51932,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="MPacketOtherMACReceived" access="readOnly">
+      <parameter name="MPacketOtherMACReceived" access="readOnly"
+          version="2.14">
         <description>
           The total number of Wi-Fi management packets received from other
           Basic Service Sets (BSSs), with a good Frame Check Sequence (FCS) and
@@ -50407,7 +51945,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="CPacketOtherMACReceived" access="readOnly">
+      <parameter name="CPacketOtherMACReceived" access="readOnly"
+          version="2.14">
         <description>
           The total number of Wi-Fi control packets received from other Basic
           Service Sets (BSSs), with a good Frame Check Sequence (FCS) and not
@@ -50419,7 +51958,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="CtsOtherMACReceived" access="readOnly">
+      <parameter name="CtsOtherMACReceived" access="readOnly" version="2.14">
         <description>
           The total number of received Clear to Send (CTS) packets not
           addressed to the MAC address of this receiver.
@@ -50429,7 +51968,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="RtsOtherMACReceived" access="readOnly">
+      <parameter name="RtsOtherMACReceived" access="readOnly" version="2.14">
         <description>
           The total number of received Request to Send (RTS) frames not
           addressed to the MAC address of this receiver.
@@ -50525,7 +52064,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="PLCPErrorCount" access="readOnly">
+      <parameter name="PLCPErrorCount" access="readOnly" version="2.7">
         <description>
           The number of packets that were received with a detected Physical
           Layer Convergence Protocol (PLCP) header error.
@@ -50535,7 +52074,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="FCSErrorCount" access="readOnly">
+      <parameter name="FCSErrorCount" access="readOnly" version="2.7">
         <description>
           The number of packets that were received with a detected FCS error.
           This parameter is based on dot11FCSErrorCount from
@@ -50546,7 +52085,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="InvalidMACCount" access="readOnly">
+      <parameter name="InvalidMACCount" access="readOnly" version="2.7">
         <description>
           The number of packets that were received with a detected invalid MAC
           header error.
@@ -50556,7 +52095,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="PacketsOtherReceived" access="readOnly">
+      <parameter name="PacketsOtherReceived" access="readOnly" version="2.7">
         <description>
           The number of packets that were received, but which were destined for
           a MAC address that is not associated with this interface.
@@ -50566,7 +52105,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Noise" access="readOnly">
+      <parameter name="Noise" access="readOnly" version="2.8">
         <description>
           An indicator of average noise strength received at this radio,
           measured in {{units}}. This measurement of non-IEEE 802.11 noise
@@ -50586,7 +52125,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="TotalChannelChangeCount" access="readOnly">
+      <parameter name="TotalChannelChangeCount" access="readOnly"
+          version="2.12">
         <description>
           The total number of times that the {{param|#.Channel}} has changed
           since the {{object|#}} entered its current operating state.
@@ -50596,7 +52136,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="ManualChannelChangeCount" access="readOnly">
+      <parameter name="ManualChannelChangeCount" access="readOnly"
+          version="2.12">
         <description>
           The number of times that the {{param|#.Channel}} has changed due to
           manual channel selection since the {{object|#}} entered its current
@@ -50607,7 +52148,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="AutoStartupChannelChangeCount" access="readOnly">
+      <parameter name="AutoStartupChannelChangeCount" access="readOnly"
+          version="2.12">
         <description>
           The number of times that the {{param|#.Channel}} has changed due to
           automatic channel selection procedure launched at radio startup since
@@ -50618,7 +52160,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="AutoUserChannelChangeCount" access="readOnly">
+      <parameter name="AutoUserChannelChangeCount" access="readOnly"
+          version="2.12">
         <description>
           The number of times that the {{param|#.Channel}} has changed due to
           automatic channel selection procedure triggered by the user (e.g. via
@@ -50629,7 +52172,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="AutoRefreshChannelChangeCount" access="readOnly">
+      <parameter name="AutoRefreshChannelChangeCount" access="readOnly"
+          version="2.12">
         <description>
           The number of times that the {{param|#.Channel}} has changed due to
           automatic channel selection procedure triggered by the
@@ -50641,7 +52185,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="AutoDynamicChannelChangeCount" access="readOnly">
+      <parameter name="AutoDynamicChannelChangeCount" access="readOnly"
+          version="2.12">
         <description>
           The number of times that the {{param|#.Channel}} has changed due to
           automatic channel selection procedure dynamically triggered to adjust
@@ -50653,7 +52198,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="AutoDFSChannelChangeCount" access="readOnly">
+      <parameter name="AutoDFSChannelChangeCount" access="readOnly"
+          version="2.12">
         <description>
           The number of times that the {{param|#.Channel}} has changed due to
           automatic channel selection procedure triggered by DFS
@@ -50746,12 +52292,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -50795,7 +52341,7 @@
           <string>
             <pathRef refType="strong" targetType="row"/>
           </string>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
@@ -50853,7 +52399,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="MLDUnit" access="readWrite">
+      <parameter name="MLDUnit" access="readWrite" version="2.17">
         <description>
           MLD-BSS unit number specifying BSS across multiple radios that form a
           single Multi Link Device. Assigning the same MLD unit groups Basic
@@ -50869,7 +52415,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Upstream" access="readOnly">
+      <parameter name="Upstream" access="readOnly" version="2.12">
         <description>
           Indicates whether the interface points towards the Internet
           ({{true}}) or towards End Devices ({{false}}).
@@ -50893,7 +52439,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ATFEnable" access="readWrite">
+      <parameter name="ATFEnable" access="readWrite" version="2.14">
         <description>
           Enables or disables Air Time Fairness (ATF).
         </description>
@@ -50902,7 +52448,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="FlushATFTable" access="readWrite">
+      <parameter name="FlushATFTable" access="readWrite" version="2.14">
         <description>
           After this parameter is set to true, the ATF configuration of the
           interface will be reset.
@@ -50912,7 +52458,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SetATF" access="readWrite">
+      <parameter name="SetATF" access="readWrite" version="2.14">
         <description>
           Configures the ATF setting for all associated devices on an
           individual SSID. Expressed as {{units}} of airtime, such that no
@@ -50993,7 +52539,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="RetransCount" access="readOnly">
+      <parameter name="RetransCount" access="readOnly" version="2.7">
         <description>
           The total number of transmitted packets which were retransmissions.
           Two retransmissions of the same packet results in this counter
@@ -51004,7 +52550,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="FailedRetransCount" access="readOnly">
+      <parameter name="FailedRetransCount" access="readOnly" version="2.7">
         <description>
           The number of packets that were not transmitted successfully due to
           the number of retransmission attempts exceeding an 802.11 retry
@@ -51016,7 +52562,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="RetryCount" access="readOnly">
+      <parameter name="RetryCount" access="readOnly" version="2.7">
         <description>
           The number of packets that were successfully transmitted after one or
           more retransmissions. This parameter is based on dot11RetryCount from
@@ -51027,7 +52573,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="MultipleRetryCount" access="readOnly">
+      <parameter name="MultipleRetryCount" access="readOnly" version="2.7">
         <description>
           The number of packets that were successfully transmitted after more
           than one retransmission. This parameter is based on
@@ -51038,7 +52584,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ACKFailureCount" access="readOnly">
+      <parameter name="ACKFailureCount" access="readOnly" version="2.7">
         <description>
           The number of expected ACKs that were never received. This parameter
           is based on dot11ACKFailureCount from {{bibref|802.11-2012}}.
@@ -51048,7 +52594,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="AggregatedPacketCount" access="readOnly">
+      <parameter name="AggregatedPacketCount" access="readOnly" version="2.7">
         <description>
           The number of aggregated packets that were transmitted. This applies
           only to 802.11n and 802.11ac.
@@ -51178,7 +52724,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="DiscardPacketsSentBufOverflow" access="readOnly">
+      <parameter name="DiscardPacketsSentBufOverflow" access="readOnly"
+          version="2.14">
         <description>
           The total number of discarded packets during transmission caused by
           transmit buffer overflow.
@@ -51188,7 +52735,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="DiscardPacketsSentNoAssoc" access="readOnly">
+      <parameter name="DiscardPacketsSentNoAssoc" access="readOnly"
+          version="2.14">
         <description>
           The total number of discarded packets due to the station not being
           associated.
@@ -51198,7 +52746,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="FragSent" access="readOnly">
+      <parameter name="FragSent" access="readOnly" version="2.14">
         <description>
           The total number of frame-fragments transmitted out of the interface.
         </description>
@@ -51207,7 +52755,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SentNoAck" access="readOnly">
+      <parameter name="SentNoAck" access="readOnly" version="2.14">
         <description>
           The total number of transmitted data packets that did not receive an
           ACK when expected.
@@ -51217,7 +52765,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="DupReceived" access="readOnly">
+      <parameter name="DupReceived" access="readOnly" version="2.14">
         <description>
           The total number of received packets whose Sequence Control field
           indicates it is a duplicate.
@@ -51227,7 +52775,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="TooLongReceived" access="readOnly">
+      <parameter name="TooLongReceived" access="readOnly" version="2.14">
         <description>
           The total number of received packets longer than the maximum allowed
           packet length.
@@ -51237,7 +52785,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="TooShortReceived" access="readOnly">
+      <parameter name="TooShortReceived" access="readOnly" version="2.14">
         <description>
           The total number of received packets that did not contain enough
           bytes for the packet type.
@@ -51247,7 +52795,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="AckUcastReceived" access="readOnly">
+      <parameter name="AckUcastReceived" access="readOnly" version="2.14">
         <description>
           The total number of unicast ACKs received, with good Frame Check
           Sequence (FCS).
@@ -51318,12 +52866,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -51422,7 +52970,7 @@
       </parameter>
 
       <parameter name="MaxAssociatedDevices" access="readWrite"
-          status="deleted">
+          status="deleted" version="2.4">
         <description>
           The maximum number of devices that can simultaneously be connected to
           the access point.
@@ -51441,7 +52989,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="IsolationEnable" access="readWrite">
+      <parameter name="IsolationEnable" access="readWrite" version="2.4">
         <description>
           Enables or disables device isolation.
 
@@ -51454,7 +53002,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="MACAddressControlEnabled" access="readWrite">
+      <parameter name="MACAddressControlEnabled" access="readWrite"
+          version="2.9">
         <description>
           Indicates whether or not MAC Address Control is enabled on this
           {{object|#}}. MAC Address Control limits client devices to those
@@ -51465,7 +53014,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="AllowedMACAddress" access="readWrite">
+      <parameter name="AllowedMACAddress" access="readWrite" version="2.9">
         <description>
           Hardware addresses of client devices that are allowed to associate
           with this {{object|#}} if {{param|MACAddressControlEnabled}} is
@@ -51477,7 +53026,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="MaxAllowedAssociations" access="readWrite">
+      <parameter name="MaxAllowedAssociations" access="readWrite"
+          version="2.12">
         <description>
           Maximum number of associated devices allowed for this SSID. If the
           number is reached new device connections to this access point will be
@@ -51497,7 +53047,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="CpeOperationMode" access="readWrite">
+      <parameter name="CpeOperationMode" access="readWrite" version="2.14">
         <description>
           Reports information about the CPE operation mode (router or
           bridge/range extender).
@@ -51511,7 +53061,7 @@
             </enumeration>
             <enumeration value="Bridge/Extender">
               <description>
-                Indicates operation as a range extender or acess point in
+                Indicates operation as a range extender or access point in
                 bridge mode.
               </description>
             </enumeration>
@@ -51553,7 +53103,7 @@
             <enumeration value="WPA2-Enterprise"/>
             <enumeration value="WPA3-Enterprise"/>
             <enumeration value="WPA-WPA2-Enterprise"/>
-            <enumeration value="OWE"/>
+            <enumeration value="OWE" version="2.16"/>
           </string>
         </syntax>
       </parameter>
@@ -51569,7 +53119,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="EncryptionMode" access="readWrite">
+      <parameter name="EncryptionMode" access="readWrite" version="2.14">
         <description>
           The type of encryption in use.
 
@@ -51667,7 +53217,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SAEPassphrase" access="readWrite">
+      <parameter name="SAEPassphrase" access="readWrite" version="2.13">
         <description>
           A passphrase for {{enum|WPA3-Personal|ModeEnabled}} or
           {{enum|WPA3-Personal-Transition|ModeEnabled}} security modes.
@@ -51694,7 +53244,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="SecondaryRadiusServerIPAddr" access="readWrite">
+      <parameter name="SecondaryRadiusServerIPAddr" access="readWrite"
+          version="2.5">
         <description>
           The IP Address of a secondary RADIUS server used for WLAN security.
           {{param}} is only applicable when {{param|ModeEnabled}} is an
@@ -51728,7 +53279,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="SecondaryRadiusServerPort" access="readWrite">
+      <parameter name="SecondaryRadiusServerPort" access="readWrite"
+          version="2.5">
         <description>
           The port number of the secondary RADIUS server used for WLAN
           security. {{param}} is only applicable when {{param|ModeEnabled}} is
@@ -51756,7 +53308,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SecondaryRadiusSecret" access="readWrite">
+      <parameter name="SecondaryRadiusSecret" access="readWrite" version="2.5">
         <description>
           The secret used for handshaking with the secondary RADIUS server
           {{bibref|RFC2865}}.
@@ -51769,7 +53321,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="MFPConfig" access="readWrite">
+      <parameter name="MFPConfig" access="readWrite" version="2.11">
         <description>
           Management Frame Protection configuration applicable when
           {{param|ModeEnabled}} is set to {{enum|WPA2-Personal|ModeEnabled}},
@@ -51788,7 +53340,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SPPAMSDU" access="readWrite">
+      <parameter name="SPPAMSDU" access="readWrite" version="2.16">
         <description>
           Signaling and Payload Protected for A-MSDU frames.
         </description>
@@ -51814,7 +53366,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="TransitionDisableIndication" access="readWrite">
+      <parameter name="TransitionDisableIndication" access="readWrite"
+          version="2.16">
         <description>
           Sets the transition disable indication. When this parameter is
           enabled with {{param|ModeEnabled}} set to a transition mode, such as
@@ -51830,7 +53383,7 @@
         </syntax>
       </parameter>
 
-      <command name="Reset()" async="false">
+      <command name="Reset()" version="2.12" async="false">
         <description>
           Reset this {{object|#}} instance's WiFi security settings to their
           factory default values. The affected settings include
@@ -51912,7 +53465,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Status" access="readOnly">
+      <parameter name="Status" access="readOnly" version="2.11">
         <description>
           Indicates the current status of WPS. If the device goes to
           {{enum|SetupLocked}} the WPS needs to be disabled and re-enabled to
@@ -51929,7 +53482,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Version" access="readOnly">
+      <parameter name="Version" access="readOnly" version="2.11">
         <description>
           The Wi-Fi Simple Configuration version supported by the device, a
           string of the form ''m.n'' where ''m'' is the major version and ''n''
@@ -51943,7 +53496,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="PIN" access="readWrite">
+      <parameter name="PIN" access="readWrite" version="2.11">
         <description>
           Represents the Device PIN used for PIN based pairing between WPS
           peers. This PIN is either a four digit number or an eight digit
@@ -51957,7 +53510,7 @@
         </syntax>
       </parameter>
 
-      <command name="InitiateWPSPBC()" async="true">
+      <command name="InitiateWPSPBC()" async="true" version="2.15">
         <description>
           Initiates a Wi-Fi Protected Setup (WPS) Push Button Configuration
           (PBC) process as defined in {{bibref|WPS 2.0}} .
@@ -52006,7 +53559,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Type" access="readOnly">
+      <parameter name="Type" access="readOnly" version="2.14">
         <description>
           Associated device type (Laptop, iPhone, Android, etc.).
         </description>
@@ -52015,7 +53568,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SetStaATF" access="readWrite">
+      <parameter name="SetStaATF" access="readWrite" version="2.14">
         <description>
           Configures the Air Time Fairness (ATF) setting of this individual
           associated device. Expressed as {{units}} of airtime, such that this
@@ -52031,7 +53584,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="OperatingStandard" access="readOnly">
+      <parameter name="OperatingStandard" access="readOnly" version="2.10">
         <description>
           The operating standard that this associated device is connected with.
         </description>
@@ -52055,7 +53608,7 @@
             <enumeration value="ax">
               <description>{{bibref|802.11ax}}</description>
             </enumeration>
-            <enumeration value="be">
+            <enumeration value="be" version="2.17">
               <description>{{bibref|802.11be}}</description>
             </enumeration>
           </string>
@@ -52091,7 +53644,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="MaxSupportedDataDownlinkRate" access="readOnly">
+      <parameter name="MaxSupportedDataDownlinkRate" access="readOnly"
+          version="2.17">
         <description>
           Maximum supported data rate on the downlink from the associated
           device to the access point, measured in {{units}}.
@@ -52123,7 +53677,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="MaxSupportedDataUplinkRate" access="readOnly">
+      <parameter name="MaxSupportedDataUplinkRate" access="readOnly"
+          version="2.17">
         <description>
           Maximum supported data rate on the uplink from the associated device
           to the access point, measured in {{units}}.
@@ -52136,7 +53691,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="AssociationTime" access="readOnly">
+      <parameter name="AssociationTime" access="readOnly" version="2.12">
         <description>
           Date and time in UTC when the device was associated
 
@@ -52169,7 +53724,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Noise" access="readOnly">
+      <parameter name="Noise" access="readOnly" version="2.12">
         <description>
           An indicator of radio noise on the uplink from the associated device
           to the access point, measured in {{units}}, as an average of the last
@@ -52179,7 +53734,7 @@
           If the instance of this {{object}} is the same as
           {{object|Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.}},
           then this parameter is the same as
-          {{param|Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.MultiAPSTA.Noise}}.
+          {{param|Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.MultiAPSTA.Noise|deprecated}}.
         </description>
         <syntax>
           <int>
@@ -52189,7 +53744,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SNR" access="readOnly">
+      <parameter name="SNR" access="readOnly" version="2.17">
         <description>
           An indicator of signal to noise ratio, in {{units}}, on the uplink
           from the associated device to the access point, measured in
@@ -52237,7 +53792,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="MaxSupportedBandwidth" access="readOnly">
+      <parameter name="MaxSupportedBandwidth" access="readOnly" version="2.17">
         <description>
           Specifies the maximum supported bandwidth for the associated device
           to the access point.
@@ -52344,7 +53899,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ErrorsReceived" access="readOnly">
+      <parameter name="ErrorsReceived" access="readOnly" version="2.14">
         <description>
           The total number of inbound packets that contained errors preventing
           them from being delivered to a higher-layer protocol.
@@ -52431,6 +53986,9 @@
       <uniqueKey functional="true">
         <parameter ref="AccessCategory"/>
       </uniqueKey>
+      <uniqueKey functional="false">
+        <parameter ref="Alias"/>
+      </uniqueKey>
 
       <parameter name="AccessCategory" access="readOnly">
         <description>
@@ -52446,16 +54004,16 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.8">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
-      <parameter name="AIFSN" access="readWrite" status="obsoleted">
+      <parameter name="AIFSN" access="readWrite" status="deleted">
         <description>
           Arbitration Inter Frame Spacing (Number). This is the number of time
           slots in the arbitration interframe space.
@@ -52463,6 +54021,8 @@
           {{deprecated|2.15|because it is superseded by the WMM Specification}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <unsignedInt>
@@ -52471,15 +54031,17 @@
         </syntax>
       </parameter>
 
-      <parameter name="ECWMin" access="readWrite" status="obsoleted">
+      <parameter name="ECWMin" access="readWrite" status="deleted">
         <description>
           Exponent of Contention Window (Minimum). This encodes the values of
-          CWMin as an exponent: CWMin = 2^ECWMin - 1. For example, if ECWMin is
-          8, then CWMin is 2^8 - 1, or 255, (expressed in {{units}}).
+          CWMin as an exponent: CWMin = 2^ECWMin^ - 1. For example, if ECWMin
+          is 8, then CWMin is 2^8^ - 1, or 255, (expressed in {{units}}).
 
           {{deprecated|2.15|because it is superseded by the WMM Specification}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <unsignedInt>
@@ -52489,15 +54051,17 @@
         </syntax>
       </parameter>
 
-      <parameter name="ECWMax" access="readWrite" status="obsoleted">
+      <parameter name="ECWMax" access="readWrite" status="deleted">
         <description>
           Exponent of Contention Window (Maximum). This encodes the values of
-          CWMax as an exponent: CWMax = 2^ECWMax - 1. For example, if ECWMax is
-          8, then CWMax is 2^8 - 1, or 255, (expressed in {{units}}).
+          CWMax as an exponent: CWMax = 2^ECWMax^ - 1. For example, if ECWMax
+          is 8, then CWMax is 2^8^ - 1, or 255, (expressed in {{units}}).
 
           {{deprecated|2.15|because it is superseded by the WMM Specification}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <unsignedInt>
@@ -52507,7 +54071,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="TxOpMax" access="readWrite" status="obsoleted">
+      <parameter name="TxOpMax" access="readWrite" status="deleted">
         <description>
           Maximum transmit opportunity, in multiples of {{units}}. A TXOP time
           interval of 0 means it is limited to a single MAC protocol data unit
@@ -52516,6 +54080,8 @@
           {{deprecated|2.15|because it is superseded by the WMM Specification}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <unsignedInt>
@@ -52889,12 +54455,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -53031,7 +54597,7 @@
             <enumeration value="WPA2-Enterprise"/>
             <enumeration value="WPA3-Enterprise"/>
             <enumeration value="WPA-WPA2-Enterprise"/>
-            <enumeration value="OWE"/>
+            <enumeration value="OWE" version="2.16"/>
           </string>
         </syntax>
       </parameter>
@@ -53088,12 +54654,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -53224,7 +54790,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SAEPassphrase" access="readWrite">
+      <parameter name="SAEPassphrase" access="readWrite" version="2.13">
         <description>
           A passphrase for {{enum|WPA3-Personal|ModeEnabled}} or
           {{enum|WPA3-Personal-Transition|ModeEnabled}} security modes.
@@ -53237,7 +54803,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="MFPConfig" access="readWrite">
+      <parameter name="MFPConfig" access="readWrite" version="2.11">
         <description>
           Management Frame Protection configuration applicable when
           {{param|ModeEnabled}} is set to {{enum|WPA2-Personal|ModeEnabled}},
@@ -53320,7 +54886,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Status" access="readOnly">
+      <parameter name="Status" access="readOnly" version="2.11">
         <description>
           Indicates the current status of WPS in EndPoint.
         </description>
@@ -53334,7 +54900,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Version" access="readOnly">
+      <parameter name="Version" access="readOnly" version="2.11">
         <description>
           The Wi-Fi Simple Configuration version supported by the device, a
           string of the form ''m.n'' where ''m'' is the major version and ''n''
@@ -53348,7 +54914,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="PIN" access="readWrite">
+      <parameter name="PIN" access="readWrite" version="2.11">
         <description>
           Represents the Device PIN used for PIN based pairing between WPS
           peers. This PIN is either a four digit number or an eight digit
@@ -53360,7 +54926,7 @@
         <syntax secured="true">
           <string>
             <size maxLength="8"/>
-            <pattern value="\d{4}|\d{8}"/>
+            <pattern value="\d{4}|\d{8}" version="2.16"/>
           </string>
         </syntax>
       </parameter>
@@ -53387,6 +54953,9 @@
       <uniqueKey functional="true">
         <parameter ref="AccessCategory"/>
       </uniqueKey>
+      <uniqueKey functional="false">
+        <parameter ref="Alias"/>
+      </uniqueKey>
 
       <parameter name="AccessCategory" access="readOnly">
         <description>
@@ -53402,16 +54971,16 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.8">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
-      <parameter name="AIFSN" access="readWrite" status="obsoleted">
+      <parameter name="AIFSN" access="readWrite" status="deleted">
         <description>
           Arbitration Inter Frame Spacing (Number). This is the number of time
           slots in the arbitration interframe space.
@@ -53419,6 +54988,8 @@
           {{deprecated|2.15|because it is superseded by the WMM Specification}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <unsignedInt>
@@ -53427,15 +54998,17 @@
         </syntax>
       </parameter>
 
-      <parameter name="ECWMin" access="readWrite" status="obsoleted">
+      <parameter name="ECWMin" access="readWrite" status="deleted">
         <description>
           Exponent of Contention Window (Minimum). This encodes the values of
-          CWMin as an exponent: CWMin = 2^ECWMin - 1. For example, if ECWMin is
-          8, then CWMin is 2^8 - 1, or 255, (expressed in {{units}}).
+          CWMin as an exponent: CWMin = 2^ECWMin^ - 1. For example, if ECWMin
+          is 8, then CWMin is 2^8^ - 1, or 255, (expressed in {{units}}).
 
           {{deprecated|2.15|because it is superseded by the WMM Specification}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <unsignedInt>
@@ -53445,15 +55018,17 @@
         </syntax>
       </parameter>
 
-      <parameter name="ECWMax" access="readWrite" status="obsoleted">
+      <parameter name="ECWMax" access="readWrite" status="deleted">
         <description>
           Exponent of Contention Window (Maximum). This encodes the values of
-          CWMax as an exponent: CWMax = 2^ECWMax - 1. For example, if ECWMax is
-          8, then CWMax is 2^8 - 1, or 255, (expressed in {{units}}).
+          CWMax as an exponent: CWMax = 2^ECWMax^ - 1. For example, if ECWMax
+          is 8, then CWMax is 2^8^ - 1, or 255, (expressed in {{units}}).
 
           {{deprecated|2.15|because it is superseded by the WMM Specification}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <unsignedInt>
@@ -53463,7 +55038,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="TxOpMax" access="readWrite" status="obsoleted">
+      <parameter name="TxOpMax" access="readWrite" status="deleted">
         <description>
           Maximum transmit opportunity, in multiples of {{units}}. A TXOP time
           interval of 0 means it is limited to a single MAC protocol data unit
@@ -53472,6 +55047,8 @@
           {{deprecated|2.15|because it is superseded by the WMM Specification}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <unsignedInt>
@@ -53766,12 +55343,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.7">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -54089,7 +55666,7 @@
         {{param|NetworkAddress}}. This is because the ZigBee specification
         describes only intra-area network topologies
         {{bibref|ZigBee2007|Section 1.1.4 Network Topology}}. As such if two or
-        more {{object}} instances have the same key value the implemenation is
+        more {{object}} instances have the same key value the implementation is
         undefined.
       </description>
       <uniqueKey functional="true">
@@ -54161,20 +55738,23 @@
         {{param|NetworkAddress}}. This is because the ZigBee specification
         describes only intra-area network topologies
         {{bibref|ZigBee2007|Section 1.1.4 Network Topology}}. As such if two or
-        more {{object}} instances have the same key value the implemenation is
+        more {{object}} instances have the same key value the implementation is
         undefined
       </description>
       <uniqueKey functional="true">
         <parameter ref="IEEEAddress"/>
         <parameter ref="NetworkAddress"/>
       </uniqueKey>
+      <uniqueKey functional="false">
+        <parameter ref="Alias"/>
+      </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.7">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -54454,7 +56034,7 @@
               <description>Constant (mains) power</description>
             </enumeration>
             <enumeration value="Rechargeable">
-              <description>Rechargable battery</description>
+              <description>Rechargeable battery</description>
             </enumeration>
             <enumeration value="Disposable">
               <description>Disposable battery</description>
@@ -54476,7 +56056,7 @@
               <description>Constant (mains) power</description>
             </enumeration>
             <enumeration value="Rechargeable">
-              <description>Rechargable battery</description>
+              <description>Rechargeable battery</description>
             </enumeration>
             <enumeration value="Disposable">
               <description>Disposable battery</description>
@@ -54816,8 +56396,7 @@
 
     <object name="Device.ZigBee.ZDO.{i}.NodeManager.RoutingTable.{i}."
         access="readOnly" numEntriesParameter="RoutingTableNumberOfEntries"
-        minEntries="0" maxEntries="unbounded" dmr:noUniqueKeys="true"
-        version="2.7">
+        minEntries="0" maxEntries="unbounded" version="2.7">
       <description>
         The {{object}} object describes the route table as defined in
         {{bibref|ZigBee2007|table 3.51 Routing Table Entry}}.
@@ -54917,12 +56496,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.7">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -55033,12 +56612,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.7">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -55094,12 +56673,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.7">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -55283,12 +56862,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.7">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -55405,7 +56984,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="MaxProviderBridgeEntries" access="readOnly">
+      <parameter name="MaxProviderBridgeEntries" access="readOnly"
+          version="2.7">
         <description>
           The maximum number of entries available in the
           {{object|ProviderBridge}} table. A non-zero value for this parameter
@@ -55416,7 +56996,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="ProviderBridgeNumberOfEntries" access="readOnly">
+      <parameter name="ProviderBridgeNumberOfEntries" access="readOnly"
+          version="2.7">
         <description>
           {{numentries}}
         </description>
@@ -55491,16 +57072,16 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
-      <parameter name="Name" access="readOnly">
+      <parameter name="Name" access="readOnly" version="2.16">
         <description>
           The textual name of the bridge as assigned by the device.
         </description>
@@ -55534,7 +57115,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="AgingTime" access="readWrite">
+      <parameter name="AgingTime" access="readWrite" version="2.16">
         <description>
           The timeout period in {{units}} for aging out dynamically-learned
           forwarding information as described in {{bibref|802.1Q-2011|Section
@@ -55765,12 +57346,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -55816,7 +57397,7 @@
           <string>
             <pathRef refType="strong" targetType="row"/>
           </string>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
@@ -55835,7 +57416,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Type" access="readWrite">
+      <parameter name="Type" access="readWrite" version="2.7">
         <description>
           The type of bridge port as defined in 802.1Q
           {{bibref|802.1Q-2011|Section 17 IEEE8021BridgePortType}}.
@@ -55903,7 +57484,7 @@
           <unsignedInt>
             <range minInclusive="0" maxInclusive="7"/>
           </unsignedInt>
-          <default type="object" value="0,1,2,3,4,5,6,7"/>
+          <default type="object" value="[0,1,2,3,4,5,6,7]"/>
         </syntax>
       </parameter>
 
@@ -55942,7 +57523,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="TPID" access="readWrite">
+      <parameter name="TPID" access="readWrite" version="2.7">
         <description>
           The Tag Protocol Identifier (TPID) assigned to this {{object}}. The
           TPID is an EtherType value used to identify the frame as a tagged
@@ -55999,7 +57580,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="ServiceAccessPrioritySelection" access="readWrite">
+      <parameter name="ServiceAccessPrioritySelection" access="readWrite"
+          version="2.7">
         <description>
           This parameter controls the Service Access Priority selection
           function as described in {{bibref|802.1Q-2011|section 6.13}}.
@@ -56014,7 +57596,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="ServiceAccessPriorityTranslation" access="readWrite">
+      <parameter name="ServiceAccessPriorityTranslation" access="readWrite"
+          version="2.7">
         <description>
           {{list}} List items represent service access priority translation
           values for each ingress priority on this {{object}} as described in
@@ -56031,7 +57614,7 @@
           <unsignedInt>
             <range minInclusive="0" maxInclusive="7"/>
           </unsignedInt>
-          <default type="object" value="0,1,2,3,4,5,6,7"/>
+          <default type="object" value="[0,1,2,3,4,5,6,7]"/>
         </syntax>
       </parameter>
 
@@ -56058,7 +57641,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="PathCost" access="readWrite">
+      <parameter name="PathCost" access="readWrite" version="2.16">
         <description>
           The Port’s contribution, when it is the Root Port, to the Root Path
           Cost for the Bridge as described in {{bibref|802.1D-2004|Section
@@ -56074,7 +57657,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Priority" access="readWrite">
+      <parameter name="Priority" access="readWrite" version="2.16">
         <description>
           The first four components of the Port’s port priority vector value as
           described in {{bibref|802.1D-2004|Section 17.19.21}}.
@@ -56349,7 +57932,7 @@
             [7,7,6,6,5,5,4,4,3,3,2,2,1,1,0,0],[7,7,6,6,5,4,5,4,3,3,2,2,1,1,0,0],[7,7,6,6,5,4,5,4,3,2,3,2,1,1,0,0],[7,7,6,6,5,4,5,4,3,2,3,2,1,0,1,0]
         </description>
         <syntax>
-          <list minItems="4" maxItems="4">
+          <list minItems="4" maxItems="4" nestedBrackets="required">
             <size/>
           </list>
           <string>
@@ -56385,7 +57968,7 @@
             [7,0,6,0,5,0,4,0,3,0,2,0,1,0,0,0],[7,0,6,0,4,0,4,1,3,0,2,0,1,0,0,0],[7,0,6,0,4,0,4,1,2,0,2,1,1,0,0,0],[7,0,6,0,4,0,4,1,2,0,2,1,0,0,0,1]
         </description>
         <syntax>
-          <list minItems="4" maxItems="4">
+          <list minItems="4" maxItems="4" nestedBrackets="required">
             <size/>
           </list>
           <string>
@@ -56427,12 +58010,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -56493,12 +58076,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -56580,12 +58163,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -56673,7 +58256,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="DHCPType" access="readWrite">
+      <parameter name="DHCPType" access="readWrite" version="2.2">
         <description>
           The DHCP protocol associated with the {{object}} instance. Affects
           only parameters that specify DHCP option values as filter criteria
@@ -56723,7 +58306,7 @@
             <size maxLength="256"/>
           </list>
           <unsignedInt/>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
@@ -56774,7 +58357,7 @@
             <size maxLength="512"/>
           </list>
           <string/>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
@@ -56821,7 +58404,7 @@
             <size maxLength="512"/>
           </list>
           <string/>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
@@ -56878,14 +58461,15 @@
         </syntax>
       </parameter>
 
-      <parameter name="SourceMACFromVendorClassIDFilterv6" access="readWrite">
+      <parameter name="SourceMACFromVendorClassIDFilterv6" access="readWrite"
+          version="2.2">
         <description>
           Classification criterion.
 
           A hexbinary string used to identify one or more devices via DHCP for
           which MAC address filtering would subsequently apply. A device is
           considered matching if the most recent DHCPv6 Vendor Class Identifier
-          (Option 16 as defined in {{bibref|RFC3315}}) was equal to the
+          (Option 16 as defined in {{bibref|RFC8415}}) was equal to the
           specified value. The option value is binary, so an exact match is
           REQUIRED.
 
@@ -56987,14 +58571,15 @@
         </syntax>
       </parameter>
 
-      <parameter name="DestMACFromVendorClassIDFilterv6" access="readWrite">
+      <parameter name="DestMACFromVendorClassIDFilterv6" access="readWrite"
+          version="2.2">
         <description>
           Classification criterion.
 
           A hexbinary string used to identify one or more devices via DHCP for
           which MAC address filtering would subsequently apply. A device is
           considered matching if the most recent DHCPv6 Vendor Class Identifier
-          (Option 16 as defined in {{bibref|RFC3315}}) was equal to the
+          (Option 16 as defined in {{bibref|RFC8415}}) was equal to the
           specified value. The option value is binary, so an exact match is
           REQUIRED.
 
@@ -57067,7 +58652,7 @@
           DHCP lease acquisition or renewal for DHCPv4) was equal to the
           specified value. The DHCP Client Identifier is Option 61 (as defined
           in {{bibref|RFC2132}}) for {{enum|DHCPv4|DHCPType}}, or is Option 1
-          (as defined in {{bibref|RFC3315}}) for {{enum|DHCPv6|DHCPType}}. The
+          (as defined in {{bibref|RFC8415}}) for {{enum|DHCPv6|DHCPType}}. The
           option value is binary, so an exact match is REQUIRED.
 
           Note that neither 802.1D {{bibref|802.1D-2004}} nor 802.1Q
@@ -57128,7 +58713,7 @@
           DHCP lease acquisition or renewal for DHCPv4) was equal to the
           specified value. The DHCP Client Identifier is Option 61 (as defined
           in {{bibref|RFC2132}}) for {{enum|DHCPv4|DHCPType}}, or is Option 1
-          (as defined in {{bibref|RFC3315}}) for {{enum|DHCPv6|DHCPType}}. The
+          (as defined in {{bibref|RFC8415}}) for {{enum|DHCPv6|DHCPType}}. The
           option value is binary, so an exact match is REQUIRED.
 
           Note: DHCPv4 Option values are limited to a length of 255, while
@@ -57181,7 +58766,7 @@
           (via DHCP lease acquisition or renewal for DHCPv4) was equal to the
           specified value. The DHCP User Class Identifier is Option 77 (as
           defined in {{bibref|RFC3004}}) for {{enum|DHCPv4|DHCPType}}, or is
-          Option 15 (as defined in {{bibref|RFC3315}}) for
+          Option 15 (as defined in {{bibref|RFC8415}}) for
           {{enum|DHCPv6|DHCPType}}. The option value is binary, so an exact
           match is REQUIRED.
 
@@ -57241,7 +58826,7 @@
           (via DHCP lease acquisition or renewal for DHCPv4) was equal to the
           specified value. The DHCP User Class Identifier is Option 77 (as
           defined in {{bibref|RFC3004}}) for {{enum|DHCPv4|DHCPType}}, or is
-          Option 15 (as defined in {{bibref|RFC3315}}) for
+          Option 15 (as defined in {{bibref|RFC8415}}) for
           {{enum|DHCPv6|DHCPType}}. The option value is binary, so an exact
           match is REQUIRED.
 
@@ -57282,7 +58867,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="DestIP" access="readWrite">
+      <parameter name="DestIP" access="readWrite" version="2.6">
         <description>
           Classification criterion.
 
@@ -57295,7 +58880,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="DestMask" access="readWrite">
+      <parameter name="DestMask" access="readWrite" version="2.6">
         <description>
           Destination IP address mask, represented as an IP routing prefix
           using CIDR notation [RFC4632]. The IP address part MUST be {{empty}}
@@ -57307,7 +58892,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="DestIPExclude" access="readWrite">
+      <parameter name="DestIPExclude" access="readWrite" version="2.6">
         <description>
           If {{false}}, the class includes only those packets that match the
           (masked) DestIP entry, if specified.
@@ -57321,7 +58906,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SourceIP" access="readWrite">
+      <parameter name="SourceIP" access="readWrite" version="2.6">
         <description>
           Classification criterion.
 
@@ -57334,7 +58919,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SourceMask" access="readWrite">
+      <parameter name="SourceMask" access="readWrite" version="2.6">
         <description>
           Source IP address mask, represented as an IP routing prefix using
           CIDR notation [RFC4632]. The IP address part MUST be an empty string
@@ -57346,7 +58931,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SourceIPExclude" access="readWrite">
+      <parameter name="SourceIPExclude" access="readWrite" version="2.6">
         <description>
           If {{false}}, the class includes only those packets that match the
           (masked) {{param|SourceIP}} entry, if specified.
@@ -57360,7 +58945,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Protocol" access="readWrite">
+      <parameter name="Protocol" access="readWrite" version="2.6">
         <description>
           Classification criterion.
 
@@ -57375,7 +58960,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ProtocolExclude" access="readWrite">
+      <parameter name="ProtocolExclude" access="readWrite" version="2.6">
         <description>
           If {{false}}, the class includes only those packets that match the
           {{param|Protocol}} entry, if specified.
@@ -57389,7 +58974,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="DestPort" access="readWrite">
+      <parameter name="DestPort" access="readWrite" version="2.6">
         <description>
           Classification criterion.
 
@@ -57404,7 +58989,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="DestPortRangeMax" access="readWrite">
+      <parameter name="DestPortRangeMax" access="readWrite" version="2.6">
         <description>
           Classification criterion.
 
@@ -57423,7 +59008,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="DestPortExclude" access="readWrite">
+      <parameter name="DestPortExclude" access="readWrite" version="2.6">
         <description>
           If {{false}}, the class includes only those packets that match the
           {{param|DestPort}} entry (or port range), if specified.
@@ -57437,7 +59022,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SourcePort" access="readWrite">
+      <parameter name="SourcePort" access="readWrite" version="2.6">
         <description>
           Classification criterion.
 
@@ -57452,7 +59037,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SourcePortRangeMax" access="readWrite">
+      <parameter name="SourcePortRangeMax" access="readWrite" version="2.6">
         <description>
           Classification criterion.
 
@@ -57471,7 +59056,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SourcePortExclude" access="readWrite">
+      <parameter name="SourcePortExclude" access="readWrite" version="2.6">
         <description>
           If {{false}}, the class includes only those packets that match the
           {{param|SourcePort}} entry (or port range), if specified.
@@ -57542,12 +59127,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.7">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -57600,7 +59185,7 @@
             <pathRef refType="strong" targetParent="#.Bridge."
                 targetType="row"/>
           </string>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
     </object>
@@ -57621,7 +59206,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SupportedNCPs" access="readOnly">
+      <parameter name="SupportedNCPs" access="readOnly" version="2.2">
         <description>
           The Network Control Protocols (NCPs) that are supported by the
           device. {{enum}}
@@ -57720,12 +59305,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -57764,12 +59349,12 @@
           <string>
             <pathRef refType="strong" targetType="row"/>
           </string>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
       <command name="Reset()" dmr:previousParameter="LowerLayers"
-          async="false">
+          version="2.12" async="false">
         <description>
           On a reset the device MUST tear down the existing PPP connection
           represented by this object and establish a new one.
@@ -58023,7 +59608,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="LCPEchoAdaptive" access="readWrite">
+      <parameter name="LCPEchoAdaptive" access="readWrite" version="2.16">
         <description>
           When traffic is received during the {{param|LCPEcho}} interval, no
           LCP Echo-Request is sent until the next {{param|LCPEcho}} interval.
@@ -58034,7 +59619,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="IPCPEnable" access="readWrite">
+      <parameter name="IPCPEnable" access="readWrite" version="2.2">
         <description>
           Enables or disables IPCP ({{bibref|RFC1332}}) on this interface. If
           this parameter is present, {{enum|IPCP|#.SupportedNCPs}} MUST be
@@ -58045,7 +59630,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="IPv6CPEnable" access="readWrite">
+      <parameter name="IPv6CPEnable" access="readWrite" version="2.2">
         <description>
           Enables or disables IPv6CP ({{bibref|RFC5072}}) on this interface. If
           this parameter is present, {{enum|IPv6CP|#.SupportedNCPs}} MUST be
@@ -58138,7 +59723,7 @@
             <size/>
           </list>
           <dataType ref="IPv4Address"/>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
@@ -58430,7 +60015,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="IPv4Enable" access="readWrite">
+      <parameter name="IPv4Enable" access="readWrite" version="2.2">
         <description>
           Enables or disables the IPv4 stack, and so the use of IPv4 on the
           device. This affects only layer 3 and above.
@@ -58444,7 +60029,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="IPv4Status" access="readOnly">
+      <parameter name="IPv4Status" access="readOnly" version="2.2">
         <description>
           Indicates the status of the IPv4 stack. {{enum}}
 
@@ -58460,7 +60045,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="IPv6Capable" access="readOnly">
+      <parameter name="IPv6Capable" access="readOnly" version="2.2">
         <description>
           Indicates whether the device is IPv6 capable.
 
@@ -58472,7 +60057,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="IPv6Enable" access="readWrite">
+      <parameter name="IPv6Enable" access="readWrite" version="2.2">
         <description>
           Enables or disables the IPv6 stack, and so the use of IPv6 on the
           device. This affects only layer 3 and above.
@@ -58486,7 +60071,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="IPv6Status" access="readOnly">
+      <parameter name="IPv6Status" access="readOnly" version="2.2">
         <description>
           Indicates the status of the IPv6 stack. {{enum}}
 
@@ -58502,7 +60087,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ULAPrefix" access="readWrite">
+      <parameter name="ULAPrefix" access="readWrite" version="2.2">
         <description>
           The ULA /48 prefix {{bibref|RFC4193|Section 3}}.
         </description>
@@ -58511,7 +60096,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="InterfaceNumberOfEntries" access="readOnly">
+      <parameter name="ActivePortNumberOfEntries" access="readOnly">
         <description>
           {{numentries}}
         </description>
@@ -58520,7 +60105,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ActivePortNumberOfEntries" access="readOnly">
+      <parameter name="InterfaceNumberOfEntries" access="readOnly">
         <description>
           {{numentries}}
         </description>
@@ -58597,7 +60182,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="IPv4Enable" access="readWrite">
+      <parameter name="IPv4Enable" access="readWrite" version="2.2"
+          dmr:previousParameter="Enable">
         <description>
           If set to {{true}}, attaches this interface to the IPv4 stack. If set
           to {{false}}, detaches this interface from the IPv4 stack.
@@ -58618,38 +60204,6 @@
         </syntax>
       </parameter>
 
-      <parameter name="IPv6Enable" access="readWrite">
-        <description>
-          If set to {{true}}, attaches this interface to the IPv6 stack. If set
-          to {{false}}, detaches this interface from the IPv6 stack.
-
-          Once detached from the IPv6 stack, the interface will now no longer
-          be able to pass IPv6 packets, and will be operationally down (unless
-          also attached to an enabled IPv4 stack).
-
-          For an IPv6 capable device, if {{param}} is not present this
-          interface SHOULD be permanently attached to the IPv6 stack.
-
-          Note that {{param}} is independent of {{param|Enable}}, and that to
-          administratively enable an interface for IPv6 it is necessary for
-          both {{param|Enable}} and {{param}} to be {{true}}.
-        </description>
-        <syntax>
-          <boolean/>
-        </syntax>
-      </parameter>
-
-      <parameter name="ULAEnable" access="readWrite">
-        <description>
-          Controls whether or not ULAs {{bibref|RFC4193}} are generated and
-          used on this interface.
-        </description>
-        <syntax>
-          <boolean/>
-          <default type="object" value="false"/>
-        </syntax>
-      </parameter>
-
       <parameter name="Status" access="readOnly">
         <description>
           The current operational state of the interface (see
@@ -58691,12 +60245,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -58739,11 +60293,12 @@
           <string>
             <pathRef refType="strong" targetType="row"/>
           </string>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
-      <parameter name="Router" access="readWrite">
+      <parameter name="Router" access="readWrite"
+          dmr:previousParameter="LowerLayers">
         <description>
           {{reference}} The ''Router'' instance that is associated with this IP
           Interface entry.
@@ -58758,7 +60313,8 @@
         </syntax>
       </parameter>
 
-      <command name="Reset()" dmr:previousParameter="Router" async="false">
+      <command name="Reset()" dmr:previousParameter="Router" version="2.12"
+          async="false">
         <description>
           On a reset device MUST tear down the existing IP connection
           represented by this object and establish a new one.
@@ -58770,6 +60326,38 @@
         </description>
       </command>
 
+      <parameter name="IPv6Enable" access="readWrite" version="2.2">
+        <description>
+          If set to {{true}}, attaches this interface to the IPv6 stack. If set
+          to {{false}}, detaches this interface from the IPv6 stack.
+
+          Once detached from the IPv6 stack, the interface will now no longer
+          be able to pass IPv6 packets, and will be operationally down (unless
+          also attached to an enabled IPv4 stack).
+
+          For an IPv6 capable device, if {{param}} is not present this
+          interface SHOULD be permanently attached to the IPv6 stack.
+
+          Note that {{param}} is independent of {{param|Enable}}, and that to
+          administratively enable an interface for IPv6 it is necessary for
+          both {{param|Enable}} and {{param}} to be {{true}}.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ULAEnable" access="readWrite" version="2.2">
+        <description>
+          Controls whether or not ULAs {{bibref|RFC4193}} are generated and
+          used on this interface.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="object" value="false"/>
+        </syntax>
+      </parameter>
+
       <parameter name="MaxMTUSize" access="readWrite">
         <description>
           The maximum transmission unit (MTU); the largest allowed size of an
@@ -58838,7 +60426,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="IPv6AddressNumberOfEntries" access="readOnly">
+      <parameter name="IPv6AddressNumberOfEntries" access="readOnly"
+          version="2.2">
         <description>
           {{numentries}}
         </description>
@@ -58847,7 +60436,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="IPv6PrefixNumberOfEntries" access="readOnly">
+      <parameter name="IPv6PrefixNumberOfEntries" access="readOnly"
+          version="2.2">
         <description>
           {{numentries}}
         </description>
@@ -58873,7 +60463,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="TWAMPReflectorNumberOfEntries" access="readOnly">
+      <parameter name="TWAMPReflectorNumberOfEntries" access="readOnly"
+          version="2.12">
         <description>
           {{numentries}}
         </description>
@@ -58886,11 +60477,11 @@
     <object name="Device.IP.Interface.{i}.IPv4Address.{i}." access="readWrite"
         numEntriesParameter="IPv4AddressNumberOfEntries"
         enableParameter="Enable" minEntries="0" maxEntries="unbounded"
-        version="2.0">
+        version="2.0" dmr:previousObject="Device.IP.Interface.{i}.">
       <description>
         IPv4 address table. Entries are auto-created and auto-deleted as IP
-        addresses are added and deleted via DHCP, auto-IP, or IPCP. Static
-        entries are created and configured by the Controller.
+        addresses are added and deleted via DHCP, auto-IP, 3GPP-NAS, or IPCP.
+        Static entries are created and configured by the Controller.
       </description>
       <uniqueKey functional="false">
         <parameter ref="Alias"/>
@@ -58910,7 +60501,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Status" access="readOnly">
+      <parameter name="Status" access="readOnly" version="2.2">
         <description>
           The status of this {{object}} table entry. {{enum}}
 
@@ -58931,7 +60522,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.0">
         <description>
           {{datatype|expand}}
 
@@ -58939,7 +60530,7 @@
           {{enum|Static|AddressingType}}.
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -58981,6 +60572,18 @@
             <enumeration value="AutoIP"/>
             <enumeration value="IPCP"/>
             <enumeration value="Static"/>
+            <enumeration value="3GPP-NAS" version="2.18">
+              <description>
+                Assigned by the core network (fixed or cellular) using 3GPP NAS
+                signalling methods. e.g. PDU Session Establishment Request
+                {{bibref|3GPP-TS.24.501|Clause 6.2.4.2}}, PDN Connectivity
+                Request {{bibref|3GPP-TS.24.301|Clause 6.2.2}}, PDP Context
+                Activation Request {{bibref|3GPP-TS.24.008|Clause 6.1.2A}}, ...
+                This information is available from the AT commands
+                {{bibref|3GPP-TS.27.007|Clause 10.1.23}} PDP context read
+                dynamic parameters +CGCONTRDP.
+              </description>
+            </enumeration>
           </string>
           <default type="object" value="Static"/>
         </syntax>
@@ -59003,13 +60606,19 @@
         4.2.2}}.
       </description>
 
+      <command name="Reset()" async="false" version="2.18">
+        <description>
+          Reset all this object's statistics counters to zero.
+        </description>
+      </command>
+
       <parameter name="BytesSent" access="readOnly" activeNotify="canDeny">
         <description>
           The total number of bytes transmitted out of the interface, including
           framing characters.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
@@ -59019,7 +60628,7 @@
           framing characters.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
@@ -59028,7 +60637,7 @@
           The total number of packets transmitted out of the interface.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
@@ -59038,7 +60647,7 @@
           The total number of packets received on the interface.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
@@ -59048,7 +60657,7 @@
           because of errors.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="StatsCounter32"/>
         </syntax>
       </parameter>
 
@@ -59059,31 +60668,19 @@
           them from being delivered to a higher-layer protocol.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="StatsCounter32"/>
         </syntax>
       </parameter>
 
       <parameter name="UnicastPacketsSent" access="readOnly"
-          activeNotify="canDeny">
+          activeNotify="canDeny" dmr:previousParameter="ErrorsReceived">
         <description>
           The total number of packets requested for transmission which were not
           addressed to a multicast or broadcast address at this layer,
           including those that were discarded or not sent.
         </description>
         <syntax>
-          <unsignedLong/>
-        </syntax>
-      </parameter>
-
-      <parameter name="UnicastPacketsReceived" access="readOnly"
-          activeNotify="canDeny">
-        <description>
-          The total number of received packets, delivered by this layer to a
-          higher layer, which were not addressed to a multicast or broadcast
-          address at this layer.
-        </description>
-        <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
@@ -59096,7 +60693,7 @@
           could be to free up buffer space.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="StatsCounter32"/>
         </syntax>
       </parameter>
 
@@ -59109,19 +60706,31 @@
           to free up buffer space.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="StatsCounter32"/>
         </syntax>
       </parameter>
 
       <parameter name="MulticastPacketsSent" access="readOnly"
-          activeNotify="canDeny">
+          activeNotify="canDeny" dmr:previousParameter="DiscardPacketsReceived">
         <description>
           The total number of packets that higher-level protocols requested for
           transmission and which were addressed to a multicast address at this
           layer, including those that were discarded or not sent.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="UnicastPacketsReceived" access="readOnly"
+          activeNotify="canDeny">
+        <description>
+          The total number of received packets, delivered by this layer to a
+          higher layer, which were not addressed to a multicast or broadcast
+          address at this layer.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
@@ -59133,7 +60742,7 @@
           layer.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
@@ -59147,7 +60756,7 @@
           will never cause this counter to increment.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
@@ -59161,7 +60770,7 @@
           will never cause this counter to increment.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
@@ -59172,7 +60781,7 @@
           discarded because of an unknown or unsupported protocol.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="StatsCounter32"/>
         </syntax>
       </parameter>
     </object>
@@ -59180,7 +60789,8 @@
     <object name="Device.IP.Interface.{i}.TWAMPReflector.{i}."
         access="readWrite" minEntries="0" maxEntries="unbounded"
         enableParameter="Enable"
-        numEntriesParameter="TWAMPReflectorNumberOfEntries" version="2.12">
+        numEntriesParameter="TWAMPReflectorNumberOfEntries" version="2.12"
+        dmr:previousObject="Device.Interface.{i}.Stats.">
       <description>
         This object contains parameters associated with the configuration that
         permits this interface to be used as Two-Way Active Measurement
@@ -59215,12 +60825,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.12">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -59295,7 +60905,7 @@
           packets to be received from any source port.
 
           Each entry in the list MUST be either a port number or a range of
-          port numbers separated by a hypen (-).
+          port numbers separated by a hyphen (-).
 
           For example, an entry with the value: '2-40' accepts test packets
           from any allowed source IP addresses with a source port between 2 and
@@ -59326,7 +60936,7 @@
           of link-local addresses (for all types of device) and global
           addresses (for non-router devices).
 
-        * Automatically via DHCPv6 {{bibref|RFC3315}}, which covers generation
+        * Automatically via DHCPv6 {{bibref|RFC8415}}, which covers generation
           of any type of address (subject to the configured DHCP server
           policy).
 
@@ -59447,7 +61057,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.2">
         <description>
           {{datatype|expand}}
 
@@ -59455,7 +61065,7 @@
           {{enum|Static|Origin}}.
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -59488,12 +61098,12 @@
                 specified by SLAAC {{bibref|RFC4862|Section 5.3}}, a global
                 address as specified by SLAAC {{bibref|RFC4862|Section 5.5}},
                 or generated via CPE logic (e.g. from delegated prefix as
-                specified by {{bibref|RFC3633}}), or from ULA /48 prefix as
+                specified by {{bibref|RFC8415}}), or from ULA /48 prefix as
                 specified by {{bibref|RFC4193}}.
               </description>
             </enumeration>
             <enumeration value="DHCPv6">
-              <description>Assigned by DHCPv6 {{bibref|RFC3315}}.</description>
+              <description>Assigned by DHCPv6 {{bibref|RFC8415}}.</description>
             </enumeration>
             <enumeration value="IKEv2">
               <description>Assigned by IKEv2 {{bibref|RFC5996}}.</description>
@@ -59510,6 +61120,18 @@
                 loopback address, which is defined in {{bibref|RFC4291}}.
               </description>
             </enumeration>
+            <enumeration value="3GPP-NAS" version="2.18">
+              <description>
+                Address assigned by the core network (fixed or cellular) using
+                3GPP NAS signalling methods. e.g. PDU Session Establishment
+                Request {{bibref|3GPP-TS.24.501|Clause 6.2.4.2}}, PDN
+                Connectivity Request {{bibref|3GPP-TS.24.301|Clause 6.2.2}},
+                PDP Context Activation Request {{bibref|3GPP-TS.24.008|Clause
+                6.1.2A}}, ... This information is available from the AT
+                commands {{bibref|3GPP-TS.27.007|Clause 10.1.23}} PDP context
+                read dynamic parameters +CGCONTRDP.
+              </description>
+            </enumeration>
             <enumeration value="Static">
               <description>
                 For example, present in the factory default configuration (but
@@ -59609,8 +61231,8 @@
         * Automatically via {{bibref|RFC4861}} Router Advertisements. See also
           {{object|###.RouterAdvertisement}}.
 
-        * Automatically via DHCPv6 {{bibref|RFC3315}} prefix delegation
-          {{bibref|RFC3633}}. See also {{object|###.DHCPv6.Client}}.
+        * Automatically via DHCPv6 {{bibref|RFC8415}} prefix delegation
+          {{bibref|RFC8415}}. See also {{object|###.DHCPv6.Client}}.
 
         * Automatically via internal CPE logic, e.g. creation of child prefixes
           derived from a parent prefix.
@@ -59701,7 +61323,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.2">
         <description>
           {{datatype|expand}}
 
@@ -59709,7 +61331,7 @@
           {{enum|Static|Origin}}.
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -59765,7 +61387,7 @@
             </enumeration>
             <enumeration value="PrefixDelegation">
               <description>
-                Delegated via DHCPv6 {{bibref|RFC3633}} or some other protocol,
+                Delegated via DHCPv6 {{bibref|RFC8415}} or some other protocol,
                 e.g. IPv6rd {{bibref|RFC5969}}. Also see {{param|StaticType}}.
               </description>
             </enumeration>
@@ -60079,7 +61701,7 @@
         The IP Diagnostics object.
       </description>
 
-      <parameter name="IPv4PingSupported" access="readOnly">
+      <parameter name="IPv4PingSupported" access="readOnly" version="2.8">
         <description>
           Indicates that Ping over IPv4 is supported.
         </description>
@@ -60088,7 +61710,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="IPv6PingSupported" access="readOnly">
+      <parameter name="IPv6PingSupported" access="readOnly" version="2.8">
         <description>
           Indicates that Ping over IPv6 is supported.
         </description>
@@ -60097,7 +61719,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="IPv4TraceRouteSupported" access="readOnly">
+      <parameter name="IPv4TraceRouteSupported" access="readOnly"
+          version="2.8">
         <description>
           Indicates that TraceRoute over IPv4 is supported.
         </description>
@@ -60106,7 +61729,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="IPv6TraceRouteSupported" access="readOnly">
+      <parameter name="IPv6TraceRouteSupported" access="readOnly"
+          version="2.8">
         <description>
           Indicates that TraceRoute over IPv6 is supported.
         </description>
@@ -60115,7 +61739,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="IPv4DownloadDiagnosticsSupported" access="readOnly">
+      <parameter name="IPv4DownloadDiagnosticsSupported" access="readOnly"
+          version="2.9">
         <description>
           Indicates that Download Diagnostics over IPv4 is supported.
         </description>
@@ -60124,7 +61749,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="IPv6DownloadDiagnosticsSupported" access="readOnly">
+      <parameter name="IPv6DownloadDiagnosticsSupported" access="readOnly"
+          version="2.9">
         <description>
           Indicates that Download Diagnostics over IPv6 is supported.
         </description>
@@ -60133,7 +61759,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="IPv4UploadDiagnosticsSupported" access="readOnly">
+      <parameter name="IPv4UploadDiagnosticsSupported" access="readOnly"
+          version="2.9">
         <description>
           Indicates that Upload Diagnostics over IPv4 is supported.
         </description>
@@ -60142,7 +61769,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="IPv6UploadDiagnosticsSupported" access="readOnly">
+      <parameter name="IPv6UploadDiagnosticsSupported" access="readOnly"
+          version="2.9">
         <description>
           Indicates that Upload Diagnostics over IPv6 is supported.
         </description>
@@ -60151,7 +61779,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="IPv4UDPEchoDiagnosticsSupported" access="readOnly">
+      <parameter name="IPv4UDPEchoDiagnosticsSupported" access="readOnly"
+          version="2.9">
         <description>
           Indicates that UDPEcho Diagnostics over IPv4 is supported.
         </description>
@@ -60160,7 +61789,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="IPv6UDPEchoDiagnosticsSupported" access="readOnly">
+      <parameter name="IPv6UDPEchoDiagnosticsSupported" access="readOnly"
+          version="2.9">
         <description>
           Indicates that UDPEcho Diagnostics over IPv6 is supported.
         </description>
@@ -60169,7 +61799,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="IPLayerCapacitySupported" access="readOnly">
+      <parameter name="IPLayerCapacitySupported" access="readOnly"
+          version="2.14">
         <description>
           Indicates that IP Layer Capacity measurement is supported.
         </description>
@@ -60179,7 +61810,7 @@
       </parameter>
 
       <parameter name="IPv4ServerSelectionDiagnosticsSupported"
-          access="readOnly">
+          access="readOnly" version="2.9">
         <description>
           Indicates that ServerSelection Diagnostics over IPv4 is supported.
         </description>
@@ -60189,7 +61820,7 @@
       </parameter>
 
       <parameter name="IPv6ServerSelectionDiagnosticsSupported"
-          access="readOnly">
+          access="readOnly" version="2.9">
         <description>
           Indicates that ServerSelection Diagnostics over IPv6 is supported.
         </description>
@@ -60198,13 +61829,13 @@
         </syntax>
       </parameter>
 
-      <command name="IPPing()" async="true">
+      <command name="IPPing()" async="true" version="2.12">
         <description>
           This command provides access to an IP-layer ping test.
         </description>
         <input>
 
-          <parameter name="Interface">
+          <parameter name="Interface" version="2.12">
             <description>
               {{reference}} The layer 2 or layer 3 interface over which the
               test is to be performed. Example: ''Device.IP.Interface.1'',
@@ -60220,7 +61851,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="ProtocolVersion" mandatory="true">
+          <parameter name="ProtocolVersion" mandatory="true" version="2.12">
             <description>
               Indicates the IP protocol to be used.
             </description>
@@ -60241,7 +61872,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="Host" mandatory="true">
+          <parameter name="Host" mandatory="true" version="2.12">
             <description>
               Host name or address of the host to ping.
 
@@ -60256,7 +61887,8 @@
             </syntax>
           </parameter>
 
-          <parameter name="NumberOfRepetitions" mandatory="true">
+          <parameter name="NumberOfRepetitions" mandatory="true"
+              version="2.12">
             <description>
               Number of repetitions of the ping test to perform before
               reporting the results.
@@ -60268,7 +61900,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="Timeout" mandatory="true">
+          <parameter name="Timeout" mandatory="true" version="2.12">
             <description>
               Timeout in {{units}} for the ping test.
             </description>
@@ -60280,7 +61912,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="DataBlockSize" mandatory="true">
+          <parameter name="DataBlockSize" mandatory="true" version="2.12">
             <description>
               Size of the data block in bytes to be sent for each ping.
             </description>
@@ -60291,7 +61923,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="DSCP">
+          <parameter name="DSCP" version="2.12">
             <description>
               DiffServ codepoint to be used for the test packets. By default
               the CPE SHOULD set this value to zero.
@@ -60305,7 +61937,7 @@
         </input>
         <output>
 
-          <parameter name="Status">
+          <parameter name="Status" version="2.13">
             <description>
               Indicates the availability of diagnostics data. {{enum}}
 
@@ -60330,7 +61962,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="IPAddressUsed">
+          <parameter name="IPAddressUsed" version="2.12">
             <description>
               Indicates which IP address was used to send the Ping request.
             </description>
@@ -60339,7 +61971,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="SuccessCount">
+          <parameter name="SuccessCount" version="2.12">
             <description>
               Result parameter indicating the number of successful pings (those
               in which a successful response was received prior to the timeout)
@@ -60350,7 +61982,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="FailureCount">
+          <parameter name="FailureCount" version="2.12">
             <description>
               Result parameter indicating the number of failed pings in the
               most recent ping test.
@@ -60360,7 +61992,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="AverageResponseTime">
+          <parameter name="AverageResponseTime" version="2.12">
             <description>
               Result parameter indicating the average response time in
               {{units}} over all repetitions with successful responses of the
@@ -60374,7 +62006,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="MinimumResponseTime">
+          <parameter name="MinimumResponseTime" version="2.12">
             <description>
               Result parameter indicating the minimum response time in
               {{units}} over all repetitions with successful responses of the
@@ -60388,7 +62020,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="MaximumResponseTime">
+          <parameter name="MaximumResponseTime" version="2.12">
             <description>
               Result parameter indicating the maximum response time in
               {{units}} over all repetitions with successful responses of the
@@ -60402,7 +62034,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="AverageResponseTimeDetailed">
+          <parameter name="AverageResponseTimeDetailed" version="2.12">
             <description>
               Result parameter indicating the average response time in
               {{units}} over all repetitions with successful responses of the
@@ -60416,7 +62048,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="MinimumResponseTimeDetailed">
+          <parameter name="MinimumResponseTimeDetailed" version="2.12">
             <description>
               Result parameter indicating the minimum response time in
               {{units}} over all repetitions with successful responses of the
@@ -60430,7 +62062,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="MaximumResponseTimeDetailed">
+          <parameter name="MaximumResponseTimeDetailed" version="2.12">
             <description>
               Result parameter indicating the maximum response time in
               {{units}} over all repetitions with successful responses of the
@@ -60446,14 +62078,14 @@
         </output>
       </command>
 
-      <command name="TraceRoute()" async="true">
+      <command name="TraceRoute()" async="true" version="2.12">
         <description>
           This command defines access to an IP-layer trace-route test for the
           specified IP interface.
         </description>
         <input>
 
-          <parameter name="Interface">
+          <parameter name="Interface" version="2.12">
             <description>
               {{reference}} The layer 2 or layer 3 interface over which the
               test is to be performed. Example: ''Device.IP.Interface.1'',
@@ -60469,7 +62101,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="ProtocolVersion" mandatory="true">
+          <parameter name="ProtocolVersion" mandatory="true" version="2.12">
             <description>
               Indicates the IP protocol to be used.
             </description>
@@ -60490,7 +62122,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="Host" mandatory="true">
+          <parameter name="Host" mandatory="true" version="2.12">
             <description>
               Host name or address of the host to find a route to.
 
@@ -60505,7 +62137,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="NumberOfTries">
+          <parameter name="NumberOfTries" version="2.12">
             <description>
               Number of tries per hop. Set prior to running Diagnostic. By
               default, the CPE SHOULD set this value to 3.
@@ -60517,7 +62149,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="Timeout">
+          <parameter name="Timeout" version="2.12">
             <description>
               Timeout in {{units}} for each hop of the trace route test. By
               default the CPE SHOULD set this value to 5000.
@@ -60530,7 +62162,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="DataBlockSize">
+          <parameter name="DataBlockSize" version="2.12">
             <description>
               Size of the data block in bytes to be sent for each trace route.
               By default, the CPE SHOULD set this value to 38.
@@ -60542,7 +62174,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="DSCP">
+          <parameter name="DSCP" version="2.12">
             <description>
               DiffServ codepoint to be used for the test packets. By default
               the CPE SHOULD set this value to 0.
@@ -60554,7 +62186,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="MaxHopCount">
+          <parameter name="MaxHopCount" version="2.12">
             <description>
               The maximum number of hop used in outgoing probe packets (max
               TTL). By default the CPE SHOULD set this value to 30.
@@ -60568,7 +62200,7 @@
         </input>
         <output>
 
-          <parameter name="Status">
+          <parameter name="Status" version="2.13">
             <description>
               Indicates the availability of diagnostics data. {{enum}}
 
@@ -60594,7 +62226,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="IPAddressUsed">
+          <parameter name="IPAddressUsed" version="2.12">
             <description>
               Indicates which IP address was used for TraceRoute.
             </description>
@@ -60603,7 +62235,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="ResponseTime">
+          <parameter name="ResponseTime" version="2.12">
             <description>
               Result parameter indicating the response time in {{units}} the
               most recent trace route test. If a route could not be determined,
@@ -60680,7 +62312,7 @@
         </output>
       </command>
 
-      <parameter name="DownloadTransports" access="readOnly">
+      <parameter name="DownloadTransports" access="readOnly" version="2.0">
         <description>
           Supported ''DownloadDiagnostics'' transport protocols for a CPE
           device.
@@ -60694,7 +62326,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="DownloadDiagnosticMaxConnections" access="readOnly">
+      <parameter name="DownloadDiagnosticMaxConnections" access="readOnly"
+          version="2.9">
         <description>
           Indicates the maximum number of connections that are supported by
           Download Diagnostics.
@@ -60707,7 +62340,7 @@
       </parameter>
 
       <parameter name="DownloadDiagnosticsMaxIncrementalResult"
-          access="readOnly">
+          access="readOnly" version="2.9">
         <description>
           The maximum number of instances in
           {{object|DownloadDiagnostics().IncrementalResult}} that the
@@ -60720,7 +62353,7 @@
         </syntax>
       </parameter>
 
-      <command name="DownloadDiagnostics()" async="true">
+      <command name="DownloadDiagnostics()" async="true" version="2.12">
         <description>
           This command defines the diagnostics configuration for a HTTP and FTP
           DownloadDiagnostics Test.
@@ -60730,7 +62363,7 @@
         </description>
         <input>
 
-          <parameter name="Interface">
+          <parameter name="Interface" version="2.12">
             <description>
               {{reference}} The IP-layer interface over which the test is to be
               performed. Example: Device.IP.Interface.1
@@ -60745,7 +62378,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="DownloadURL" mandatory="true">
+          <parameter name="DownloadURL" mandatory="true" version="2.12">
             <description>
               The {{datatype}} for the CPE to perform the download on. This
               parameter MUST be in the form of a valid HTTP {{bibref|RFC2616}}
@@ -60768,7 +62401,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="DSCP">
+          <parameter name="DSCP" version="2.12">
             <description>
               The DiffServ code point for marking packets transmitted in the
               test.
@@ -60782,7 +62415,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="EthernetPriority">
+          <parameter name="EthernetPriority" version="2.12">
             <description>
               Ethernet priority code for marking packets transmitted in the
               test (if applicable).
@@ -60796,7 +62429,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="TimeBasedTestDuration">
+          <parameter name="TimeBasedTestDuration" version="2.12">
             <description>
               Controls time based testing {{bibref|TR-143|Section 4.3}}. When
               {{param}} &gt; 0, {{param}} is the duration in {{units}} of a
@@ -60812,7 +62445,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="TimeBasedTestMeasurementInterval">
+          <parameter name="TimeBasedTestMeasurementInterval" version="2.12">
             <description>
               The measurement interval duration in {{units}} for objects in
               {{object|IncrementalResult}} for a time based FTP/HTTP download
@@ -60832,7 +62465,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="TimeBasedTestMeasurementOffset">
+          <parameter name="TimeBasedTestMeasurementOffset" version="2.12">
             <description>
               This {{param}} works in conjunction with
               {{param|TimeBasedTestMeasurementInterval}} to allow the interval
@@ -60852,7 +62485,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="ProtocolVersion">
+          <parameter name="ProtocolVersion" version="2.12">
             <description>
               Indicates the IP protocol version to be used. The default value
               SHOULD be {{enum|Any}}.
@@ -60874,7 +62507,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="NumberOfConnections">
+          <parameter name="NumberOfConnections" version="2.12">
             <description>
               The number of connections to be used in the test. The default
               value SHOULD be 1. {{param}} MUST NOT be set to a value greater
@@ -60887,7 +62520,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="EnablePerConnectionResults">
+          <parameter name="EnablePerConnectionResults" version="2.12">
             <description>
               The results must be returned in the
               {{object|PerConnectionResult}} table for every connection when
@@ -60900,7 +62533,7 @@
         </input>
         <output>
 
-          <parameter name="Status">
+          <parameter name="Status" version="2.13">
             <description>
               Indicates the availability of diagnostics data. {{enum}}
 
@@ -60928,7 +62561,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="IPAddressUsed">
+          <parameter name="IPAddressUsed" version="2.12">
             <description>
               Indicates which IP address was used to send the request.
             </description>
@@ -60937,7 +62570,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="ROMTime">
+          <parameter name="ROMTime" version="2.12">
             <description>
               Request time in UTC, which MUST be specified to microsecond
               precision.
@@ -60958,7 +62591,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="BOMTime">
+          <parameter name="BOMTime" version="2.12">
             <description>
               Begin of transmission time in UTC, which MUST be specified to
               microsecond precision
@@ -60979,7 +62612,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="EOMTime">
+          <parameter name="EOMTime" version="2.12">
             <description>
               End of transmission in UTC, which MUST be specified to
               microsecond precision.
@@ -61000,7 +62633,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="TestBytesReceived">
+          <parameter name="TestBytesReceived" version="2.12">
             <description>
               The number of {{units}} received during the FTP/HTTP transaction
               including FTP/HTTP headers, between {{param|BOMTime}} and
@@ -61013,7 +62646,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="TotalBytesReceived">
+          <parameter name="TotalBytesReceived" version="2.12">
             <description>
               The total number of {{units}} (at the IP layer) received on the
               Interface between {{param|BOMTime}} and {{param|EOMTime}}. This
@@ -61029,7 +62662,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="TotalBytesSent">
+          <parameter name="TotalBytesSent" version="2.12">
             <description>
               The total number of {{units}} (at the IP layer) sent on the
               Interface between {{param|BOMTime}} and {{param|EOMTime}}. This
@@ -61045,7 +62678,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="TestBytesReceivedUnderFullLoading">
+          <parameter name="TestBytesReceivedUnderFullLoading" version="2.12">
             <description>
               The number of {{units}} of the test file received between the
               latest {{param|PerConnectionResult.{i}.BOMTime}} and the earliest
@@ -61058,7 +62691,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="TotalBytesReceivedUnderFullLoading">
+          <parameter name="TotalBytesReceivedUnderFullLoading" version="2.12">
             <description>
               The total number of {{units}} (at the IP layer) received in
               between the latest {{param|PerConnectionResult.{i}.BOMTime}} and
@@ -61075,7 +62708,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="TotalBytesSentUnderFullLoading">
+          <parameter name="TotalBytesSentUnderFullLoading" version="2.12">
             <description>
               The total number of {{units}} (at the IP layer) sent between the
               latest {{param|PerConnectionResult.{i}.BOMTime}} and the earliest
@@ -61092,7 +62725,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="PeriodOfFullLoading">
+          <parameter name="PeriodOfFullLoading" version="2.12">
             <description>
               The period of time in {{units}} between the latest
               {{param|PerConnectionResult.{i}.BOMTime}} and the earliest
@@ -61105,7 +62738,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="TCPOpenRequestTime">
+          <parameter name="TCPOpenRequestTime" version="2.12">
             <description>
               Request time in UTC, which MUST be specified to microsecond
               precision.
@@ -61128,7 +62761,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="TCPOpenResponseTime">
+          <parameter name="TCPOpenResponseTime" version="2.12">
             <description>
               Response time in UTC, which MUST be specified to microsecond
               precision.
@@ -61380,7 +63013,7 @@
         </output>
       </command>
 
-      <parameter name="UploadTransports" access="readOnly">
+      <parameter name="UploadTransports" access="readOnly" version="2.0">
         <description>
           Supported ''UploadDiagnostics'' transport protocols for a CPE device.
         </description>
@@ -61393,7 +63026,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="UploadDiagnosticsMaxConnections" access="readOnly">
+      <parameter name="UploadDiagnosticsMaxConnections" access="readOnly"
+          version="2.9">
         <description>
           Indicates the maximum number of connections that are supported by
           Upload Diagnostics.
@@ -61406,7 +63040,7 @@
       </parameter>
 
       <parameter name="UploadDiagnosticsMaxIncrementalResult"
-          access="readOnly">
+          access="readOnly" version="2.9">
         <description>
           The maximum number of instances in
           {{object|UploadDiagnostics().IncrementalResult}} that the
@@ -61419,7 +63053,7 @@
         </syntax>
       </parameter>
 
-      <command name="UploadDiagnostics()" async="true">
+      <command name="UploadDiagnostics()" async="true" version="2.12">
         <description>
           This command defines the diagnostics configuration for a HTTP or FTP
           UploadDiagnostics test.
@@ -61429,7 +63063,7 @@
         </description>
         <input>
 
-          <parameter name="Interface">
+          <parameter name="Interface" version="2.12">
             <description>
               {{reference}} The IP-layer interface over which the test is to be
               performed. Example: Device.IP.Interface.1
@@ -61444,7 +63078,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="UploadURL" mandatory="true">
+          <parameter name="UploadURL" mandatory="true" version="2.12">
             <description>
               The {{datatype}} for the CPE to Upload to. This parameter MUST be
               in the form of a valid HTTP {{bibref|RFC2616}} or FTP
@@ -61463,7 +63097,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="DSCP">
+          <parameter name="DSCP" version="2.12">
             <description>
               DiffServ code point for marking packets transmitted in the test.
 
@@ -61476,7 +63110,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="EthernetPriority">
+          <parameter name="EthernetPriority" version="2.12">
             <description>
               Ethernet priority code for marking packets transmitted in the
               test (if applicable).
@@ -61490,7 +63124,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="TestFileLength">
+          <parameter name="TestFileLength" version="2.12">
             <description>
               The size of the file {{units}} to be uploaded to the server.
 
@@ -61503,7 +63137,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="TimeBasedTestDuration">
+          <parameter name="TimeBasedTestDuration" version="2.12">
             <description>
               Controls time based testing {{bibref|TR-143|Section 4.3}}. When
               {{param}} &gt; 0, {{param}} is the duration in {{units}} of a
@@ -61519,7 +63153,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="TimeBasedTestMeasurementInterval">
+          <parameter name="TimeBasedTestMeasurementInterval" version="2.12">
             <description>
               The measurement interval duration in {{units}} for objects in
               {{object|IncrementalResult}} for a time based FTP/HTTP upload
@@ -61539,7 +63173,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="TimeBasedTestMeasurementOffset">
+          <parameter name="TimeBasedTestMeasurementOffset" version="2.12">
             <description>
               This {{param}} works in conjunction with
               {{param|TimeBasedTestMeasurementInterval}} and allows the
@@ -61559,7 +63193,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="ProtocolVersion">
+          <parameter name="ProtocolVersion" version="2.12">
             <description>
               Indicates the IP protocol version to be used. The default value
               SHOULD be {{enum|Any}}.
@@ -61581,7 +63215,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="NumberOfConnections">
+          <parameter name="NumberOfConnections" version="2.12">
             <description>
               The number of connections to be used in the test. The default
               value SHOULD be 1. {{param}} MUST NOT be set to a value greater
@@ -61594,7 +63228,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="EnablePerConnectionResults">
+          <parameter name="EnablePerConnectionResults" version="2.12">
             <description>
               The results must be returned in the
               {{object|PerConnectionResult}} table for every connection when
@@ -61607,7 +63241,7 @@
         </input>
         <output>
 
-          <parameter name="Status">
+          <parameter name="Status" version="2.13">
             <description>
               Indicates the availability of diagnostics data. {{enum}}
 
@@ -61636,7 +63270,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="IPAddressUsed">
+          <parameter name="IPAddressUsed" version="2.12">
             <description>
               Indicates which IP address was used to send the request.
             </description>
@@ -61645,7 +63279,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="ROMTime">
+          <parameter name="ROMTime" version="2.12">
             <description>
               Request time in UTC, which MUST be specified to microsecond
               precision.
@@ -61666,7 +63300,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="BOMTime">
+          <parameter name="BOMTime" version="2.12">
             <description>
               Begin of transmission time in UTC, which MUST be specified to
               microsecond precision
@@ -61687,7 +63321,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="EOMTime">
+          <parameter name="EOMTime" version="2.12">
             <description>
               End of transmission in UTC, which MUST be specified to
               microsecond precision.
@@ -61708,11 +63342,11 @@
             </syntax>
           </parameter>
 
-          <parameter name="TestBytesSent">
+          <parameter name="TestBytesSent" version="2.12">
             <description>
               The number of {{units}} of the test file sent during the FTP/HTTP
               transaction including FTP/HTTP headers, between {{param|BOMTime}}
-              and {{param|EOMTime}} acrosss all connections.
+              and {{param|EOMTime}} across all connections.
             </description>
             <syntax>
               <dataType ref="StatsCounter64">
@@ -61721,7 +63355,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="TotalBytesReceived">
+          <parameter name="TotalBytesReceived" version="2.12">
             <description>
               The total number of {{units}} (at the IP layer) received on the
               Interface between {{param|BOMTime}} and {{param|EOMTime}}. This
@@ -61737,7 +63371,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="TotalBytesSent">
+          <parameter name="TotalBytesSent" version="2.12">
             <description>
               The total number of {{units}} (at the IP layer) sent on the
               Interface between {{param|BOMTime}} and {{param|EOMTime}}. This
@@ -61753,7 +63387,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="TestBytesSentUnderFullLoading">
+          <parameter name="TestBytesSentUnderFullLoading" version="2.12">
             <description>
               The number of {{units}} of the test file sent between the latest
               {{param|PerConnectionResult.{i}.BOMTime}} and the earliest
@@ -61766,7 +63400,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="TotalBytesReceivedUnderFullLoading">
+          <parameter name="TotalBytesReceivedUnderFullLoading" version="2.12">
             <description>
               The total number of {{units}} (at the IP layer) received between
               the latest {{param|PerConnectionResult.{i}.BOMTime}} and the
@@ -61785,7 +63419,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="TotalBytesSentUnderFullLoading">
+          <parameter name="TotalBytesSentUnderFullLoading" version="2.12">
             <description>
               The total number of {{units}} (at the IP layer) sent between the
               latest {{param|PerConnectionResult.{i}.BOMTime}} and the earliest
@@ -61804,7 +63438,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="PeriodOfFullLoading">
+          <parameter name="PeriodOfFullLoading" version="2.12">
             <description>
               The period of time in {{units}} between the latest
               {{param|PerConnectionResult.{i}.BOMTime}} and the earliest
@@ -61817,7 +63451,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="TCPOpenRequestTime">
+          <parameter name="TCPOpenRequestTime" version="2.12">
             <description>
               Request time in UTC, which MUST be specified to microsecond
               precision.
@@ -61840,7 +63474,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="TCPOpenResponseTime">
+          <parameter name="TCPOpenResponseTime" version="2.12">
             <description>
               Response time in UTC, which MUST be specified to microsecond
               precision.
@@ -62093,7 +63727,8 @@
         </output>
       </command>
 
-      <parameter name="UDPEchoDiagnosticsMaxResults" access="readOnly">
+      <parameter name="UDPEchoDiagnosticsMaxResults" access="readOnly"
+          version="2.9">
         <description>
           The maximum number of rows in
           {{object|UDPEchoDiagnostics().IndividualPacketResult}} that the CPE
@@ -62108,7 +63743,7 @@
         </syntax>
       </parameter>
 
-      <command name="UDPEchoDiagnostics()" async="true">
+      <command name="UDPEchoDiagnostics()" async="true" version="2.12">
         <description>
           This command defines the diagnostics configuration for a UDP Echo
           test {{bibref|TR-143|Appendix A.1}} defined in {{bibref|RFC862}} or a
@@ -62116,7 +63751,7 @@
         </description>
         <input>
 
-          <parameter name="Interface">
+          <parameter name="Interface" version="2.12">
             <description>
               The IP-layer interface over which the test is to be performed.
               Example: Device.IP.Interface.1
@@ -62132,7 +63767,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="Host" mandatory="true">
+          <parameter name="Host" mandatory="true" version="2.12">
             <description>
               Host name or address of the host to perform tests to.
             </description>
@@ -62143,7 +63778,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="Port" mandatory="true">
+          <parameter name="Port" mandatory="true" version="2.12">
             <description>
               Port on the host to perform tests to.
             </description>
@@ -62155,7 +63790,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="NumberOfRepetitions">
+          <parameter name="NumberOfRepetitions" version="2.12">
             <description>
               Number of repetitions of the test to perform before reporting the
               results. The default value SHOULD be 1.
@@ -62167,7 +63802,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="Timeout" mandatory="true">
+          <parameter name="Timeout" mandatory="true" version="2.12">
             <description>
               Timeout in {{units}} for the test. That is, the amount of time to
               wait for the return of a packet that was sent to the
@@ -62181,7 +63816,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="DataBlockSize">
+          <parameter name="DataBlockSize" version="2.12">
             <description>
               Size of the data block in {{units}} to be sent for each packet.
               The default value SHOULD be 24.
@@ -62194,7 +63829,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="DSCP">
+          <parameter name="DSCP" version="2.12">
             <description>
               DiffServ codepoint to be used for the test packets. The default
               value SHOULD be zero.
@@ -62206,7 +63841,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="InterTransmissionTime">
+          <parameter name="InterTransmissionTime" version="2.12">
             <description>
               The time in {{units}} between the {{param|NumberOfRepetitions}}
               of packets sent during a given test. The default value SHOULD be
@@ -62220,7 +63855,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="ProtocolVersion">
+          <parameter name="ProtocolVersion" version="2.12">
             <description>
               Indicates the IP protocol version to be used. The default value
               SHOULD be {{enum|Any}}.
@@ -62242,7 +63877,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="EnableIndividualPacketResults">
+          <parameter name="EnableIndividualPacketResults" version="2.12">
             <description>
               The results must be returned in the
               {{object|IndividualPacketResult}} table for every repetition of
@@ -62256,7 +63891,7 @@
         </input>
         <output>
 
-          <parameter name="Status">
+          <parameter name="Status" version="2.13">
             <description>
               Indicates the availability of diagnostics data. {{enum}}
 
@@ -62274,7 +63909,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="IPAddressUsed">
+          <parameter name="IPAddressUsed" version="2.12">
             <description>
               Indicates which IP address was used to send the request.
             </description>
@@ -62283,7 +63918,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="SuccessCount">
+          <parameter name="SuccessCount" version="2.12">
             <description>
               Result parameter indicating the number of successful packets
               (those in which a successful response was received prior to the
@@ -62294,7 +63929,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="FailureCount">
+          <parameter name="FailureCount" version="2.12">
             <description>
               Result parameter indicating the number of failed packets (those
               in which a successful response was not received prior to the
@@ -62305,7 +63940,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="AverageResponseTime">
+          <parameter name="AverageResponseTime" version="2.12">
             <description>
               Result parameter indicating the average response time in
               {{units}} over all repetitions with successful responses of the
@@ -62319,7 +63954,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="MinimumResponseTime">
+          <parameter name="MinimumResponseTime" version="2.12">
             <description>
               Result parameter indicating the minimum response time in
               {{units}} over all repetitions with successful responses of the
@@ -62333,7 +63968,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="MaximumResponseTime">
+          <parameter name="MaximumResponseTime" version="2.12">
             <description>
               Result parameter indicating the maximum response time in
               {{units}} over all repetitions with successful responses of the
@@ -62477,7 +64112,7 @@
         </output>
       </command>
 
-      <parameter name="IPLayerMaxConnections" access="readOnly">
+      <parameter name="IPLayerMaxConnections" access="readOnly" version="2.14">
         <description>
           Indicates the maximum number of connections that are supported for an
           IP-Layer Capacity test.
@@ -62489,7 +64124,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="IPLayerMaxIncrementalResult" access="readOnly">
+      <parameter name="IPLayerMaxIncrementalResult" access="readOnly"
+          version="2.14">
         <description>
           The maximum number of instances in
           {{object|IPLayerCapacity().IncrementalResult}} that the
@@ -62502,7 +64138,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="IPLayerCapSupportedSoftwareVersion" access="readOnly">
+      <parameter name="IPLayerCapSupportedSoftwareVersion" access="readOnly"
+          version="2.15">
         <description>
           Indicates the installed version of the test software. The software
           version string will be implementation-dependent, and SHOULD identify
@@ -62516,7 +64153,7 @@
       </parameter>
 
       <parameter name="IPLayerCapSupportedControlProtocolVersion"
-          access="readOnly">
+          access="readOnly" version="2.15">
         <description>
           Indicates the control protocol version supported by the test
           software. Refer to {{bibref|TR-471}} for more information.
@@ -62528,7 +64165,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="IPLayerCapSupportedMetrics" access="readOnly">
+      <parameter name="IPLayerCapSupportedMetrics" access="readOnly"
+          version="2.14">
         <description>
           Indicates the test metrics from {{bibref|TR-471|Section 5.2}} that
           are supported by the device.
@@ -62558,7 +64196,7 @@
         </syntax>
       </parameter>
 
-      <command name="IPLayerCapacity()" async="true">
+      <command name="IPLayerCapacity()" async="true" version="2.14">
         <description>
           This command defines the IP Layer Capacity measurement configuration.
           IP Layer Capacity measurement is specified in {{bibref|TR-471}}.
@@ -62568,7 +64206,7 @@
         </description>
         <input>
 
-          <parameter name="Interface">
+          <parameter name="Interface" version="2.14">
             <description>
               {{reference}} The IP-layer interface over which the test is to be
               performed. Example: Device.IP.Interface.1
@@ -62583,7 +64221,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="Role" mandatory="true">
+          <parameter name="Role" mandatory="true" version="2.14">
             <description>
               Indicates whether the device will act as Sender or Receiver of
               test packets.
@@ -62602,7 +64240,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="Host" status="deprecated">
+          <parameter name="Host" status="deprecated" version="2.14">
             <description>
               The Fully Qualified Domain Name (FQDN) or IP address of the Test
               Endpoint to perform the UDP Capacity tests with.
@@ -62618,7 +64256,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="ServerList" mandatory="true">
+          <parameter name="ServerList" mandatory="true" version="2.17">
             <description>
               A list of servers intended as testing partners for the client.
               The client works through the server list attempting individual
@@ -62638,13 +64276,13 @@
             </syntax>
           </parameter>
 
-          <parameter name="Port" status="deprecated">
+          <parameter name="Port" status="deprecated" version="2.14">
             <description>
               Port on the Test Endpoint host.
 
-               {{deprecated|2.17|because it is superseded by
-               {{param|ServerList}} with multi-flow and server capability.
-               Refer to {{bibref|TR-471}} for details}}
+              {{deprecated|2.17|because it is superseded by
+              {{param|ServerList}} with multi-flow and server capability. Refer
+              to {{bibref|TR-471}} for details}}
             </description>
             <syntax>
               <unsignedInt>
@@ -62653,7 +64291,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="JumboFramesPermitted">
+          <parameter name="JumboFramesPermitted" version="2.14">
             <description>
               If {{true}}, jumbo frames are allowed above 1 Gbps. The default
               value SHOULD be {{true}}.
@@ -62663,7 +64301,8 @@
             </syntax>
           </parameter>
 
-          <parameter name="NumberOfConnections" status="deprecated">
+          <parameter name="NumberOfConnections" status="deprecated"
+              version="2.14">
             <description>
               The number of connections to be used in the test. The default
               value SHOULD be 1. {{param}} MUST NOT be set to a value greater
@@ -62681,7 +64320,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="FlowCount">
+          <parameter name="FlowCount" version="2.17">
             <description>
               Optional Number of flows required for a test. The default SHOULD
               be 0 (a magic number that indicates the parameter is not used).
@@ -62693,7 +64332,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="MaximumFlows">
+          <parameter name="MaximumFlows" version="2.17">
             <description>
               Optional number of flows to attempt. MaximumFlows must be greater
               than the size of ServerList or FlowCount.
@@ -62708,7 +64347,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="EthernetPriority">
+          <parameter name="EthernetPriority" version="2.14">
             <description>
               Ethernet priority code for marking packets transmitted in the
               test (if applicable). The default value SHOULD be zero.
@@ -62720,7 +64359,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="DSCP">
+          <parameter name="DSCP" version="2.14">
             <description>
               The DiffServ code point for marking packets transmitted in the
               test. The default value SHOULD be zero.
@@ -62732,7 +64371,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="ProtocolVersion">
+          <parameter name="ProtocolVersion" version="2.14">
             <description>
               Indicates the IP protocol version to be used. The default value
               SHOULD be {{enum|Any}}.
@@ -62754,7 +64393,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="UDPPayloadMin">
+          <parameter name="UDPPayloadMin" version="2.14">
             <description>
               Minimum reference size of UDP payload in {{units}}. No default.
               The implementation will algorithmically determine a value if none
@@ -62769,7 +64408,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="UDPPayloadMax">
+          <parameter name="UDPPayloadMax" version="2.14">
             <description>
               Maximum reference size of UDP payload in {{units}}. No default.
               The implementation will algorithmically determine a value if none
@@ -62788,7 +64427,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="UDPPayloadContent">
+          <parameter name="UDPPayloadContent" version="2.15">
             <description>
               UDP Payload Content Type, If there is payload compression in the
               path and tests intend to characterize a possible advantage due to
@@ -62817,7 +64456,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="PortMin">
+          <parameter name="PortMin" version="2.14">
             <description>
               Starting value for range of Dynamic Ports supported for test
               traffic and status feedback messages. {{param}} MUST be less than
@@ -62833,7 +64472,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="PortMax">
+          <parameter name="PortMax" version="2.14">
             <description>
               Indicates the upper bound of the supported Dynamic Port range,
               where {{param|PortMin}} indicates the starting port number.
@@ -62849,7 +64488,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="PortOptionalMin">
+          <parameter name="PortOptionalMin" version="2.14">
             <description>
               Starting value for range of User Ports supported for test traffic
               and status feedback messages. A value of zero (0) indicates no
@@ -62863,7 +64502,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="PortOptionalMax">
+          <parameter name="PortOptionalMax" version="2.14">
             <description>
               Indicates the upper bound of the supported User Port range, where
               {{param|PortOptionalMin}} indicates the starting port number.
@@ -62879,7 +64518,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="TestType">
+          <parameter name="TestType" version="2.14">
             <description>
               Indicates the type of IP-Layer Capacity test being run. The
               default value SHOULD be {{enum|Search}}.
@@ -62898,7 +64537,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="IPDVEnable">
+          <parameter name="IPDVEnable" version="2.14">
             <description>
               Enables one-way IPDV (IP Packet Delay Variation) metric for load
               rate adjustment algorithm. When {{true}} (enabled), one-way delay
@@ -62910,7 +64549,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="IPRREnable">
+          <parameter name="IPRREnable" version="2.14">
             <description>
               Enables IPRR (IP packet Reordering Ratio) metric. The default
               value SHOULD be {{false}}.
@@ -62920,7 +64559,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="RIPREnable">
+          <parameter name="RIPREnable" version="2.15">
             <description>
               Enables RIPRR (Replicated IP Packet Ratio) metric. The default
               value SHOULD be {{false}}.
@@ -62930,7 +64569,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="PreambleDuration">
+          <parameter name="PreambleDuration" version="2.14">
             <description>
               Duration of the preamble testing, when traffic is being sent
               and/or received but the test clock has not been started. This is
@@ -62946,7 +64585,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="StartSendingRate">
+          <parameter name="StartSendingRate" version="2.14">
             <description>
               The Sending Rate for a {{enum|Fixed|TestType}} test or the
               initial Sending Rate value for a {{enum|Search|TestType}} test.
@@ -62961,7 +64600,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="StartSendingRateIndex">
+          <parameter name="StartSendingRateIndex" version="2.16">
             <description>
               The configurable initial Sending Rate index (to a row of the
               sending rate table) for a {{enum|Fixed|TestType}} or
@@ -62977,7 +64616,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="NumberTestSubIntervals">
+          <parameter name="NumberTestSubIntervals" version="2.14">
             <description>
               Number of intermediate measurement reporting intervals. The value
               MUST NOT be greater than
@@ -62991,7 +64630,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="NumberFirstModeTestSubIntervals">
+          <parameter name="NumberFirstModeTestSubIntervals" version="2.15">
             <description>
               When the value &gt;= 1, bimodal test mode is requested and the
               value represents the number of sub-intervals to be included in
@@ -63008,7 +64647,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="TestSubInterval">
+          <parameter name="TestSubInterval" version="2.14">
             <description>
               Duration of intermediate measurement reporting intervals.
               {{param}} * {{param|NumberTestSubIntervals}} MUST result in an
@@ -63024,7 +64663,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="StatusFeedbackInterval">
+          <parameter name="StatusFeedbackInterval" version="2.14">
             <description>
               Period of status feedback message (receiver of offered load
               returns messages to the sender with results of measured metrics).
@@ -63039,7 +64678,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="TimeoutNoTraffic" status="obsoleted">
+          <parameter name="TimeoutNoTraffic" status="deleted" version="2.14">
             <description>
               Timeout value. Value specified in {{units}}. The default value
               SHOULD be 5 {{units}}.
@@ -63049,6 +64688,8 @@
               Refer to {{bibref|TR-471}} for details}}
 
               {{obsoleted|2.17}}
+
+              {{deleted|2.18}}
             </description>
             <syntax>
               <unsignedInt>
@@ -63058,7 +64699,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="TimeoutNoTestTraffic">
+          <parameter name="TimeoutNoTestTraffic" version="2.15">
             <description>
               Timeout value. If no test traffic packets are received for
               {{param}} {{units}}, test will timeout. Value specified in
@@ -63072,7 +64713,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="TimeoutNoStatusMessage">
+          <parameter name="TimeoutNoStatusMessage" version="2.15">
             <description>
               Timeout value. If no status message packets are received for
               {{param}} {{units}}, test will timeout. Value specified in
@@ -63086,7 +64727,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="Tmax">
+          <parameter name="Tmax" version="2.14">
             <description>
               Maximum waiting time for packets to arrive. Value specified in
               {{units}}. The default value SHOULD be 1000 {{units}}.
@@ -63099,7 +64740,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="TmaxRTT">
+          <parameter name="TmaxRTT" version="2.14">
             <description>
               Maximum Round Trip Time waiting time for packets to arrive. Value
               specified in {{units}}. The default value SHOULD be 3000
@@ -63113,7 +64754,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="TimestampResolution">
+          <parameter name="TimestampResolution" version="2.14">
             <description>
               Indicates the requested precision of timestamp values. The test
               implementation will determine the actual precision to use based
@@ -63133,7 +64774,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="SeqErrThresh">
+          <parameter name="SeqErrThresh" version="2.15">
             <description>
               This parameter is only meaningful if {{param|TestType}} is
               {{enum|Search|TestType}}. Threshold for Loss or Reordering or
@@ -63148,7 +64789,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="ReordDupIgnoreEnable">
+          <parameter name="ReordDupIgnoreEnable" version="2.15">
             <description>
               This parameter is only meaningful if {{param|TestType}} is
               {{enum|Search|TestType}}. When {{true}} (enabled) only Loss
@@ -63163,7 +64804,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="LowerThresh">
+          <parameter name="LowerThresh" version="2.14">
             <description>
               This parameter is only meaningful if {{param|TestType}} is
               {{enum|Search|TestType}}. The lower threshold on the range of
@@ -63178,7 +64819,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="UpperThresh">
+          <parameter name="UpperThresh" version="2.14">
             <description>
               This parameter is only meaningful if {{param|TestType}} is
               {{enum|Search|TestType}}. The upper threshold on the range of
@@ -63193,7 +64834,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="RetryThresh">
+          <parameter name="RetryThresh" version="2.16">
             <description>
               The initial number of retries before activating “fast” sending
               rate increase mode. Different paths through the flow chart
@@ -63209,7 +64850,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="HighSpeedDelta">
+          <parameter name="HighSpeedDelta" version="2.14">
             <description>
               This parameter is only meaningful if {{param|TestType}} is
               {{enum|Search|TestType}}. The number of rows to move in a single
@@ -63223,7 +64864,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="RateAdjAlgorithm">
+          <parameter name="RateAdjAlgorithm" version="2.16">
             <description>
               Configurable choice of Load Rate Adjustment Algorithm. Refer to
               {{bibref|TR-471}} for details.
@@ -63246,7 +64887,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="SlowAdjThresh">
+          <parameter name="SlowAdjThresh" version="2.14">
             <description>
               This parameter is only meaningful if {{param|TestType}} is
               {{enum|Search|TestType}}. Threshold on the measured number of
@@ -63261,7 +64902,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="HSpeedThresh">
+          <parameter name="HSpeedThresh" version="2.14">
             <description>
               This parameter is only meaningful if {{param|TestType}} is
               {{enum|Search|TestType}}. Threshold for transition between low
@@ -63305,7 +64946,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="BOMTime">
+          <parameter name="BOMTime" version="2.14">
             <description>
               Beginning of transmission send/receive time in UTC, which MUST be
               specified to {{param|TimestampResolution}} precision. If multiple
@@ -63317,7 +64958,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="EOMTime">
+          <parameter name="EOMTime" version="2.14">
             <description>
               End of transmission in UTC, which MUST be specified to
               {{param|TimestampResolution}} precision. If multiple connections
@@ -63329,7 +64970,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="TmaxUsed">
+          <parameter name="TmaxUsed" version="2.14">
             <description>
               Configured value of {{param|Tmax}} used in the test. This value
               is expressed in {{units}}.
@@ -63341,7 +64982,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="TestInterval">
+          <parameter name="TestInterval" version="2.14">
             <description>
               Duration of the test (either downlink or uplink). This value is
               expected to equal {{param|TestSubInterval}} *
@@ -63355,14 +64996,15 @@
             </syntax>
           </parameter>
 
-          <parameter name="MaxIPLayerCapacity">
+          <parameter name="MaxIPLayerCapacity" version="2.14">
             <description>
               The maximum IP-Layer Capacity metric from among all
               {{param|IncrementalResult.{i}.IPLayerCapacity}} values measured
               between {{param|BOMTime}} and {{param|EOMTime}} across all
               connections for this test. This is calculated according to
               {{bibref|TR-471}} Equation 1. Result is expressed in {{units}}
-              with 2 digits beyond the decimal. 10^6 bits/second = 1 {{units}}.
+              with 2 digits beyond the decimal. 10^6^ bits/second = 1
+              {{units}}.
             </description>
             <syntax>
               <decimal>
@@ -63371,7 +65013,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="TimeOfMax">
+          <parameter name="TimeOfMax" version="2.14">
             <description>
               Time in UTC of end of the sub-interval when
               {{param|MaxIPLayerCapacity}} was measured. If the value of
@@ -63385,13 +65027,13 @@
             </syntax>
           </parameter>
 
-          <parameter name="MaxETHCapacityNoFCS">
+          <parameter name="MaxETHCapacityNoFCS" version="2.15">
             <description>
               Results of measurements using the Maximum IP-Layer Capacity
               metric, according to {{bibref|TR-471}} Equation 1, and
               calculations to estimate the capacity at Layer 2 with Preamble
               and Inter-frame gap, but no ETH Frame Check Sequence. Result is
-              expressed in {{units}} with 2 digits beyond the decimal. 10^6
+              expressed in {{units}} with 2 digits beyond the decimal. 10^6^
               bits/second = 1 {{units}}.
             </description>
             <syntax>
@@ -63401,13 +65043,13 @@
             </syntax>
           </parameter>
 
-          <parameter name="MaxETHCapacityWithFCS">
+          <parameter name="MaxETHCapacityWithFCS" version="2.15">
             <description>
               Results of measurements using the Maximum IP-Layer Capacity
               metric, according to {{bibref|TR-471}} Equation 1, and
               calculations to estimate the capacity at Layer 2 with ETH Frame
               Check Sequence. Result is expressed in {{units}} with 2 digits
-              beyond the decimal. 10^6bits/second = 1 {{units}}.
+              beyond the decimal. 10^6^ bits/second = 1 {{units}}.
             </description>
             <syntax>
               <decimal>
@@ -63416,13 +65058,14 @@
             </syntax>
           </parameter>
 
-          <parameter name="MaxETHCapacityWithFCSVLAN">
+          <parameter name="MaxETHCapacityWithFCSVLAN" version="2.15">
             <description>
               Results of measurements using the Maximum IP-Layer Capacity
               metric, according to {{bibref|TR-471}} Equation 1, and
               calculations to estimate the capacity at Layer 2 with ETH Frame
               Check Sequence and VLAN tag. Result is expressed in {{units}}
-              with 2 digits beyond the decimal. 10^6bits/second = 1 {{units}}.
+              with 2 digits beyond the decimal. 10^6^ bits/second = 1
+              {{units}}.
             </description>
             <syntax>
               <decimal>
@@ -63431,7 +65074,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="LossRatioAtMax">
+          <parameter name="LossRatioAtMax" version="2.14">
             <description>
               Ratio of lost packets to total packets during sub-interval of
               {{param|MaxIPLayerCapacity}}. This value is expressed as a
@@ -63442,7 +65085,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="RTTRangeAtMax">
+          <parameter name="RTTRangeAtMax" version="2.14">
             <description>
               The range of Round Trip Time (RTT) during sub-interval of
               {{param|MaxIPLayerCapacity}}. This value is expressed in
@@ -63456,7 +65099,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="PDVRangeAtMax">
+          <parameter name="PDVRangeAtMax" version="2.14">
             <description>
               The range of Packet Delay Variation (PDV) during sub-interval of
               {{param|MaxIPLayerCapacity}}. This value is expressed in
@@ -63470,7 +65113,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="MinOnewayDelayAtMax">
+          <parameter name="MinOnewayDelayAtMax" version="2.14">
             <description>
               The minimum one-way delay during the sub-interval of
               {{param|MaxIPLayerCapacity}}. The minimum one-way delay is
@@ -63487,7 +65130,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="ReorderedRatioAtMax">
+          <parameter name="ReorderedRatioAtMax" version="2.14">
             <description>
               Ratio of reordered packets to total packets during the
               sub-interval of {{param|MaxIPLayerCapacity}}. This value is
@@ -63498,7 +65141,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="ReplicatedRatioAtMax">
+          <parameter name="ReplicatedRatioAtMax" version="2.15">
             <description>
               Ratio of replicated packets to total packets during the
               sub-interval of {{param|MaxIPLayerCapacity}}. This value is
@@ -63509,7 +65152,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="InterfaceEthMbpsAtMax">
+          <parameter name="InterfaceEthMbpsAtMax" version="2.15">
             <description>
               The number of bits observed on the Interface during an IP-Layer
               Capacity test for time interval of duration
@@ -63517,7 +65160,7 @@
               {{param|IncrementalResult.{i}.TimeOfSubInterval}} corresponding
               to the {{param|MaxIPLayerCapacity}}, divided by the duration of
               {{param|TestSubInterval}}. Result is expressed in Mbps with 2
-              digits beyond the decimal. 10^6 bits/second = 1 {{units}}. This
+              digits beyond the decimal. 10^6^ bits/second = 1 {{units}}. This
               is primarily a diagnostic measurement. Measurement direction
               follows the {{param|Role}}.
             </description>
@@ -63528,14 +65171,15 @@
             </syntax>
           </parameter>
 
-          <parameter name="IPLayerCapacitySummary">
+          <parameter name="IPLayerCapacitySummary" version="2.15">
             <description>
               The IP-Layer Capacity metric from among all
               {{param|IncrementalResult.{i}.IPLayerCapacity}} values measured
               between {{param|BOMTime}} and {{param|EOMTime}} across all
               connections for this test. This is calculated according to
               {{bibref|TR-471}} Equation 1. Result is expressed in {{units}}
-              with 2 digits beyond the decimal. 10^6 bits/second = 1 {{units}}.
+              with 2 digits beyond the decimal. 10^6^ bits/second = 1
+              {{units}}.
             </description>
             <syntax>
               <decimal>
@@ -63544,7 +65188,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="LossRatioSummary">
+          <parameter name="LossRatioSummary" version="2.15">
             <description>
               Ratio of lost packets to total packets during the complete
               {{param|TestInterval}}. This value is expressed as a decimal to 9
@@ -63555,7 +65199,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="RTTRangeSummary">
+          <parameter name="RTTRangeSummary" version="2.15">
             <description>
               The range of measured Round Trip Time (RTT) during the complete
               {{param|TestInterval}}. This value is expressed in {{units}}, as
@@ -63568,7 +65212,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="PDVRangeSummary">
+          <parameter name="PDVRangeSummary" version="2.15">
             <description>
               The range of Packet Delay Variation (PDV) during the complete
               {{param|TestInterval}}. This value is expressed in {{units}}, as
@@ -63581,7 +65225,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="MinOnewayDelaySummary">
+          <parameter name="MinOnewayDelaySummary" version="2.15">
             <description>
               The minimum one-way delay during the complete
               {{param|TestInterval}}. This value is expressed in {{units}}, as
@@ -63594,7 +65238,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="MinRTTSummary">
+          <parameter name="MinRTTSummary" version="2.15">
             <description>
               The minimum RTT during the complete {{param|TestInterval}}. This
               value is expressed in {{units}}, as a decimal to 9 decimal
@@ -63607,7 +65251,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="ReorderedRatioSummary">
+          <parameter name="ReorderedRatioSummary" version="2.15">
             <description>
               Ratio of reordered packets to total packets during the complete
               {{param|TestInterval}}. This value is expressed as a decimal to 9
@@ -63618,7 +65262,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="ReplicatedRatioSummary">
+          <parameter name="ReplicatedRatioSummary" version="2.15">
             <description>
               Ratio of replicated packets to total packets during the complete
               {{param|TestInterval}}. This value is expressed as a decimal to 9
@@ -63629,13 +65273,13 @@
             </syntax>
           </parameter>
 
-          <parameter name="InterfaceEthMbpsSummary">
+          <parameter name="InterfaceEthMbpsSummary" version="2.15">
             <description>
               The number of bits observed on the {{param|Interface}} during an
               IP-Layer Capacity test for the entire time interval of duration
               {{param|TestInterval}}, divided by the duration of
               {{param|TestInterval}}. Result is expressed in {{units}} with 2
-              digits beyond the decimal. 10^6 bits/second = 1 {{units}}. This
+              digits beyond the decimal. 10^6^ bits/second = 1 {{units}}. This
               is primarily a diagnostic measurement. Measurement direction
               follows the {{param|Role}}.
             </description>
@@ -63646,6 +65290,43 @@
             </syntax>
           </parameter>
 
+          <parameter name="TmaxRTTUsed" version="2.14">
+            <description>
+              Configured value of {{param|TmaxRTT}} used in the test. This
+              value is expressed in {{units}}.
+            </description>
+            <syntax>
+              <unsignedInt>
+                <units value="milliseconds"/>
+              </unsignedInt>
+            </syntax>
+          </parameter>
+
+          <parameter name="TimestampResolutionUsed" version="2.14">
+            <description>
+              Indicates the timestamp resolution of reported results. This is a
+              function of the measurement protocol, and it is usually
+              determined once the protocol chosen. Value specified in
+              {{units}}.
+            </description>
+            <syntax>
+              <unsignedInt>
+                <units value="microseconds"/>
+              </unsignedInt>
+            </syntax>
+          </parameter>
+
+          <parameter name="ActiveFlows" version="2.17">
+            <description>
+              Number of flows set-up and used for a test.
+            </description>
+            <syntax>
+              <unsignedInt>
+                <range minInclusive="0"/>
+              </unsignedInt>
+            </syntax>
+          </parameter>
+
           <object name="ModalResult.{i}." minEntries="1"
               maxEntries="unbounded" dmr:noUniqueKeys="true" version="2.15">
             <description>
@@ -63667,7 +65348,7 @@
                 corresponding mode across all connections for this test. This
                 is calculated according to {{bibref|TR-471}} Equation 1. Result
                 is expressed in {{units}} with 2 digits beyond the decimal.
-                10^6bits/second = 1 {{units}}.
+                10^6^ bits/second = 1 {{units}}.
               </description>
               <syntax>
                 <decimal>
@@ -63697,8 +65378,8 @@
                 metric, according to {{bibref|TR-471}} Equation 1, and
                 calculations to estimate the capacity at Layer 2 with Preamble
                 and Inter-frame gap, but no ETH Frame Check Sequence. Result is
-                expressed in {{units}} with 2 digits beyond the decimal.
-                10^6bits/second = 1 {{units}}.
+                expressed in {{units}} with 2 digits beyond the decimal. 10^6^
+                bits/second = 1 {{units}}.
               </description>
               <syntax>
                 <decimal>
@@ -63713,7 +65394,7 @@
                 metric, according to {{bibref|TR-471}} Equation 1, and
                 calculations to estimate the capacity at Layer 2 with ETH Frame
                 Check Sequence. Result is expressed in {{units}} with 2 digits
-                beyond the decimal. 10^6bits/second = 1 {{units}}.
+                beyond the decimal. 10^6^ bits/second = 1 {{units}}.
               </description>
               <syntax>
                 <decimal>
@@ -63728,7 +65409,7 @@
                 metric, according to {{bibref|TR-471}} Equation 1, and
                 calculations to estimate the capacity at Layer 2 with ETH Frame
                 Check Sequence and VLAN tag. Result is expressed in {{units}}
-                with 2 digits beyond the decimal. 10^6bits/second = 1
+                with 2 digits beyond the decimal. 10^6^ bits/second = 1
                 {{units}}.
               </description>
               <syntax>
@@ -63816,7 +65497,7 @@
               </syntax>
             </parameter>
 
-            <parameter name="InterfaceEthMbpsAtMax">
+            <parameter name="InterfaceEthMbpsAtMax" version="2.15">
               <description>
                 The number of bits observed on the {{param|#.Interface}} during
                 an IP-Layer Capacity test for time interval of duration
@@ -63824,7 +65505,7 @@
                 {{param|#.IncrementalResult.{i}.TimeOfSubInterval}}
                 corresponding to the {{param|MaxIPLayerCapacity}}, divided by
                 the duration of {{param|#.TestSubInterval}}. Result is
-                expressed in Mbps with 2 digits beyond the decimal. 10^6
+                expressed in Mbps with 2 digits beyond the decimal. 10^6^
                 bits/second = 1 {{units}}. This is primarily a diagnostic
                 measurement. Measurement direction follows the
                 {{param|#.Role}}.
@@ -63857,7 +65538,7 @@
                 {{param|#.TestSubInterval}} ending at
                 {{param|TimeOfSubInterval}} across all connections for this
                 test. Result is expressed in {{units}} with 2 digits beyond the
-                decimal. 10^6 bits/second = 1 {{units}}.
+                decimal. 10^6^ bits/second = 1 {{units}}.
               </description>
               <syntax>
                 <decimal>
@@ -63953,7 +65634,7 @@
               </syntax>
             </parameter>
 
-            <parameter name="ReplicatedRatio">
+            <parameter name="ReplicatedRatio" version="2.15">
               <description>
                 Ratio of replicated packets to total packets, for time interval
                 of duration {{param|#.TestSubInterval}} ending at
@@ -63965,16 +65646,16 @@
               </syntax>
             </parameter>
 
-            <parameter name="InterfaceEthMbps">
+            <parameter name="InterfaceEthMbps" version="2.15">
               <description>
                 The number of bits observed on the {{param|#.Interface}} during
                 an IP-Layer Capacity test for time interval of duration
                 {{param|#.TestSubInterval}} ending at
                 {{param|TimeOfSubInterval}}, divided by the duration of
                 {{param|#.TestSubInterval}}. Result is expressed in Mbps with 2
-                digits beyond the decimal. 10^6 bits/second = 1 {{units}}. This
-                is primarily a diagnostic measurement. Measurement direction
-                follows the {{param|#.Role}}.
+                digits beyond the decimal. 10^6^ bits/second = 1 {{units}}.
+                This is primarily a diagnostic measurement. Measurement
+                direction follows the {{param|#.Role}}.
               </description>
               <syntax>
                 <decimal>
@@ -63983,47 +65664,10 @@
               </syntax>
             </parameter>
           </object>
-
-          <parameter name="TmaxRTTUsed">
-            <description>
-              Configured value of {{param|TmaxRTT}} used in the test. This
-              value is expressed in {{units}}.
-            </description>
-            <syntax>
-              <unsignedInt>
-                <units value="milliseconds"/>
-              </unsignedInt>
-            </syntax>
-          </parameter>
-
-          <parameter name="TimestampResolutionUsed">
-            <description>
-              Indicates the timestamp resolution of reported results. This is a
-              function of the measurement protocol, and it is usually
-              determined once the protocol chosen. Value specified in
-              {{units}}.
-            </description>
-            <syntax>
-              <unsignedInt>
-                <units value="microseconds"/>
-              </unsignedInt>
-            </syntax>
-          </parameter>
-
-          <parameter name="ActiveFlows">
-            <description>
-              Number of flows set-up and used for a test.
-            </description>
-            <syntax>
-              <unsignedInt>
-                <range minInclusive="0"/>
-              </unsignedInt>
-            </syntax>
-          </parameter>
         </output>
       </command>
 
-      <command name="ServerSelectionDiagnostics()" async="true">
+      <command name="ServerSelectionDiagnostics()" async="true" version="2.12">
         <description>
           This command provides access to a diagnostics test that performs
           either an ICMP Ping or UDP Echo ping against multiple hosts
@@ -64033,7 +65677,7 @@
         </description>
         <input>
 
-          <parameter name="Interface">
+          <parameter name="Interface" version="2.12">
             <description>
               {{reference|the IP-layer interface over which the test is to be
               performed}} Example: Device.IP.Interface.1
@@ -64049,7 +65693,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="ProtocolVersion" mandatory="true">
+          <parameter name="ProtocolVersion" mandatory="true" version="2.12">
             <description>
               Indicates the IP protocol version to be used.
             </description>
@@ -64071,7 +65715,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="Protocol" mandatory="true">
+          <parameter name="Protocol" mandatory="true" version="2.12">
             <description>
               The protocol over which the test is to be performed.
             </description>
@@ -64083,7 +65727,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="HostList" mandatory="true">
+          <parameter name="HostList" mandatory="true" version="2.12">
             <description>
               Each entry is a Host name or address of a host to ping.
             </description>
@@ -64097,7 +65741,8 @@
             </syntax>
           </parameter>
 
-          <parameter name="NumberOfRepetitions" mandatory="true">
+          <parameter name="NumberOfRepetitions" mandatory="true"
+              version="2.12">
             <description>
               Number of repetitions of the ping test to perform for each
               {{param|HostList}} entry before reporting the results.
@@ -64109,7 +65754,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="Timeout" mandatory="true">
+          <parameter name="Timeout" mandatory="true" version="2.12">
             <description>
               Timeout in {{units}} for each iteration of the ping test where
               the total number of iterations is the value of
@@ -64126,7 +65771,7 @@
         </input>
         <output>
 
-          <parameter name="Status">
+          <parameter name="Status" version="2.13">
             <description>
               Indicates the availability of diagnostics data. {{enum}}
 
@@ -64144,7 +65789,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="FastestHost">
+          <parameter name="FastestHost" version="2.12">
             <description>
               Result parameter indicating the Host (one of the items within the
               {{param|HostList}} Parameter) with the smallest average response
@@ -64155,7 +65800,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="MinimumResponseTime">
+          <parameter name="MinimumResponseTime" version="2.12">
             <description>
               Result parameter indicating the minimum response time in
               {{units}} over all repetitions with successful responses of the
@@ -64171,7 +65816,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="AverageResponseTime">
+          <parameter name="AverageResponseTime" version="2.12">
             <description>
               Result parameter indicating the average response time in
               {{units}} over all repetitions with successful responses of the
@@ -64187,7 +65832,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="MaximumResponseTime">
+          <parameter name="MaximumResponseTime" version="2.12">
             <description>
               Result parameter indicating the maximum response time in
               {{units}} over all repetitions with successful responses of the
@@ -64203,7 +65848,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="IPAddressUsed">
+          <parameter name="IPAddressUsed" version="2.12">
             <description>
               Indicates which IP address was used to send the request to the
               host identified in {{param|FastestHost}}.
@@ -65384,12 +67029,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.5">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -65710,12 +67355,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.5">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -65876,7 +67521,7 @@
           <string>
             <enumerationRef targetParam=".IPsec.SupportedIntegrityAlgorithms"/>
           </string>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
@@ -65890,7 +67535,7 @@
           <string>
             <enumerationRef targetParam=".IPsec.SupportedIntegrityAlgorithms"/>
           </string>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
@@ -66108,12 +67753,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.5">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -66183,12 +67828,12 @@
         <parameter ref="TunneledInterface"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.5">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -66318,7 +67963,7 @@
 
     <object name="Device.IPsec.IKEv2SA.{i}." access="readOnly"
         numEntriesParameter="IKEv2SANumberOfEntries" minEntries="0"
-        maxEntries="unbounded" dmr:noUniqueKeys="true" version="2.5">
+        maxEntries="unbounded" version="2.5">
       <description>
         Represents an IKEv2 Security Association (SA), corresponding to an
         IKEv2 session. Instances are automatically created and deleted as IKEv2
@@ -66327,6 +67972,9 @@
       <uniqueKey functional="true">
         <parameter ref="Tunnel"/>
       </uniqueKey>
+      <uniqueKey functional="false">
+        <parameter ref="Alias"/>
+      </uniqueKey>
 
       <parameter name="Status" access="readOnly">
         <description>
@@ -66343,12 +67991,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.5">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -66695,6 +68343,9 @@
       <uniqueKey functional="true">
         <parameter ref="OutboundSPI"/>
       </uniqueKey>
+      <uniqueKey functional="false">
+        <parameter ref="Alias"/>
+      </uniqueKey>
 
       <parameter name="Status" access="readOnly">
         <description>
@@ -66711,12 +68362,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.5">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -66943,12 +68594,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.8">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -67234,12 +68885,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.8">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -67537,12 +69188,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.8">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -67695,12 +69346,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.12">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -68051,12 +69702,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.12">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -68344,12 +69995,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.12">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -68502,12 +70153,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.12">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -68830,12 +70481,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.12">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -69084,12 +70735,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.12">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -69270,12 +70921,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.8">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -69382,10 +71033,10 @@
         </syntax>
       </parameter>
 
-      <parameter name="PSIDOffset" access="readWrite" status="obsoleted">
+      <parameter name="PSIDOffset" access="readWrite" status="deleted">
         <description>
           ''Port-set ID'' (PSID) offset in {{units}}. The number of Port-sets
-          is 2^{{param}}.
+          is 2^{{param}}^.
 
           Corresponds to the {{bibref|RFC7598}} ''S46_PORTPARAMS'' (Port
           Parameters) option's ''offset'' field.
@@ -69395,6 +71046,8 @@
           the proper location within the {{object|Rule.{i}.}} object}}
 
           {{obsoleted|2.14-2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <unsignedInt>
@@ -69405,7 +71058,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="PSIDLength" access="readWrite" status="obsoleted">
+      <parameter name="PSIDLength" access="readWrite" status="deleted">
         <description>
           The length in {{units}} of the ''Port-set id'' (PSID) configured in
           the {{param|PSID}} parameter.
@@ -69418,6 +71071,8 @@
           the proper location within the {{object|Rule.{i}.}} object}}
 
           {{obsoleted|2.14-2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <unsignedInt>
@@ -69428,7 +71083,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="PSID" access="readWrite" status="obsoleted">
+      <parameter name="PSID" access="readWrite" status="deleted">
         <description>
           ''Port-set ID'' (PSID) to use in preference to the value extracted
           from the ''Embedded Address'' (EA) bits.
@@ -69445,6 +71100,8 @@
           the proper location within the {{object|Rule.{i}.}} object}}
 
           {{obsoleted|2.14-2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <unsignedInt>
@@ -69454,19 +71111,18 @@
         </syntax>
       </parameter>
 
-      <parameter name="IncludeSystemPorts" access="readWrite"
-          status="obsoleted">
+      <parameter name="IncludeSystemPorts" access="readWrite" status="deleted">
         <description>
           Whether to include low-numbered (system) ports in the Port-sets.
           Normally ports in the range
-          [0:2^(16-{{param|PSIDOffset|obsoleted}})-1] are excluded, e.g. for
-          the default {{param|PSIDOffset|obsoleted}} value of 6, ports [0:1023]
-          are not included in the Port-sets.
+          [0:2^(16-{{param|PSIDOffset|deleted}})^-1] are excluded, e.g. for the
+          default {{param|PSIDOffset|deleted}} value of 6, ports [0:1023] are
+          not included in the Port-sets.
 
           This parameter is related to {{bibref|RFC7597}}'s ''N'', which is
           defined as ''the number of ports (e.g., 1024) excluded from the lower
           end of the range''. The parameter is relevant only when
-          {{param|PSIDOffset|obsoleted}} is 0; {{false}} corresponds to
+          {{param|PSIDOffset|deleted}} is 0; {{false}} corresponds to
           ''N=1024'' and {{true}} corresponds to ''N=0''.
 
           {{deprecated|2.15|because details changed between drafting this data
@@ -69474,6 +71130,8 @@
           the proper location within the {{object|Rule.{i}.}} object}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <boolean/>
@@ -69537,12 +71195,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.8">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -69635,10 +71293,10 @@
         </syntax>
       </parameter>
 
-      <parameter name="PSIDOffset" access="readWrite">
+      <parameter name="PSIDOffset" access="readWrite" version="2.12">
         <description>
           ''Port-set ID'' (PSID) offset in {{units}}. The number of Port-sets
-          is 2^{{param}}.
+          is 2^{{param}}^.
 
           Corresponds to the {{bibref|RFC7598}} ''S46_PORTPARAMS'' (Port
           Parameters) option's ''offset'' field.
@@ -69652,7 +71310,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="PSIDLength" access="readWrite">
+      <parameter name="PSIDLength" access="readWrite" version="2.12">
         <description>
           The length in {{units}} of the ''Port-set id'' (PSID) configured in
           the {{param|PSID}} parameter.
@@ -69669,7 +71327,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="PSID" access="readWrite">
+      <parameter name="PSID" access="readWrite" version="2.12">
         <description>
           ''Port-set ID'' (PSID) to use in preference to the value extracted
           from the ''Embedded Address'' (EA) bits.
@@ -69689,10 +71347,10 @@
         </syntax>
       </parameter>
 
-      <parameter name="IncludeSystemPorts" access="readWrite">
+      <parameter name="IncludeSystemPorts" access="readWrite" version="2.15">
         <description>
           Whether to include low-numbered (system) ports in the Port-sets.
-          Normally ports in the range [0:2^(16-{{param|PSIDOffset}})-1] are
+          Normally ports in the range [0:2^(16-{{param|PSIDOffset}})^-1] are
           excluded, e.g. for the default {{param|PSIDOffset}} value of 6, ports
           [0:1023] are not included in the Port-sets.
 
@@ -69769,12 +71427,16 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.8"
+          status="deprecated">
         <description>
           {{datatype|expand}}
+
+          {{deprecated|2.18|because {{object|#}} already has an Alias
+          parameter.}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -70170,12 +71832,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -70188,7 +71850,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="IPv6ForwardingNumberOfEntries" access="readOnly">
+      <parameter name="IPv6ForwardingNumberOfEntries" access="readOnly"
+          version="2.2">
         <description>
           {{numentries}}
         </description>
@@ -70207,8 +71870,8 @@
 
         In addition to statically configured routes, this table MUST include
         dynamic routes learned through layer 3 routing protocols, including RIP
-        (i.e. RIP version 2), OSPF, DHCPv4, and IPCP. The CPE MAY reject
-        attempts to delete or modify a dynamic route entry.
+        (i.e. RIP version 2), OSPF, DHCPv4, 3GPP-NAS and IPCP. The CPE MAY
+        reject attempts to delete or modify a dynamic route entry.
 
         For each incoming packet, the layer 3 forwarding decision is
         conceptually made as follows:
@@ -70280,16 +71943,16 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
-      <parameter name="Type" access="readWrite">
+      <parameter name="Type" access="readWrite" version="2.16">
         <description>
           Specifies the forwarding entry type. Based on {{bibref|RFC8349}}
         </description>
@@ -70431,7 +72094,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Origin" access="readOnly">
+      <parameter name="Origin" access="readOnly" version="2.2">
         <description>
           Protocol via which the IPv4 forwarding rule was learned. {{enum}}
         </description>
@@ -70441,6 +72104,16 @@
             <enumeration value="OSPF"/>
             <enumeration value="IPCP"/>
             <enumeration value="RIP"/>
+            <enumeration value="3GPP-NAS" version="2.18">
+              <description>
+                Assigned by the core network (fixed or cellular) using 3GPP NAS
+                signalling methods. e.g. PDU Session Establishment Request, PDN
+                Connectivity Request, PDP Context Activation Request, ... This
+                information is available from the AT commands
+                {{bibref|3GPP-TS.27.007|Clause 10.1.23}} PDP context read
+                dynamic parameters +CGCONTRDP.
+              </description>
+            </enumeration>
             <enumeration value="Static">
               <description>
                 For example, present in the factory default configuration,
@@ -70475,8 +72148,8 @@
 
         In addition to statically configured routes, this table MUST include
         dynamic routes learned through layer 3 routing protocols, including
-        RIPng, OSPF, DHCPv6, and RA. The CPE MAY reject attempts to delete or
-        modify a dynamic route entry.
+        RIPng, OSPF, DHCPv6, 3GPP-NAS, and RA. The CPE MAY reject attempts to
+        delete or modify a dynamic route entry.
 
         For each incoming packet, the layer 3 forwarding decision is
         conceptually made as follows:
@@ -70541,16 +72214,16 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.2">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
-      <parameter name="Type" access="readWrite">
+      <parameter name="Type" access="readWrite" version="2.16">
         <description>
           Specifies the forwarding entry type. Based on {{bibref|RFC8349}}
         </description>
@@ -70683,6 +72356,16 @@
             <enumeration value="RIPng">
               <description>RIPng for IPv6 {{bibref|RFC2080}}</description>
             </enumeration>
+            <enumeration value="3GPP-NAS" version="2.18">
+              <description>
+                Address assigned by the core network (fixed or cellular) using
+                3GPP NAS signalling methods. e.g. PDU Session Establishment
+                Request, PDN Connectivity Request, PDP Context Activation
+                Request, ... This information is available from the AT commands
+                {{bibref|3GPP-TS.27.007|Clause 10.1.23}} PDP context read
+                dynamic parameters +CGCONTRDP.
+              </description>
+            </enumeration>
             <enumeration value="Static">
               <description>
                 For example, present in the factory default configuration,
@@ -70822,12 +72505,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -70980,7 +72663,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="ManagedAddressConfiguration" access="readOnly">
+      <parameter name="ManagedAddressConfiguration" access="readOnly"
+          version="2.16">
         <description>
           When set, it indicates that addresses are available via Dynamic Host
           Configuration Protocol [DHCPv6]. If the {{param}} is set, the
@@ -70993,7 +72677,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="OtherConfiguration" access="readOnly">
+      <parameter name="OtherConfiguration" access="readOnly" version="2.16">
         <description>
           When set, it indicates that other configuration information is
           available via DHCPv6. Examples of such information are DNS-related
@@ -71019,7 +72703,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ReachableTime" access="readOnly">
+      <parameter name="ReachableTime" access="readOnly" version="2.16">
         <description>
           The time, in {{units}}, that a node assumes a neighbor is reachable
           after having received a reachability confirmation. Used by the
@@ -71035,7 +72719,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="RetransTimer" access="readOnly">
+      <parameter name="RetransTimer" access="readOnly" version="2.16">
         <description>
           The time, in {{units}}, between retransmitted Neighbor Solicitation
           messages. Used by address resolution and the Neighbor Unreachability
@@ -71050,7 +72734,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="HomeAgent" access="readOnly">
+      <parameter name="HomeAgent" access="readOnly" version="2.16">
         <description>
           The Home Agent (H) bit is set in a Router Advertisement to indicate
           that the router sending this Router Advertisement is also functioning
@@ -71062,7 +72746,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="OptionNumberOfEntries" access="readOnly">
+      <parameter name="OptionNumberOfEntries" access="readOnly" version="2.16">
         <description>
           {{numentries}}
         </description>
@@ -71089,12 +72773,12 @@
         <parameter ref="Tag"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.16">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -71391,12 +73075,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.15">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -71825,7 +73509,7 @@
         numEntriesParameter="RouteNumberOfEntries" minEntries="0"
         maxEntries="unbounded" version="2.15">
       <description>
-        This object provides parameters for routes recieved from neighbors and
+        This object provides parameters for routes received from neighbors and
         internal routes.
       </description>
       <uniqueKey functional="true">
@@ -71954,12 +73638,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.15">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -72000,12 +73684,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.15">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -72124,12 +73808,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.15">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -72170,12 +73854,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.15">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -72304,12 +73988,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.2">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -72326,7 +74010,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="DADTransmits" access="readWrite">
+      <parameter name="DADTransmits" access="readWrite" version="2.13">
         <description>
           The number of consecutive Neighbor Solicitation messages sent while
           performing Duplicate Address Detection on a tentative address
@@ -72513,12 +74197,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.2">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -72535,7 +74219,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="RDNSSMode" access="readWrite">
+      <parameter name="RDNSSMode" access="readWrite" version="2.17">
         <description>
           Describes which IPv6 address information MUST be specified in the
           RDNSS option field specified in {{bibref|RFC8106|5.1. Recursive DNS
@@ -72573,7 +74257,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="RDNSS" access="readWrite">
+      <parameter name="RDNSS" access="readWrite" version="2.17">
         <description>
           The RDNSS parameter contains one or more IPv6 addresses of RDNSSes as
           described in {{bibref|RFC8106|5.1. Recursive DNS Server Option}}.
@@ -72587,11 +74271,11 @@
         <syntax>
           <list/>
           <dataType ref="IPv6Address"/>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
-      <parameter name="DNSSL" access="readWrite">
+      <parameter name="DNSSL" access="readWrite" version="2.17">
         <description>
           The DNSSL parameter contains one or more domain names of DNS suffixes
           as described in {{bibref|RFC8106|5.2. DNS Search List Option}}.
@@ -72601,7 +74285,7 @@
         <syntax>
           <list/>
           <string/>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
@@ -72630,7 +74314,7 @@
             <pathRef refType="strong"
                 targetParent="##.IP.Interface.{i}.IPv6Prefix." targetType="row"/>
           </string>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
@@ -72726,7 +74410,7 @@
       <parameter name="AdvManagedFlag" access="readWrite">
         <description>
           The value placed in the "Managed address configuration" (M) flag
-          field of Router Advertisement messages on this interafce (see
+          field of Router Advertisement messages on this interface (see
           {{bibref|RFC4861|Section 4.2}}, and {{bibref|RFC4862}}).
         </description>
         <syntax>
@@ -72853,7 +74537,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="AdvRDNSSLifetime" access="readWrite">
+      <parameter name="AdvRDNSSLifetime" access="readWrite" version="2.17">
         <description>
           The Lifetime field in RDNSS specifies the maximum duration, in
           {{units}}, during which the provided RDNSS addresses can be used for
@@ -72879,7 +74563,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="AdvDNSSLLifetime" access="readWrite">
+      <parameter name="AdvDNSSLLifetime" access="readWrite" version="2.17">
         <description>
           The Lifetime field in DNSSL specifies the maximum duration, in
           {{units}}, during which the provided DNSSL domain names can be used
@@ -72947,12 +74631,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.2">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -73059,12 +74743,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.2">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -73278,12 +74962,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.2">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -73302,7 +74986,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="EndpointAddressTypePrecedence" access="readWrite">
+      <parameter name="EndpointAddressTypePrecedence" access="readWrite"
+          version="2.5">
         <description>
           Indicates the preferred method to be used to assign the address of
           the DS-Lite Endpoint when both {{param|EndpointName}} and
@@ -73327,7 +75012,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="EndpointAddressInUse" access="readOnly">
+      <parameter name="EndpointAddressInUse" access="readOnly" version="2.5">
         <description>
           Indicates the address currently in use for the tunnel concentrator
           (remote endpoint). It is derived from the values of the
@@ -73387,7 +75072,7 @@
         <syntax>
           <string>
             <enumeration value="DHCPv6">
-              <description>Assigned by DHCPv6 {{bibref|RFC3315}}.</description>
+              <description>Assigned by DHCPv6 {{bibref|RFC8415}}.</description>
             </enumeration>
             <enumeration value="Static">
               <description>
@@ -73588,7 +75273,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="MaxSchedulerEntries" access="readOnly">
+      <parameter name="MaxSchedulerEntries" access="readOnly" version="2.16">
         <description>
           The maximum number of entries available in the {{object|Scheduler}}
           table.
@@ -73598,7 +75283,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="SchedulerNumberOfEntries" access="readOnly">
+      <parameter name="SchedulerNumberOfEntries" access="readOnly"
+          version="2.16">
         <description>
           {{numentries}}
         </description>
@@ -73691,7 +75377,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="DefaultInnerEthernetPriorityMark" access="readWrite">
+      <parameter name="DefaultInnerEthernetPriorityMark" access="readWrite"
+          version="2.7">
         <description>
           Ethernet priority code (as defined in {{bibref|802.1Q-2011}}) to mark
           traffic of the inner VLAN Tag as defined in 802.1Q, when the PDU is
@@ -73796,16 +75483,16 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
-      <parameter name="DHCPType" access="readWrite">
+      <parameter name="DHCPType" access="readWrite" version="2.2">
         <description>
           The DHCP protocol associated with the {{object}} instance. Affects
           only parameters that specify DHCP option values as classification
@@ -73862,7 +75549,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="IPVersion" access="readWrite">
+      <parameter name="IPVersion" access="readWrite" version="2.16">
         <description>
           Classification criterion.
 
@@ -74343,13 +76030,13 @@
         </syntax>
       </parameter>
 
-      <parameter name="SourceVendorClassIDv6" access="readWrite">
+      <parameter name="SourceVendorClassIDv6" access="readWrite" version="2.2">
         <description>
           Classification criterion.
 
           A hexbinary string used to identify one or more LAN devices, value of
           the DHCPv6 Vendor Class Identifier (Option 16) as defined in
-          {{bibref|RFC3315}}. The option value is binary, so an exact match is
+          {{bibref|RFC8415}}. The option value is binary, so an exact match is
           REQUIRED.
 
           {{empty}} indicates this criterion is not used for classification.
@@ -74430,13 +76117,13 @@
         </syntax>
       </parameter>
 
-      <parameter name="DestVendorClassIDv6" access="readWrite">
+      <parameter name="DestVendorClassIDv6" access="readWrite" version="2.2">
         <description>
           Classification criterion.
 
           A hexbinary string used to identify one or more LAN devices, value of
           the DHCPv6 Vendor Class Identifier (Option 16) as defined in
-          {{bibref|RFC3315}}. The option value is binary, so an exact match is
+          {{bibref|RFC8415}}. The option value is binary, so an exact match is
           REQUIRED.
 
           {{empty}} indicates this criterion is not used for classification.
@@ -74497,7 +76184,7 @@
           A hexbinary string used to identify one or more LAN devices, value of
           the DHCP Client Identifier. The DHCP Client Identifier is Option 61
           (as defined in {{bibref|RFC2132}}) for {{enum|DHCPv4|DHCPType}}, or
-          is Option 1 (as defined in {{bibref|RFC3315}}) for
+          is Option 1 (as defined in {{bibref|RFC8415}}) for
           {{enum|DHCPv6|DHCPType}}. The option value is binary, so an exact
           match is REQUIRED.
 
@@ -74543,7 +76230,7 @@
           A hexbinary string used to identify one or more LAN devices, value of
           the DHCP Client Identifier. The DHCP Client Identifier is Option 61
           (as defined in {{bibref|RFC2132}}) for {{enum|DHCPv4|DHCPType}}, or
-          is Option 1 (as defined in {{bibref|RFC3315}}) for
+          is Option 1 (as defined in {{bibref|RFC8415}}) for
           {{enum|DHCPv6|DHCPType}}. The option value is binary, so an exact
           match is REQUIRED.
 
@@ -74590,7 +76277,7 @@
           the DHCP User Class Identifier. The DHCP User Class Identifier is
           Option 77 (as defined in {{bibref|RFC3004}}) for
           {{enum|DHCPv4|DHCPType}}, or is Option 15 (as defined in
-          {{bibref|RFC3315}}) for {{enum|DHCPv6|DHCPType}}. The option value is
+          {{bibref|RFC8415}}) for {{enum|DHCPv6|DHCPType}}. The option value is
           binary, so an exact match is REQUIRED.
 
           {{empty}} indicates this criterion is not used for classification.
@@ -74634,7 +76321,7 @@
           the DHCP User Class Identifier. The DHCP User Class Identifier is
           Option 77 (as defined in {{bibref|RFC3004}}) for
           {{enum|DHCPv4|DHCPType}}, or is Option 15 (as defined in
-          {{bibref|RFC3315}}) for {{enum|DHCPv6|DHCPType}}. The option value is
+          {{bibref|RFC8415}}) for {{enum|DHCPv6|DHCPType}}. The option value is
           binary, so an exact match is REQUIRED.
 
           {{empty}} indicates this criterion is not used for classification.
@@ -74679,7 +76366,7 @@
           {{param|SourceVendorSpecificInfoSubOption}}. The DHCP Vendor-specific
           Information is Option 125 (as defined in {{bibref|RFC3925}}) for
           {{enum|DHCPv4|DHCPType}}, or is Option 17 (as defined in
-          {{bibref|RFC3315}}) for {{enum|DHCPv6|DHCPType}}.
+          {{bibref|RFC8415}}) for {{enum|DHCPv6|DHCPType}}.
 
           {{empty}} indicates this criterion is not used for classification.
 
@@ -74751,7 +76438,7 @@
           {{param|DestVendorSpecificInfoSubOption}}. The DHCP Vendor-specific
           Information is Option 125 (as defined in {{bibref|RFC3925}}) for
           {{enum|DHCPv4|DHCPType}}, or is Option 17 (as defined in
-          {{bibref|RFC3315}}) for {{enum|DHCPv6|DHCPType}}.
+          {{bibref|RFC8415}}) for {{enum|DHCPv6|DHCPType}}.
 
           {{empty}} indicates this criterion is not used for classification.
 
@@ -74846,10 +76533,12 @@
         <description>
           Classification criterion.
 
-          Minimum IP Packet Length (including header) in bytes.
+          Minimum IP Packet Length (including header) in {{units}}.
         </description>
         <syntax>
-          <unsignedInt/>
+          <unsignedInt>
+            <units value="bytes"/>
+          </unsignedInt>
           <default type="object" value="0"/>
         </syntax>
       </parameter>
@@ -74858,13 +76547,15 @@
         <description>
           Classification criterion.
 
-          Maximum IP Packet Length (including header) in bytes.
+          Maximum IP Packet Length (including header) in {{units}}.
 
           A value of zero indicates that no maximum is specified (an umlimited
           maximum length).
         </description>
         <syntax>
-          <unsignedInt/>
+          <unsignedInt>
+            <units value="bytes"/>
+          </unsignedInt>
           <default type="object" value="0"/>
         </syntax>
       </parameter>
@@ -74998,7 +76689,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="InnerEthernetPriorityCheck" access="readWrite">
+      <parameter name="InnerEthernetPriorityCheck" access="readWrite"
+          version="2.7">
         <description>
           Classification criterion.
 
@@ -75014,7 +76706,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="InnerEthernetPriorityExclude" access="readWrite">
+      <parameter name="InnerEthernetPriorityExclude" access="readWrite"
+          version="2.7">
         <description>
           If {{false}}, the class includes only those packets that match the
           {{param|InnerEthernetPriorityCheck}} entry, if specified.
@@ -75028,7 +76721,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="InnerEthernetPriorityMark" access="readWrite">
+      <parameter name="InnerEthernetPriorityMark" access="readWrite"
+          version="2.7">
         <description>
           Classification result.
 
@@ -75050,7 +76744,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="EthernetDEICheck" access="readWrite">
+      <parameter name="EthernetDEICheck" access="readWrite" version="2.7">
         <description>
           Classification criterion.
 
@@ -75067,7 +76761,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="EthernetDEIExclude" access="readWrite">
+      <parameter name="EthernetDEIExclude" access="readWrite" version="2.7">
         <description>
           If {{false}}, the class includes only those packets that match the
           {{param|EthernetDEICheck}} entry, if specified.
@@ -75250,12 +76944,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -75365,7 +77059,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="DefaultInnerEthernetPriorityMark" access="readWrite">
+      <parameter name="DefaultInnerEthernetPriorityMark" access="readWrite"
+          version="2.7">
         <description>
           Ethernet priority code (as defined in {{bibref|802.1Q-2011}}) to mark
           the inner VLAN Tags as defined in 802.1Q with this {{object}} table
@@ -75423,12 +77118,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -75458,7 +77153,7 @@
           <string>
             <size maxLength="256"/>
           </string>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
@@ -75563,7 +77258,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="InnerEthernetPriorityMark" access="readWrite">
+      <parameter name="InnerEthernetPriorityMark" access="readWrite"
+          version="2.7">
         <description>
           Ethernet priority code (as defined in {{bibref|802.1Q-2011}}) to mark
           the inner VLAN Tags with for traffic that falls into this flow.
@@ -75620,45 +77316,52 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
       <parameter name="CommittedRate" access="readWrite">
         <description>
           Committed rate allowed for this policer in {{units}}.
+
+          Note: To be able to support higher bit rates, this parameter was
+          changed to unsignedLong in the Device:2.18 version.
         </description>
         <syntax>
-          <unsignedInt>
+          <unsignedLong>
             <units value="bits per second"/>
-          </unsignedInt>
+          </unsignedLong>
           <default type="object" value="0"/>
         </syntax>
       </parameter>
 
       <parameter name="CommittedBurstSize" access="readWrite">
         <description>
-          Committed Burstsize in bytes.
+          Committed Burstsize in {{units}}.
         </description>
         <syntax>
-          <unsignedInt/>
+          <unsignedInt>
+            <units value="bytes"/>
+          </unsignedInt>
           <default type="object" value="0"/>
         </syntax>
       </parameter>
 
       <parameter name="ExcessBurstSize" access="readWrite">
         <description>
-          Excess Burstsize in bytes.
+          Excess Burstsize in {{units}}.
 
           Applied for a {{enum|SingleRateThreeColor|MeterType}} meter.
         </description>
         <syntax>
-          <unsignedInt/>
+          <unsignedInt>
+            <units value="bytes"/>
+          </unsignedInt>
           <default type="object" value="0"/>
         </syntax>
       </parameter>
@@ -75668,23 +77371,28 @@
           Peak rate allowed for this Meter in {{units}}.
 
           Applied for {{enum|TwoRateThreeColor|MeterType}} meters.
+
+          Note: To be able to support higher bit rates, this parameter was
+          changed to unsignedLong in the Device:2.18 version.
         </description>
         <syntax>
-          <unsignedInt>
+          <unsignedLong>
             <units value="bits per second"/>
-          </unsignedInt>
+          </unsignedLong>
           <default type="object" value="0"/>
         </syntax>
       </parameter>
 
       <parameter name="PeakBurstSize" access="readWrite">
         <description>
-          Peak Burstsize in bytes.
+          Peak Burstsize in {{units}}.
 
           Applied for {{enum|TwoRateThreeColor|MeterType}} meters.
         </description>
         <syntax>
-          <unsignedInt/>
+          <unsignedInt>
+            <units value="bytes"/>
+          </unsignedInt>
           <default type="object" value="0"/>
         </syntax>
       </parameter>
@@ -76001,16 +77709,16 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
-      <parameter name="Children" access="readWrite">
+      <parameter name="Children" access="readWrite" version="2.16">
         <description>
           {{list}} Each reference can be associated with another
           {{object|##.QoS.Queue.{i}}}, {{object|##.QoS.Shaper.{i}}},
@@ -76044,7 +77752,7 @@
             <size maxLength="256"/>
           </list>
           <unsignedInt/>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
@@ -76094,14 +77802,16 @@
 
       <parameter name="BufferLength" access="readOnly">
         <description>
-          Number of bytes in the buffer.
+          Number of {{units}} in the buffer.
 
           Queue buffer size for all egress interfaces for which this queue
           exists. If the buffer size is not the same for all such egress
           interfaces, this parameter MUST be 0.
         </description>
         <syntax>
-          <unsignedInt/>
+          <unsignedInt>
+            <units value="bytes"/>
+          </unsignedInt>
         </syntax>
       </parameter>
 
@@ -76237,31 +77947,37 @@
           ATM layer is rate-constrained, then the rate is calculated relative
           to this rate. Otherwise, the rate is calculated relative to the
           physical-layer DSL rate.
+
+          Note: To be able to support higher bit rates, this parameter was
+          changed to unsignedLong in the Device:2.18 version.
         </description>
         <syntax>
-          <int>
+          <long>
             <range minInclusive="-1"/>
-          </int>
+          </long>
           <default type="object" value="-1"/>
         </syntax>
       </parameter>
 
-      <parameter name="CurrentShapingRate" access="readOnly">
+      <parameter name="CurrentShapingRate" access="readOnly" version="2.16">
         <description>
           If the Queue is active, the CurrentShapingRate must reflect the
           actual configured ShapingRate, in {{units}} per second. -1 means no
           rate due to do Queue not active.
+
+          Note: To be able to support higher bit rates, this parameter was
+          changed to unsignedLong in the Device:2.18 version.
         </description>
         <syntax>
-          <int>
+          <long>
             <range minInclusive="-1"/>
             <units value="bits per second"/>
-          </int>
+          </long>
           <default type="object" value="-1"/>
         </syntax>
       </parameter>
 
-      <parameter name="AssuredRate" access="readWrite">
+      <parameter name="AssuredRate" access="readWrite" version="2.16">
         <description>
           Minimum rate to shape this queue's traffic to.
 
@@ -76271,37 +77987,45 @@
           If &gt; 100, in bits per second.
 
           A value of -1 indicates no shaping.
+
+          Note: To be able to support higher bit rates, this parameter was
+          changed to unsignedLong in the Device:2.18 version.
         </description>
         <syntax>
-          <int>
+          <long>
             <range minInclusive="-1"/>
-          </int>
+          </long>
           <default type="object" value="-1"/>
         </syntax>
       </parameter>
 
-      <parameter name="CurrentAssuredRate" access="readOnly">
+      <parameter name="CurrentAssuredRate" access="readOnly" version="2.16">
         <description>
           If the Queue is active, the CurrentAssuredRate must reflect the
           actual configured AssuredRate, in bits per second. -1 means no rate
           due to do Queue not active.
+
+          Note: To be able to support higher bit rates, this parameter was
+          changed to unsignedLong in the Device:2.18 version.
         </description>
         <syntax>
-          <int>
+          <long>
             <range minInclusive="-1"/>
-          </int>
+          </long>
           <default type="object" value="-1"/>
         </syntax>
       </parameter>
 
       <parameter name="ShapingBurstSize" access="readWrite">
         <description>
-          Burst size in bytes. For both leaky bucket (constant rate shaping)
-          and token bucket (variable rate shaping) this is the bucket size and
-          is therefore the maximum burst size.
+          Burst size in {{units}}. For both leaky bucket (constant rate
+          shaping) and token bucket (variable rate shaping) this is the bucket
+          size and is therefore the maximum burst size.
         </description>
         <syntax>
-          <unsignedInt/>
+          <unsignedInt>
+            <units value="bytes"/>
+          </unsignedInt>
         </syntax>
       </parameter>
     </object>
@@ -76360,12 +78084,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -76413,10 +78137,12 @@
 
       <parameter name="OutputBytes" access="readOnly" activeNotify="canDeny">
         <description>
-          Number of bytes output through the queue.
+          Number of {{units}} output through the queue.
         </description>
         <syntax>
-          <unsignedInt/>
+          <unsignedInt>
+            <units value="bytes"/>
+          </unsignedInt>
           <default type="object" value="0"/>
         </syntax>
       </parameter>
@@ -76434,10 +78160,12 @@
 
       <parameter name="DroppedBytes" access="readOnly" activeNotify="canDeny">
         <description>
-          Number of bytes dropped by the queue.
+          Number of {{units}} dropped by the queue.
         </description>
         <syntax>
-          <unsignedInt/>
+          <unsignedInt>
+            <units value="bytes"/>
+          </unsignedInt>
           <default type="object" value="0"/>
         </syntax>
       </parameter>
@@ -76529,16 +78257,16 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
-      <parameter name="Children" access="readWrite">
+      <parameter name="Children" access="readWrite" version="2.16">
         <description>
           {{list}} Each reference can be associated with another
           {{object|##.QoS.Queue.{i}}}, {{object|##.QoS.Shaper.{i}}},
@@ -76587,23 +78315,28 @@
           layer is rate-constrained, then the rate is calculated relative to
           this rate. Otherwise, the rate is calculated relative to the
           physical-layer DSL rate.
+
+          Note: To be able to support higher bit rates, this parameter was
+          changed to unsignedLong in the Device:2.18 version.
         </description>
         <syntax>
-          <int>
+          <long>
             <range minInclusive="-1"/>
-          </int>
+          </long>
           <default type="object" value="-1"/>
         </syntax>
       </parameter>
 
       <parameter name="ShapingBurstSize" access="readWrite">
         <description>
-          Burst size in bytes. For both leaky bucket (constant rate shaping)
-          and token bucket (variable rate shaping) this is the bucket size and
-          is therefore the maximum burst size.
+          Burst size in {{units}}. For both leaky bucket (constant rate
+          shaping) and token bucket (variable rate shaping) this is the bucket
+          size and is therefore the maximum burst size.
         </description>
         <syntax>
-          <unsignedInt/>
+          <unsignedInt>
+            <units value="bytes"/>
+          </unsignedInt>
         </syntax>
       </parameter>
     </object>
@@ -76649,16 +78382,16 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.16">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
-      <parameter name="Children" access="readWrite">
+      <parameter name="Children" access="readWrite" version="2.16">
         <description>
           {{list}} Each reference can be associated with another
           {{object|##.QoS.Queue.{i}}}, {{object|##.QoS.Shaper.{i}}},
@@ -76723,11 +78456,14 @@
           If &gt; 100, in bits per second.
 
           A value of -1 indicates no shaping.
+
+          Note: To be able to support higher bit rates, this parameter was
+          changed to unsignedLong in the Device:2.18 version.
         </description>
         <syntax>
-          <int>
+          <long>
             <range minInclusive="-1"/>
-          </int>
+          </long>
           <default type="object" value="-1"/>
         </syntax>
       </parameter>
@@ -76739,11 +78475,14 @@
           Must be &gt; 0 and &lt; ShapingRate, for a valid rate.
 
           A value of -1 indicates the ShapingRate's value is not used.
+
+          Note: To be able to support higher bit rates, this parameter was
+          changed to unsignedLong in the Device:2.18 version.
         </description>
         <syntax>
-          <int>
+          <long>
             <range minInclusive="-1"/>
-          </int>
+          </long>
           <default type="object" value="-1"/>
         </syntax>
       </parameter>
@@ -76811,7 +78550,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="AccessControlNumberOfEntries" access="readOnly">
+      <parameter name="AccessControlNumberOfEntries" access="readOnly"
+          version="2.14">
         <description>
           {{numentries}}
         </description>
@@ -76831,7 +78571,8 @@
         <parameter ref="PhysAddress"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly" status="deleted">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.0"
+          status="deleted">
         <description>
           {{datatype|expand}}
 
@@ -76842,7 +78583,7 @@
           {{deleted|2.15}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -76896,7 +78637,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="DHCPClient" access="readOnly">
+      <parameter name="DHCPClient" access="readOnly" version="2.2">
         <description>
           {{reference}} Each list item is the DHCPv4 or DHCPv6 server's client
           entry that corresponds to the host.
@@ -76937,7 +78678,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="AssociatedDevice" access="readOnly">
+      <parameter name="AssociatedDevice" access="readOnly" version="2.2">
         <description>
           {{noreference}}The value MUST be the path name of the
           ''AssociatedDevice'' (or equivalent) table row that models the host,
@@ -76987,7 +78728,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="InterfaceType" access="readOnly">
+      <parameter name="InterfaceType" access="readOnly" version="2.13">
         <description>
           Type of physical interface through which this host is connected.
         </description>
@@ -77118,7 +78859,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ActiveLastChange" access="readOnly">
+      <parameter name="ActiveLastChange" access="readOnly" version="2.10">
         <description>
           The datetime when {{param|Active}} last changed from {{true}} to
           {{false}} or from {{false}} to {{true}}. The initial detection of a
@@ -77138,7 +78879,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="IPv4AddressNumberOfEntries" access="readOnly">
+      <parameter name="IPv4AddressNumberOfEntries" access="readOnly"
+          version="2.2">
         <description>
           {{numentries}}
         </description>
@@ -77147,7 +78889,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="IPv6AddressNumberOfEntries" access="readOnly">
+      <parameter name="IPv6AddressNumberOfEntries" access="readOnly"
+          version="2.2">
         <description>
           {{numentries}}
         </description>
@@ -77304,18 +79047,21 @@
         <parameter ref="PhysAddress"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.14">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
-      <parameter name="Origin" access="readOnly">
+      <parameter name="Origin" access="writeOnceReadOnly" version="2.17">
         <description>
           Indicates the owner of the {{object}} instance.
+
+          Note: This parameter was changed to writeOnceReadOnly in the
+          Device:2.18 version.
         </description>
         <syntax>
           <string>
@@ -77354,7 +79100,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="PhysAddressMask" access="readWrite">
+      <parameter name="PhysAddressMask" access="readWrite" version="2.17">
         <description>
           Mask to be applied on {{param|PhysAddress}}. When set to
           'FF:FF:FF:FF:FF:FF' the access control rule is applicable to a single
@@ -77398,11 +79144,14 @@
           Allows or denies access for a device.
 
           If {{param}} is set to "Allow", device access is allowed based on the
-          {{object|Schedule}} objects. Access is enabled if there is no
-          {{object|Schedule}} object defined.
+          {{object|.Schedules.Schedule}} objects referenced by the
+          {{param|ScheduleRef}} parameter. Access is enabled if there is no
+          {{object|.Schedules.Schedule}} object referenced by the
+          {{param|ScheduleRef}} parameter.
 
-          If {{param}} is set to "Deny", defined {{object|Schedule}} objects
-          are ignored and no access is allowed for the device.
+          If {{param}} is set to "Deny", {{object|.Schedules.Schedule}} objects
+          referenced by the {{param|ScheduleRef}} parameter are ignored and no
+          access is allowed for the device.
         </description>
         <syntax>
           <string>
@@ -77413,8 +79162,27 @@
         </syntax>
       </parameter>
 
-      <parameter name="ScheduleNumberOfEntries" access="readOnly">
+      <parameter name="ScheduleRef" access="readWrite" version="2.18">
         <description>
+          Each reference provides a schedule where time based access can be
+          enabled. When {{param}} is {{empty}} the {{object}} is not scheduled,
+          and the {{param|Enable}} defines the operational state.
+        </description>
+        <syntax>
+          <list/>
+          <string>
+            <pathRef refType="strong" targetParent=".Schedules.Schedule."
+                targetType="row"/>
+          </string>
+          <default type="object" value="[]"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ScheduleNumberOfEntries" access="readOnly"
+          status="deprecated">
+        <description>
+          {{deprecated|2.18|in favor of {{object|.Schedules.}}}}
+
           {{numentries}}
         </description>
         <syntax>
@@ -77426,8 +79194,10 @@
     <object name="Device.Hosts.AccessControl.{i}.Schedule.{i}."
         access="readWrite" numEntriesParameter="ScheduleNumberOfEntries"
         enableParameter="Enable" minEntries="0" maxEntries="unbounded"
-        version="2.14">
+        version="2.14" status="deprecated">
       <description>
+        {{deprecated|2.18|in favor of {{object|.Schedules.}}}}
+
         Each instance of this object provides a schedule where access is
         enabled.
       </description>
@@ -77435,12 +79205,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.14">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -77514,7 +79284,7 @@
         Properties for Domain Name Service (DNS).
       </description>
 
-      <parameter name="SupportedRecordTypes" access="readOnly">
+      <parameter name="SupportedRecordTypes" access="readOnly" version="2.2">
         <description>
           The DNS record types that are supported by the device. {{enum}}
         </description>
@@ -77537,7 +79307,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ZoneNumberOfEntries" access="readOnly">
+      <parameter name="ZoneNumberOfEntries" access="readOnly" version="2.17">
         <description>
           {{numentries}}
         </description>
@@ -77557,12 +79327,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.17">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -77586,9 +79356,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Origin" access="readOnly">
+      <parameter name="Origin" access="writeOnceReadOnly">
         <description>
           The mechanism via which the Zone was created.
+
+          Note: This parameter was changed to writeOnceReadOnly in the
+          Device:2.18 version.
         </description>
         <syntax>
           <string>
@@ -77650,12 +79423,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.17">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -77680,9 +79453,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Origin" access="readWrite">
+      <parameter name="Origin" access="writeOnceReadOnly">
         <description>
           Indicates the owner of the {{object}} instance.
+
+          Note: This parameter was changed to writeOnceReadOnly in the
+          Device:2.18 version.
         </description>
         <syntax>
           <string>
@@ -77779,8 +79555,8 @@
       <description>
         This table contains the DNS Server IP address to be used by the DNS
         Client (it does ''not'' model a DNS Server). Entries are either
-        automatically created as result of DHCP (v4 or v6), IPCP, or RA
-        received DNS server information, or are statically configured by the
+        automatically created as result of DHCP (v4 or v6), IPCP, 3GPP-NAS, or
+        RA received DNS server information, or are statically configured by the
         Controller.
       </description>
       <uniqueKey functional="true">
@@ -77817,12 +79593,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -77832,8 +79608,8 @@
 
           Note: {{param}} is only writable when {{param|Type}} is
           {{enum|Static|Type}}; otherwise, {{param}} is automatically
-          configured as result of DHCP, IPCP, or RA received DNS server
-          information.
+          configured as result of DHCP, IPCP, 3GPP-NAS, or RA received DNS
+          server information.
         </description>
         <syntax>
           <dataType ref="IPAddress"/>
@@ -77849,8 +79625,8 @@
 
           Note: {{param}} is only writable when {{param|Type}} is
           {{enum|Static|Type}}; otherwise, {{param}} is automatically
-          configured as result of DHCP, IPCP, or RA received DNS server
-          information.
+          configured as result of DHCP, IPCP, 3GPP-NAS, or RA received DNS
+          server information.
         </description>
         <syntax>
           <string>
@@ -77867,10 +79643,11 @@
           Method used to assign the {{param|DNSServer}} address. {{enum}}
 
           Table entries that are automatically created as result of DHCP, IPCP,
-          or RA received DNS server information will have {{param}} set to
-          {{enum|DHCPv4}}, {{enum|DHCPv6}}, {{enum|IPCP}}, or
-          {{enum|RouterAdvertisement}}, as the case may be. Manually created
-          table entires will have their {{param}} set to {{enum|Static}}.
+          3GPP-NAS, or RA received DNS server information will have {{param}}
+          set to {{enum|DHCPv4}}, {{enum|DHCPv6}}, {{enum|IPCP}},
+          {{enum|3GPP-NAS}} or {{enum|RouterAdvertisement}}, as the case may
+          be. Manually created table entries will have their {{param}} set to
+          {{enum|Static}}.
         </description>
         <syntax>
           <string>
@@ -77886,6 +79663,21 @@
             <enumeration value="DHCPv6"/>
             <enumeration value="RouterAdvertisement"/>
             <enumeration value="IPCP"/>
+            <enumeration value="3GPP-NAS" version="2.18">
+              <description>
+                Assigned by the core network (fixed or cellular) using 3GPP NAS
+                signalling methods. e.g. PDU Session Establishment Request
+                using the extended Protocol Configuration Options
+                {{bibref|3GPP-TS.24.008|clause 10.5.6.3}}, PDN Connectivity
+                Request using the Protocol Configuration Options
+                {{bibref|3GPP-TS.24.008|clause 10.5.6.3}, PDP Context
+                Activation Request using the Protocol Configuration Options
+                {{bibref|3GPP-TS.24.008|clause 10.5.6.3}, ... This information
+                is available from the AT commands
+                {{bibref|3GPP-TS.27.007|Clause 10.1.23}} PDP context read
+                dynamic parameters +CGCONTRDP.
+              </description>
+            </enumeration>
             <enumeration value="Static"/>
           </string>
           <default type="object" value="Static"/>
@@ -77927,7 +79719,7 @@
       </parameter>
 
       <parameter name="ConfigNumberOfEntries" access="readOnly"
-          dmr:customNumEntriesParameter="true">
+          dmr:customNumEntriesParameter="true" version="2.17">
         <description>
           {{numentries}}
         </description>
@@ -77958,12 +79750,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.17">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -77978,7 +79770,7 @@
             <pathRef refType="strong" targetParent="#.Forwarding."
                 targetType="row"/>
           </string>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
@@ -78013,7 +79805,7 @@
 
       <parameter name="CacheMinTTL" access="readOnly">
         <description>
-          Specifies the minium TTL amount of time, in {{units}}, that an entry
+          Specifies the minimum TTL amount of time, in {{units}}, that an entry
           MUST be kept in the cache regardless of what has been specified by
           the domain owner.
 
@@ -78045,7 +79837,7 @@
         </syntax>
       </parameter>
 
-      <command name="FlushCache()" async="false">
+      <command name="FlushCache()" async="false" version="2.17">
         <description>
           This command empties the cache.
         </description>
@@ -78098,12 +79890,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -78151,7 +79943,7 @@
           or RA received DNS server information will have {{param}} set to
           {{enum|DHCPv4}}, {{enum|DHCPv6}}, {{enum|IPCP}}, or
           {{enum|RouterAdvertisement}}, as the case may be. Manually created
-          table entires will have their {{param}} set to {{enum|Static}}.
+          table entries will have their {{param}} set to {{enum|Static}}.
         </description>
         <syntax>
           <string>
@@ -78181,7 +79973,7 @@
         {{command|NSLookupDiagnostics()}} test.
       </description>
 
-      <command name="NSLookupDiagnostics()" async="true">
+      <command name="NSLookupDiagnostics()" async="true" version="2.12">
         <description>
           This command defines access to an IP-layer NS Lookup test for the
           specified IP interface.
@@ -78198,7 +79990,7 @@
         </description>
         <input>
 
-          <parameter name="Interface">
+          <parameter name="Interface" version="2.12">
             <description>
               {{reference}} The layer 3 interface over which the test is to be
               performed. Example: ''Device.IP.Interface.1''.
@@ -78213,7 +80005,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="HostName" mandatory="true">
+          <parameter name="HostName" mandatory="true" version="2.12">
             <description>
               Specifies the Host Name that NS Lookup is to look for. The
               current domain name MUST be used unless the name is a fully
@@ -78226,7 +80018,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="DNSServer">
+          <parameter name="DNSServer" version="2.12">
             <description>
               Specifies the DNS Server name or IP address that NS Lookup is to
               use for the lookup. The name of this server will be resolved
@@ -78242,7 +80034,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="Timeout" mandatory="true">
+          <parameter name="Timeout" mandatory="true" version="2.12">
             <description>
               Timeout in {{units}} that indicates that a request has failed.
             </description>
@@ -78253,7 +80045,8 @@
             </syntax>
           </parameter>
 
-          <parameter name="NumberOfRepetitions" mandatory="true">
+          <parameter name="NumberOfRepetitions" mandatory="true"
+              version="2.12">
             <description>
               The number of times the device SHOULD repeat the execution of the
               NSLookup using the same input parameters. If the diagnostics test
@@ -78270,7 +80063,7 @@
         </input>
         <output>
 
-          <parameter name="Status">
+          <parameter name="Status" version="2.13">
             <description>
               Indicates the availability of diagnostics data. {{enum}}
 
@@ -78290,7 +80083,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="SuccessCount">
+          <parameter name="SuccessCount" version="2.12">
             <description>
               Number of successfully executed repetitions.
             </description>
@@ -78415,7 +80208,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="AdvertiseNumberOfEntries" access="readOnly">
+      <parameter name="AdvertiseNumberOfEntries" access="readOnly"
+          version="2.17">
         <description>
           {{numentries}}
         </description>
@@ -78434,7 +80228,7 @@
       </parameter>
 
       <parameter name="AdvertisedInterfaces" access="readWrite"
-          status="deprecated">
+          status="deprecated" version="2.12">
         <description>
           {{reference|the {{object|##.IP.Interface}} object instance from which
           DNS-SD services are advertised}}
@@ -78496,12 +80290,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.17">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -78554,11 +80348,14 @@
         </syntax>
       </parameter>
 
-      <parameter name="InstanceName" access="readOnly">
+      <parameter name="InstanceName" access="readWrite">
         <description>
           Human-readable instance name {{bibref|DNS-SD|Section 4.1.1 Instance
           Names}} (i.e. The "[{{param}}]" portion of the '"Service Instance
           Name'").
+
+          Note: This parameter was promoted to readWrite in the Device:2.18
+          version.
         </description>
         <syntax>
           <string>
@@ -78567,11 +80364,14 @@
         </syntax>
       </parameter>
 
-      <parameter name="ApplicationProtocol" access="readOnly">
+      <parameter name="ApplicationProtocol" access="readWrite">
         <description>
           The Application Protocol, without the leading underscore, associated
           with the service (e.g., daap) as defined by the DNS-SD service
           {{bibref|DNS-SD|Section 7 Application Protocol Names}}.
+
+          Note: This parameter was promoted to readWrite in the Device:2.18
+          version.
         </description>
         <syntax>
           <string>
@@ -78580,10 +80380,13 @@
         </syntax>
       </parameter>
 
-      <parameter name="TransportProtocol" access="readOnly">
+      <parameter name="TransportProtocol" access="readWrite">
         <description>
           The Transport Protocol associated with the service as defined by the
           DNS-SD service {{bibref|DNS-SD|Section 4.1.2 Service Names}}.
+
+          Note: This parameter was promoted to readWrite in the Device:2.18
+          version.
         </description>
         <syntax>
           <string>
@@ -78593,12 +80396,15 @@
         </syntax>
       </parameter>
 
-      <parameter name="Domain" access="readOnly">
+      <parameter name="Domain" access="readWrite">
         <description>
           The value to be entered into the Name field of the DNS SRV record
           {{bibref|RFC2782}} which represents the fully qualified domain name
           (FQDN) associated with the service as defined by the DNS-SD service
           {{bibref|DNS-SD|Section 4.1.3 Domain Names}}.
+
+          Note: This parameter was promoted to readWrite in the Device:2.18
+          version.
         </description>
         <syntax>
           <string>
@@ -78608,10 +80414,13 @@
         </syntax>
       </parameter>
 
-      <parameter name="Port" access="readOnly">
+      <parameter name="Port" access="readWrite">
         <description>
           The value to be entered into the Port field of the DNS SRV record
           {{bibref|RFC2782}} that is used to contact the service.
+
+          Note: This parameter was promoted to readWrite in the Device:2.18
+          version.
         </description>
         <syntax>
           <unsignedInt>
@@ -78631,7 +80440,7 @@
     </object>
 
     <object name="Device.DNS.SD.Advertise.{i}.TextRecord.{i}."
-        access="readOnly" numEntriesParameter="TextRecordNumberOfEntries"
+        access="readWrite" numEntriesParameter="TextRecordNumberOfEntries"
         minEntries="0" maxEntries="unbounded" dmr:noUniqueKeys="true"
         version="2.17">
       <description>
@@ -78641,6 +80450,8 @@
 
         When multiple instances of the {{object}} table have the same value for
         the {{param|Key}} parameter, the implementation is CPE specific.
+
+        Note: This object was promoted to readWrite in the Device:2.18 version.
       </description>
 
       <parameter name="Key" access="readWrite">
@@ -78954,7 +80765,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="MaxNumberOfPortMappings" access="readOnly">
+      <parameter name="MaxNumberOfPortMappings" access="readOnly"
+          version="2.17">
         <description>
           The maximum number of port mappings that can exist at any given time.
 
@@ -78966,7 +80778,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="PortTriggerNumberOfEntries" access="readOnly">
+      <parameter name="PortTriggerNumberOfEntries" access="readOnly"
+          version="2.16">
         <description>
           {{numentries}}
         </description>
@@ -78975,7 +80788,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="MaxNumberOfPortTriggers" access="readOnly">
+      <parameter name="MaxNumberOfPortTriggers" access="readOnly"
+          version="2.17">
         <description>
           The maximum number of port triggers that can exist at any given time.
 
@@ -79061,12 +80875,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -79085,7 +80899,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SourceNetwork" access="readWrite">
+      <parameter name="SourceNetwork" access="readWrite" version="2.16">
         <description>
           Each list item MUST be the Path name of a
           {{object|.IP.Interface.{i}.IPv4Address.}} table or of one of its
@@ -79107,11 +80921,12 @@
           <string>
             <size maxLength="256"/>
           </string>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
-      <parameter name="TCPTranslationTimeout" access="readWrite">
+      <parameter name="TCPTranslationTimeout" access="readWrite"
+          version="2.13">
         <description>
           Determines the timeout, in {{units}}, of NAT translations for TCP
           sessions. It is the time after which a NAT entry is removed from the
@@ -79127,7 +80942,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="UDPTranslationTimeout" access="readWrite">
+      <parameter name="UDPTranslationTimeout" access="readWrite"
+          version="2.13">
         <description>
           Determines the timeout, in {{units}}, of NAT translations for UDP
           bindings. It is the time after which a NAT entry is removed from the
@@ -79201,6 +81017,13 @@
           <string>
             <enumeration value="Disabled"/>
             <enumeration value="Enabled"/>
+            <enumeration value="Inactive" version="2.18">
+              <description>
+                Indicates that the port mapping is still enabled but has been
+                temporarily deactivated due to the Schedules defined in
+                {{param|ScheduleRef}}.
+              </description>
+            </enumeration>
             <enumeration value="Error_Misconfigured"/>
             <enumeration value="Error" optional="true"/>
           </string>
@@ -79208,9 +81031,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Origin" access="readOnly">
+      <parameter name="Origin" access="writeOnceReadOnly" version="2.17">
         <description>
           Indicates the Origin of the {{object}} instance.
+
+          Note: This parameter was changed to writeOnceReadOnly in the
+          Device:2.18 version.
         </description>
         <syntax>
           <string>
@@ -79243,7 +81069,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.0">
         <description>
           {{datatype|expand}}
 
@@ -79252,7 +81078,7 @@
           because automatically-created {{object}} instances can be transitory.
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -79308,6 +81134,26 @@
         </syntax>
       </parameter>
 
+      <parameter name="RemainingLeaseTime" access="readOnly"
+          activeNotify="canDeny" version="2.18">
+        <description>
+          For a dynamic (non-static) port mapping, when this parameter is read,
+          the value represents the time (in {{units}}) remaining on the port
+          mapping lease. That is, for a dynamic port mapping, the value counts
+          down toward 0. When a dynamic port mapping lease expires, the device
+          MUST automatically terminate that port mapping, and MUST
+          automatically delete the corresponding {{object}} table entry.
+
+          For a static port mapping, this parameter is irrelevant and should
+          return ''0''.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
       <parameter name="RemoteHost" access="readWrite">
         <description>
           This parameter is the IP address of the source of inbound packets.
@@ -79418,6 +81264,9 @@
         <description>
           The port on {{param|InternalClient}} that the gateway SHOULD forward
           traffic to.
+
+          When {{param|ExternalPortEndRange}} is utilized, this range will also
+          be applied accordingly, starting from the {{param}} number.
         </description>
         <syntax>
           <unsignedInt>
@@ -79484,6 +81333,22 @@
           <default type="object" value=""/>
         </syntax>
       </parameter>
+
+      <parameter name="ScheduleRef" access="readWrite" version="2.18">
+        <description>
+          Each reference provides a schedule where time based access can be
+          enabled. When {{param}} is {{empty}} the {{object}} is not scheduled,
+          and the {{param|Enable}} defines the operational state.
+        </description>
+        <syntax>
+          <list/>
+          <string>
+            <pathRef refType="strong" targetParent=".Schedules.Schedule."
+                targetType="row"/>
+          </string>
+          <default type="object" value="[]"/>
+        </syntax>
+      </parameter>
     </object>
 
     <object name="Device.NAT.PortTrigger.{i}." access="readWrite"
@@ -79496,12 +81361,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.16">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -79530,6 +81395,13 @@
                 Indicates that the PortTrigger entry is enabled.
               </description>
             </enumeration>
+            <enumeration value="Inactive" version="2.18">
+              <description>
+                Indicates that the PortTrigger is still enabled but has been
+                temporary deactivated due to the Schedules defined in
+                {{param|ScheduleRef}}.
+              </description>
+            </enumeration>
             <enumeration value="Error_Misconfigured">
               <description>
                 Indicates that a necessary configuration value is undefined or
@@ -79546,9 +81418,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Origin" access="readWrite">
+      <parameter name="Origin" access="writeOnceReadOnly">
         <description>
           Indicates the owner of the {{object}} instance.
+
+          Note: This parameter was changed to writeOnceReadOnly in the
+          Device:2.18 version.
         </description>
         <syntax>
           <string>
@@ -79650,10 +81525,13 @@
         </syntax>
       </parameter>
 
-      <parameter name="ActivationDate" access="readWrite">
+      <parameter name="ActivationDate" access="readOnly">
         <description>
           Indicates when the port trigger was enabled. When the port trigger is
           no longer active.
+
+          Note: This parameter was demoted to readOnly in the Device:2.18
+          version.
         </description>
         <syntax>
           <dateTime/>
@@ -79673,7 +81551,23 @@
         </syntax>
       </parameter>
 
-      <parameter name="RuleNumberOfEntries" access="readOnly">
+      <parameter name="ScheduleRef" access="readWrite" version="2.18">
+        <description>
+          Each reference provides a schedule where time based access can be
+          enabled. When {{param}} is {{empty}} the {{object}} is not scheduled,
+          and the {{param|Enable}} defines the operational state.
+        </description>
+        <syntax>
+          <list/>
+          <string>
+            <pathRef refType="strong" targetParent=".Schedules.Schedule."
+                targetType="row"/>
+          </string>
+          <default type="object" value="[]"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="RuleNumberOfEntries" access="readOnly" version="2.16">
         <description>
           {{numentries}}
         </description>
@@ -79693,12 +81587,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.16">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -79760,7 +81654,7 @@
         description of the working of this PCP data model.
       </description>
 
-      <parameter name="Enable" access="readWrite">
+      <parameter name="Enable" access="readWrite" version="2.16">
         <description>
           Enables or disables the PCP stack. If the stack is disabled then the
           status of any enabled {{object|Client}} entries will change to
@@ -79848,12 +81742,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.8">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -79881,7 +81775,7 @@
           <string>
             <enumeration value="Disabled"/>
             <enumeration value="Enabled"/>
-            <enumeration value="StackDisabled"/>
+            <enumeration value="StackDisabled" version="2.16"/>
             <enumeration value="Error" optional="true"/>
           </string>
         </syntax>
@@ -80096,12 +81990,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.8">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -80357,12 +82251,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.8">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -80603,12 +82497,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.8">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -80648,7 +82542,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="RemotePortEndRange" access="readOnly">
+      <parameter name="RemotePortEndRange" access="readWrite">
         <description>
           Indicates the last port of the remote port range that starts with
           {{param|RemotePort}}.
@@ -80658,6 +82552,9 @@
 
           A value of zero (0) indicates that no remote port range is specified,
           i.e. that the range consists only of {{param|RemotePort}}.
+
+          Note: This parameter was promoted to readWrite in the Device:2.18
+          version.
         </description>
         <syntax>
           <unsignedInt>
@@ -80745,12 +82642,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.8">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -80990,12 +82887,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -81054,7 +82951,8 @@
         </syntax>
       </parameter>
 
-      <command name="Renew()" dmr:previousParameter="DHCPStatus" async="false">
+      <command name="Renew()" dmr:previousParameter="DHCPStatus"
+          version="2.12" async="false">
         <description>
           The DHCP client will renew its DHCP lease.
         </description>
@@ -81097,7 +82995,7 @@
             <size maxLength="256"/>
           </list>
           <dataType ref="IPv4Address"/>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
@@ -81114,7 +83012,7 @@
             <size maxLength="256"/>
           </list>
           <dataType ref="IPv4Address"/>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
@@ -81221,12 +83119,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -81290,12 +83188,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -81329,6 +83227,120 @@
       </parameter>
     </object>
 
+    <object name="Device.DHCPv4.Client.{i}.Retransmission." access="readOnly"
+        version="2.18">
+      <description>
+        This object enables the configurion of the DHCPv4 retransmission
+        behavior according to the guidelines described in
+        {{bibref|RFC2131|Chapter 4.1}}.
+      </description>
+
+      <parameter name="DiscoverInitialTimeout" access="readWrite">
+        <description>
+          Initial delay, expressed in {{units}}, before initiating the first
+          DCHCPDISCOVER message.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+          <default type="object" value="4"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="DiscoverMaxTimeout" access="readWrite">
+        <description>
+          Maximum duration, expressed in {{units}}, between two DHCPDISCOVER
+          message retransmission.
+
+          According to {{bibref|RFC2131|Chapter 4.1}}, the recommended value
+          for this parameter is 64 {{units}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+          <default type="object" value="64"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="DiscoverMaxDuration" access="readWrite">
+        <description>
+          Maximum duration, expressed in {{units}}, during which the DHCPv4
+          client is permitted to retransmit DHCPDISCOVER message
+
+          A value of '0' indicates that no specific maximum duration is set.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+          <default type="object" value="0"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="RequestInitialTimeout" access="readWrite">
+        <description>
+          Initial delay, expressed in {{units}}, before initiating the first
+          DHCPREQUEST message.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+          <default type="object" value="4"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="RequestMaxTimeout" access="readWrite">
+        <description>
+          Maximum duration, expressed in {{units}}, between two DHCPREQUEST
+          message retransmission.
+
+          According to {{bibref|RFC2131|Chapter 4.1}}, the recommended value
+          for this parameter is 64 {{units}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+          <default type="object" value="64"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="RequestMaxDuration" access="readWrite">
+        <description>
+          Maximum duration, expressed in {{units}}, during which the DHCPv4
+          client is permitted to retransmit DHCPREQUEST message.
+
+          A value of '0' indicates that no specific maximum duration is set.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+          <default type="object" value="0"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="TimeoutRandomize" access="readWrite">
+        <description>
+          The Randomization factor for the retransmission timeout, in
+          {{units}}, as defined in {{bibref|RFC2131|4.1 Constructing and
+          sending DHCP messages}}.
+
+          E.g. a timeout of 2000ms with a randomization of 1000 will end up
+          between 1000 and 3000 ms.
+        </description>
+        <syntax>
+          <int>
+            <units value="ms"/>
+          </int>
+          <default type="object" value="1000"/>
+        </syntax>
+      </parameter>
+    </object>
+
     <object name="Device.DHCPv4.Server." access="readOnly" minEntries="1"
         maxEntries="1" version="2.0">
       <description>
@@ -81410,12 +83422,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -81615,7 +83627,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="AllowedDevices" access="readWrite">
+      <parameter name="AllowedDevices" access="readWrite" version="2.13">
         <description>
           Pool association criterion. Determines which devices are allowed,
           {{enum}}
@@ -81692,7 +83704,7 @@
             <size/>
           </list>
           <dataType ref="IPv4Address"/>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
@@ -81793,7 +83805,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ClientNumberOfEntries" access="readOnly">
+      <parameter name="ClientNumberOfEntries" access="readOnly" version="2.2">
         <description>
           {{numentries}}
         </description>
@@ -81843,12 +83855,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -81900,12 +83912,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -81949,7 +83961,7 @@
         <parameter ref="Chaddr"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.2">
         <description>
           {{datatype|expand}}
 
@@ -81958,7 +83970,7 @@
           because automatically-created {{object}} instances can be transitory.
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -82156,12 +84168,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -82392,7 +84404,7 @@
         maxEntries="1" version="2.2">
       <description>
         The Dynamic Host Configuration Protocol (DHCP) IPv6 object
-        {{bibref|RFC3315}}. This entire object applies to IPv6 only. It
+        {{bibref|RFC8415}}. This entire object applies to IPv6 only. It
         contains the {{object|Client}} and {{object|Server}} objects.
       </description>
 
@@ -82443,12 +84455,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.2">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -82491,8 +84503,8 @@
 
       <parameter name="DUID" access="readOnly">
         <description>
-          The client's DHCP Unique Identifier (DUID) {{bibref|RFC3315|Section
-          9}}. {{param}} is set by the CPE.
+          The client's DHCP Unique Identifier (DUID) {{bibref|RFC8415|Section
+          11}}. {{param}} is set by the CPE.
         </description>
         <syntax>
           <hexBinary>
@@ -82505,7 +84517,7 @@
         <description>
           Enables or disables inclusion of the ''Identity Association (IA) for
           Non-Temporary Address'' option OPTION_IA_NA(3)
-          {{bibref|RFC3315|Section 22.4}} in Solicit messages.
+          {{bibref|RFC8415|Section 21.4}} in Solicit messages.
         </description>
         <syntax>
           <boolean/>
@@ -82516,8 +84528,8 @@
       <parameter name="RequestPrefixes" access="readWrite">
         <description>
           Enables or disables inclusion of the ''Identity Association (IA) for
-          Prefix Delegation'' option OPTION_IA_PD(25) {{bibref|RFC3633|Section
-          10}} in Solicit messages.
+          Prefix Delegation'' option OPTION_IA_PD(25) {{bibref|RFC8415|Section
+          21.22}} in Solicit messages.
 
           Note that this is only appropriate for an upstream interface on a
           requesting router, e.g. for an RG WAN interface.
@@ -82531,7 +84543,7 @@
       <parameter name="RapidCommit" access="readWrite">
         <description>
           Enables or disables inclusion of the ''Rapid Commit'' option
-          OPTION_RAPID_COMMIT(14) {{bibref|RFC3315|Section 22.14}} in Solicit
+          OPTION_RAPID_COMMIT(14) {{bibref|RFC8415|Section 21.14}} in Solicit
           messages.
         </description>
         <syntax>
@@ -82541,7 +84553,7 @@
       </parameter>
 
       <command name="Renew()" dmr:previousParameter="RapidCommit"
-          async="false">
+          version="2.12" async="false">
         <description>
           The {{object}} will renew its DHCPv6-supplied information (i.e. the
           Agent will do a renew or information request as needed, updating both
@@ -82553,8 +84565,8 @@
       <parameter name="SuggestedT1" access="readWrite">
         <description>
           T1 value, in {{units}}, that the client SHOULD use when sending IA
-          options, e.g. OPTION_IA_NA {{bibref|RFC3315|Section 22.4}} and
-          OPTION_IA_PD {{bibref|RFC3633|Section 10}}.
+          options, e.g. OPTION_IA_NA {{bibref|RFC8415|Section 21.4}} and
+          OPTION_IA_PD {{bibref|RFC8415|Section 10}}.
 
           A value of -1 indicates that no T1 value is specified.
         </description>
@@ -82569,8 +84581,8 @@
       <parameter name="SuggestedT2" access="readWrite">
         <description>
           T2 value, in {{units}}, that the client SHOULD use when sending IA
-          options, e.g. OPTION_IA_NA {{bibref|RFC3315|Section 22.4}} and
-          OPTION_IA_PD {{bibref|RFC3633|Section 10}}.
+          options, e.g. OPTION_IA_NA {{bibref|RFC8415|Section 21.4}} and
+          OPTION_IA_PD {{bibref|RFC8415|Section 21.22}}.
 
           A value of -1 indicates that no T2 value is specified.
         </description>
@@ -82614,8 +84626,8 @@
           options and handle them as best it can.
 
           Loosely speaking, these are the options that the client will include
-          in OPTION_ORO {{bibref|RFC3315}} but the client is free to decide (in
-          accordance with {{bibref|RFC3315}}) in which messages to request
+          in OPTION_ORO {{bibref|RFC8415}} but the client is free to decide (in
+          accordance with {{bibref|RFC8415}}) in which messages to request
           which option, whether also to request additional options, whether not
           to request inappropriate options, and in which order to request any
           options that are also in {{param|SupportedOptions}}.
@@ -82679,8 +84691,8 @@
 
       <parameter name="DUID" access="readOnly">
         <description>
-          The server's DHCP Unique Identifier (DUID) {{bibref|RFC3315|Section
-          9}} as received via OPTION_SERVERID.
+          The server's DHCP Unique Identifier (DUID) {{bibref|RFC8415|Section
+          11}} as received via OPTION_SERVERID.
         </description>
         <syntax>
           <hexBinary>
@@ -82737,18 +84749,18 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.2">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
       <parameter name="Tag" access="readWrite">
         <description>
-          Option tag (code) {{bibref|RFC3315|Section 22.1}}.
+          Option tag (code) {{bibref|RFC8415|Section 21.1}}.
         </description>
         <syntax>
           <unsignedInt>
@@ -82759,10 +84771,10 @@
 
       <parameter name="Value" access="readWrite">
         <description>
-          A hexbinary encoded option data {{bibref|RFC3315|Section 22.1}}.
+          A hexbinary encoded option data {{bibref|RFC8415|Section 21.1}}.
 
           Note: The length of the option data is ''option-len'' octets, as
-          specified in {{bibref|RFC3315|Section 22.1}}.
+          specified in {{bibref|RFC8415|Section 21.1}}.
         </description>
         <syntax>
           <hexBinary>
@@ -82792,7 +84804,7 @@
 
       <parameter name="Tag" access="readOnly">
         <description>
-          Option tag (code) {{bibref|RFC3315|Section 22.1}}.
+          Option tag (code) {{bibref|RFC8415|Section 21.1}}.
         </description>
         <syntax>
           <unsignedInt>
@@ -82803,7 +84815,7 @@
 
       <parameter name="Value" access="readOnly">
         <description>
-          A hexbinary encoded option data {{bibref|RFC3315|Section 22.1}}.
+          A hexbinary encoded option data {{bibref|RFC8415|Section 21.1}}.
         </description>
         <syntax>
           <hexBinary>
@@ -82826,6 +84838,346 @@
       </parameter>
     </object>
 
+    <object name="Device.DHCPv6.Client.{i}.Retransmission." access="readOnly"
+        version="2.18">
+      <description>
+        This object enables the configurion of the DHCPv6 retransmission
+        behavior according to the guidelines described in
+        {{bibref|RFC8415|Section 7.6}}.
+      </description>
+
+      <parameter name="SolicitMaxDelay" access="readWrite">
+        <description>
+          Maximum delay of first Solicit, expressed in {{units}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+          <default type="object" value="1"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="SolicitInitialTimeout" access="readWrite">
+        <description>
+          Initial solicit, expressed in {{units}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+          <default type="object" value="1"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="SolicitMaxTimeout" access="readWrite">
+        <description>
+          Maximum solicit timeout value, expressed in {{units}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+          <default type="object" value="3600"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="RequestInitialTimeout" access="readWrite">
+        <description>
+          Initial request timeout, expressed in {{units}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+          <default type="object" value="1"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="RequestMaxTimeout" access="readWrite">
+        <description>
+          Maximum request timeout, expressed in {{units}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+          <default type="object" value="30"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="RequestMaxRetry" access="readWrite">
+        <description>
+          Maximum request retry attempts.
+        </description>
+        <syntax>
+          <unsignedInt/>
+          <default type="object" value="10"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ConfirmMaxDelay" access="readWrite">
+        <description>
+          Maximum delay of first confirm, expressed in {{units}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+          <default type="object" value="1"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ConfirmInitialTimeout" access="readWrite">
+        <description>
+          Initial confirm timeout, expressed in {{units}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+          <default type="object" value="1"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ConfirmMaxTimeout" access="readWrite">
+        <description>
+          Maximum confirm timeout, expressed in {{units}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+          <default type="object" value="4"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ConfirmMaxDuration" access="readWrite">
+        <description>
+          Maximum confirm duration, expressed in {{units}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+          <default type="object" value="10"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="RenewInitialTimeout" access="readWrite">
+        <description>
+          Initial renew timeout, expressed in {{units}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+          <default type="object" value="10"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="RenewMaxTimeout" access="readWrite">
+        <description>
+          Maximum renew timeout value, expressed in {{units}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+          <default type="object" value="600"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="RebindInitialTimeout" access="readWrite">
+        <description>
+          Initial rebind timeout, expressed in {{units}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+          <default type="object" value="10"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="RebindMaxTimeout" access="readWrite">
+        <description>
+          Maximum rebind timeout value, expressed in {{units}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+          <default type="object" value="600"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="InformationRequestMaxDelay" access="readWrite">
+        <description>
+          Maximum delay of first information-request, expressed in {{units}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+          <default type="object" value="1"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="InformationRequestInitialTimeout" access="readWrite">
+        <description>
+          Initial information-request timeout, expressed in {{units}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+          <default type="object" value="1"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="InformationRequestMaxTimeout" access="readWrite">
+        <description>
+          Maximum information-request timeout, expressed in {{units}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+          <default type="object" value="3600"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ReleaseInitialTimeout" access="readWrite">
+        <description>
+          Initial Release timeout, expressed in {{units}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+          <default type="object" value="1"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ReleaseMaxAttempts" access="readWrite">
+        <description>
+          Maximum release retry attempts.
+        </description>
+        <syntax>
+          <unsignedInt/>
+          <default type="object" value="4"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="DeclineInitialTimeout" access="readWrite">
+        <description>
+          Initial Decline timeout, expressed in {{units}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+          <default type="object" value="1"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="DeclineMaxAttempts" access="readWrite">
+        <description>
+          Maximum decline retry attempts.
+        </description>
+        <syntax>
+          <unsignedInt/>
+          <default type="object" value="4"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ReconfigureInitialTimeout" access="readWrite">
+        <description>
+          Initial reconfigure timeout, expressed in {{units}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+          <default type="object" value="2"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ReconfigureMaxAttempts" access="readWrite">
+        <description>
+          Maximum reconfigure attempts.
+        </description>
+        <syntax>
+          <unsignedInt/>
+          <default type="object" value="8"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="HopCountLimit" access="readWrite">
+        <description>
+          Maximum hop count in a relay-forward message.
+        </description>
+        <syntax>
+          <unsignedInt/>
+          <default type="object" value="32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="InformationRefreshTime" access="readWrite">
+        <description>
+          Default information refresh time, expressed in {{units}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+          <default type="object" value="86400"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="MinInformationRefreshTime" access="readWrite">
+        <description>
+          Minimum information refresh time, expressed in {{units}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+          <default type="object" value="600"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="MaxWaitTime" access="readWrite">
+        <description>
+          Maximum required time to wait for a response, expressed in {{units}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+          <default type="object" value="60"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="TimeoutRandomize" access="readWrite">
+        <description>
+          The Randomization factor for the retransmission timeout, in
+          {{units}}, as defined in {{bibref|RFC8415|15 Reliability of
+          Client-Initiated Message Exchanges}}.
+
+          E.g. a timeout of 1000ms with a randomization of 100 will end up
+          between 900 and 1100 ms.
+        </description>
+        <syntax>
+          <int>
+            <units value="ms"/>
+          </int>
+          <default type="object" value="100"/>
+        </syntax>
+      </parameter>
+    </object>
+
     <object name="Device.DHCPv6.Server." access="readOnly" minEntries="1"
         maxEntries="1" version="2.2">
       <description>
@@ -82906,12 +85258,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.2">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -82946,8 +85298,8 @@
           Pool association criterion.
 
           A hexbinary string used to identify one or more LAN devices, value of
-          the DHCPv6 Client Identifier (Option 1) {{bibref|RFC3315|Section
-          22.2}}. The option value is binary, so an exact match is REQUIRED.
+          the DHCPv6 Client Identifier (Option 1) {{bibref|RFC8415|Section
+          21.2}}. The option value is binary, so an exact match is REQUIRED.
 
           {{empty}} indicates this criterion is not used.
 
@@ -82982,7 +85334,7 @@
 
           A hexbinary string used to identify one or more LAN devices, value of
           the DHCPv6 Vendor Class Identifier (Option 16)
-          {{bibref|RFC3315|Section 22.16}}. The option value is binary, so an
+          {{bibref|RFC8415|Section 21.16}}. The option value is binary, so an
           exact match is REQUIRED.
 
           {{empty}} indicates this criterion is not used.
@@ -83014,8 +85366,8 @@
           Pool association criterion.
 
           A hexbinary string used to identify one or more LAN devices, value of
-          the DHCPv6 User Class Identifier (Option 15) {{bibref|RFC3315|Section
-          22.15}}.
+          the DHCPv6 User Class Identifier (Option 15) {{bibref|RFC8415|Section
+          21.15}}.
 
           {{empty}} indicates this criterion is not used.
         </description>
@@ -83120,7 +85472,7 @@
                 targetParent="###.IP.Interface.{i}.IPv6Prefix."
                 targetType="row"/>
           </string>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
@@ -83196,7 +85548,7 @@
                 targetParent="###.IP.Interface.{i}.IPv6Prefix."
                 targetType="row"/>
           </string>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
@@ -83288,7 +85640,7 @@
         <parameter ref="SourceAddress"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.2">
         <description>
           {{datatype|expand}}
 
@@ -83297,7 +85649,7 @@
           because automatically-created {{object}} instances can be transitory.
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -83449,7 +85801,7 @@
 
       <parameter name="Tag" access="readOnly">
         <description>
-          Option tag (code) {{bibref|RFC3315|Section 22.1}}.
+          Option tag (code) {{bibref|RFC8415|Section 21.1}}.
         </description>
         <syntax>
           <unsignedInt>
@@ -83499,18 +85851,18 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.2">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
       <parameter name="Tag" access="readWrite">
         <description>
-          Option tag (code) {{bibref|RFC3315|Section 22.1}}.
+          Option tag (code) {{bibref|RFC8415|Section 21.1}}.
         </description>
         <syntax>
           <unsignedInt>
@@ -83633,12 +85985,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -83791,7 +86143,7 @@
       </parameter>
 
       <command name="Reset()" async="false"
-          dmr:previousParameter="AuthenticationSuccessPolicy">
+          dmr:previousParameter="AuthenticationSuccessPolicy" version="2.12">
         <description>
           On a reset the device MUST reset the session by performing an initial
           authentication attempt as defined in {{bibref|802.1x-2004|9.6.1.3}},
@@ -83802,7 +86154,7 @@
         </description>
       </command>
 
-      <command name="Disconnect()" async="false">
+      <command name="Disconnect()" version="2.12" async="false">
         <description>
           On a reset the device MUST disconnect (forced unauthentication) the
           resource.
@@ -83956,6 +86308,32 @@
           <dataType ref="MACAddress"/>
         </syntax>
       </parameter>
+
+      <parameter name="SuccessCount" access="readOnly" version="2.18">
+        <description>
+          Count of the number of successful authentications from the
+          perspective of this supplicant.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="FailureCount" access="readOnly" version="2.18">
+        <description>
+          Count of the number of failed authentications from the perspective of
+          this supplicant.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <command name="Reset()" async="false" version="2.18">
+        <description>
+          Reset all this object's statistics counters to zero.
+        </description>
+      </command>
     </object>
 
     <object name="Device.IEEE8021x.Supplicant.{i}.EAPMD5." access="readOnly"
@@ -84034,7 +86412,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="GroupNumberOfEntries" access="readOnly">
+      <parameter name="GroupNumberOfEntries" access="readOnly" version="2.15">
         <description>
           {{numentries}}
         </description>
@@ -84043,7 +86421,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="RoleNumberOfEntries" access="readOnly">
+      <parameter name="RoleNumberOfEntries" access="readOnly" version="2.15">
         <description>
           {{numentries}}
         </description>
@@ -84052,7 +86430,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="SupportedShellNumberOfEntries" access="readOnly">
+      <parameter name="SupportedShellNumberOfEntries" access="readOnly"
+          version="2.15">
         <description>
           {{numentries}}
         </description>
@@ -84061,7 +86440,65 @@
         </syntax>
       </parameter>
 
-      <command name="CheckCredentialsDiagnostics()" async="false">
+      <parameter name="SupportedCapabilities" access="readOnly" version="2.18">
+        <description>
+          This parameter contains the supported capabilities on this system.
+          These are privileges that allow precise control for individual
+          processes. Essentially, capabilities can be assigned to processes
+          giving them necessary permissions to perform certain functions.
+          Please refer to Linux man page on capabilities ("capabilities(7) -
+          Linux manual page").
+        </description>
+        <syntax>
+          <list/>
+          <string>
+            <enumeration value="CAP_AUDIT_CONTROL"/>
+            <enumeration value="CAP_AUDIT_READ"/>
+            <enumeration value="CAP_AUDIT_WRITE"/>
+            <enumeration value="CAP_BLOCK_SUSPEND"/>
+            <enumeration value="CAP_BPF"/>
+            <enumeration value="CAP_CHECKPOINT_RESTORE"/>
+            <enumeration value="CAP_CHOWN"/>
+            <enumeration value="CAP_DAC_OVERRIDE"/>
+            <enumeration value="CAP_DAC_READ_SEARCH"/>
+            <enumeration value="CAP_FOWNER"/>
+            <enumeration value="CAP_FSETID"/>
+            <enumeration value="CAP_IPC_LOCK"/>
+            <enumeration value="CAP_IPC_OWNER"/>
+            <enumeration value="CAP_KILL"/>
+            <enumeration value="CAP_LEASE"/>
+            <enumeration value="CAP_LINUX_IMMUTABLE"/>
+            <enumeration value="CAP_MAC_ADMIN"/>
+            <enumeration value="CAP_MAC_OVERRIDE"/>
+            <enumeration value="CAP_MKNOD"/>
+            <enumeration value="CAP_NET_ADMIN"/>
+            <enumeration value="CAP_NET_BIND_SERVICE"/>
+            <enumeration value="CAP_NET_BROADCAST"/>
+            <enumeration value="CAP_NET_RAW"/>
+            <enumeration value="CAP_PERFMON"/>
+            <enumeration value="CAP_SETGID"/>
+            <enumeration value="CAP_SETFCAP"/>
+            <enumeration value="CAP_SETPCAP"/>
+            <enumeration value="CAP_SETUID"/>
+            <enumeration value="CAP_SYS_ADMIN"/>
+            <enumeration value="CAP_SYS_BOOT"/>
+            <enumeration value="CAP_SYS_CHROOT"/>
+            <enumeration value="CAP_SYS_MODULE"/>
+            <enumeration value="CAP_SYS_NICE"/>
+            <enumeration value="CAP_SYS_PACCT"/>
+            <enumeration value="CAP_SYS_PTRACE"/>
+            <enumeration value="CAP_SYS_RAWIO"/>
+            <enumeration value="CAP_SYS_RESOURCE"/>
+            <enumeration value="CAP_SYS_TIME"/>
+            <enumeration value="CAP_SYS_TTY_CONFIG"/>
+            <enumeration value="CAP_SYSLOG"/>
+            <enumeration value="CAP_WAKE_ALARM"/>
+          </string>
+        </syntax>
+      </parameter>
+
+      <command name="CheckCredentialsDiagnostics()" async="false"
+          version="2.15">
         <description>
           Checks whether the input {{param|Username}} and {{param|Password}}
           are valid for allowing access to the user interface on the device. If
@@ -84127,12 +86564,12 @@
         <parameter ref="UserID"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.0">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -84150,7 +86587,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="UserID" access="readWrite">
+      <parameter name="UserID" access="readWrite" version="2.15">
         <description>
           Unique Identifier of the user. Depending on the implementation this
           can be the unique identifier assigned by the underlying system.
@@ -84161,7 +86598,7 @@
       </parameter>
 
       <parameter name="RemoteAccessCapable" access="readWrite"
-          status="deprecated">
+          status="obsoleted">
         <description>
           Allows this user to remotely access the UserInterface via the
           mechanism defined in {{object|##.UserInterface.HTTPAccess}}
@@ -84169,6 +86606,8 @@
           {{deprecated|2.16|due to the introduction of
           {{object|.UserInterface.HTTPAccess.{i}.}} and
           {{param|RoleParticipation}}}}
+
+          {{obsoleted|2.18}}
         </description>
         <syntax>
           <boolean/>
@@ -84210,7 +86649,7 @@
           <string>
             <pathRef refType="weak" targetParent="#.Group." targetType="row"/>
           </string>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
@@ -84225,7 +86664,7 @@
           <string>
             <pathRef refType="weak" targetParent="#.Role." targetType="row"/>
           </string>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
@@ -84286,12 +86725,12 @@
         <parameter ref="GroupID"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.15">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -84310,7 +86749,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="GroupID" access="readWrite">
+      <parameter name="GroupID" access="readWrite" version="2.15">
         <description>
           Unique Identifier of the group. Depending on the implementation this
           can be the unique identifier assigned by the underlying system.
@@ -84344,7 +86783,7 @@
           <string>
             <pathRef refType="weak" targetParent="#.Role." targetType="row"/>
           </string>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
@@ -84375,12 +86814,12 @@
         <parameter ref="Name"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.15">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -84422,12 +86861,12 @@
         <parameter ref="RoleID"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.15">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -84473,6 +86912,18 @@
           <default type="object" value="false"/>
         </syntax>
       </parameter>
+
+      <parameter name="RequiredCapabilities" access="readWrite" version="2.18">
+        <description>
+          Capabilities that have been assigned to this {{object}}.
+        </description>
+        <syntax>
+          <list/>
+          <string>
+            <enumerationRef targetParam=".Users.SupportedCapabilities"/>
+          </string>
+        </syntax>
+      </parameter>
     </object>
 
     <object name="Device.SmartCardReaders." access="readOnly" minEntries="1"
@@ -84505,12 +86956,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.3">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -84557,7 +87008,8 @@
         </syntax>
       </parameter>
 
-      <command name="Reset()" dmr:previousParameter="Name" async="false">
+      <command name="Reset()" dmr:previousParameter="Name" version="2.12"
+          async="false">
         <description>
           Reset the SmartCard Reader and the associated SmartCard.
         </description>
@@ -85148,7 +87600,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="LastUpdate" access="readOnly">
+      <parameter name="LastUpdate" access="readOnly" version="2.6">
         <description>
           The date and time at which the last advertisement from this
           {{object}} was received.
@@ -85296,7 +87748,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="LastUpdate" access="readOnly">
+      <parameter name="LastUpdate" access="readOnly" version="2.6">
         <description>
           The date and time at which the last advertisement from this
           {{object}} was received.
@@ -85416,7 +87868,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="LastUpdate" access="readOnly">
+      <parameter name="LastUpdate" access="readOnly" version="2.6">
         <description>
           The date and time at which the last advertisement from this
           {{object}} was received.
@@ -85426,7 +87878,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ParentDevice" access="readOnly">
+      <parameter name="ParentDevice" access="readOnly" version="2.6">
         <description>
           {{reference|the {{object|#.RootDevice}} or {{object|#.Device}} table
           entries that embeds this {{object}}}} This parameter is populated by
@@ -85640,7 +88092,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="DeviceCategory" access="readOnly">
+      <parameter name="DeviceCategory" access="readOnly" version="2.8">
         <description>
           Each list item is the value of an element in the Device Description
           Document for this {{object}} that indicates a device category (e.g.
@@ -85677,7 +88129,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ManufacturerOUI" access="readOnly">
+      <parameter name="ManufacturerOUI" access="readOnly" version="2.8">
         <description>
           The value of an element in the Device Description Document for this
           {{object}} that indicates the manufacturer OUI if this value is
@@ -86077,7 +88529,7 @@
         {{enum|Advanced|Config}} configuration.
       </description>
 
-      <parameter name="Enable" access="readWrite">
+      <parameter name="Enable" access="readWrite" version="2.2">
         <description>
           Enables or disables the Firewall.
 
@@ -86139,7 +88591,7 @@
                 {{param|AdvancedLevel}}.
               </description>
             </enumeration>
-            <enumeration value="Policy" optional="true">
+            <enumeration value="Policy" optional="true" version="2.16">
               <description>
                 Policy firewall configuration applies, as specified by
                 {{param|PolicyLevel}}.
@@ -86149,7 +88601,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="AdvancedLevel" access="readWrite">
+      <parameter name="AdvancedLevel" access="readWrite" version="2.2">
         <description>
           Selects the currently active Firewall Level.
 
@@ -86163,7 +88615,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="PolicyLevel" access="readWrite">
+      <parameter name="PolicyLevel" access="readWrite" version="2.16">
         <description>
           Selects the currently active Firewall Policy Level.
 
@@ -86177,7 +88629,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Type" access="readOnly">
+      <parameter name="Type" access="readOnly" version="2.2">
         <description>
           Firewall Type. {{enum}}
 
@@ -86244,7 +88696,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="LevelNumberOfEntries" access="readOnly">
+      <parameter name="LevelNumberOfEntries" access="readOnly" version="2.2">
         <description>
           {{numentries}}
         </description>
@@ -86253,7 +88705,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ChainNumberOfEntries" access="readOnly">
+      <parameter name="ChainNumberOfEntries" access="readOnly" version="2.2">
         <description>
           {{numentries}}
         </description>
@@ -86262,7 +88714,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="DMZNumberOfEntries" access="readOnly">
+      <parameter name="DMZNumberOfEntries" access="readOnly" version="2.16">
         <description>
           {{numentries}}
         </description>
@@ -86271,7 +88723,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="ServiceNumberOfEntries" access="readOnly">
+      <parameter name="ServiceNumberOfEntries" access="readOnly"
+          version="2.16">
         <description>
           {{numentries}}
         </description>
@@ -86280,7 +88733,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="PinholeNumberOfEntries" access="readOnly">
+      <parameter name="PinholeNumberOfEntries" access="readOnly"
+          version="2.16">
         <description>
           {{numentries}}
         </description>
@@ -86289,7 +88743,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="PolicyNumberOfEntries" access="readOnly">
+      <parameter name="PolicyNumberOfEntries" access="readOnly" version="2.16">
         <description>
           {{numentries}}
         </description>
@@ -86298,7 +88752,17 @@
         </syntax>
       </parameter>
 
-      <parameter name="InterfaceSettingNumberOfEntries" access="readOnly">
+      <parameter name="InterfaceSettingNumberOfEntries" access="readOnly"
+          version="2.17">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="SetNumberOfEntries" access="readOnly" version="2.18">
         <description>
           {{numentries}}
         </description>
@@ -86326,12 +88790,12 @@
         <parameter ref="Name"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.2">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -86370,7 +88834,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Policies" access="readWrite">
+      <parameter name="Policies" access="readWrite" version="2.16">
         <description>
           {{list}} {{reference|a {{object|#.Policy}}}} {{param}} only applies
           when {{param|#.Config}} is {{enum|Policy|#.Config}}.
@@ -86476,12 +88940,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.16">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -86689,12 +89153,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.2">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -86847,12 +89311,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.2">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -87156,6 +89620,38 @@
         </syntax>
       </parameter>
 
+      <parameter name="DestMatchSet" access="readWrite" version="2.18">
+        <description>
+          {{object}} criterion.
+
+          Destination Match Set, Matches packets if their destination is found
+          in the designated {{object|##.Set.}} reference. {{empty}} indicates
+          this criterion is not used for matching.
+        </description>
+        <syntax>
+          <string>
+            <pathRef refType="strong" targetParent="##.Set." targetType="row"/>
+          </string>
+          <default type="object" value=""/>
+        </syntax>
+      </parameter>
+
+      <parameter name="DestMatchSetExclude" access="readWrite" version="2.18">
+        <description>
+          {{object}} criterion.
+
+          Destination Exclude Match Set, Matches packets if their destination
+          is not found in the designated {{object|##.Set.}} reference.
+          {{empty}} indicates this criterion is not used for matching.
+        </description>
+        <syntax>
+          <string>
+            <pathRef refType="strong" targetParent="##.Set." targetType="row"/>
+          </string>
+          <default type="object" value=""/>
+        </syntax>
+      </parameter>
+
       <parameter name="SourceIP" access="readWrite">
         <description>
           {{object}} criterion.
@@ -87201,6 +89697,39 @@
         </syntax>
       </parameter>
 
+      <parameter name="SourceMatchSet" access="readWrite" version="2.18">
+        <description>
+          {{object}} criterion.
+
+          Source Match Set, Matches packets if their source is found in the
+          designated {{object|##.Set.}} reference. {{empty}} indicates this
+          criterion is not used for matching.
+        </description>
+        <syntax>
+          <string>
+            <pathRef refType="strong" targetParent="##.Set." targetType="row"/>
+          </string>
+          <default type="object" value=""/>
+        </syntax>
+      </parameter>
+
+      <parameter name="SourceMatchSetExclude" access="readWrite"
+          version="2.18">
+        <description>
+          {{object}} criterion.
+
+          Source Exclude Match Set, Matches packets if their source is not
+          found in the designated {{object|##.Set.}} reference. {{empty}}
+          indicates this criterion is not used for matching.
+        </description>
+        <syntax>
+          <string>
+            <pathRef refType="strong" targetParent="##.Set." targetType="row"/>
+          </string>
+          <default type="object" value=""/>
+        </syntax>
+      </parameter>
+
       <parameter name="Protocol" access="readWrite">
         <description>
           {{object}} criterion.
@@ -87398,7 +89927,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ConnectionState" access="readWrite">
+      <parameter name="ConnectionState" access="readWrite" version="2.16">
         <description>
           Matches only packets according to the following connection states.
           {{empty}} indicates this criterion is not used for matching.
@@ -87435,7 +89964,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SourceMAC" access="readWrite">
+      <parameter name="SourceMAC" access="readWrite" version="2.16">
         <description>
           Source MAC address. {{empty}} indicates this criterion is not used
           for matching.
@@ -87446,7 +89975,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SourceMACExclude" access="readWrite">
+      <parameter name="SourceMACExclude" access="readWrite" version="2.16">
         <description>
           If {{false}}, the rule matches only those packets that match the
           {{param|SourceMAC}} entry, if specified.
@@ -87479,12 +90008,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.16">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -87511,6 +90040,13 @@
             <enumeration value="Enabled">
               <description>Indicates that the pinhole is enabled.</description>
             </enumeration>
+            <enumeration value="Inactive" version="2.18">
+              <description>
+                Indicates that the pinhole is still enabled but has been
+                temporarily deactivated due to the Schedules defined in
+                {{param|ScheduleRef}}.
+              </description>
+            </enumeration>
             <enumeration value="Error_Misconfigured">
               <description>
                 Indicates that a necessary configuration value is undefined or
@@ -87527,9 +90063,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Origin" access="readOnly">
+      <parameter name="Origin" access="writeOnceReadOnly">
         <description>
           Indicates the Origin of the {{object}} instance.
+
+          Note: This parameter was changed to writeOnceReadOnly in the
+          Device:2.18 version.
         </description>
         <syntax>
           <string>
@@ -87545,7 +90084,7 @@
                 system itself.
               </description>
             </enumeration>
-            <enumeration value="UPnP">
+            <enumeration value="UPnP" version="2.17">
               <description>
                 Used for indicating that the pinhole rule was created by a
                 device using UPnP-IGD.
@@ -87587,7 +90126,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="LeaseDuration" access="readWrite">
+      <parameter name="LeaseDuration" access="readWrite" version="2.17">
         <description>
           Determines the time to live, in {{units}}, of a pin hole lease, where
           "time to live" means the number of {{units}} before the pin hole
@@ -87605,7 +90144,7 @@
       </parameter>
 
       <parameter name="RemainingLeaseTime" access="readOnly"
-          activeNotify="canDeny">
+          activeNotify="canDeny" version="2.17">
         <description>
           For a dynamic (non-static) pin hole, when this parameter is read, the
           value represents the time (in {{units}}) remaining on the pin hole
@@ -87637,6 +90176,23 @@
         </syntax>
       </parameter>
 
+      <parameter name="SourcePortRangeMax" access="readWrite" version="2.18">
+        <description>
+          If specified, indicates the {{object}} criterion is to include the
+          port range from {{param|SourcePort}} through {{param}} (inclusive).
+          If specified, {{param}} MUST be greater than or equal to
+          {{param|SourcePort}}.
+
+          A value of -1 indicates that no port range is specified.
+        </description>
+        <syntax>
+          <int>
+            <range minInclusive="-1" maxInclusive="65535"/>
+          </int>
+          <default type="object" value="-1"/>
+        </syntax>
+      </parameter>
+
       <parameter name="DestPort" access="readWrite">
         <description>
           Destination port number. A value of ''-1'' indicates this criterion
@@ -87650,6 +90206,23 @@
         </syntax>
       </parameter>
 
+      <parameter name="DestPortRangeMax" access="readWrite" version="2.18">
+        <description>
+          If specified, indicates the {{object}} criterion is to include the
+          port range from {{param|DestPort}} through {{param}} (inclusive). If
+          specified, {{param}} MUST be greater than or equal to
+          {{param|DestPort}}.
+
+          A value of -1 indicates that no port range is specified.
+        </description>
+        <syntax>
+          <int>
+            <range minInclusive="-1" maxInclusive="65535"/>
+          </int>
+          <default type="object" value="-1"/>
+        </syntax>
+      </parameter>
+
       <parameter name="IPVersion" access="readWrite">
         <description>
           IP Protocol Version as specified in {{bibref|IANA-ipversionnumbers}}.
@@ -87676,15 +90249,16 @@
 
           * ''6'' (TCP)
 
-          * ''17''(UDP) A value of ''-1'' indicates this criterion is not used
-            for matching.
+          * ''17'' (UDP)
+
+          A value of ''-1'' indicates this criterion is not used for matching.
         </description>
         <syntax>
           <list/>
           <int>
             <range minInclusive="-1" maxInclusive="255"/>
           </int>
-          <default type="object" value="-1"/>
+          <default type="object" value="[-1]"/>
         </syntax>
       </parameter>
 
@@ -87723,6 +90297,22 @@
           <dataType ref="MACAddress"/>
         </syntax>
       </parameter>
+
+      <parameter name="ScheduleRef" access="readWrite" version="2.18">
+        <description>
+          Each reference provides a schedule where time based access can be
+          enabled. When {{param}} is {{empty}} the {{object}} is not scheduled,
+          and the {{param|Enable}} defines the operational state.
+        </description>
+        <syntax>
+          <list/>
+          <string>
+            <pathRef refType="strong" targetParent=".Schedules.Schedule."
+                targetType="row"/>
+          </string>
+          <default type="object" value="[]"/>
+        </syntax>
+      </parameter>
     </object>
 
     <object name="Device.Firewall.DMZ.{i}." access="readWrite"
@@ -87730,7 +90320,7 @@
         minEntries="0" maxEntries="unbounded" version="2.16">
       <description>
         Firewall DMZ object that is be used for configuring a demilitarized
-        zone. A DMZ network is a seperate network perimeter that protects the
+        zone. A DMZ network is a separate network perimeter that protects the
         internal network from untrusted traffic. Typically the DMZ is located
         between two firewalls, the firewall of the internal network and the
         firewall responsible for handling untrusted traffic.
@@ -87752,12 +90342,12 @@
         <parameter ref="SourcePrefix"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.16">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -87802,9 +90392,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Origin" access="readWrite">
+      <parameter name="Origin" access="writeOnceReadOnly">
         <description>
           Indicates who configured the {{object}} instance.
+
+          Note: This parameter was changed to writeOnceReadOnly in the
+          Device:2.18 version.
         </description>
         <syntax>
           <string>
@@ -87856,7 +90449,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="LeaseDuration" access="readWrite">
+      <parameter name="LeaseDuration" access="readWrite" version="2.17">
         <description>
           Determines the time to live, in {{units}}, of a DMZ rule, where "time
           to live" means the number of {{units}} before the DMZ rule expires.
@@ -87873,7 +90466,7 @@
       </parameter>
 
       <parameter name="RemainingLeaseTime" access="readOnly"
-          activeNotify="canDeny">
+          activeNotify="canDeny" version="2.17">
         <description>
           For a dynamic (non-static) DMZ rule, when this parameter is read, the
           value represents the time (in {{units}}) remaining on the DMZ rule
@@ -87941,12 +90534,12 @@
         <parameter ref="SourcePrefixes"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.16">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -88016,7 +90609,7 @@
           <int>
             <range minInclusive="-1" maxInclusive="65535"/>
           </int>
-          <default type="object" value="-1"/>
+          <default type="object" value="[-1]"/>
         </syntax>
       </parameter>
 
@@ -88046,15 +90639,16 @@
 
           * ''6'' (TCP)
 
-          * ''17''(UDP) A value of ''-1'' indicates this criterion is not used
-            for matching.
+          * ''17'' (UDP)
+
+          A value of ''-1'' indicates this criterion is not used for matching.
         </description>
         <syntax>
           <list/>
           <int>
             <range minInclusive="-1" maxInclusive="255"/>
           </int>
-          <default type="object" value="-1"/>
+          <default type="object" value="[-1]"/>
         </syntax>
       </parameter>
 
@@ -88082,7 +90676,7 @@
         <syntax>
           <list/>
           <dataType ref="IPPrefix"/>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
@@ -88173,12 +90767,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.17">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -88255,6 +90849,18 @@
         </syntax>
       </parameter>
 
+      <parameter name="IPv6PassTroughICMPEchoRequest" access="readWrite"
+          version="2.18">
+        <description>
+          When {{true}} the 'ICMPv6 echo request' packet must be forward to the
+          LAN device. When {{false}} the 'ICMPv6 echo request' packet must be
+          dropped.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
       <parameter name="StealthMode" access="readWrite">
         <description>
           Enables or disables the stealth mode. Stealth mode defines how the
@@ -88548,6 +91154,215 @@
       </parameter>
     </object>
 
+    <object name="Device.Firewall.Set.{i}." access="readWrite"
+        numEntriesParameter="SetNumberOfEntries" enableParameter="Enable"
+        minEntries="0" maxEntries="unbounded" version="2.18">
+      <description>
+        This object is used for configuring sets of IP, MAC addresses and/or
+        port numbers which can then be used in conjunction with the firewall.
+
+        It provides a more efficient way to manage large collections of
+        addresses and ports compared to traditional methods of listing them
+        individually within firewall rules.
+      </description>
+      <uniqueKey functional="false">
+        <parameter ref="Alias"/>
+      </uniqueKey>
+      <uniqueKey functional="true">
+        <parameter ref="Name"/>
+      </uniqueKey>
+
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.18">
+        <description>
+          {{datatype|expand}}
+        </description>
+        <syntax>
+          <dataType ref="_AliasUSP"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Enable" access="readWrite">
+        <description>
+          Enables or disables this {{object}} entry.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="object" value="false"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Origin" access="writeOnceReadOnly">
+        <description>
+          Indicates the Origin of the {{object}} instance.
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="User">
+              <description>
+                Used for indicating that the set rule was created by the
+                end-user. For example through the web-ui.
+              </description>
+            </enumeration>
+            <enumeration value="System">
+              <description>
+                Used for indicating that the set rule was created by the system
+                itself.
+              </description>
+            </enumeration>
+            <enumeration value="Controller">
+              <description>
+                Used for indicating that the set rule was created by a
+                Controller.
+              </description>
+            </enumeration>
+          </string>
+          <default type="object" value="Controller"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Name" access="readWrite">
+        <description>
+          Human-readable name associated with this {{object}} entry.
+        </description>
+        <syntax>
+          <string>
+            <size maxLength="31"/>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="Type" access="readWrite">
+        <description>
+          Describes the intention of the {{object|Rule}} entries and what it
+          contains.
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="IPAddresses">
+              <description>
+                The Rule set entry describes only a list of IPaddresses.
+              </description>
+            </enumeration>
+            <enumeration value="Ports">
+              <description>
+                The Rule set entry describes only a list of ports.
+              </description>
+            </enumeration>
+            <enumeration value="MACAddresses">
+              <description>
+                The Rule set entry describes only a list of MAC addresses.
+              </description>
+            </enumeration>
+          </string>
+          <default type="object" value="IPAddresses"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="IPVersion" access="readWrite">
+        <description>
+          IP Protocol Version as specified in {{bibref|IANA-ipversionnumbers}}.
+          For example:
+
+          * ''4'' (IPv4)
+
+          * ''6'' (IPv6)
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range minInclusive="4" maxInclusive="4"/>
+            <range minInclusive="6" maxInclusive="6"/>
+          </unsignedInt>
+          <default type="object" value="6"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="RuleNumberOfEntries" access="readOnly">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object name="Device.Firewall.Set.{i}.Rule.{i}." access="readWrite"
+        numEntriesParameter="RuleNumberOfEntries" minEntries="0"
+        maxEntries="unbounded" version="2.18">
+      <description>
+        Firewall Rule object that is used for configuring the set lists.
+      </description>
+      <uniqueKey functional="false">
+        <parameter ref="Alias"/>
+      </uniqueKey>
+
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.18">
+        <description>
+          {{datatype|expand}}
+        </description>
+        <syntax>
+          <dataType ref="_AliasUSP"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Exclude" access="readWrite">
+        <description>
+          Specifies if this rule entry should match or not match the configured
+          criteria.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="object" value="false"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="IPAddressList" access="readWrite">
+        <description>
+          Source IPv4 or IPv6 address or subnet mask.
+
+          Note: The IP version of the IP address MUST correspond to the IP
+          version set in {{param|#.IPVersion}}. Can not be used in combination
+          with {{param|MACAddressList}} or {{param|PortList}}.
+        </description>
+        <syntax>
+          <list/>
+          <dataType ref="IPAddress"/>
+          <default type="object" value="[]"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="MACAddressList" access="readWrite">
+        <description>
+          Specifies the MACAddress that can be used by the {{object}} entry.
+
+          Note: Can not be used in combination with {{param|IPAddressList}} or
+          {{param|PortList}}.
+        </description>
+        <syntax>
+          <dataType ref="MACAddress"/>
+          <default type="object" value=""/>
+        </syntax>
+      </parameter>
+
+      <parameter name="PortList" access="readWrite">
+        <description>
+          Specifies the Port number or a port range that can be used by the
+          {{object}} entry. Syntax:
+
+          A single port can be configured as e.g. '80'. A port range can be
+          configured as '8000-80010'.
+
+          Note: Can not be used in combination with {{param|MACAddressList}} or
+          {{param|IPAddressList}}.
+        </description>
+        <syntax>
+          <list/>
+          <string/>
+          <default type="object" value="[]"/>
+        </syntax>
+      </parameter>
+    </object>
+
     <object name="Device.PeriodicStatistics." access="readOnly" minEntries="1"
         maxEntries="1" version="2.0">
       <description>
@@ -88611,12 +91426,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.3">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -88635,7 +91450,7 @@
       </parameter>
 
       <parameter name="Status" access="readOnly"
-          dmr:previousParameter="Enable" status="deprecated">
+          dmr:previousParameter="Enable" status="obsoleted">
         <description>
           Indicates availability of Sample statistics. {{enum}}
 
@@ -88649,6 +91464,8 @@
 
           {{deprecated|2.16|because the periodic statistics are sent through a
           USP {{event|Push!}} event}}
+
+          {{obsoleted|2.18}}
         </description>
         <syntax>
           <string>
@@ -88683,7 +91500,7 @@
       </parameter>
 
       <parameter name="Controller" access="readOnly"
-          dmr:previousParameter="Name">
+          dmr:previousParameter="Name" version="2.15">
         <description>
           {{reference|the {{object|##.LocalAgent.Controller}} instance that
           created {{object}}|delete}}
@@ -88866,7 +91683,7 @@
           <unsignedInt>
             <units value="seconds"/>
           </unsignedInt>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
@@ -88901,7 +91718,7 @@
         </syntax>
       </parameter>
 
-      <event name="Push!">
+      <event name="Push!" version="2.16">
         <description>
           Periodic Statistics Push event for delivering a periodic statistics
           report within a USP Notification message.
@@ -89037,7 +91854,7 @@
         </object>
       </event>
 
-      <command name="ForceSample()" async="false">
+      <command name="ForceSample()" version="2.12" async="false">
         <description>
           Force statistics for the current sample to be calculated and updated
           in the data model.
@@ -89067,7 +91884,7 @@
         </description>
       </command>
 
-      <command name="ForceCollection()" async="false">
+      <command name="ForceCollection()" version="2.16" async="false">
         <description>
           Start the periodic statistics collection performing actions
           equivalent to a {{command|ForceSample()}} command and transmission
@@ -89103,12 +91920,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.3">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -89194,6 +92011,14 @@
                 interval
               </description>
             </enumeration>
+            <enumeration value="Histogram" version="2.18">
+              <description>
+                Statistic is a histogram representing the sampled values during
+                the sample interval with histogram bin spacing defined by
+                {{param|HistogramBinBoundaries}}. With this selection, the
+                output is in {{param|ValuesIfHistogram}}.
+              </description>
+            </enumeration>
           </string>
           <default type="object" value="Latest"/>
         </syntax>
@@ -89254,7 +92079,7 @@
           <unsignedInt>
             <units value="seconds"/>
           </unsignedInt>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
@@ -89272,7 +92097,7 @@
           <unsignedInt>
             <range maxInclusive="1"/>
           </unsignedInt>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
@@ -89287,11 +92112,42 @@
           If the {{param|SampleMode}} parameter is not present, or is
           inappropriate for the referenced parameter, the statistics values
           MUST be collected in Current mode.
+
+          if {{param|CalculationMode}} has value "Histogram" then the values of
+          the referenced parameter are in {{param|ValuesIfHistogram}}.
         </description>
         <syntax>
           <list/>
           <string/>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ValuesIfHistogram" access="readOnly"
+          activeNotify="canDeny" version="2.18">
+        <description>
+          {{list}} Each entry indicates the value of the referenced parameter,
+          as determined by {{param|SampleMode}}, during the sample interval.
+
+          The statistics values in this comma-separated list MUST be in time
+          order, with the oldest one first and the most recent one last.
+
+          If the {{param|SampleMode}} parameter is not present, or is
+          inappropriate for the referenced parameter, the statistics values
+          MUST be collected in Current mode.
+
+          This parameter applies only if {{param|CalculationMode}} has value
+          "Histogram" and then this parameter is the values of the sampled
+          histograms, where each histogram bin is the count of the number of
+          samples within the corresponding {{param|HistogramBinBoundaries}},
+          and this parameter is expressed using square brackets to protect
+          comma separators within nested lists. For example,
+          [12,5,1,0,1],[12,3,2,1,0] represents two histograms.
+        </description>
+        <syntax>
+          <list nestedBrackets="required"/>
+          <string/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
@@ -89335,6 +92191,26 @@
           <default type="object" value="0"/>
         </syntax>
       </parameter>
+
+      <parameter name="HistogramBinBoundaries" access="readWrite"
+          version="2.18">
+        <description>
+          {{list}} Definition of the boundaries between histogram bins. Applies
+          if {{param|CalculationMode}} has value "Histogram". Each value is the
+          minimum value of this bin, and the next value is just above the
+          maximum value of this bin. For example, “0,1,4,8,” defines the four
+          histogram bins: 0 to 1 but not including values identically equal to
+          1, 1 to 4 but not including values identically equal to 4, 4 to 8 but
+          not including values identically equal to 8, and greater than or
+          equal to 8. (No value after the last comma means no upper bound.) If
+          this parameter is set to an empty string, then no histogram will be
+          collected.
+        </description>
+        <syntax>
+          <list/>
+          <string/>
+        </syntax>
+      </parameter>
     </object>
 
     <object name="Device.FaultMgmt." access="readOnly" minEntries="1"
@@ -90533,7 +93409,7 @@
       </parameter>
 
       <command name="GPSReset()" dmr:previousParameter="NumberOfSatellites"
-          async="false">
+          version="2.12" async="false">
         <description>
           Reset the GPS Hardware.
         </description>
@@ -90939,12 +93815,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.4">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -92144,7 +95020,7 @@
         <syntax>
           <list/>
           <string>
-            <enumeration value="Streaming" status="obsoleted">
+            <enumeration value="Streaming" status="deleted">
               <description>
                 IPDR Streaming Protocol {{bibref|IPDR-SP}}
 
@@ -92152,9 +95028,11 @@
                 supported in USP}}
 
                 {{obsoleted|2.17}}
+
+                {{deleted|2.18}}
               </description>
             </enumeration>
-            <enumeration value="File" status="obsoleted">
+            <enumeration value="File" status="deleted">
               <description>
                 IPDR File Transfer Protocol {{bibref|IPDR-FTP}}
 
@@ -92162,6 +95040,8 @@
                 supported in USP}}
 
                 {{obsoleted|2.17}}
+
+                {{deleted|2.18}}
               </description>
             </enumeration>
             <enumeration value="HTTP">
@@ -92193,7 +95073,7 @@
         <syntax>
           <list/>
           <string>
-            <enumeration value="XML" status="obsoleted">
+            <enumeration value="XML" status="deleted">
               <description>
                 Used with the IPDR Streaming and File Protocols.
                 {{bibref|IPDR-XML}}
@@ -92202,9 +95082,11 @@
                 supported in USP}}
 
                 {{obsoleted|2.17}}
+
+                {{deleted|2.18}}
               </description>
             </enumeration>
-            <enumeration value="XDR" status="obsoleted">
+            <enumeration value="XDR" status="deleted">
               <description>
                 Used with the IPDR Streaming and File Protocols.
                 {{bibref|IPDR-XDR}}
@@ -92213,6 +95095,8 @@
                 supported in USP}}
 
                 {{obsoleted|2.17}}
+
+                {{deleted|2.18}}
               </description>
             </enumeration>
             <enumeration value="CSV">
@@ -92231,7 +95115,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="ParameterWildCardSupported" access="readOnly">
+      <parameter name="ParameterWildCardSupported" access="readOnly"
+          version="2.10">
         <description>
           When {{true}}, the Device supports the use of wildcards to determine
           the parameters that are reported using a Profile.
@@ -92314,16 +95199,16 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.5">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
-      <parameter name="Name" access="readWrite">
+      <parameter name="Name" access="readWrite" version="2.10">
         <description>
           The name of the profile.
         </description>
@@ -92335,7 +95220,7 @@
       </parameter>
 
       <parameter name="Controller" access="readOnly"
-          dmr:previousParameter="Name">
+          dmr:previousParameter="Name" version="2.12">
         <description>
           {{reference|the {{object|##.LocalAgent.Controller}} instance that
           created {{object}}|delete}}
@@ -92360,7 +95245,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="NumberOfRetainedFailedReports" access="readWrite">
+      <parameter name="NumberOfRetainedFailedReports" access="readWrite"
+          version="2.10">
         <description>
           The number of failed reports to be retained and transmitted (in
           addition to the current report) at the end of the current reporting
@@ -92488,7 +95374,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="StreamingHost" access="readWrite" status="obsoleted">
+      <parameter name="StreamingHost" access="readWrite" status="deleted">
         <description>
           This is the host name or IP Address of the IPDR Collector to be used
           by the CPE to stream bulk data records if this collection profile is
@@ -92500,6 +95386,8 @@
           in USP}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <string>
@@ -92508,7 +95396,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="StreamingPort" access="readWrite" status="obsoleted">
+      <parameter name="StreamingPort" access="readWrite" status="deleted">
         <description>
           This is the port number of the IPDR Collector to be used by the CPE
           to stream bulk data records if this collection profile is configured
@@ -92520,6 +95408,8 @@
           in USP}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <unsignedInt>
@@ -92529,8 +95419,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="StreamingSessionID" access="readWrite"
-          status="obsoleted">
+      <parameter name="StreamingSessionID" access="readWrite" status="deleted">
         <description>
           This is the unique identification of an IPDR Session to be used when
           this collection profile is configured for the IPDR Streaming Protocol
@@ -92549,6 +95438,8 @@
           in USP}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <unsignedInt>
@@ -92558,7 +95449,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="FileTransferURL" access="readWrite" status="obsoleted">
+      <parameter name="FileTransferURL" access="readWrite" status="deleted">
         <description>
           This is the {{datatype}} within the CPE that is used by an IPDR
           Collector to retrieve the IPDRDocs when this collection profile is
@@ -92570,6 +95461,8 @@
           in USP}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <dataType ref="URL"/>
@@ -92577,7 +95470,7 @@
       </parameter>
 
       <parameter name="FileTransferUsername" access="readWrite"
-          status="obsoleted">
+          status="deleted">
         <description>
           Username used for authentication of the {{param|FileTransferURL}}.
 
@@ -92590,6 +95483,8 @@
           in USP}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <string>
@@ -92599,7 +95494,7 @@
       </parameter>
 
       <parameter name="FileTransferPassword" access="readWrite"
-          status="obsoleted">
+          status="deleted">
         <description>
           Password used for authentication of the {{param|FileTransferURL}}.
 
@@ -92612,6 +95507,8 @@
           in USP}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax secured="true">
           <string>
@@ -92620,8 +95517,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ControlFileFormat" access="readWrite"
-          status="obsoleted">
+      <parameter name="ControlFileFormat" access="readWrite" status="deleted">
         <description>
           If this collection profile is configured for the IPDR File Transfer
           Protocol {{bibref|IPDR-FTP}} (the {{param|Protocol}} parameter has a
@@ -92652,6 +95548,8 @@
           in USP}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <string>
@@ -92660,7 +95558,7 @@
         </syntax>
       </parameter>
 
-      <event name="Push!">
+      <event name="Push!" version="2.13">
         <description>
           Bulk Data Push event for delivering a bulk data report within a USP
           Notification message.
@@ -92677,7 +95575,7 @@
         </parameter>
       </event>
 
-      <command name="ForceCollection()" async="false">
+      <command name="ForceCollection()" version="2.15" async="false">
         <description>
           Start the bulk data collection and transmission as defined in this
           profile immediately, regardless of the current values of the
@@ -92702,7 +95600,7 @@
         omitted if {{param|Exclude}} is {{true}}.
       </description>
 
-      <parameter name="Name" access="readWrite">
+      <parameter name="Name" access="readWrite" version="2.10">
         <description>
           Name of the parameter in the report body.
 
@@ -92744,7 +95642,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Exclude" access="readWrite">
+      <parameter name="Exclude" access="readWrite" version="2.16">
         <description>
           When {{true}}, the entry is to be excluded from the report.
         </description>
@@ -93112,7 +96010,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="PersistAcrossReboot" access="readWrite">
+      <parameter name="PersistAcrossReboot" access="readWrite" version="2.12">
         <description>
           Determines whether or not data transfers that have failed are
           required to be persisted across reboots.
@@ -93242,7 +96140,8 @@
         Top level object for dynamically managed software applications.
       </description>
 
-      <parameter name="ExecEnvClassNumberOfEntries" access="readOnly">
+      <parameter name="ExecEnvClassNumberOfEntries" access="readOnly"
+          version="2.16">
         <description>
           {{numentries}}
         </description>
@@ -93278,7 +96177,7 @@
         </syntax>
       </parameter>
 
-      <command name="InstallDU()" async="true">
+      <command name="InstallDU()" async="true" version="2.12">
         <description>
           Install one or more Deployment Units (DUs) to the associated
           {{object}}.
@@ -93340,6 +96239,31 @@
             </syntax>
           </parameter>
 
+          <parameter name="Privileged" version="2.18">
+            <description>
+              This parameter indicates whether the Deployment Unit runs in
+              privileged mode. {{false}} - Unprivileged Container. {{true}} -
+              Privileged Container.
+            </description>
+            <syntax>
+              <boolean/>
+              <default type="parameter" value="false"/>
+            </syntax>
+          </parameter>
+
+          <parameter name="NumRequiredUIDs" version="2.18">
+            <description>
+              Number of UIDs (EU User Identifiers) that this container will
+              need as part of its user namespace. UIDs are unique identifiers
+              associated with each user and system process that is used to
+              determine the allocation and isolation of system resources.
+            </description>
+            <syntax>
+              <unsignedInt/>
+              <default type="parameter" value="1"/>
+            </syntax>
+          </parameter>
+
           <parameter name="ExecutionEnvRef">
             <description>
               A reference to the Execution Environment upon which the DU is to
@@ -93357,7 +96281,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="Signature">
+          <parameter name="Signature" version="2.16">
             <description>
               The {{datatype}} which can be used to fetch the signature for
               this DU. The {{datatype}} may use the "data" scheme defined in
@@ -93383,7 +96307,22 @@
             </syntax>
           </parameter>
 
-          <parameter name="RequiredRoles">
+          <parameter name="ShutdownDelay" version="2.18">
+            <description>
+              The delay in {{units}} before which the container is shutdown.
+              This delay ensures that the application has enough time to
+              perform any cleanup before the Execution Unit transitions to idle
+              state. The default value is 10 seconds.
+            </description>
+            <syntax>
+              <unsignedInt>
+                <units value="seconds"/>
+              </unsignedInt>
+              <default type="parameter" value="10"/>
+            </syntax>
+          </parameter>
+
+          <parameter name="RequiredRoles" version="2.16">
             <description>
               The roles which the application installed by this command will
               need to be assigned in order to be able to function at all. If
@@ -93409,7 +96348,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="OptionalRoles">
+          <parameter name="OptionalRoles" version="2.16">
             <description>
               The additional roles which the application installed by this
               command would need to be assigned in order to be able to provide
@@ -93435,6 +96374,44 @@
             </syntax>
           </parameter>
 
+          <parameter name="RequiredUserRoles" version="2.18">
+            <description>
+              The User Roles which the application installed by this command
+              will need to be assigned in order to be able to function at all.
+              If any of these User Roles are not present in the
+              {{param|#.ExecEnv.{i}.AvailableUserRoles}} of the
+              {{object|#.ExecEnv}} into which the DU is to be installed then
+              the command will fail. Some Agents may apply further filtering
+              for User Roles which are considered security- or
+              privacy-sensitive.
+
+              Each entry in the list is the Name of a row in
+              {{object|##.Users.Role}}. If there is no such row then the
+              command will fail, as installation requires a User Role which is
+              not available on the Device.
+
+              If this argument is absent or empty then no User Roles are
+              required in order for the application to function.
+            </description>
+            <syntax>
+              <list/>
+              <string>
+                <size maxLength="256"/>
+              </string>
+            </syntax>
+          </parameter>
+
+          <parameter name="ModuleVersion" mandatory="false" version="2.17">
+            <description>
+              Version of the {{object}} as optionally set by the Controller.
+            </description>
+            <syntax>
+              <string>
+                <size maxLength="32"/>
+              </string>
+            </syntax>
+          </parameter>
+
           <object name="AutoRestart." minEntries="1" maxEntries="1"
               version="2.16">
             <description>
@@ -93457,8 +96434,8 @@
               {{param|##.ExecutionUnit.{i}.AutoRestart.RetryCount}}. Then on
               the next occasion that the Agent determines that the EU has
               terminated abnormally, the delay before re-starting the EU must
-              lie between ''m * (k/1000)^n'' and ''m * (k/1000)^(n+1)''
-              seconds, so long as ''m * (k/1000)^n'' evaluates to a value less
+              lie between ''m * (k/1000)^n^'' and ''m * (k/1000)^(n+1)^''
+              seconds, so long as ''m * (k/1000)^n^'' evaluates to a value less
               than {{param|RetryMaximumWaitInterval}}. Once this point has been
               reached, on all subsequent occasions that the Agent determines
               that the EU has terminated abnormally the delay before
@@ -93551,7 +96528,7 @@
               absent then no resource restrictions will be applied.
             </description>
 
-            <parameter name="AllocatedDiskSpace">
+            <parameter name="AllocatedDiskSpace" version="2.16">
               <description>
                 The amount of disk space measured in {{units}} allocated to any
                 {{object|##.ExecutionUnit}} which is created as a result of
@@ -93567,7 +96544,7 @@
               </syntax>
             </parameter>
 
-            <parameter name="AllocatedMemory">
+            <parameter name="AllocatedMemory" version="2.16">
               <description>
                 The amount of physical RAM measured in {{units}} allocated to
                 any {{object|##.ExecutionUnit}} which is created as a result of
@@ -93583,7 +96560,7 @@
               </syntax>
             </parameter>
 
-            <parameter name="AllocatedCPUPercent">
+            <parameter name="AllocatedCPUPercent" version="2.16">
               <description>
                 The CPU power measured in {{units}} allocated to any
                 {{object|##.ExecutionUnit}} which is created as a result of
@@ -93777,50 +96754,35 @@
             </parameter>
           </object>
 
-          <parameter name="ModuleVersion" mandatory="false">
-            <description>
-              Version of the {{object}} as optionally set by the Controller.
-            </description>
-            <syntax>
-              <string>
-                <size maxLength="32"/>
-              </string>
-            </syntax>
-          </parameter>
-
           <object name="NetworkConfig." version="2.17">
             <description>
-              Specifies the network configuration for any ExecutionUnit
-              generated during the installation or update of the
-              DeploymentUnit.
+              Specifies the network configuration for any ExecutionUnit which
+              is created by the installation of the DeploymentUnit.
 
-              When this argument or any of its child objects are missing from
-              the {{command|.SoftwareModules.InstallDU()}}, the corresponding
-              absent part is considered unnecessary and will not be available
-              to the ExecutionUnit.
-
-              When this argument is not present in the
-              {{command|.SoftwareModules.DeploymentUnit.{i}.Update()}}, the
-              network configuration remains unaltered.
+              When this argument or any of its child objects are missing, the
+              corresponding absent part is considered unnecessary and will not
+              be available to the ExecutionUnit.
             </description>
 
             <parameter name="AccessInterfaces" mandatory="false">
               <description>
-                The logical network interfaces which the application installed
-                by this command will be allowed to send traffic through it. If
-                any of these access interface are not present in the
+                The network interfaces which the application installed by this
+                command will be allowed to send traffic through it. If any of
+                these access interface are not present in the
                 {{param|.SoftwareModules.ExecEnv.{i}.AvailableAccessInterfaces}}
                 of the ExecEnv into which the DU is to be installed then the
                 command will fail.
 
                 Some Agents may apply further filtering for access interfaces
                 which are considered security- or privacy-sensitive. Each entry
-                in the list is the Name of a row in
-                {{object|.Logical.Interface.}}.
-
-                If there is no such row then the command will fail, as
-                installation requires access to a network, through the logical
-                interface, which is not available.
+                in the list is the Name of a row within either
+                {{object|.Logical.Interface.}} or {{object|.IP.Interface.}}. If
+                Name is present in both {{object|.Logical.Interface.}} and
+                {{object|.IP.Interface.}}, the Interface referenced in
+                {{object|.Logical.Interface.}} must be selected. If there is no
+                such row then the command will fail, as installation requires
+                access to a network, through the interface, which is not
+                available.
 
                 When this argument is absent or {{empty}} then no outgoing
                 network access is required for the ExecutionUnit to function.
@@ -93838,13 +96800,20 @@
               maxEntries="unbounded" version="2.17">
             <description>
               Defines the list of required port mapping rules for any
-              ExecutionUnit which is created as a result of this call command.
+              ExecutionUnit which is created as a result of this command. If
+              this command encounters any issue in providing the requested
+              mapping, such as the port already being used or reserved, then it
+              will fail.
             </description>
 
             <parameter name="Interface" mandatory="true">
               <description>
-                Name of a row in {{object|.Logical.Interface.}}. Specifies the
-                logical interface to which the port mapping applies.
+                Name of a row within either {{object|.Logical.Interface.}} or
+                {{object|.IP.Interface.}}. If Name is present in both
+                {{object|.Logical.Interface.}} and {{object|.IP.Interface.}},
+                the Interface referenced in {{object|.Logical.Interface.}} must
+                be selected. Specifies the interface to which the port mapping
+                applies.
               </description>
               <syntax>
                 <string>
@@ -93893,9 +96862,50 @@
             </parameter>
           </object>
         </input>
+        <output>
+
+          <parameter name="UUID" version="2.18">
+            <description>
+              The Universally Unique Identifier that was either provided by the
+              Controller, or generated by the device, when this Deployment Unit
+              was installed.
+
+              The format of this value is defined by {{bibref|RFC4122}} Version
+              5 (Name-Based) and {{bibref|TR-181i2|Annex C}}.
+            </description>
+            <syntax>
+              <dataType ref="UUID"/>
+            </syntax>
+          </parameter>
+
+          <parameter name="Version" version="2.18">
+            <description>
+              Version of the installed Deployment Unit. The format of this
+              value is Execution Environment specific.
+            </description>
+            <syntax>
+              <string>
+                <size maxLength="32"/>
+              </string>
+            </syntax>
+          </parameter>
+
+          <parameter name="ExecEnvRef" version="2.18">
+            <description>
+              A reference to the {{object|##.ExecEnv}} where the Deployment
+              Unit was installed.
+            </description>
+            <syntax>
+              <string>
+                <pathRef targetParent="##.ExecEnv." refType="weak"
+                    targetType="row"/>
+              </string>
+            </syntax>
+          </parameter>
+        </output>
       </command>
 
-      <event name="DUStateChange!">
+      <event name="DUStateChange!" version="2.12">
         <description>
           This event informs a Controller of the completion (successful or
           unsuccessful) of a DU state change.
@@ -94161,6 +97171,12 @@
                Role which is not in the EE's AvailableRoles list, then the
                device SHOULD reject the operation with a 7032 (Unavailable
                Role) fault code.
+
+              *If a requested operation attempts to Install or Update a DU and
+               includes a RequestedUserRole argument which contains at least
+               one User Role which is not in the EE's AvailableUserRoles list,
+               then the device SHOULD reject the operation with a 7037
+               (Unavailable User Role) fault code.
             </description>
             <syntax>
               <unsignedInt/>
@@ -94200,12 +97216,12 @@
         <parameter ref="Version"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.16">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -94259,7 +97275,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="CapabilityNumberOfEntries" access="readOnly">
+      <parameter name="CapabilityNumberOfEntries" access="readOnly"
+          version="2.16">
         <description>
           {{numentries}}
         </description>
@@ -94268,7 +97285,7 @@
         </syntax>
       </parameter>
 
-      <command name="AddExecEnv()" async="false">
+      <command name="AddExecEnv()" async="false" version="2.16">
         <description>
           Create a new Execution Environment of this class.
         </description>
@@ -94332,6 +97349,26 @@
             </syntax>
           </parameter>
 
+          <parameter name="AvailableUserRoles" version="2.18">
+            <description>
+              The User Roles which are available to Deployment Units installed
+              into the new instance. Only the listed User Roles may be assigned
+              to any DeploymentUnit installed into the instance. If this
+              parameter is missing or {{empty}} then no User Roles may be
+              assigned to any DeploymentUnit installed into the instance.
+
+              Each entry in the list is the Name of a row in
+              {{object|###.Users.Role}}. If there is no such row then the entry
+              will be ignored.
+            </description>
+            <syntax>
+              <list/>
+              <string>
+                <size maxLength="256"/>
+              </string>
+            </syntax>
+          </parameter>
+
           <parameter name="Enable">
             <description>
               If this parameter is present and is {{true}}, the created ExecEnv
@@ -94377,7 +97414,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="AllocatedCPUPercent">
+          <parameter name="AllocatedCPUPercent" version="2.16">
             <description>
               The percentage of CPU time allocated to this ExecEnv, i.e. the
               percentage of the whole CPU (all cores) which is available to the
@@ -94401,7 +97438,7 @@
             </description>
             <syntax>
               <string>
-                <pathRef targetParent="##.ExecEnv." refType="weak"
+                <pathRef targetParent="##.ExecEnv." refType="strong"
                     targetType="row"/>
               </string>
             </syntax>
@@ -94518,17 +97555,17 @@
             <enumeration value="Up"/>
             <enumeration value="Error" optional="true"/>
             <enumeration value="Disabled"/>
-            <enumeration value="Restarting"/>
+            <enumeration value="Restarting" version="2.16"/>
           </string>
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.1">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -94605,7 +97642,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="InitialExecutionUnitRunLevel" access="readWrite">
+      <parameter name="InitialExecutionUnitRunLevel" access="readWrite"
+          version="2.4">
         <description>
           Indicates the initial value on creation for
           {{param|#.ExecutionUnit.{i}.RunLevel}} for all Execution Unit
@@ -94696,7 +97734,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="AllocatedCPUPercent" access="readOnly">
+      <parameter name="AllocatedCPUPercent" access="readOnly" version="2.16">
         <description>
           The percentage of CPU time allocated to this ExecEnv, i.e. the
           percentage of the whole CPU (all cores) which is available to the
@@ -94750,7 +97788,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="AvailableCPUPercent" access="readOnly">
+      <parameter name="AvailableCPUPercent" access="readOnly" version="2.16">
         <description>
           The fraction (in {{units}}) of CPU time currently available to this
           {{object}}. This value changes as the {{object|#.ExecutionUnit}}
@@ -94784,9 +97822,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="ProcessorRefList" access="readOnly">
+      <parameter name="ProcessorRefList" access="readOnly" status="deprecated">
         <description>
           Represents the processors that this {{object}} has available to it.
+
+          {{deprecated|2.18|because the referenced
+          object,{{object|##.DeviceInfo.Processor.}}, is deprecated.}}
         </description>
         <syntax>
           <list/>
@@ -94797,7 +97838,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="CreatedAt" access="readOnly">
+      <parameter name="CreatedAt" access="readOnly" version="2.16">
         <description>
           The time and date at which this {{object}} was created. If the
           {{object}} is provided by the primary firmware of the device then
@@ -94808,7 +97849,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ExecEnvClassRef" access="readOnly">
+      <parameter name="ExecEnvClassRef" access="readOnly" version="2.16">
         <description>
           The {{object|#.ExecEnvClass}} of which this {{object}} is an
           instance.
@@ -94821,7 +97862,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="ApplicationDataNumberOfEntries" access="readOnly">
+      <parameter name="ApplicationDataNumberOfEntries" access="readOnly"
+          version="2.16">
         <description>
           {{numentries}}
         </description>
@@ -94830,7 +97872,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="RestartReason" access="readOnly">
+      <parameter name="RestartReason" access="readOnly" version="2.16">
         <description>
           This parameter is set each time the {{object}} is restarted. It is
           cleared each time that parameter {{param|Enable}} is set {{false}}
@@ -94847,7 +97889,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="RestartCount" access="readOnly">
+      <parameter name="RestartCount" access="readOnly" version="2.16">
         <description>
           The number of times the {{object}} has been restarted since it was
           last disabled.
@@ -94857,7 +97899,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="LastRestarted" access="readOnly">
+      <parameter name="LastRestarted" access="readOnly" version="2.16">
         <description>
           The time at which the {{object}} was last restarted. Initially this
           parameter is set to the Unknown Time (0001-01-01T00:00:00Z).
@@ -94867,7 +97909,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Signers" access="readWrite">
+      <parameter name="Signers" access="readWrite" version="2.16">
         <description>
           If the device stores the acceptable public keys for signing in X.509
           certificates, this parameter identifies which certificates contain
@@ -94887,7 +97929,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="AvailableRoles">
+      <parameter name="AvailableRoles" version="2.16">
         <description>
           The roles which are available to Deployment Units installed into this
           {{object}}. Only the listed roles may be assigned to any
@@ -94906,7 +97948,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="AvailableAccessInterfaces" access="readOnly">
+      <parameter name="AvailableAccessInterfaces" access="readOnly"
+          version="2.17">
         <description>
           Represents the network interface through which the outgoing traffic
           from the ExecutionUnit running in this {{object}} may be allowed.
@@ -94923,10 +97966,28 @@
         </syntax>
       </parameter>
 
-      <command name="SetRunLevel()" async="false">
+      <parameter name="AvailableUserRoles" version="2.18">
+        <description>
+          The User Roles which are available to Deployment Units installed into
+          this {{object}}. Only the listed User Roles may be assigned to a
+          DeploymentUnit.
+
+          If this parameter is missing or {{empty}} then no User Roles will be
+          available to Deployment Units installed into this {{object}}.
+        </description>
+        <syntax>
+          <list/>
+          <string>
+            <pathRef refType="strong" targetParent="Device.Users.Role."
+                targetType="row"/>
+          </string>
+        </syntax>
+      </parameter>
+
+      <command name="SetRunLevel()" version="2.12" async="false">
         <description>
           Provides a mechanism to remotely manipulate the run level of this
-          {{object}}, meaning that altering this comand will change the value
+          {{object}}, meaning that altering this command will change the value
           of the {{param|#.CurrentRunLevel}}.
 
           Run levels dictate which Execution Units will be started. Execution
@@ -94954,7 +98015,7 @@
         </input>
       </command>
 
-      <command name="ModifyConstraints()" async="true">
+      <command name="ModifyConstraints()" async="true" version="2.16">
         <description>
           Provides a mechanism to remotely manipulate the resource constraints
           applied to this {{object}}, thereby changing the value of
@@ -95021,7 +98082,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="AllocatedCPUPercent">
+          <parameter name="AllocatedCPUPercent" version="2.16">
             <description>
               The percentage of CPU time allocated to this ExecEnv, i.e. the
               percentage of the whole CPU (all cores) which is available to the
@@ -95039,7 +98100,7 @@
         </input>
       </command>
 
-      <command name="ModifyAvailableRoles()" async="true">
+      <command name="ModifyAvailableRoles()" async="true" version="2.16">
         <description>
           Modify the roles which are available to Deployment Units installed
           into this {{object}}.
@@ -95068,10 +98129,30 @@
               </string>
             </syntax>
           </parameter>
+
+          <parameter name="AvailableUserRoles" mandatory="true" version="2.18">
+            <description>
+              The new list of User Roles which may be assigned to a
+              DeploymentUnit installed into the {{object}}; this list replaces
+              the previous value of {{param|#.AvailableUserRoles}}. If this
+              parameter is {{empty}} then no User Roles can be assigned to a
+              DeploymentUnit installed into the {{object}}.
+
+              Each entry in the list is the Name of a row in
+              {{object|###.Users.Role}}.
+            </description>
+            <syntax>
+              <list/>
+              <string>
+                <size maxLength="256"/>
+              </string>
+            </syntax>
+          </parameter>
         </input>
       </command>
 
-      <command name="ModifyAvailableAccessInterfaces()" async="true">
+      <command name="ModifyAvailableAccessInterfaces()" async="true"
+          version="2.17">
         <description>
           Modify the outgoing network traffic interfaces which are available to
           Deployment Units installed into this {{object}}.
@@ -95103,7 +98184,7 @@
         </input>
       </command>
 
-      <command name="Restart()" async="true">
+      <command name="Restart()" async="true" version="2.16">
         <description>
           Restart this ExecEnv.
 
@@ -95121,7 +98202,7 @@
             {{enum|Idle|#.ExecutionUnit.{i}.Status}}, exactly as if the
             {{object}} had transitioned to status {{enum|Disabled|Status}}.
 
-          # As soon as all the Execution Units have transisitioned to
+          # As soon as all the Execution Units have transitioned to
             {{enum|Idle|#.ExecutionUnit.{i}.Status}}, the {{object}}
             transitions to status {{enum|Up|Status}}. The Execution Units which
             were running on the {{object}} will be restarted according to their
@@ -95157,7 +98238,7 @@
         </input>
       </command>
 
-      <command name="Reset()" async="true">
+      <command name="Reset()" version="2.12" async="true">
         <description>
           This command causes this {{object}} to revert back to the state it
           was in when the device last issued a Boot event with a cause of a
@@ -95191,7 +98272,7 @@
         </description>
       </command>
 
-      <command name="Remove()" async="true">
+      <command name="Remove()" async="true" version="2.16">
         <description>
           This command removes the {{object}} from the device. The command will
           always fail if the {{object}} has at least 1 child {{object}}; the
@@ -95224,7 +98305,7 @@
         </input>
       </command>
 
-      <event name="Restarted!">
+      <event name="Restarted!" version="2.16">
         <description>
           This event informs a Controller when an {{object}} has been
           restarted.
@@ -95359,12 +98440,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.16">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -95448,12 +98529,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.1">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -95652,7 +98733,7 @@
       </parameter>
 
       <parameter name="InternalController"
-          dmr:previousParameter="ExecutionEnvRef">
+          dmr:previousParameter="ExecutionEnvRef" version="2.16">
         <description>
           The internal Controller which the application installed by this
           {{object}} uses to access the Data Model. Will be {{empty}} if the
@@ -95666,7 +98747,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Installed" access="readOnly">
+      <parameter name="Installed" access="readOnly" version="2.16">
         <description>
           Documents when this {{object}} instance was installed.
         </description>
@@ -95675,7 +98756,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="LastUpdate" access="readOnly">
+      <parameter name="LastUpdate" access="readOnly" version="2.16">
         <description>
           Documents when this {{object}} instance was last updated.
         </description>
@@ -95684,7 +98765,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ModuleVersion" access="readOnly">
+      <parameter name="ModuleVersion" access="readOnly" version="2.17">
         <description>
           Version of the {{object}} as optionally set by the Controller during
           {{command|#.InstallDU()}} command or {{command|Update()}}.
@@ -95702,7 +98783,7 @@
         </description>
         <input>
 
-          <parameter name="URL">
+          <parameter name="URL" version="2.12">
             <description>
               The {{datatype}} that specifies the location of the DU to be
               installed.
@@ -95714,7 +98795,7 @@
               be supported. Other optional transports MAY also be supported.
 
               If the device receives an Update command with the same source URL
-              as a previous Update or Install comamnd, the device MUST perform
+              as a previous Update or Install command, the device MUST perform
               each Update as requested, and MUST NOT assume that the content of
               the file to be downloaded is the same each time.
             </description>
@@ -95723,7 +98804,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="Username">
+          <parameter name="Username" version="2.12">
             <description>
               Username to be used by the device to authenticate with the file
               server, if authentication is required.
@@ -95736,7 +98817,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="Password">
+          <parameter name="Password" version="2.12">
             <description>
               Password to be used by the device to authenticate with the file
               server, if authentication is required.
@@ -95749,7 +98830,32 @@
             </syntax>
           </parameter>
 
-          <parameter name="Signature">
+          <parameter name="Privileged" version="2.18">
+            <description>
+              This parameter determines whether the {{object}} runs in priviled
+              mode. {{false}} - Unprivileged Container. {{true}} - Privileged
+              Container.
+            </description>
+            <syntax>
+              <boolean/>
+              <default type="parameter" value="false"/>
+            </syntax>
+          </parameter>
+
+          <parameter name="NumRequiredUIDs" version="2.18">
+            <description>
+              Number of UIDs (EU User Identifiers) that this container will
+              need as part of its user namespace. UIDs are unique identifiers
+              associated with each user and system process that is used to
+              determine the allocation and isolation of system resources.
+            </description>
+            <syntax>
+              <unsignedInt/>
+              <default type="parameter" value="1"/>
+            </syntax>
+          </parameter>
+
+          <parameter name="Signature" version="2.16">
             <description>
               The {{datatype}} which can be used to fetch the signature for
               this DU. The {{datatype}} may use the "data" scheme defined in
@@ -95775,7 +98881,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="RequiredRoles">
+          <parameter name="RequiredRoles" version="2.16">
             <description>
               If this argument is present, it lists the roles which the
               application will need to be assigned in order to be able to
@@ -95804,7 +98910,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="OptionalRoles">
+          <parameter name="OptionalRoles" version="2.16">
             <description>
               If this argument is present, it lists the additional roles which
               the application would need to be assigned in order to be able to
@@ -95831,6 +98937,64 @@
             </syntax>
           </parameter>
 
+          <parameter name="RequiredUserRoles" version="2.18">
+            <description>
+              If this argument is present, it lists the User Roles which the
+              application will need to be assigned in order to be able to
+              function at all after this update. If it is absent then the
+              required User Roles are unchanged from the previous version.
+
+              If any of these User Roles are not present in the
+              {{param|##.ExecEnv.{i}.AvailableUserRoles}} of the
+              {{object|###.ExecEnv}} in which the DU is installed then the
+              command will fail. Some Agents may apply further filtering for
+              User Roles which are considered security- or privacy-sensitive.
+
+              Each entry in the list is the Name of a row in
+              {{object|###.Users.Role}}. If there is no such row then the
+              command will fail, as installation requires a User Role which is
+              not available on the Device.
+
+              If this argument is {{empty}} then no User Roles are required in
+              order for the application to function.
+            </description>
+            <syntax>
+              <list/>
+              <string>
+                <size maxLength="256"/>
+              </string>
+            </syntax>
+          </parameter>
+
+          <parameter name="RetainData" version="2.16">
+            <description>
+              This argument only has an effect if the UUID of the
+              DeploymentUnit matches the ApplicationUUID of one or more rows in
+              the {{object|Device.SoftwareModules.ExecEnv.{i}.ApplicationData}}
+              table which have the Retain parameter set to
+              {{enum|Forever|Device.SoftwareModules.ExecEnv.{i}.ApplicationData.{i}.Retain}}.
+              If this is the case then the data held in these volumes will be
+              preserved across the operation if and only if {{param}} is set
+              {{true}}.
+            </description>
+            <syntax>
+              <boolean/>
+              <default type="parameter" value="false"/>
+            </syntax>
+          </parameter>
+
+          <parameter name="ModuleVersion" mandatory="false" version="2.17">
+            <description>
+              Version of the {{object}} as optionally set by the Controller.
+              When the argument is absent then {{param}} is unchanged.
+            </description>
+            <syntax>
+              <string>
+                <size maxLength="32"/>
+              </string>
+            </syntax>
+          </parameter>
+
           <object name="Resources." minEntries="1" maxEntries="1"
               version="2.16">
             <description>
@@ -95840,7 +99004,7 @@
               before the command was invoked.
             </description>
 
-            <parameter name="AllocatedDiskSpace">
+            <parameter name="AllocatedDiskSpace" version="2.16">
               <description>
                 The amount of disk space measured in {{units}} allocated to any
                 {{object|###.ExecutionUnit}} created by this command. A value
@@ -95857,7 +99021,7 @@
               </syntax>
             </parameter>
 
-            <parameter name="AllocatedMemory">
+            <parameter name="AllocatedMemory" version="2.16">
               <description>
                 The amount of physical RAM measured in {{units}} allocated to
                 any {{object|###.ExecutionUnit}} created by this command. A
@@ -95874,7 +99038,7 @@
               </syntax>
             </parameter>
 
-            <parameter name="AllocatedCPUPercent">
+            <parameter name="AllocatedCPUPercent" version="2.16">
               <description>
                 The CPU power measured in {{units}} allocated to any
                 {{object|###.ExecutionUnit}} created by this command, as a
@@ -96024,23 +99188,6 @@
             </parameter>
           </object>
 
-          <parameter name="RetainData">
-            <description>
-              This argument only has an effect if the UUID of the
-              DeploymentUnit matches the ApplicationUUID of one or more rows in
-              the {{object|Device.SoftwareModules.ExecEnv.{i}.ApplicationData}}
-              table which have the Retain parameter set to
-              {{enum|Forever|Device.SoftwareModules.ExecEnv.{i}.ApplicationData.{i}.Retain}}.
-              If this is the case then the data held in these volumes will be
-              preserved across the operation if and only if {{param}} is set
-              {{true}}.
-            </description>
-            <syntax>
-              <boolean/>
-              <default type="parameter" value="false"/>
-            </syntax>
-          </parameter>
-
           <object name="HostObject.{i}." minEntries="0" maxEntries="unbounded"
               version="2.16">
             <description>
@@ -96130,28 +99277,11 @@
             </parameter>
           </object>
 
-          <parameter name="ModuleVersion" mandatory="false">
-            <description>
-              Version of the {{object}} as optionally set by the Controller.
-              When the argument is absent then {{param}} is unchanged.
-            </description>
-            <syntax>
-              <string>
-                <size maxLength="32"/>
-              </string>
-            </syntax>
-          </parameter>
-
           <object name="NetworkConfig." version="2.17">
             <description>
-              Specifies the network configuration for any ExecutionUnit
-              generated during the installation or update of the
-              DeploymentUnit.
-
-              When this argument or any of its child objects are missing from
-              the {{command|.SoftwareModules.InstallDU()}}, the corresponding
-              absent part is considered unnecessary and will not be available
-              to the ExecutionUnit.
+              Specifies the network configuration for any ExecutionUnit which
+              is created by the update of the DeploymentUnit. The new network
+              configuration supersedes any previous configuration.
 
               When this argument is not present in the
               {{command|.SoftwareModules.DeploymentUnit.{i}.Update()}}, the
@@ -96160,24 +99290,36 @@
 
             <parameter name="AccessInterfaces" mandatory="false">
               <description>
-                The logical network interfaces which the application installed
-                by this command will be allowed to send traffic through it. If
-                any of these access interface are not present in the
+                The network interfaces which the application updated by this
+                command will be allowed to send traffic through it. If any of
+                these access interface are not present in the
                 {{param|.SoftwareModules.ExecEnv.{i}.AvailableAccessInterfaces}}
-                of the ExecEnv into which the DU is to be installed then the
+                of the ExecEnv into which the DU is to be updated then the
                 command will fail.
 
                 Some Agents may apply further filtering for access interfaces
                 which are considered security- or privacy-sensitive. Each entry
-                in the list is the Name of a row in
-                {{object|.Logical.Interface.}}.
+                in the list is the Name of a row within either
+                {{object|.Logical.Interface.}} or {{object|.IP.Interface.}}. If
+                Name is present in both {{object|.Logical.Interface.}} and
+                {{object|.IP.Interface.}}, the Interface referenced in
+                {{object|.Logical.Interface.}} must be selected.
 
-                If there is no such row then the command will fail, as
-                installation requires access to a network, through the logical
-                interface, which is not available.
+                If there is no such row then the command will fail, as the
+                update requires access to a network, through the interface,
+                which is not available.
 
-                When this argument is absent or {{empty}} then no outgoing
-                network access is required for the ExecutionUnit to function.
+                When the argument {{object|NetworkConfig}} is absent or
+                {{empty}} for the
+                {{command|.SoftwareModules.DeploymentUnit.{i}.Update()}}, the
+                {{param}} network configuration remains unaltered.
+
+                When the argument {{object|NetworkConfig}} provided in
+                {{command|.SoftwareModules.DeploymentUnit.{i}.Update()}},
+                {{param}} configuration supersedes any previous configuration.
+                If {{param}} is absent or {{empty}}, it indicate that no
+                outgoing network access is required for the resulting
+                ExecutionUnit to function.
               </description>
               <syntax>
                 <list/>
@@ -96192,13 +99334,30 @@
               maxEntries="unbounded" version="2.17">
             <description>
               Defines the list of required port mapping rules for any
-              ExecutionUnit which is created as a result of this call command.
+              ExecutionUnit which is created as a result of this command. If
+              this command encounters any issue in providing the requested
+              mapping, such as the port already being used or reserved, then it
+              will fail.
+
+              When the argument {{object|NetworkConfig}} is absent or {{empty}}
+              for the {{command|.SoftwareModules.DeploymentUnit.{i}.Update()}},
+              the {{object}} network configuration remains unaltered.
+
+              When the argument {{object|NetworkConfig}} provided in
+              {{command|.SoftwareModules.DeploymentUnit.{i}.Update()}},
+              {{object}} configuration supersedes any previous configuration.
+              If {{object}} is absent or {{empty}}, it indicate that no port
+              mapping is required for the resulting ExecutionUnit to function.
             </description>
 
             <parameter name="Interface" mandatory="true">
               <description>
-                Name of a row in {{object|.Logical.Interface.}}. Specifies the
-                logical interface to which the port mapping applies.
+                Name of a row within either {{object|.Logical.Interface.}} or
+                {{object|.IP.Interface.}}. If Name is present in both
+                {{object|.Logical.Interface.}} and {{object|.IP.Interface.}},
+                the Interface referenced in {{object|.Logical.Interface.}} must
+                be selected. Specifies the interface to which the port mapping
+                applies.
               </description>
               <syntax>
                 <string>
@@ -96255,7 +99414,7 @@
         </description>
         <input>
 
-          <parameter name="RetainData">
+          <parameter name="RetainData" version="2.16">
             <description>
               This argument only has an effect if the UUID of the
               DeploymentUnit matches the ApplicationUUID of one or more rows in
@@ -96329,12 +99488,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.1">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -96392,7 +99551,7 @@
                 transition to the {{enum|Idle}} state.
               </description>
             </enumeration>
-            <enumeration value="Restarting">
+            <enumeration value="Restarting" version="2.16">
               <description>
                 This instance is in the process of Restarting and SHOULD
                 transition to the {{enum|Active}} state.
@@ -96514,7 +99673,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="AllocatedDiskSpace" access="readOnly">
+      <parameter name="AllocatedDiskSpace" access="readOnly" version="2.16">
         <description>
           The amount of disk space measured in {{units}} allocated to this
           {{object}}. A value of -1 MUST be used for {{object}} instances where
@@ -96543,7 +99702,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="AllocatedMemory" access="readOnly">
+      <parameter name="AllocatedMemory" access="readOnly" version="2.16">
         <description>
           The amount of physical RAM measured in {{units}} allocated to this
           {{object}}. A value of -1 MUST be used for {{object}} instances where
@@ -96571,7 +99730,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="AllocatedCPUPercent" access="readOnly">
+      <parameter name="AllocatedCPUPercent" access="readOnly" version="2.16">
         <description>
           The CPU power allocated to this {{object}}, as a fraction (in
           {{units}}) of the CPU allocation of the {{object|#.ExecEnv}} in which
@@ -96586,7 +99745,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="CPUPercentInUse" access="readOnly">
+      <parameter name="CPUPercentInUse" access="readOnly" version="2.16">
         <description>
           The CPU power currently being used by this by this {{object}}, as a
           fraction (in {{units}}) of the CPU allocation of the
@@ -96602,6 +99761,88 @@
         </syntax>
       </parameter>
 
+      <parameter name="AllocatedEUUID" access="readOnly" version="2.18">
+        <description>
+          This parameter is allocated by the host system. This is the user
+          identifier within the execution unit's environment. This UID is local
+          to the execution unit and is used by the EU's internal processes to
+          manage permissions. By default, processes within the EU execute as
+          root (UID 0) unless otherwise specified.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="AllocatedEUGID" access="readOnly" version="2.18">
+        <description>
+          This parameter is allocated by the host system. This is the group
+          identifier within the execution unit's environment. This GID is local
+          to the execution unit and is used by the EU's internal processes to
+          manage permissions.
+        </description>
+        <syntax>
+          <string/>
+        </syntax>
+      </parameter>
+
+      <parameter name="AllocatedHostUID" access="readOnly" version="2.18">
+        <description>
+          This parameter is allocated by the host system. This is the user
+          identifier on the host system where this EU is running. This UID is
+          system wide and is managed by the kernel.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="AllocatedHostGID" access="readOnly" version="2.18">
+        <description>
+          This parameter is allocated by the host system. This is the group
+          identifier on the host system where this EU is running. This GID is
+          system wide and is managed by the kernel.
+        </description>
+        <syntax>
+          <string/>
+        </syntax>
+      </parameter>
+
+      <parameter name="CreationTime" access="readOnly" version="2.18">
+        <description>
+          The date and time when the EU was created.
+        </description>
+        <syntax>
+          <dateTime/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Uptime" access="readOnly" version="2.18">
+        <description>
+          The amount of time in {{units}} that this EU has been up and running
+          since it was activated.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="ShutdownDelay" access="readWrite" version="2.18">
+        <description>
+          The delay in {{units}} before which the container is shutdown. This
+          delay ensures that the application has enough time to perform any
+          cleanup before the Execution Unit transitions to idle state.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+          <default type="implementation" value="10"/>
+        </syntax>
+      </parameter>
+
       <parameter name="References" access="readOnly">
         <description>
           Represents the instances of multi-instanced objects that are directly
@@ -96683,7 +99924,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ApplicationDataList" access="readOnly">
+      <parameter name="ApplicationDataList" access="readOnly" version="2.16">
         <description>
           Represents the application data volumes that are used by this
           {{object}}.
@@ -96710,7 +99951,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="HostObjectNumberOfEntries" access="readOnly">
+      <parameter name="HostObjectNumberOfEntries" access="readOnly"
+          version="2.16">
         <description>
           {{numentries}}
         </description>
@@ -96719,7 +99961,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="EnvVariableNumberOfEntries" access="readOnly">
+      <parameter name="EnvVariableNumberOfEntries" access="readOnly"
+          version="2.17">
         <description>
           {{numentries}}
         </description>
@@ -96739,7 +99982,7 @@
         </description>
         <input>
 
-          <parameter name="RequestedState" mandatory="true">
+          <parameter name="RequestedState" mandatory="true" version="2.12">
             <description>
               Indicates the requested state to transition this instance of the
               {{object|##.}} object. {{enum}}
@@ -96773,7 +100016,7 @@
         </input>
       </command>
 
-      <command name="Restart()" async="false">
+      <command name="Restart()" async="false" version="2.16">
         <description>
           Initiate a restart of the ExecutionUnit.
 
@@ -96819,13 +100062,13 @@
         value of {{param|RetryIntervalMultiplier}}, and ''n'' the current value
         of {{param|RetryCount}}. Then on the next occasion that the Agent
         determines that the EU has terminated abnormally, the delay before
-        re-starting the EU must lie between ''m * (k/1000)^n'' and ''m *
-        (k/1000)^(n+1)'' seconds, so long as ''m * (k/1000)^n'' evaluates to a
-        value less than {{param|RetryMaximumWaitInterval}}. Once this point has
-        been reached, on all subsequent occasion that the Agent determines that
-        the EU has terminated abnormally the delay before re-starting the EU
-        must lie between {{param|RetryMaximumWaitInterval}}'' * (1000/k)'' and
-        {{param|RetryMaximumWaitInterval}} seconds.
+        re-starting the EU must lie between ''m * (k/1000)^n^'' and ''m *
+        (k/1000)^(n+1)^'' seconds, so long as ''m * (k/1000)^n^'' evaluates to
+        a value less than {{param|RetryMaximumWaitInterval}}. Once this point
+        has been reached, on all subsequent occasion that the Agent determines
+        that the EU has terminated abnormally the delay before re-starting the
+        EU must lie between {{param|RetryMaximumWaitInterval}}'' * (1000/k)''
+        and {{param|RetryMaximumWaitInterval}} seconds.
       </description>
 
       <parameter name="Enable" access="readWrite">
@@ -96925,8 +100168,8 @@
       <parameter name="NextRestart" access="readOnly">
         <description>
           The time at which the next restart of the {{object|#}} is scheduled
-          to occur. The Infinte Time (9999-12-31T23:59:59Z) is used to indicate
-          that no restart is currently scheduled.
+          to occur. The Infinite Time (9999-12-31T23:59:59Z) is used to
+          indicate that no restart is currently scheduled.
         </description>
         <syntax>
           <dateTime/>
@@ -97025,12 +100268,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.16">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
     </object>
@@ -97073,12 +100316,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.17">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
     </object>
@@ -97116,7 +100359,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="SupportedServerConnectAlgorithms" access="readOnly">
+      <parameter name="SupportedServerConnectAlgorithms" access="readOnly"
+          version="2.11">
         <description>
           The algorithms supported by the CPE for resolving XMPP server
           addresses and ports. {{enum}}
@@ -97196,12 +100440,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.7">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -97264,7 +100508,7 @@
         <description>
           The complete Jabber ID as determined by the first-hop XMPP server at
           time of connection establishment. This Jabber ID will usually be the
-          standard concatentation of the local-part (Username), domain-part
+          standard concatenation of the local-part (Username), domain-part
           (Domain), and resource-part (Resource) as defined in
           {{bibref|RFC6120|Section 2.1}}
           (local-part@domain-part/resource-part), but since the Jabber ID is
@@ -97525,12 +100769,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.7">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -97572,8 +100816,8 @@
           for this {{object|##.Connection}}.
 
           If the value of this Parameter is a FQDN that resolves to multiple
-          addresses then each address SHOULD be attemtped (in an
-          implemnetation-specific order) until a connection can be made or all
+          addresses then each address SHOULD be attempted (in an
+          implementation-specific order) until a connection can be made or all
           addresses are exhausted, in which case the next {{object}} instance
           (based on {{param|Priority}} and {{param|Weight}}) SHOULD be used.
         </description>
@@ -97798,7 +101042,7 @@
 
     <object name="Device.IEEE1905.AL.Interface.{i}." access="readOnly"
         numEntriesParameter="InterfaceNumberOfEntries" minEntries="0"
-        maxEntries="unbounded" dmr:noUniqueKeys="true" version="2.9">
+        maxEntries="unbounded" version="2.9">
       <description>
         The 1905 interface table (described in {{bibref|IEEE1905.1a|sub-clause
         5 Abstraction Layer Management}}).
@@ -98384,7 +101628,7 @@
         minEntries="0" maxEntries="unbounded" dmr:noUniqueKeys="true"
         version="2.9">
       <description>
-        The 1905 fowarding rule for the ALME-SET-FWD-RULE.request and
+        The 1905 forwarding rule for the ALME-SET-FWD-RULE.request and
         ALME-GET-FWD-RULES.response with classification criteria as defined in
         {{bibref|IEEE1905.1a|Table 5-9: ClassificationSet elements}}.
       </description>
@@ -98407,7 +101651,7 @@
             <pathRef refType="strong" targetParent="##.Interface."
                 targetType="row"/>
           </string>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
@@ -98819,22 +102063,19 @@
         </syntax>
       </parameter>
 
-      <parameter name="AssocWiFiNetworkDeviceRef" access="readOnly">
+      <parameter name="AssocWiFiNetworkDeviceRef" access="readOnly"
+          version="2.13">
         <description>
-          {{reference||obsoleted}}{{param}} is a reference to a MultiAP.Device
-          or Wi-Fi Network Data Elements Device. Since IEEE 1905.1 is the
-          protocol used by the Wi-Fi Alliance's EasyMesh specification for
-          communications, this parameter allows the IEEE 1905.1 portion of the
-          data model to reference the associated EasyMesh portion of the data
-          model.
+          {{param}} is a reference to a Wi-Fi Network Data Elements Device.
+          Since IEEE 1905.1 is the protocol used by the Wi-Fi Alliance's
+          EasyMesh specification for communications, this parameter allows the
+          IEEE 1905.1 portion of the data model to reference the associated
+          EasyMesh portion of the data model.
         </description>
         <syntax>
           <string>
-            <pathRef
-                refType="strong"
-                targetParent="
-                  ####.WiFi.MultiAP.APDevice.
-                  ####.WiFi.DataElements.Network.Device."
+            <pathRef refType="strong"
+                targetParent="####.WiFi.DataElements.Network.Device."
                 targetType="row"/>
           </string>
         </syntax>
@@ -99431,8 +102672,7 @@
     <object
         name="Device.IEEE1905.AL.NetworkTopology.IEEE1905Device.{i}.IEEE1905Neighbor.{i}.Metric.{i}."
         access="readOnly" numEntriesParameter="MetricNumberOfEntries"
-        minEntries="0" maxEntries="unbounded" dmr:noUniqueKeys="true"
-        version="2.9">
+        minEntries="0" maxEntries="unbounded" version="2.9">
       <description>
         This object represents the metrics included in a Link metric response
         from the IEEE1905Device where {{param|#.LocalInterface}} is the MAC
@@ -99739,7 +102979,7 @@
                 Protocol according to {{bibref|MQTT311}}
               </description>
             </enumeration>
-            <enumeration value="5.0">
+            <enumeration value="5.0" version="2.13">
               <description>
                 Protocol according to {{bibref|MQTT50}}
               </description>
@@ -99766,7 +103006,7 @@
                 Unencrypted MQTT connection over a WebSocket transport
               </description>
             </enumeration>
-            <enumeration value="WebSocketTLS">
+            <enumeration value="WebSocketTLS" version="2.15">
               <description>
                 TLS encrypted MQTT connection over a WebSocket transport
               </description>
@@ -99812,8 +103052,7 @@
 
     <object name="Device.MQTT.Client.{i}." access="readWrite"
         numEntriesParameter="ClientNumberOfEntries" enableParameter="Enable"
-        minEntries="0" maxEntries="unbounded" dmr:fixedObject="true"
-        version="2.10">
+        minEntries="0" maxEntries="unbounded" version="2.10">
       <description>
         MQTT client table. Contains a list of configured MQTT clients.
       </description>
@@ -99824,12 +103063,12 @@
         <parameter ref="Name"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.10">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -99903,7 +103142,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Interface" access="readWrite">
+      <parameter name="Interface" access="readWrite" version="2.16">
         <description>
           The IP Interface associated with the {{object}} entry.
 
@@ -99932,7 +103171,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="EnableEncryption" access="readWrite" status="obsoleted">
+      <parameter name="EnableEncryption" access="readWrite" version="2.14"
+          status="deleted">
         <description>
           When {{true}}, encryption MUST be used for this MQTT {{object}}
           instance.
@@ -99941,6 +103181,8 @@
           handled by the {{param|TransportProtocol}} parameter}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <boolean/>
@@ -100004,7 +103246,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="CleanStart" access="readWrite">
+      <parameter name="CleanStart" access="readWrite" version="2.13">
         <description>
           The value of the MQTT Clean Start flag in the MQTT CONNECT packet
           (see {{bibref|MQTT50|section 3.1.2.4}}. If this flag is set to
@@ -100092,7 +103334,7 @@
       </parameter>
 
       <command name="ForceReconnect()" dmr:previousParameter="KeepAliveTime"
-          async="false">
+          version="2.12" async="false">
         <description>
           Disconnects the MQTT client from the MQTT broker and reconnects it
           again (toggle connection). It is only effective if the MQTT client is
@@ -100107,7 +103349,8 @@
         </description>
       </command>
 
-      <parameter name="SessionExpiryInterval" access="readWrite">
+      <parameter name="SessionExpiryInterval" access="readWrite"
+          version="2.13">
         <description>
           Session expiry interval in {{units}} defines the wait time before a
           session expires after the connection has been closed by the MQTT
@@ -100122,7 +103365,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ReceiveMaximum" access="readWrite">
+      <parameter name="ReceiveMaximum" access="readWrite" version="2.13">
         <description>
           The MQTT client uses this value to limit the number of QoS 1 and QoS
           2 publications that it is willing to process concurrently (see
@@ -100137,7 +103380,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="MaximumPacketSize" access="readWrite">
+      <parameter name="MaximumPacketSize" access="readWrite" version="2.13">
         <description>
           The maximum packet size in {{units}} the MQTT client can and will
           accept from the MQTT broker. A value of 0 means no limit. If the
@@ -100155,7 +103398,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="TopicAliasMaximum" access="readWrite">
+      <parameter name="TopicAliasMaximum" access="readWrite" version="2.13">
         <description>
           This value indicates the highest value that the MQTT client will
           accept as a Topic Alias sent by the Server (see
@@ -100176,7 +103419,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="RequestResponseInfo" access="readWrite">
+      <parameter name="RequestResponseInfo" access="readWrite" version="2.13">
         <description>
           The MQTT client uses this value in a MQTT CONNECT packet to request
           the Server to return Response Information in the MQTT CONNACK (see
@@ -100191,7 +103434,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="RequestProblemInfo" access="readWrite">
+      <parameter name="RequestProblemInfo" access="readWrite" version="2.13">
         <description>
           This value indicates whether the Reason String or User Properties are
           sent in the case of failures.(see {{bibref|MQTT50|section
@@ -100206,7 +103449,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="AuthenticationMethod" access="readWrite">
+      <parameter name="AuthenticationMethod" access="readWrite" version="2.13">
         <description>
           This value defines the extended authentication method to be used (see
           {{bibref|MQTT50|section 3.1.2.11.9}}).
@@ -100248,7 +103491,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="WillDelayInterval" access="readWrite">
+      <parameter name="WillDelayInterval" access="readWrite" version="2.13">
         <description>
           The delay in {{units}} after the session is disconnected, before
           sending the Will message {{bibref|MQTT50|section 3.1.3.2.2}}). A
@@ -100266,7 +103509,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="WillMessageExpiryInterval" access="readWrite">
+      <parameter name="WillMessageExpiryInterval" access="readWrite"
+          version="2.13">
         <description>
           The lifetime in {{units}} of a Will Message (see
           {{bibref|MQTT50|section 3.1.3.2.4}}). A value of 0 indicates that no
@@ -100282,7 +103526,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="WillContentType" access="readWrite">
+      <parameter name="WillContentType" access="readWrite" version="2.13">
         <description>
           Describes the type of the {{param|WillValue}} {{bibref|MQTT50|section
           3.1.3.2.5}}).
@@ -100298,7 +103542,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="WillResponseTopic" access="readWrite">
+      <parameter name="WillResponseTopic" access="readWrite" version="2.13">
         <description>
           Topic Name for a will response message. The presence of a Response
           Topic identifies the Will Message as a Request
@@ -100384,7 +103628,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="PublishMessageExpiryInterval" access="readWrite">
+      <parameter name="PublishMessageExpiryInterval" access="readWrite"
+          version="2.13">
         <description>
           The lifetime in {{units}} of a PUBLISH Message (see
           {{bibref|MQTT50|section 3.3.2.3.3}}). A value of 0 indicates that no
@@ -100429,8 +103674,8 @@
 
           If the parameter {{param|ConnectRetryIntervalMultiplier}} is defined,
           the MQTT client MUST use a random value between
-          {{param}}*({{param|ConnectRetryIntervalMultiplier}}/1000)^(n-1) and
-          {{param}}*({{param|ConnectRetryIntervalMultiplier}}/1000)^n for the
+          {{param}}*({{param|ConnectRetryIntervalMultiplier}}/1000)^(n-1)^ and
+          {{param}}*({{param|ConnectRetryIntervalMultiplier}}/1000)^n^ for the
           connect retry time, with n equals the current retry number. The max
           number of n is 10, starting with the 11th retry always the value n =
           10 is used.
@@ -100449,7 +103694,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="ConnectRetryIntervalMultiplier" access="readWrite">
+      <parameter name="ConnectRetryIntervalMultiplier" access="readWrite"
+          version="2.13">
         <description>
           Configures the retry interval multiplier.
 
@@ -100464,7 +103710,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="ConnectRetryMaxInterval" access="readWrite">
+      <parameter name="ConnectRetryMaxInterval" access="readWrite"
+          version="2.13">
         <description>
           The maximum reconnection wait interval, in {{units}}.
         </description>
@@ -100477,7 +103724,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ResponseInformation" access="readOnly">
+      <parameter name="ResponseInformation" access="readOnly" version="2.13">
         <description>
           The value of the CONNACK Response Information property supplied by a
           MQTT 5.0 server. This value is used by a MQTT 5.0 client as the basis
@@ -100503,7 +103750,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="UserPropertyNumberOfEntries" access="readOnly">
+      <parameter name="UserPropertyNumberOfEntries" access="readOnly"
+          version="2.13">
         <description>
           {{numentries}}
         </description>
@@ -100516,7 +103764,7 @@
     <object name="Device.MQTT.Client.{i}.Subscription.{i}." access="readWrite"
         numEntriesParameter="SubscriptionNumberOfEntries"
         enableParameter="Enable" minEntries="0" maxEntries="unbounded"
-        dmr:fixedObject="true" version="2.10">
+        version="2.10">
       <description>
         List of MQTT subscriptions handled by the MQTT client.
 
@@ -100533,12 +103781,12 @@
         <parameter ref="Topic"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.10">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -100622,7 +103870,7 @@
     <object name="Device.MQTT.Client.{i}.UserProperty.{i}." access="readWrite"
         numEntriesParameter="UserPropertyNumberOfEntries"
         enableParameter="Enable" minEntries="0" maxEntries="unbounded"
-        dmr:fixedObject="true" version="2.13">
+        version="2.13">
       <description>
         List of user properties used by the MQTT client.
 
@@ -100636,12 +103884,12 @@
         <parameter ref="Name"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.13">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -100758,7 +104006,7 @@
     </object>
 
     <object name="Device.MQTT.Client.{i}.Stats." access="readOnly"
-        minEntries="1" maxEntries="1" dmr:fixedObject="true" version="2.10">
+        minEntries="1" maxEntries="1" version="2.10">
       <description>
         Contains the MQTT client statistics and usage information.
 
@@ -100878,8 +104126,7 @@
 
     <object name="Device.MQTT.Broker.{i}." access="readWrite"
         numEntriesParameter="BrokerNumberOfEntries" enableParameter="Enable"
-        minEntries="0" maxEntries="unbounded" dmr:fixedObject="true"
-        version="2.10">
+        minEntries="0" maxEntries="unbounded" version="2.10">
       <description>
         MQTT broker table. Contains a list of configured MQTT brokers.
       </description>
@@ -100890,12 +104137,12 @@
         <parameter ref="Name"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.10">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -101005,8 +104252,7 @@
 
     <object name="Device.MQTT.Broker.{i}.Bridge.{i}." access="readWrite"
         numEntriesParameter="BridgeNumberOfEntries" enableParameter="Enable"
-        minEntries="0" maxEntries="unbounded" dmr:fixedObject="true"
-        version="2.10">
+        minEntries="0" maxEntries="unbounded" version="2.10">
       <description>
         Configures MQTT bridges, which are used to communicate with other MQTT
         brokers.
@@ -101018,12 +104264,12 @@
         <parameter ref="Name"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.10">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -101136,7 +104382,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="CleanStart" access="readWrite">
+      <parameter name="CleanStart" access="readWrite" version="2.13">
         <description>
           The value of the MQTT Clean Start flag in the MQTT CONNECT packet
           (see {{bibref|MQTT50|section 3.1.2.4}} to establish a MQTT bridge
@@ -101178,7 +104424,7 @@
       </parameter>
 
       <command name="ForceReconnect()" dmr:previousParameter="KeepAliveTime"
-          async="false">
+          version="2.12" async="false">
         <description>
           Disconnects the MQTT bridge to the remote MQTT broker and reconnects
           it again (toggle connection). It is only effective if the MQTT bridge
@@ -101389,12 +104635,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.10">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -101485,12 +104731,12 @@
         <parameter ref="Direction"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.10">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -101704,7 +104950,7 @@
     </object>
 
     <object name="Device.MQTT.Broker.{i}.Stats." access="readOnly"
-        minEntries="1" maxEntries="1" dmr:fixedObject="true" version="2.10">
+        minEntries="1" maxEntries="1" version="2.10">
       <description>
         The MQTT broker statistics values. These will reset with each MQTT
         broker start, either after reboot or if the MQTT broker gets
@@ -101915,12 +105161,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.10">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -102125,12 +105371,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.10">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -102285,12 +105531,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.11">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -102436,12 +105682,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.11">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -102593,12 +105839,12 @@
         <parameter ref="MeasurementAgent"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.12">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -102820,12 +106066,12 @@
         <parameter ref="Identifier"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.12">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -103214,12 +106460,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.12">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -103464,12 +106710,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.12">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -103717,12 +106963,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.12">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -103789,12 +107035,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.12">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -103865,12 +107111,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.12">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -103924,12 +107170,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.12">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -104001,12 +107247,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.12">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -104106,12 +107352,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.12">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -104212,12 +107458,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.12">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -104312,7 +107558,7 @@
         action ({{object|#.MeasurementAgent.{i}.Schedule.{i}.Action.{i}}}).
 
         The {{object}} replicates the {{object|#.MeasurementAgent.{i}}} object
-        instance's data at the time of the action exection.
+        instance's data at the time of the action execution.
 
         When a {{object|##.BulkData.Profile.{i}}} object instance is used to
         communicate a {{object}} instance, the CPE adds a
@@ -104374,8 +107620,7 @@
 
     <object name="Device.LMAP.Report.{i}.Result.{i}." access="readOnly"
         minEntries="0" maxEntries="unbounded"
-        numEntriesParameter="ResultNumberOfEntries" dmr:noUniqueKeys="true"
-        version="2.12">
+        numEntriesParameter="ResultNumberOfEntries" version="2.12">
       <description>
         The {{object}} object provides the meta-data of the result report of a
         single executed action that produced the result.
@@ -104737,12 +107982,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.12">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -105183,12 +108428,12 @@
         <parameter ref="Name"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.14">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -105228,7 +108473,7 @@
           <string>
             <enumeration value="RM_REGISTERED">
               <description>
-                The 5G-RG has sucessfully authenticated and has been assigned
+                The 5G-RG has successfully authenticated and has been assigned
                 an AMF to manage it.
               </description>
             </enumeration>
@@ -105325,7 +108570,7 @@
     <object name="Device.WWC.AccessNetwork.{i}.GUTI." access="readOnly"
         minEntries="1" maxEntries="1" version="2.14">
       <description>
-        A 5G Globally Unique Temparary Identity (GUTI) securely identifes an
+        A 5G Globally Unique Temporary Identity (GUTI) securely identifes an
         CPE by keeping the permanent User Equipment (UE identifier (IMSI)
         hidden. This identity is globally unique and assigned by the AMF at the
         time of registration.
@@ -105333,7 +108578,7 @@
         See {{bibref|3GPP-TS.23.003|.Clause 2.10}}.
       </description>
 
-      <parameter name="PLMN" access="readOnly">
+      <parameter name="PLMN" access="readOnly" version="2.14">
         <description>
           The Public Land Mobile Network (PLMN) globally identifies the service
           provider. A PLMN consists of a country code (MCC) and a network code
@@ -105349,7 +108594,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="AMFId" access="readOnly">
+      <parameter name="AMFId" access="readOnly" version="2.14">
         <description>
           The AMFId identifies an AMF instance within a service provider's
           network. In conjunction with the PLMN, it forms a Globally Unique AMF
@@ -105362,7 +108607,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="TMSI" access="readOnly">
+      <parameter name="TMSI" access="readOnly" version="2.14">
         <description>
           The Temporary Mobile Subscriber Identity (TMSI) is allocatred by the
           AMF at the time of registration and uniquely identifies the CPE.
@@ -105387,7 +108632,7 @@
         capabilities' matching 'ims' in order to establish a dedicated PDU
         session for telephony.
 
-        See {{bibref|3GPP-TS.24.526|Clause 5.2}} for a full descrption of the
+        See {{bibref|3GPP-TS.24.526|Clause 5.2}} for a full description of the
         URSP data elements.
       </description>
       <uniqueKey functional="false">
@@ -105397,12 +108642,12 @@
         <parameter ref="Precedence"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.14">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -105446,12 +108691,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.14">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -105507,12 +108752,12 @@
         <parameter ref="Precedence"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.14">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -105599,7 +108844,7 @@
         See {{bibref|3GPP-TS.24.501|Clause 9.11.2.8}}
       </description>
 
-      <parameter name="SliceServiceType" access="readOnly">
+      <parameter name="SliceServiceType" access="readOnly" version="2.14">
         <description>
           The Slice Service Type (SST). {{enum}}
 
@@ -105610,7 +108855,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SliceDifferentiator" access="readOnly">
+      <parameter name="SliceDifferentiator" access="readOnly" version="2.14">
         <description>
           The Slice differentiator is an optional number used to differentiate
           network slices with the same SST.
@@ -105657,12 +108902,12 @@
         <parameter ref="SessionID"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.14">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -105818,7 +109063,7 @@
         <description>
           The Data Network Name used by the PDU. The DNN value may be from the
           optional S-NSSAI specified at the time of PDU establishment or a
-          default determined by the 5G core. A DNN is analagous to an LTE APN
+          default determined by the 5G core. A DNN is analogous to an LTE APN
           used the same format defined in {{bibref|3GPP-TS.24.501|clause
           9.11.2.1A}}.
         </description>
@@ -105908,7 +109153,7 @@
         See {{bibref|3GPP-TS.24.501|Clause 9.11.2.8}}
       </description>
 
-      <parameter name="SliceServiceType" access="readOnly">
+      <parameter name="SliceServiceType" access="readOnly" version="2.14">
         <description>
           The Slice Service Type (SST). {{enum}}
 
@@ -105919,7 +109164,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SliceDifferentiator" access="readOnly">
+      <parameter name="SliceDifferentiator" access="readOnly" version="2.14">
         <description>
           The Slice differentiator is an optional number used to differentiate
           network slices with the same SST.
@@ -105938,7 +109183,7 @@
       <description>
         This object describes the PDU QoS Rule table. The purpose of the QoS
         Rule table is to assign a QFI to mark traffic based on a set of
-        classification rules. The rules are set by the netowrk operator and are
+        classification rules. The rules are set by the network operator and are
         specific for each PDU.
 
         For example:
@@ -105988,12 +109233,12 @@
         <parameter ref="Identifier"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.14">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -106076,12 +109321,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.14">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -106153,12 +109398,12 @@
         <parameter ref="QFI"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.14">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -106301,12 +109546,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.14">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -106656,12 +109901,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.16">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -106719,7 +109964,7 @@
         interface status is discussed in {{bibref|TR-181i2|section 4.2.2}}.
 
         This information SHOULD be mirrored or aggregated from the active
-        underlaying interfaces.
+        underlying interfaces.
       </description>
 
       <parameter name="BytesSent" access="readOnly" activeNotify="canDeny">
@@ -107172,12 +110417,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.16">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -107564,12 +110809,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.16">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -108494,7 +111739,7 @@
 
           This parameter specifies the downstream bit error rate (BER)
           threshold to detect the SF alarm. When this value is y, the BER
-          threshold is 10^–y.
+          threshold is 10^-y^.
 
           This parameter is based on ''Signal fail (SF) threshold'' from
           {{bibref|G.988|Section 9.2.1}}.
@@ -108511,7 +111756,7 @@
           Signal degrade (SD) threshold.
 
           This parameter specifies the downstream BER threshold to detect the
-          SD alarm. When this value is x, the BER threshold for SD is 10^–x .
+          SD alarm. When this value is x, the BER threshold for SD is 10^-x^.
           The SD threshold must be lower than the SF threshold; i.e., x &gt; y.
 
           This parameter is based on ''Signal degrade (SD) threshold'' from
@@ -108652,7 +111897,7 @@
 
       <parameter name="LODS" access="readOnly">
         <description>
-          Loss of downstream syncronization. See {{bibref|G.9807.1|}}.
+          Loss of downstream synchronization. See {{bibref|G.9807.1|}}.
         </description>
         <syntax>
           <boolean/>
@@ -108985,12 +112230,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.16">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -108998,8 +112243,8 @@
         <description>
           The IP Interface associated with the {{object}} entry.
 
-          If {{empty}} is specified, the CPE MUST use its bridging or routing
-          policy to determine the appropriate interface.
+          If {{empty}} is specified, the service should listen on all
+          interfaces.
         </description>
         <syntax>
           <string>
@@ -109163,9 +112408,12 @@
         </syntax>
       </parameter>
 
-      <parameter name="PID" access="readWrite">
+      <parameter name="PID" access="readOnly">
         <description>
-          Current PID of the SSH server instance.
+          Current Process Identifier of the SSH server instance.
+
+          Note: This parameter was demoted to readOnly in the Device:2.18
+          version.
         </description>
         <syntax>
           <unsignedInt/>
@@ -109183,7 +112431,7 @@
       </parameter>
     </object>
 
-    <object name="Device.SSH.Server.{i}.Session.{i}." access="readWrite"
+    <object name="Device.SSH.Server.{i}.Session.{i}." access="readOnly"
         numEntriesParameter="SessionNumberOfEntries" minEntries="0"
         maxEntries="unbounded" version="2.16">
       <description>
@@ -109193,18 +112441,21 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.16">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
-      <parameter name="User" access="readWrite">
+      <parameter name="User" access="readOnly">
         <description>
           The user to whom the session belongs to.
+
+          Note: This parameter was demoted to readOnly in the Device:2.18
+          version.
         </description>
         <syntax>
           <string>
@@ -109212,7 +112463,6 @@
             <pathRef refType="strong" targetParent=".Users.User."
                 targetType="row"/>
           </string>
-          <default type="object" value=""/>
         </syntax>
       </parameter>
 
@@ -109251,12 +112501,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.16">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -109315,12 +112565,12 @@
         <parameter ref="Path"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.16">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -109428,7 +112678,7 @@
       <parameter name="DeploymentUnitRef" access="readOnly">
         <description>
           {{reference|the {{object|##.SoftwareModules.DeploymentUnit.}} object
-          instance that this USP Service is part off.}}
+          instance that this USP Service is part of.}}
 
           {{empty}} means that USP service doesn't have a corresponding
           software module.
@@ -109443,6 +112693,24 @@
         </syntax>
       </parameter>
 
+      <parameter name="ExecutionUnitRef" access="readOnly" version="2.18">
+        <description>
+          {{reference|the {{object|##.SoftwareModules.ExecutionUnit.}} object
+          instance that this USP Service is part of.}}
+
+          {{empty}} means that USP service doesn't have a corresponding
+          software module.
+        </description>
+        <syntax>
+          <list/>
+          <string>
+            <pathRef refType="strong"
+                targetParent="##.SoftwareModules.ExecutionUnit."
+                targetType="row"/>
+          </string>
+        </syntax>
+      </parameter>
+
       <parameter name="HasController" access="readOnly">
         <description>
           The USP service has controller functionality next to the standard USP
@@ -109546,12 +112814,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.17">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -109640,7 +112908,7 @@
               <description>All facilities are selected.</description>
             </enumeration>
           </string>
-          <default type="object" value="All"/>
+          <default type="object" value="[All]"/>
         </syntax>
       </parameter>
 
@@ -109773,12 +113041,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.17">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -109960,9 +113228,9 @@
           received. When {{empty}} is specified the syslog service will listen
           to all available network interfaces. Example:
 
-          * ''Device.IP.Interface.1''.
+          * ''Device.IP.Interface.1''
 
-          * ''Device.Logical.Interface.1''.
+          * ''Device.Logical.Interface.1''
 
           {{template|INTERFACE-ROUTING}}
         </description>
@@ -110029,12 +113297,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.17">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -110072,12 +113340,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.17">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -110093,7 +113361,7 @@
             <pathRef refType="strong" targetParent="#.Source."
                 targetType="row"/>
           </string>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
@@ -110116,7 +113384,7 @@
             <pathRef refType="strong" targetParent="#.Filter."
                 targetType="row"/>
           </string>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
@@ -110149,7 +113417,7 @@
         </syntax>
       </parameter>
 
-      <event name="LogEvent!">
+      <event name="LogEvent!" version="2.17">
         <description>
           Syslog event
         </description>
@@ -110240,10 +113508,13 @@
         </syntax>
       </parameter>
 
-      <parameter name="Protocol" access="readOnly">
+      <parameter name="Protocol" access="readWrite">
         <description>
           Protocol to be used to deliver the syslog messages to the remote
           server.
+
+          Note: This parameter was promoted to readWrite in the Device:2.18
+          version.
         </description>
         <syntax>
           <string>
@@ -110310,6 +113581,175 @@
       </parameter>
     </object>
 
+    <object name="Device.Schedules." access="readOnly" version="2.18">
+      <description>
+        This object is responsible for managing the schedules that are embedded
+        within the Device.
+      </description>
+
+      <parameter name="Enable" access="readWrite">
+        <description>
+          Enables or disables the scheduling. If the scheduling is disabled
+          then the status of any enabled {{object|Schedule}} entries will
+          change to {{enum|StackDisabled|Schedule.{i}.Status}}.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="implementation" value="true"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ScheduleNumberOfEntries" access="readOnly">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object name="Device.Schedules.Schedule.{i}." access="readWrite"
+        numEntriesParameter="ScheduleNumberOfEntries" enableParameter="Enable"
+        minEntries="0" maxEntries="unbounded" version="2.18">
+      <description>
+        Each instance of this object provides a schedule where access is
+        enabled.
+      </description>
+      <uniqueKey functional="false">
+        <parameter ref="Alias"/>
+      </uniqueKey>
+
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.18">
+        <description>
+          {{datatype|expand}}
+        </description>
+        <syntax>
+          <dataType ref="_AliasUSP"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Enable" access="readWrite">
+        <description>
+          Enables or disables this {{object}} entry.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="object" value="false"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Status" access="readOnly">
+        <description>
+          Status of the schedule.
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="Active"/>
+            <enumeration value="Inactive"/>
+            <enumeration value="StackDisabled">
+              <description>
+                When the global {{param|#.Enable}} is {{false}} and the
+                {{param|Enable}} parameter is {{true}}, the scheduling is
+                disabled and the status of the enabled {{object}} entry must
+                change to {{enum|StackDisabled|Status}}. The value of the
+                {{param|Enable}} parameter is not changed.
+              </description>
+            </enumeration>
+            <enumeration value="Error" optional="true"/>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="Description" access="readWrite">
+        <description>
+          A description of the schedule (human readable string).
+        </description>
+        <syntax>
+          <string>
+            <size maxLength="256"/>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="Day" access="readWrite">
+        <description>
+          {{list|the days for which access is enabled}} {{enum}}
+        </description>
+        <syntax>
+          <list/>
+          <string>
+            <enumeration value="Monday"/>
+            <enumeration value="Tuesday"/>
+            <enumeration value="Wednesday"/>
+            <enumeration value="Thursday"/>
+            <enumeration value="Friday"/>
+            <enumeration value="Saturday"/>
+            <enumeration value="Sunday"/>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="StartTime" access="readWrite">
+        <description>
+          Start time of the enable schedule in hh:mm format. [hh] refers to a
+          zero-padded hour between 00 and 23. [mm] refers to a zero-padded
+          minute between 00 and 59.
+
+          Start time is in local time zone.
+        </description>
+        <syntax>
+          <string>
+            <size maxLength="5"/>
+            <pattern value=""/>
+            <pattern value="([01][0-9]|2[0-3]):[0-5][0-9]"/>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="Duration" access="readWrite">
+        <description>
+          The duration, in {{units}}, which the access is enabled.
+
+          If the {{param|StartTime}} is not defined, duration is the total time
+          access is allowed during a calendar day.
+
+          If a {{param|StartTime}} is defined, access is allowed for the
+          {{param}} period starting from {{param|StartTime}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range minInclusive="1"/>
+            <units value="seconds"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="InverseMode" access="readWrite">
+        <description>
+          When enabled, the Inverse Mode reverses the default behavior of the
+          schedule, creating a dynamic where actions that are typically
+          activated are now deactivated, and vice versa.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="object" value="false"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="TimeLeft" access="readOnly" activeNotify="canDeny">
+        <description>
+          The number of {{units}} remaining before the next state change will
+          occur. ''0'' means that schedule is disabled.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+    </object>
+
     <object name="Device.LocalAgent." access="readOnly" minEntries="1"
         maxEntries="1" version="2.12">
       <description>
@@ -110376,7 +113816,7 @@
         <syntax>
           <list minItems="1"/>
           <string>
-            <enumeration value="CoAP" status="obsoleted">
+            <enumeration value="CoAP" status="deleted">
               <description>
                 See {{bibref|RFC7252}}.
 
@@ -110384,6 +113824,8 @@
                 1.2}}
 
                 {{obsoleted|2.17}}
+
+                {{deleted|2.18}}
               </description>
             </enumeration>
             <enumeration value="WebSocket">
@@ -110397,7 +113839,7 @@
                 See {{bibref|MQTT311}} and {{bibref|MQTT50}}
               </description>
             </enumeration>
-            <enumeration value="UDS">
+            <enumeration value="UDS" version="2.16">
               <description>See {{bibref|TR-369}}</description>
             </enumeration>
           </string>
@@ -110432,7 +113874,7 @@
       </parameter>
 
       <parameter name="SupportedThresholdOperator" access="readOnly"
-          dmr:previousParameter="SupportedFingerprintAlgorithms">
+          dmr:previousParameter="SupportedFingerprintAlgorithms" version="2.13">
         <description>
           {{list|each entry is a threshold operation for
           {{param|Threshold.{i}.ThresholdOperator}} supported by the Agent}}
@@ -110508,7 +113950,8 @@
       </parameter>
 
       <parameter name="ThresholdNumberOfEntries" access="readOnly"
-          dmr:previousParameter="MaxSubscriptionChangeAdoptionTime">
+          dmr:previousParameter="MaxSubscriptionChangeAdoptionTime"
+          version="2.13">
         <description>
           {{numentries}}
         </description>
@@ -110687,7 +114130,7 @@
           </syntax>
         </parameter>
 
-        <parameter name="CheckSumAlgorithm">
+        <parameter name="CheckSumAlgorithm" version="2.17">
           <description>
             The hash algorithm that was used to generate the checksum for the
             transferred file.
@@ -110718,7 +114161,7 @@
           </syntax>
         </parameter>
 
-        <parameter name="CheckSum">
+        <parameter name="CheckSum" version="2.17">
           <description>
             The hash value that was used for the transferred file. This hash
             value was generated using transferred file content and the
@@ -110784,6 +114227,16 @@
         </input>
       </command>
 
+      <parameter name="WatchdogNumberOfEntries" access="readOnly"
+          version="2.18">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
       <parameter name="SubscriptionNumberOfEntries" access="readOnly">
         <description>
           {{numentries}}
@@ -110802,7 +114255,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="MonitorNumberOfEntries" access="readOnly">
+      <parameter name="MonitorNumberOfEntries" access="readOnly"
+          version="2.16">
         <description>
           {{numentries}}
         </description>
@@ -110811,7 +114265,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="SupportedNumberOfSubscriptions" access="readOnly">
+      <parameter name="SupportedNumberOfSubscriptions" access="readOnly"
+          version="2.16">
         <description>
           An indication of the maximum number of {{object|Subscription}}
           instances supported by this implementation or -1 if no hard limit
@@ -110835,12 +114290,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.12">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -110905,7 +114360,7 @@
           When {{true}}, the hostname advertised in the SRV record MUST be a
           Fully Qualified Domain Name (FQDN).
 
-          The interfaces that advertise these DNS-SD services are restriced to
+          The interfaces that advertise these DNS-SD services are restricted to
           the set of interfaces associated with this {{object}} instance and
           the interfaces defined by the
           {{param|.DNS.SD.Advertise.{i}.Interface}} parameter.
@@ -110919,7 +114374,7 @@
 
     <object name="Device.LocalAgent.MTP.{i}.CoAP." access="readOnly"
         minEntries="0" maxEntries="1" discriminatorParameter="Protocol"
-        status="obsoleted" version="2.12">
+        status="deleted" version="2.12">
       <description>
         If the USP Endpoint uses the CoAP Message Transfer Protocol (MTP), then
         this object contains CoAP specific configuration parameters.
@@ -110927,6 +114382,8 @@
         {{deprecated|2.15|because the CoAP MTP was deprecated in USP 1.2}}
 
         {{obsoleted|2.17}}
+
+        {{deleted|2.18}}
       </description>
 
       <parameter name="Interfaces" access="readWrite">
@@ -111099,7 +114556,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="EnableEncryption" access="readWrite">
+      <parameter name="EnableEncryption" access="readWrite" version="2.14">
         <description>
           When {{true}}, encryption MUST be used for all connections to this
           MTP instance.
@@ -111110,7 +114567,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="KeepAliveInterval" access="readWrite">
+      <parameter name="KeepAliveInterval" access="readWrite" version="2.15">
         <description>
           The duration in {{units}} between when WebSocket ping control frames
           are transmitted by the Agent's WebSocket server to the Controller's
@@ -111275,12 +114732,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.13">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -111373,7 +114830,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Controller" access="readOnly">
+      <parameter name="Controller" access="readOnly" version="2.15">
         <description>
           {{reference|the {{object|#.Controller}} instance that created
           {{object}}|delete}}
@@ -111449,12 +114906,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.16">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -111620,6 +115077,216 @@
       </event>
     </object>
 
+    <object name="Device.LocalAgent.Watchdog.{i}." access="readWrite"
+        minEntries="0" maxEntries="unbounded"
+        numEntriesParameter="WatchdogNumberOfEntries" enableParameter="Enable"
+        dmr:previousObject="Device.LocalAgent.Threshold.{i}." version="2.18">
+      <description>
+        Each {{object}} instance of this table represents a Watchdog Event. A
+        {{object}} instance is used to detect the lack of an expected update of
+        a parameter value within a certain time window
+        {{param|ReloadTimerValue}}. In case this timer expires, meaning
+        {{param|RemainingTimerValue}} becomes 0, a notification event
+        {{event|Watchdog!}}, will be sent to the {{param|Controller}}. This is
+        because timely parameter updates are required, e.g. for SLA or security
+        reasons.
+      </description>
+      <uniqueKey functional="false">
+        <parameter ref="Alias"/>
+      </uniqueKey>
+
+      <parameter name="Alias" access="readWrite">
+        <description>
+          {{datatype|expand}}
+        </description>
+        <syntax>
+          <dataType ref="Alias"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Enable" access="readWrite">
+        <description>
+          Enable/Disable this {{object}} instance. If the {{object}} instance
+          is disabled, the {{event|Watchdog!}} will not be invoked, even if
+          there is a {{object|#.Subscription}} instance that references it. The
+          {{param|RemainingTimerValue}} will be set to 0. If the {{object}}
+          instance is set to enabled, the {{param|RemainingTimerValue}} will be
+          set to the value of {{param|ReloadTimerValue}}.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="object" value="false"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ReloadTimerValue" access="readWrite">
+        <description>
+          Watchdog timer reload value in {{units}}. Every time the
+          {{param|Reference}} value is updated, this {{param}} is used to
+          reload the {{param|RemainingTimerValue}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="RemainingTimerValue" activeNotify="canDeny"
+          access="readOnly">
+        <description>
+          This value is decreased every {{units}}. When 0, the {{object}} timer
+          expires, an {{event|Watchdog!}} event will be generated.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="Status" access="readOnly">
+        <description>
+          The operational status of the {{object}} instance.
+
+          When the value of {{param|RemainingTimerValue}} becomes 0, this
+          {{param}} will become {{enum|Expired}} and a {{event|Watchdog!}}
+          event will be triggered. {{object}} will not be restarted, meaning
+          that the {{param|RemainingTimerValue}} will stay at 0 until the
+          {{command|Reset()}} command is invoked.
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="Inactive">
+              <description>The {{param|Enable}} is disabled.</description>
+            </enumeration>
+            <enumeration value="Active">
+              <description>
+                The {{param|Enable}} is enabled. The {{object}} timer is
+                running. This means that {{param|RemainingTimerValue}} is
+                decreased every second.
+              </description>
+            </enumeration>
+            <enumeration value="Expired">
+              <description>
+                The {{param|Enable}} is enabled. The {{object}} timer expired
+                whereby {{param|RemainingTimerValue}} is set to 0.
+              </description>
+            </enumeration>
+          </string>
+          <default type="object" value="Inactive"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Reference" access="readWrite">
+        <description>
+          The {{param}} consists of a Path Name or Search Path that determines
+          the element(s) of the data model that the {{object}} is applicable
+          to. When more than one {{param}} is used, the Watchdog timer will
+          only be stopped if all Parameters, referenced by {{param}} are
+          updated. If one of the referenced Parameters is not updated, either
+          with the same or different value, an {{event|Watchdog!}} will be
+          generated. If all parameters, referenced by {{param}}, are updated,
+          the {{param|RemainingTimerValue}} is set to the value of the
+          {{param|ReloadTimerValue}}.
+        </description>
+        <syntax>
+          <string/>
+        </syntax>
+      </parameter>
+
+      <parameter name="SeverityIndication" access="readWrite">
+        <description>
+          Provides an indication of the severity which will be included in the
+          generated {{event|Watchdog!}} event when the {{object}} instance
+          expires.
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="Info"/>
+            <enumeration value="Minor"/>
+            <enumeration value="Major"/>
+            <enumeration value="Critical"/>
+          </string>
+          <default type="object" value="Info"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Controller" access="readOnly" version="2.18">
+        <description>
+          {{reference|the {{object|#.Controller}} instance that created
+          {{object}}|delete}}
+
+          The value of this parameter is automatically populated by the USP
+          Agent upon {{object}} creation using the reference to the USP
+          Controller that created the instance.
+
+          The USP Controller referenced by this parameter also defines the set
+          of permissions to use when evaluating the Watchdog. Furthermore, only
+          the USP Controller referenced by this parameter will receive a
+          {{event|Watchdog!}} Event (assuming it has an associated
+          Subscription), even if another USP Controller has an associated
+          Subscription.
+        </description>
+        <syntax>
+          <string>
+            <pathRef refType="strong" targetParent="#.Controller."
+                targetType="row"/>
+          </string>
+        </syntax>
+      </parameter>
+
+      <command name="Reset()" version="2.18" async="false">
+        <description>
+          When the {{command}} is invoked, the {{param|RemainingTimerValue}}
+          will be set to the {{param|ReloadTimerValue}} and the
+          {{param|Status}} to either {{enum|Active|Status}} or
+          {{enum|Inactive|Status}} depending on the value of the
+          {{param|Enable}} parameter.
+        </description>
+      </command>
+
+      <event name="Watchdog!">
+        <description>
+          Watchdog event requested via a {{object}} object.
+
+          When the {{param|RemainingTimerValue}} becomes 0 because the value of
+          the {{param|Reference}} was not updated then the Watchdog Event will
+          be invoked.
+        </description>
+
+        <parameter name="Reference">
+          <description>
+            The parameter {{param|#.Reference}} for which the Watchdog has been
+            triggered.
+          </description>
+          <syntax>
+            <string/>
+          </syntax>
+        </parameter>
+
+        <parameter name="ReloadTimerValue">
+          <description>
+            The {{param|#.ReloadTimerValue}} Value in {{units}}.
+          </description>
+          <syntax>
+            <unsignedInt>
+              <units value="seconds"/>
+            </unsignedInt>
+          </syntax>
+        </parameter>
+
+        <parameter name="SeverityIndication">
+          <description>
+            The {{param|#.SeverityIndication}} Value.
+          </description>
+          <syntax>
+            <string/>
+          </syntax>
+        </parameter>
+      </event>
+    </object>
+
     <object name="Device.LocalAgent.Controller.{i}." access="readWrite"
         minEntries="0" maxEntries="unbounded"
         numEntriesParameter="ControllerNumberOfEntries"
@@ -111640,12 +115307,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.12">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -111994,7 +115661,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="OnBoardingComplete" access="readWrite">
+      <parameter name="OnBoardingComplete" access="readWrite" version="2.17">
         <description>
           Signifies whether the onboarding is completed for this Controller.
 
@@ -112020,7 +115687,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="OnBoardingRestartTime" access="readWrite">
+      <parameter name="OnBoardingRestartTime" access="readWrite"
+          version="2.17">
         <description>
           This parameter is used to configure a linear retry mechanism for the
           OnBoardRequest. It represents the time in {{units}} before the
@@ -112067,12 +115735,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.12">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -112102,7 +115770,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Order" access="readWrite">
+      <parameter name="Order" access="readWrite" version="2.15">
         <description>
           The order (relative priority) to use when determining which
           {{object}} to use for communicating to the Controller.
@@ -112128,7 +115796,7 @@
 
     <object name="Device.LocalAgent.Controller.{i}.MTP.{i}.CoAP."
         access="readOnly" minEntries="0" maxEntries="1"
-        discriminatorParameter="Protocol" status="obsoleted" version="2.12">
+        discriminatorParameter="Protocol" status="deleted" version="2.12">
       <description>
         If the USP Endpoint uses the CoAP Message Transfer Protocol (MTP), then
         this object contains CoAP specific configuration parameters.
@@ -112136,6 +115804,8 @@
         {{deprecated|2.15|because the CoAP MTP was deprecated in USP 1.2}}
 
         {{obsoleted|2.17}}
+
+        {{deleted|2.18}}
       </description>
 
       <parameter name="Host" access="readWrite">
@@ -112218,7 +115888,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="USPServiceRef" access="readOnly">
+      <parameter name="USPServiceRef" access="readOnly" version="2.16">
         <description>
           A reference to the USP Service associated with this Agent when
           communicating via the STOMP MTP.
@@ -112293,7 +115963,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="EnableEncryption" access="readWrite">
+      <parameter name="EnableEncryption" access="readWrite" version="2.14">
         <description>
           When {{true}}, encryption MUST be used for this MTP instance.
         </description>
@@ -112368,7 +116038,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="USPServiceRef" access="readOnly">
+      <parameter name="USPServiceRef" access="readOnly" version="2.16">
         <description>
           A reference to the USP Service associated with this Agent when
           communicating via the WebSocket MTP.
@@ -112399,12 +116069,14 @@
         related to how this Controller communicates with the MQTT broker.
       </description>
 
-      <parameter name="Reference" access="readWrite" status="deprecated">
+      <parameter name="Reference" access="readWrite" status="obsoleted">
         <description>
           A reference to the MQTT Client used by this Controller when
           communicating via the MQTT MTP.
 
           {{deprecated|2.16|because {{param|AgentMTPReference}} was added}}
+
+          {{obsoleted|2.18}}
         </description>
         <syntax>
           <string>
@@ -112453,7 +116125,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="AgentMTPReference" access="readWrite">
+      <parameter name="AgentMTPReference" access="readWrite" version="2.16">
         <description>
           {{reference|the {{object|###.MTP.}} object instance containing the
           Response Topic used by this Controller when communicating via the
@@ -112467,7 +116139,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="USPServiceRef" access="readOnly">
+      <parameter name="USPServiceRef" access="readOnly" version="2.16">
         <description>
           A reference to the USP Service associated with this Agent when
           communicating via the MQTT MTP.
@@ -112583,12 +116255,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.12">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -112630,7 +116302,7 @@
         functionality for this {{object|##.Controller.{i}}} object instance.
       </description>
 
-      <parameter name="Enable" access="readWrite" status="obsoleted">
+      <parameter name="Enable" access="readWrite" status="deleted">
         <description>
           Enable/Disable this {{object}} instance.
 
@@ -112645,6 +116317,8 @@
           {{deprecated|2.15|because it is replaced by {{param|SessionMode}}}}
 
           {{obsoleted|2.17}}
+
+          {{deleted|2.18}}
         </description>
         <syntax>
           <boolean/>
@@ -112652,7 +116326,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SessionMode" access="readWrite">
+      <parameter name="SessionMode" access="readWrite" version="2.15">
         <description>
           The desired usage mode of an End-to-End Session Context with this
           particular Controller.
@@ -112785,7 +116459,7 @@
       </parameter>
 
       <parameter name="SegmentedPayloadChunkSize" access="readWrite"
-          status="deprecated">
+          status="obsoleted">
         <description>
           The maximum size, in {{units}}, of the Record (payload(s) and
           headers) that can be transmitted to the remote endpoint. The smallest
@@ -112796,6 +116470,8 @@
 
           {{deprecated|2.16|because it is replaced by
           {{param|MaxUSPRecordSize}}}}
+
+          {{obsoleted|2.18}}
         </description>
         <syntax>
           <unsignedInt>
@@ -112807,7 +116483,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="MaxUSPRecordSize" access="readWrite">
+      <parameter name="MaxUSPRecordSize" access="readWrite" version="2.16">
         <description>
           The maximum size allowed by the MTP, in {{units}}, a USP Record
           (payload(s) and header fields) that can be transmitted to the remote
@@ -112907,12 +116583,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.12">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -113069,7 +116745,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SecuredRoles" access="readWrite">
+      <parameter name="SecuredRoles" access="readWrite" version="2.16">
         <description>
           {{list|each entry is a Role that is associated with Controllers to
           indicate their access to secured parameters (e.g.
@@ -113299,12 +116975,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.12">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -113356,12 +117032,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.12">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -113410,7 +117086,7 @@
         <syntax>
           <list/>
           <string/>
-          <default type="object" value=""/>
+          <default type="object" value="[]"/>
         </syntax>
       </parameter>
 
@@ -113419,10 +117095,11 @@
           The permissions of a Role for the specified Targets.
 
           A string of 4 characters where each character represents a permission
-          ("r" for Read, "w" for Write, "x" for Execute", and "n" for Notify).
+          ("`r`" for Read, "`w`" for Write, "`x`" for Execute", and "`n`" for
+          Notify).
 
-          The string is always in the same order (rwxn) and the lack of a
-          permission is signified by a "-" character (e.g., r--n).
+          The string is always in the same order (`rwxn`) and the lack of a
+          permission is signified by a "`-`" character (e.g., `r--n`).
 
           The following describes the meaning of the permissions for Parameter
           type of Targets:
@@ -113452,10 +117129,11 @@
           The permissions of a Role for the specified Targets.
 
           A string of 4 characters where each character represents a permission
-          ("r" for Read, "w" for Write, "x" for Execute", and "n" for Notify).
+          ("`r`" for Read, "`w`" for Write, "`x`" for Execute", and "`n`" for
+          Notify).
 
-          The string is always in the same order (rwxn) and the lack of a
-          permission is signified by a "-" character (e.g., r--n).
+          The string is always in the same order (`rwxn`) and the lack of a
+          permission is signified by a "`-`" character (e.g., `r--n`).
 
           The following describes the meaning of the permissions for Object
           type of Targets:
@@ -113486,10 +117164,11 @@
           The permissions of a Role for the specified Targets.
 
           A string of 4 characters where each character represents a permission
-          ("r" for Read, "w" for Write, "x" for Execute", and "n" for Notify).
+          ("`r`" for Read, "`w`" for Write, "`x`" for Execute", and "`n`" for
+          Notify).
 
-          The string is always in the same order (rwxn) and the lack of a
-          permission is signified by a "-" character (e.g., r--n).
+          The string is always in the same order (`rwxn`) and the lack of a
+          permission is signified by a "`-`" character (e.g., `r--n`).
 
           The following describes the meaning of the permissions for
           Instantiated Object type of Targets:
@@ -113524,10 +117203,11 @@
           The permissions of a Role for the specified Targets.
 
           A string of 4 characters where each character represents a permission
-          ("r" for Read, "w" for Write, "x" for Execute", and "n" for Notify).
+          ("`r`" for Read, "`w`" for Write, "`x`" for Execute", and "`n`" for
+          Notify).
 
-          The string is always in the same order (rwxn) and the lack of a
-          permission is signified by a "-" character (e.g., r--n).
+          The string is always in the same order (`rwxn`) and the lack of a
+          permission is signified by a "`-`" character (e.g., `r--n`).
 
           The following describes the meaning of the permissions for Command
           and Event type of Targets:
@@ -113569,8 +117249,9 @@
         trust) are considered "trusted".
 
         If the Controller authenticated via an entry in this table is not
-        previously known to the Agent, the associated Role entry is
-        automatically applied to the Controller.
+        previously known to the Agent, the Roles specified in the
+        {{param|Role}} parameter might be automatically applied, depending on
+        the value of the {{param|AllowedUses}} parameter.
       </description>
       <uniqueKey functional="true">
         <parameter ref="Credential"/>
@@ -113579,12 +117260,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.12">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -113645,23 +117326,26 @@
             <enumeration value="MTP-only">
               <description>
                 The CA can only authorize MTP (domain) connectivity, and cannot
-                authenticate Controllers.
+                authenticate Controllers, i.e. no Roles are automatically
+                applied.
               </description>
             </enumeration>
             <enumeration value="MTP-and-USP">
               <description>
                 The CA can authorize MTP (domain) connectivity and authenticate
-                Controllers.
+                Controller, i.e. the {{param|Role}} parameter applies.
               </description>
             </enumeration>
             <enumeration value="MTP-and-broker">
               <description>
                 The CA can authorize MTP (domain) connectivity and the
-                presenter of this certificate is trusted to have authenticated
-                the identity of Endpoints whose Records it transmits such that
-                the from_id can be trusted without additional authentication.
-                See {{bibref|TR-369|"Authentication and Authorization"}} for
-                additional description of the Trusted Broker function.
+                presenter of a certificate signed by such CA is trusted to have
+                authenticated the identity of Endpoints whose Records it
+                transmits. Any Controller communicating through such a Broker
+                is automatically authenticated, i.e. the {{param|Role}}
+                parameter applies. See {{bibref|TR-369|"Authentication and
+                Authorization"}} for additional description of the Trusted
+                Broker concept.
               </description>
             </enumeration>
           </string>
@@ -113705,12 +117389,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.12">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -113882,12 +117566,12 @@
         <parameter ref="ID"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.12">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -113919,7 +117603,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="TriggerAction" access="readWrite">
+      <parameter name="TriggerAction" access="readWrite" version="2.16">
         <description>
           Determines the action to take when the monitored event occurs.
         </description>
@@ -113949,7 +117633,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="TriggerConfigSettings" access="readOnly">
+      <parameter name="TriggerConfigSettings" access="readWrite"
+          version="2.16">
         <description>
           Each entry is a name-value pair representing the name of the data
           model parameter to configure and the value to configure it with.
@@ -114018,7 +117703,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ReferenceList" access="readWrite">
+      <parameter name="ReferenceList" access="readWrite" version="2.13">
         <description>
           Each entry in the list is a Path Name, Search Path, Command
           reference, or Event reference that determines the element(s) of the
@@ -114214,12 +117899,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.12">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -114353,12 +118038,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.16">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -114591,16 +118276,16 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.12">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
-      <parameter name="Type" access="readOnly">
+      <parameter name="Type" access="readOnly" version="2.13">
         <description>
           {{datatype|expand}}
         </description>
@@ -114609,7 +118294,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Description" access="readOnly">
+      <parameter name="Description" access="readOnly" version="2.13">
         <description>
           Human-readable description of the {{object}}. e.g. a more detailed
           description of {{param|Type}}.
@@ -114621,7 +118306,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Name" access="readWrite">
+      <parameter name="Name" access="readWrite" version="2.13">
         <description>
           A textual name of the instance, which can be assigned by the user.
           {{object}}.
@@ -114633,7 +118318,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Online" access="readOnly">
+      <parameter name="Online" access="readOnly" version="2.13">
         <description>
           This parameter provides the state of the {{object}} on the underlying
           (proxied) connected network.
@@ -114643,7 +118328,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="LastTimeContacted" access="readOnly">
+      <parameter name="LastTimeContacted" access="readOnly" version="2.13">
         <description>
           The date time of the last successful contact.
         </description>
@@ -114652,7 +118337,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="InterfaceReference" access="readOnly">
+      <parameter name="InterfaceReference" access="readOnly" version="2.13">
         <description>
           {{reference|a protocol object that uses the
           {{param|ProxyProtocol}}}}.
@@ -114664,7 +118349,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ProxyProtocol" access="readOnly">
+      <parameter name="ProxyProtocol" access="readOnly" version="2.13">
         <description>
           The protocol being used to communicate between the Agent and this
           Proxied Device. {{enum}}
@@ -114688,7 +118373,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="NodeNumberOfEntries" access="readOnly">
+      <parameter name="NodeNumberOfEntries" access="readOnly" version="2.13">
         <description>
           {{numentries}}
         </description>
@@ -114709,12 +118394,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.13">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -114798,12 +118483,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="writeOnceReadOnly">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.12">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -115062,7 +118747,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="EnableEncryption" access="readWrite">
+      <parameter name="EnableEncryption" access="readWrite" version="2.14">
         <description>
           When {{true}}, encryption MUST be used for this STOMP Connection
           {{object}}.
@@ -115080,7 +118765,7 @@
         This object contains information associated with a connected gateway.
       </description>
 
-      <event name="UnknownGatewayDiscovered!">
+      <event name="UnknownGatewayDiscovered!" version="2.16">
         <description>
           Gateway discovery event indicating that the device discovered a
           gateway that is not compliant with CWMP or USP. This event MAY be
@@ -115098,7 +118783,7 @@
         </parameter>
       </event>
 
-      <event name="USPGatewayDiscovered!">
+      <event name="USPGatewayDiscovered!" version="2.16">
         <description>
           Gateway discovery event indicating that the device discovered a
           compliant USP-enabled gateway. This event MAY be sent when the
@@ -115116,7 +118801,7 @@
         </parameter>
       </event>
 
-      <event name="CWMPGatewayDiscovered!">
+      <event name="CWMPGatewayDiscovered!" version="2.16">
         <description>
           Gateway discovery event indicating that the device discovered a
           compliant CWMP-enabled gateway. This event MAY be sent when the
@@ -115168,7 +118853,7 @@
         </parameter>
       </event>
 
-      <parameter name="ManagementProtocol" access="readOnly">
+      <parameter name="ManagementProtocol" access="readOnly" version="2.16">
         <description>
           Specifies the management protocol used by the gateway.
         </description>
@@ -115201,7 +118886,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="EndpointID" access="readOnly">
+      <parameter name="EndpointID" access="readOnly" version="2.16">
         <description>
           The unique USP identifier for this USP Agent.
         </description>
@@ -115210,7 +118895,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="MACAddress" access="readOnly">
+      <parameter name="MACAddress" access="readOnly" version="2.16">
         <description>
           MAC address of the discovered device.
         </description>
@@ -115276,12 +118961,12 @@
         <parameter ref="Name"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.13">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -115602,6 +119287,15 @@
         </syntax>
       </parameter>
 
+      <parameter name="LastContactTime" access="readOnly" version="2.18">
+        <description>
+          The date and time in UTC when the {{object}} has received data.
+        </description>
+        <syntax>
+          <dateTime/>
+        </syntax>
+      </parameter>
+
       <parameter name="Sensitivity" access="readWrite">
         <description>
           A 0 to 100 value indicating how reactive to changes the {{object}}
@@ -115690,6 +119384,15 @@
         </syntax>
       </parameter>
 
+      <parameter name="LastContactTime" access="readOnly" version="2.18">
+        <description>
+          The date and time in UTC when the {{object}} has received data.
+        </description>
+        <syntax>
+          <dateTime/>
+        </syntax>
+      </parameter>
+
       <parameter name="Unit" access="readOnly">
         <description>
           {{datatype|expand}}
@@ -115821,6 +119524,15 @@
         </syntax>
       </parameter>
 
+      <parameter name="LastContactTime" access="readOnly" version="2.18">
+        <description>
+          The date and time in UTC when the {{object}} has received data.
+        </description>
+        <syntax>
+          <dateTime/>
+        </syntax>
+      </parameter>
+
       <parameter name="Unit" access="readOnly">
         <description>
           {{datatype|expand}}
@@ -115882,6 +119594,15 @@
         </syntax>
       </parameter>
 
+      <parameter name="LastContactTime" access="readOnly" version="2.18">
+        <description>
+          The date and time in UTC when the {{object}} has received data.
+        </description>
+        <syntax>
+          <dateTime/>
+        </syntax>
+      </parameter>
+
       <parameter name="ValidValues" access="readOnly">
         <description>
           List of valid values reported from the sensor represented by this
@@ -115907,12 +119628,12 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly" version="2.13">
         <description>
           {{datatype|expand}}
         </description>
         <syntax>
-          <dataType ref="Alias"/>
+          <dataType ref="_AliasUSP"/>
         </syntax>
       </parameter>
 
@@ -116001,7 +119722,7 @@
       </object>
     </profile>
 
-    <profile name="Processors:1" version="2.1">
+    <profile name="Processors:1" version="2.1" status="deprecated">
       <object ref="Device.DeviceInfo.Processor.{i}." requirement="present">
         <parameter ref="Architecture" requirement="readOnly"/>
       </object>
@@ -116039,14 +119760,12 @@
       </object>
     </profile>
 
-    <profile name="Time:1" version="2.0" status="deprecated">
+    <profile name="Time:1" version="2.0" status="obsoleted">
       <object ref="Device.Time." requirement="present">
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Status" requirement="readOnly"/>
-        <parameter ref="NTPServer1" requirement="readWrite"
-            status="deprecated"/>
-        <parameter ref="NTPServer2" requirement="readWrite"
-            status="deprecated"/>
+        <parameter ref="NTPServer1" requirement="readWrite" status="obsoleted"/>
+        <parameter ref="NTPServer2" requirement="readWrite" status="obsoleted"/>
         <parameter ref="CurrentLocalTime" requirement="readOnly"/>
         <parameter ref="LocalTimeZone" requirement="readWrite"/>
       </object>
@@ -118673,13 +122392,13 @@
     </profile>
 
     <profile name="MAPAdv:1" extends="MAPBasic:1" version="2.8"
-        status="obsoleted">
+        status="deleted">
       <object ref="Device.MAP.Domain.{i}." requirement="present">
-        <parameter ref="PSIDOffset" requirement="readWrite" status="obsoleted"/>
-        <parameter ref="PSIDLength" requirement="readWrite" status="obsoleted"/>
-        <parameter ref="PSID" requirement="readWrite" status="obsoleted"/>
+        <parameter ref="PSIDOffset" requirement="readWrite" status="deleted"/>
+        <parameter ref="PSIDLength" requirement="readWrite" status="deleted"/>
+        <parameter ref="PSID" requirement="readWrite" status="deleted"/>
         <parameter ref="IncludeSystemPorts" requirement="readWrite"
-            status="obsoleted"/>
+            status="deleted"/>
       </object>
       <object ref="Device.MAP.Domain.{i}.Rule.{i}." requirement="createDelete">
         <parameter ref="EABitsLength" requirement="readWrite"/>
@@ -119405,7 +123124,7 @@
       </object>
     </profile>
 
-    <profile name="AccessControl:1" version="2.14">
+    <profile name="AccessControl:1" status="deprecated" version="2.14">
       <object ref="Device.Hosts." requirement="present">
         <parameter ref="AccessControlNumberOfEntries" requirement="readOnly"/>
       </object>
@@ -119413,10 +123132,11 @@
         <parameter ref="PhysAddress" requirement="readWrite"/>
         <parameter ref="AccessPolicy" requirement="readWrite"/>
         <parameter ref="Enable" requirement="readWrite"/>
-        <parameter ref="ScheduleNumberOfEntries" requirement="readOnly"/>
+        <parameter ref="ScheduleNumberOfEntries" requirement="readOnly"
+            status="deprecated"/>
       </object>
       <object ref="Device.Hosts.AccessControl.{i}.Schedule.{i}."
-          requirement="present">
+          requirement="present" status="deprecated">
         <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Day" requirement="readWrite"/>
@@ -119425,6 +123145,18 @@
       </object>
     </profile>
 
+    <profile name="AccessControl:2" version="2.18">
+      <object ref="Device.Hosts." requirement="present">
+        <parameter ref="AccessControlNumberOfEntries" requirement="readOnly"/>
+      </object>
+      <object ref="Device.Hosts.AccessControl.{i}." requirement="present">
+        <parameter ref="PhysAddress" requirement="readWrite"/>
+        <parameter ref="AccessPolicy" requirement="readWrite"/>
+        <parameter ref="Enable" requirement="readWrite"/>
+        <parameter ref="ScheduleRef" requirement="readOnly"/>
+      </object>
+    </profile>
+
     <profile name="DNSRelay:1" version="2.0">
       <object ref="Device.DNS." requirement="present"/>
       <object ref="Device.DNS.Relay." requirement="present">
@@ -119987,11 +123719,11 @@
 
     <profile name="PeriodicStatsAdv:1" extends="PeriodicStatsBase:1"
         version="2.0" dmr:previousProfile="PeriodicStatsBase:1"
-        status="deprecated">
+        status="obsoleted">
       <object ref="Device.PeriodicStatistics.SampleSet.{i}."
           requirement="createDelete">
         <parameter ref="Enable" requirement="readWrite"/>
-        <parameter ref="Status" requirement="readOnly" status="deprecated"/>
+        <parameter ref="Status" requirement="readOnly" status="obsoleted"/>
         <parameter ref="TimeReference" requirement="readWrite"/>
         <parameter ref="FetchSamples" requirement="readWrite"/>
         <command ref="ForceSample()"/>
@@ -121127,6 +124859,19 @@
       </object>
     </profile>
 
+    <profile name="Schedules:1" version="2.18">
+      <object ref="Device.Schedules." requirement="present">
+        <parameter ref="ScheduleNumberOfEntries" requirement="readOnly"/>
+      </object>
+      <object ref="Device.Schedules.Schedule.{i}." requirement="present">
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
+        <parameter ref="Enable" requirement="readWrite"/>
+        <parameter ref="Day" requirement="readWrite"/>
+        <parameter ref="StartTime" requirement="readWrite"/>
+        <parameter ref="Duration" requirement="readWrite"/>
+      </object>
+    </profile>
+
     <profile name="_Baseline:1" status="deleted" version="2.0">
       <object ref="Device." requirement="present">
         <parameter ref="InterfaceStackNumberOfEntries" requirement="readOnly"/>
@@ -121466,7 +125211,7 @@
       </object>
     </profile>
 
-    <profile name="IPLayerCapacity:1" version="2.14" status="obsoleted">
+    <profile name="IPLayerCapacity:1" version="2.14" status="deleted">
       <object ref="Device.IP.Diagnostics." requirement="present">
         <parameter ref="IPLayerCapacitySupported" requirement="readOnly"/>
         <parameter ref="IPLayerMaxConnections" requirement="readOnly"/>
@@ -121476,10 +125221,10 @@
           <input>
             <parameter ref="Interface"/>
             <parameter ref="Role"/>
-            <parameter ref="Host" status="obsoleted"/>
-            <parameter ref="Port" status="obsoleted"/>
+            <parameter ref="Host" status="deleted"/>
+            <parameter ref="Port" status="deleted"/>
             <parameter ref="JumboFramesPermitted"/>
-            <parameter ref="NumberOfConnections" status="obsoleted"/>
+            <parameter ref="NumberOfConnections" status="deleted"/>
             <parameter ref="EthernetPriority"/>
             <parameter ref="DSCP"/>
             <parameter ref="ProtocolVersion"/>
@@ -121493,7 +125238,7 @@
             <parameter ref="NumberTestSubIntervals"/>
             <parameter ref="TestSubInterval"/>
             <parameter ref="StatusFeedbackInterval"/>
-            <parameter ref="TimeoutNoTraffic" status="obsoleted"/>
+            <parameter ref="TimeoutNoTraffic" status="deleted"/>
             <parameter ref="Tmax"/>
             <parameter ref="TmaxRTT"/>
             <parameter ref="TimestampResolution"/>
@@ -121529,7 +125274,7 @@
       </object>
     </profile>
 
-    <profile name="IPLayerCapacityTest:1" version="2.15" status="deprecated">
+    <profile name="IPLayerCapacityTest:1" version="2.15" status="obsoleted">
       <object ref="Device.IP.Diagnostics." requirement="present">
         <parameter ref="IPLayerCapacitySupported" requirement="readOnly"/>
         <parameter ref="IPLayerCapSupportedSoftwareVersion"
@@ -121540,7 +125285,7 @@
         <command ref="IPLayerCapacity()">
           <input>
             <parameter ref="Role"/>
-            <parameter ref="Host" status="deprecated"/>
+            <parameter ref="Host" status="obsoleted"/>
             <parameter ref="JumboFramesPermitted"/>
             <parameter ref="DSCP"/>
             <parameter ref="TestType"/>
@@ -122198,9 +125943,9 @@
     </profile>
 
     <profile name="CoAPAgent:1" extends="LocalAgent:1" version="2.13"
-        status="obsoleted">
+        status="deleted">
       <object ref="Device.LocalAgent.MTP.{i}.CoAP." requirement="present"
-          status="obsoleted">
+          status="deleted">
         <parameter ref="Port" requirement="readOnly"/>
         <parameter ref="Path" requirement="readOnly"/>
       </object>
@@ -122253,9 +125998,9 @@
     </profile>
 
     <profile name="CoAPController:1" extends="Controllers:1" version="2.13"
-        status="obsoleted">
+        status="deleted">
       <object ref="Device.LocalAgent.Controller.{i}.MTP.{i}.CoAP."
-          requirement="present" status="obsoleted">
+          requirement="present" status="deleted">
         <parameter ref="Host" requirement="readOnly"/>
         <parameter ref="Port" requirement="readOnly"/>
         <parameter ref="Path" requirement="readOnly"/>
@@ -122281,15 +126026,17 @@
     </profile>
 
     <profile name="MQTTController:1" extends="Controllers:1" version="2.13"
-        status="deprecated">
+        status="obsoleted">
       <description>
         This profile adds USP controller extensions for MQTT transport.
 
         {{deprecated|2.16|because it now contains a deprecated parameter}}
+
+        {{obsoleted|2.18}}
       </description>
       <object ref="Device.LocalAgent.Controller.{i}.MTP.{i}.MQTT."
           requirement="present">
-        <parameter ref="Reference" requirement="readOnly" status="deprecated"/>
+        <parameter ref="Reference" requirement="readOnly" status="obsoleted"/>
         <parameter ref="Topic" requirement="readWrite"/>
       </object>
     </profile>
diff --git a/test/tools/cwmp-datamodel-1-8.xsd b/test/tools/cwmp-datamodel-1-8.xsd
index 086e4907..8b293b16 100644
--- a/test/tools/cwmp-datamodel-1-8.xsd
+++ b/test/tools/cwmp-datamodel-1-8.xsd
@@ -3,24 +3,24 @@
   Data Model Definition Schema (DM Schema) v1.8
 
   Copyright (c) 2008-2020, Broadband Forum
-
+  
   Redistribution and use in source and binary forms, with or
   without modification, are permitted provided that the following
   conditions are met:
-
+  
   1. Redistributions of source code must retain the above copyright
      notice, this list of conditions and the following disclaimer.
-
+  
   2. Redistributions in binary form must reproduce the above
      copyright notice, this list of conditions and the following
      disclaimer in the documentation and/or other materials
      provided with the distribution.
-
+  
   3. Neither the name of the copyright holder nor the names of its
      contributors may be used to endorse or promote products
      derived from this software without specific prior written
      permission.
-
+  
   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
   CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
   INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
@@ -34,14 +34,14 @@
   STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
   ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
+  
   The above license is used as a license under copyright only.
   Please reference the Forum IPR Policy for patent licensing terms
   <https://www.broadband-forum.org/ipr-policy>.
-
+  
   Any moral rights which are necessary to exercise under the above
   license grant are also deemed granted under this license.
-
+  
   Summary:
     CWMP and USP Data Model Definition Schema (DM Schema). DM Instances define CWMP
     or USP data models.  Within the schema, elements are grouped by category (simple
@@ -63,8 +63,8 @@
       - updated all of the unique object-name constraints so that the
         object/@base attribute is also considered.
       - added "prefix" option to the description/@action attribute
-      - made import/@file attribute required for import element
-      - removed size facet's default maxLength on string/base64/hexBinary
+      - made import/@file attribute required for import element 
+      - removed size facet's default maxLength on string/base64/hexBinary 
         parameters
       - added syntax/@command attribute to the syntax element
     * cwmp-datamodel-1-4.xsd: July 2011: corresponds to TR-106 Amendment 6
@@ -83,7 +83,7 @@
     * cwmp-datamodel-1-7.xsd: September 13 2019: September 13 2019:
       - supported implementation defaults, version attribute, description templates,
         writeOnceReadOnly access type and the decimal datatype
-    * cwmp-datamodel-1-8.xsd: November 5 2020: November 5 2020: corresponds to TR-106 Amendment 10
+    * cwmp-datamodel-1-8.xsd: TBD 2020: TBD 2020: corresponds to TR-106 Amendment 9
       - allowed command attributes, e.g. mandatory, in component definitions
 -->
 
@@ -705,7 +705,7 @@ The range facet MUST NOT be specified for non-numeric data types, i.e. data type
       <xs:element name="enumeration" type="tns:EnumerationFacet">
         <xs:annotation>
           <xs:documentation>Enumeration facets, taken together, define the valid values, e.g. "a" and "b" mean that the value has to be a or b.
-The enumeration facet MUST NOT be specified for data types that are not derived from string.
+The enumeration facet MUST NOT be specified for data types that are not derived from string. 
 Derived types MAY add additional enumeration values.  See A.2.5.</xs:documentation>
         </xs:annotation>
       </xs:element>
@@ -718,7 +718,7 @@ The enumerationRef facet MUST NOT be specified for data types that are not deriv
       <xs:element name="pattern" type="tns:PatternFacet">
         <xs:annotation>
           <xs:documentation>Pattern attributes, taken together, define valid patterns, e.g. "" and "[0-9A-Fa-f]{6}" means that the value has to be empty or a 6 digit hex string.
-The pattern facet MUST NOT be specified for data types that are not derived from string.
+The pattern facet MUST NOT be specified for data types that are not derived from string. 
 Pattern syntax is the same as for XML Schema regular expressions.  See https://www.w3.org/TR/xmlschema-2/#regexs.</xs:documentation>
         </xs:annotation>
       </xs:element>
@@ -1192,7 +1192,7 @@ Specify "prefix" to prefix to the previous description, "append" to append to th
   </xs:complexType>
   <xs:complexType name="DescriptionTemplate">
     <xs:annotation>
-      <xs:documentation>DescriptionTemplate: free text with a length up to 256 characters, which can be added in multiple descriptions and MAY contain a limited amount of mediawiki-like markup as
+      <xs:documentation>DescriptionTemplate: free text with a length up to 256 characters, which can be added in multiple descriptions and MAY contain a limited amount of mediawiki-like markup as 
 specified in A.2.2 (same restrictions as tns:Description type</xs:documentation>
     </xs:annotation>
     <xs:simpleContent>
diff --git a/tools/generate_dm_xml.py b/tools/generate_dm_xml.py
index 642b791b..c2256ec3 100755
--- a/tools/generate_dm_xml.py
+++ b/tools/generate_dm_xml.py
@@ -144,12 +144,13 @@ def generate_bbf_xml_file(output_file, dm_json_files=None):
     root.set("xmlns:dm", "urn:broadband-forum-org:cwmp:datamodel-1-8")
     root.set("xmlns:dmr", "urn:broadband-forum-org:cwmp:datamodel-report-0-1")
     root.set("xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance")
-    root.set("xsi:schemaLocation", "urn:broadband-forum-org:cwmp:datamodel-1-8 https://www.broadband-forum.org/cwmp/cwmp-datamodel-1-8.xsd urn:broadband-forum-org:cwmp:datamodel-report-0-1 https://www.broadband-forum.org/cwmp/cwmp-datamodel-report.xsd")
-    root.set("spec", "urn:broadband-forum-org:tr-181-2-14-1-cwmp")
-    root.set("file", "tr-181-2-17-0-cwmp-full.xml")
+    
+    root.set("xsi:schemaLocation", "urn:broadband-forum-org:cwmp:datamodel-1-14 https://www.broadband-forum.org/cwmp/cwmp-datamodel-1-14.xsd urn:broadband-forum-org:cwmp:datamodel-report-1-0 https://www.broadband-forum.org/cwmp/cwmp-datamodel-report-1-0.xsd")
+    root.set("spec", "urn:broadband-forum-org:tr-181-2-18-0-cwmp")
+    root.set("file", "tr-181-2-18-0-cwmp.xml")
 
     model = ET.SubElement(root, "model")
-    model.set("name", "Device:2.17")
+    model.set("name", "Device:2.18")
 
     for entry in LIST_SUPPORTED_DM:
         name = entry.get("param")