diff --git a/libbbfdm/dmtree/json/tr181.json b/libbbfdm/dmtree/json/tr181.json
index ab818490..b61cfd31 100644
--- a/libbbfdm/dmtree/json/tr181.json
+++ b/libbbfdm/dmtree/json/tr181.json
@@ -419,7 +419,7 @@
 					"cwmp",
 					"usp"
 				],
-				"description": "Organizationally unique identifier of the 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.<<np>>Any change would indicate that its a new device and would therefore require a BOOTSTRAP Inform.",
+				"description": "Organizationally unique identifier of the 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. Any change would indicate that its a new device and would therefore require a BOOTSTRAP Inform.",
 				"datatype": "string",
 				"range": [
 					{
@@ -681,6 +681,17 @@
 				"description": "<<numentries>>",
 				"datatype": "unsignedInt"
 			},
+			"LogRotateNumberOfEntries": {
+				"type": "unsignedInt",
+				"read": true,
+				"write": false,
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"description": "<<numentries>>",
+				"datatype": "unsignedInt"
+			},
 			"VendorLogFileNumberOfEntries": {
 				"type": "unsignedInt",
 				"read": true,
@@ -1140,7 +1151,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "<<numentries>><<np>>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>>.",
+					"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"
 				},
 				"Device.DeviceInfo.ProcessStatus.Process.{i}.": {
@@ -1615,6 +1626,212 @@
 					]
 				}
 			},
+			"Device.DeviceInfo.LogRotate.{i}.": {
+				"type": "object",
+				"version": "2.17",
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"description": "This Object details the available rotation settings for vendor log file rotation. Based on <<bibref|YANGSYSLOG|A YANG Data Model for Syslog Configuration>>.",
+				"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": "Alias",
+					"range": [
+						{
+							"max": 64
+						}
+					]
+				},
+				"Enable": {
+					"type": "boolean",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Enables or disables the log rotation functionality for this item.",
+					"datatype": "boolean"
+				},
+				"Name": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Specifies the full path and filename of the log file that must be rotated. Which MUST use the uri scheme file <<bibref|RFC8089|The file URI Scheme>>.",
+					"datatype": "string"
+				},
+				"NumberOfFiles": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Specifies the maximum number of log files retained. When during log rotation the maximum number of log files is reached, the oldest log file will be deleted. Specify 1 for implementations that only support one log file.",
+					"datatype": "unsignedInt",
+					"range": [
+						{
+							"min": 1
+						}
+					]
+				},
+				"MaxFileSize": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Specifies the maximum log file size in <<units>>. Log events that arrive after the maximum file size is reached will cause the current log file to be closed and a new log file to be opened.",
+					"datatype": "unsignedInt",
+					"unit": "KiB"
+				},
+				"RollOver": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Specifies the length of time, in <<units>>, that log events should be written to a specific log file. Log events that arrive after the rollover period cause the current log file to be closed and a new log file to be opened.",
+					"datatype": "unsignedInt",
+					"unit": "minutes"
+				},
+				"Retention": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Specifies the length of time, in <<units>>, that completed/closed log event files should be stored in the file system before they are removed.",
+					"datatype": "unsignedInt",
+					"unit": "minutes"
+				},
+				"Compression": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Specifies the post-rotation compression method that must be applied exclusively on the initial log file in a rotation sequence.",
+					"default": "None",
+					"datatype": "string",
+					"enumerations": [
+						"None",
+						"GZIP",
+						"BZIP2",
+						"LZO",
+						"XZ",
+						"ZSTD"
+					]
+				},
+				"LogFileNumberOfEntries": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "<<numentries>>",
+					"datatype": "unsignedInt"
+				},
+				"Device.DeviceInfo.LogRotate.{i}.LogFile.{i}.": {
+					"type": "object",
+					"version": "2.17",
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Each table entry represents a Log File. This table of log files is informational only and does not allow the Controller to operate on these files in any way.",
+					"uniqueKeys": [
+						"Alias",
+						"Name"
+					],
+					"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": "Alias",
+						"range": [
+							{
+								"max": 64
+							}
+						]
+					},
+					"Name": {
+						"type": "string",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Name of the rotated log file stored within the same directory that <<param|#.Name>> is specified. Which MUST use the uri scheme file <<bibref|RFC8089|The file URI Scheme>>.",
+						"datatype": "string",
+						"range": [
+							{
+								"max": 64
+							}
+						]
+					},
+					"Size": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "The size of the log file in <<units>>. If the device doesnt know the file size then <<param>> will be 0.",
+						"datatype": "unsignedInt",
+						"unit": "bytes"
+					},
+					"LastChange": {
+						"type": "dateTime",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Last modification date of the file specified by <<param|Name>>.",
+						"datatype": "dateTime"
+					}
+				}
+			},
 			"Device.DeviceInfo.VendorLogFile.{i}.": {
 				"type": "object",
 				"version": "2.1",
@@ -2107,6 +2324,497 @@
 					"input": {}
 				}
 			},
+			"Device.DeviceInfo.KernelFaults.": {
+				"type": "object",
+				"version": "2.17",
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"description": "A fault in the context of the Kernel refers to a situation where the kernel encounters a critical error or a bug that it cannot recover from. When this happens, the kernel generates a fault message or kernel panic, which provides information about the error, the state of the system at the time of the error, and a stack trace of function calls leading up to the error.",
+				"access": false,
+				"array": false,
+				"StoragePath": {
+					"type": "string",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Path where the Kernel faults logs must be stored.",
+					"datatype": "string"
+				},
+				"LastUpgradeCount": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Total number of Kernel faults which occured since last firmware upgrade.",
+					"datatype": "unsignedInt"
+				},
+				"PreviousBootCount": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "The number of Kernel faults which occurred during the previous boot cycle.",
+					"datatype": "unsignedInt"
+				},
+				"MinFreeSpace": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Minimum free space in <<units>> on the device that must be free before attempting to create a <<object|KernelFault>> instance. This setting does not affect the counting of Kernel faults.",
+					"datatype": "unsignedInt",
+					"unit": "KiB"
+				},
+				"MaxKernelFaultEntries": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "The maximum number of entries available in the <<object|KernelFault>> table. Defines the maximum number of <<object|KernelFault>> instances that can be stored on the device. If this limit is hit, No new <<object|KernelFault>> instances will be created until sufficient Kernel fault instances are removed. Set this parameter to 0 to completely disable the creation of <<object|KernelFault>> instances. Reducing the <<param>> will cause for the implementation to delete the oldest <<object|KernelFault>> instances. This setting does not affect the counting of Kernel faults.",
+					"datatype": "unsignedInt"
+				},
+				"KernelFaultNumberOfEntries": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "<<numentries>>",
+					"datatype": "unsignedInt"
+				},
+				"RemoveAllKernelFaults()": {
+					"type": "command",
+					"async": true,
+					"protocols": [
+						"usp"
+					]
+				},
+				"Device.DeviceInfo.KernelFaults.KernelFault.{i}.": {
+					"type": "object",
+					"version": "2.17",
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Each table entry represents a Kernel fault that is stored on the device.",
+					"uniqueKeys": [
+						"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": "Alias",
+						"range": [
+							{
+								"max": 64
+							}
+						]
+					},
+					"FaultLocation": {
+						"type": "string",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Specifies the location of where to create and keep the logs. Can either be a relative path or file within the <<param|#.StoragePath>> location.",
+						"datatype": "string"
+					},
+					"LastInstruction": {
+						"type": "string",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "The last instruction executed when the Kernel fault was triggered.",
+						"datatype": "string"
+					},
+					"TimeStamp": {
+						"type": "dateTime",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "The time when the Kernel fault was registered.",
+						"datatype": "dateTime"
+					},
+					"FirmwareVersion": {
+						"type": "string",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "The firmeware version that triggered the Kernel fault.",
+						"datatype": "string"
+					},
+					"ProcessName": {
+						"type": "string",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "The name of the process that was active while the kernel fault occurred.",
+						"datatype": "string"
+					},
+					"Reason": {
+						"type": "string",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "The reason why the kernel fault occurred.",
+						"datatype": "string"
+					},
+					"Upload()": {
+						"type": "command",
+						"async": true,
+						"protocols": [
+							"usp"
+						],
+						"input": {
+							"URL": {
+								"type": "string",
+								"read": true,
+								"write": true,
+								"mandatory": true,
+								"protocols": [
+									"usp"
+								],
+								"description": "The <<datatype>> specifying the destination file location. The HTTPS transport MUST be supported, and the HTTP transport MAY be supported. This argument specifies only the destination file location, and does not indicate in any way the name or location of the local file to be uploaded. If the Agent receives multiple upload requests with the same URL, the Agent MUST perform each upload as requested, and MUST NOT assume that the content of the file to be uploaded is the same each time. This URL MUST NOT include the userinfo component, as defined in <<bibref|RFC3986>>.",
+								"datatype": "URL"
+							},
+							"Username": {
+								"type": "string",
+								"read": true,
+								"write": true,
+								"mandatory": true,
+								"protocols": [
+									"usp"
+								],
+								"description": "Username to be used by the Agent to authenticate with the file server. This string is set to <<empty>> if no authentication is required.",
+								"datatype": "string",
+								"range": [
+									{
+										"max": 256
+									}
+								]
+							},
+							"Password": {
+								"type": "string",
+								"read": true,
+								"write": true,
+								"mandatory": true,
+								"protocols": [
+									"usp"
+								],
+								"description": "Password to be used by the Agent to authenticate with the file server. This string is set to <<empty>> if no authentication is required.",
+								"datatype": "string",
+								"range": [
+									{
+										"max": 256
+									}
+								]
+							}
+						}
+					},
+					"Remove()": {
+						"type": "command",
+						"async": true,
+						"protocols": [
+							"usp"
+						]
+					}
+				}
+			},
+			"Device.DeviceInfo.ProcessFaults.": {
+				"type": "object",
+				"version": "2.17",
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"description": "Monitoring process faults and configuring the operating system to generate crash dumps and core files is essential for diagnosing and troubleshooting issues with applications and processes.",
+				"access": false,
+				"array": false,
+				"StoragePath": {
+					"type": "string",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Path where the process fault logs must be stored.",
+					"datatype": "string"
+				},
+				"LastUpgradeCount": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Total number of process faults which occured since last firmware upgrade.",
+					"datatype": "unsignedInt"
+				},
+				"PreviousBootCount": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "The number of process faults which occurred during the previous boot cycle.",
+					"datatype": "unsignedInt"
+				},
+				"MinFreeSpace": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Minimum free space in <<units>> on the device that must be free before attempting to create a <<object|ProcessFault>> instance. This setting does not affect the counting of process faults.",
+					"datatype": "unsignedInt",
+					"unit": "KiB"
+				},
+				"MaxProcessFaultEntries": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "The maximum number of entries available in the <<object|ProcessFault>> table. Defines the maximum number of <<object|ProcessFault>> instances that can be stored on the device. If this limit is hit, No new <<object|ProcessFault>> instances will be created until sufficient process fault instances are removed. Set this parameter to 0 to completely disable the creation of <<object|ProcessFault>> instances. Reducing the <<param>> will cause for the implementation to delete the oldest <<object|ProcessFault>> instances. This setting does not affect the counting of process faults.",
+					"datatype": "unsignedInt"
+				},
+				"ProcessFaultNumberOfEntries": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "<<numentries>>",
+					"datatype": "unsignedInt"
+				},
+				"RemoveAllProcessFaults()": {
+					"type": "command",
+					"async": true,
+					"protocols": [
+						"usp"
+					]
+				},
+				"Device.DeviceInfo.ProcessFaults.ProcessFault.{i}.": {
+					"type": "object",
+					"version": "2.17",
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Each table entry represents a process fault that is stored on the device.",
+					"uniqueKeys": [
+						"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": "Alias",
+						"range": [
+							{
+								"max": 64
+							}
+						]
+					},
+					"ProcessID": {
+						"type": "string",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Process ID of the process that crashed.",
+						"datatype": "string"
+					},
+					"ProcessName": {
+						"type": "string",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Process Name of the process that crashed.",
+						"datatype": "string"
+					},
+					"FaultLocation": {
+						"type": "string",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Specifies the location of where to create and keep the process fault logs. Can either be a relative path or file within the <<param|#.StoragePath>> location.",
+						"datatype": "string"
+					},
+					"TimeStamp": {
+						"type": "dateTime",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "The time when the process fault occured.",
+						"datatype": "dateTime"
+					},
+					"FirmwareVersion": {
+						"type": "string",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "The firmware version that triggered the the process fault.",
+						"datatype": "string"
+					},
+					"Arguments": {
+						"type": "string",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "The command arguments that were used to start to the process.",
+						"datatype": "string"
+					},
+					"Reason": {
+						"type": "string",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "The reason why the process fault occurred.",
+						"datatype": "string"
+					},
+					"Upload()": {
+						"type": "command",
+						"async": true,
+						"protocols": [
+							"usp"
+						],
+						"input": {
+							"URL": {
+								"type": "string",
+								"read": true,
+								"write": true,
+								"mandatory": true,
+								"protocols": [
+									"usp"
+								],
+								"description": "The <<datatype>> specifying the destination file location. The HTTPS transport MUST be supported, and the HTTP transport MAY be supported. This argument specifies only the destination file location, and does not indicate in any way the name or location of the local file to be uploaded. If the Agent receives multiple upload requests with the same URL, the Agent MUST perform each upload as requested, and MUST NOT assume that the content of the file to be uploaded is the same each time. This URL MUST NOT include the userinfo component, as defined in <<bibref|RFC3986>>.",
+								"datatype": "URL"
+							},
+							"Username": {
+								"type": "string",
+								"read": true,
+								"write": true,
+								"mandatory": true,
+								"protocols": [
+									"usp"
+								],
+								"description": "Username to be used by the Agent to authenticate with the file server. This string is set to <<empty>> if no authentication is required.",
+								"datatype": "string",
+								"range": [
+									{
+										"max": 256
+									}
+								]
+							},
+							"Password": {
+								"type": "string",
+								"read": true,
+								"write": true,
+								"mandatory": true,
+								"protocols": [
+									"usp"
+								],
+								"description": "Password to be used by the Agent to authenticate with the file server. This string is set to <<empty>> if no authentication is required.",
+								"datatype": "string",
+								"range": [
+									{
+										"max": 256
+									}
+								]
+							}
+						}
+					},
+					"Remove()": {
+						"type": "command",
+						"async": true,
+						"protocols": [
+							"usp"
+						]
+					}
+				}
+			},
 			"Device.DeviceInfo.SupportedDataModel.{i}.": {
 				"type": "object",
 				"version": "2.0",
@@ -4923,7 +5631,7 @@
 					"cwmp",
 					"usp"
 				],
-				"description": "The server the CPE can check to see if an update is available for direct download to it.<<np>>This MUST NOT be used by the CPE if the <<param|#.ManagementServer.UpgradesManaged>> parameter is <<true>>.",
+				"description": "The server the CPE can check to see if an update is available for direct download to it. This MUST NOT be used by the CPE if the <<param|#.ManagementServer.UpgradesManaged>> parameter is <<true>>.",
 				"datatype": "string",
 				"range": [
 					{
@@ -4939,7 +5647,7 @@
 					"cwmp",
 					"usp"
 				],
-				"description": "The server where a user can check via a web browser if an update is available for download to a PC.<<np>>This MUST NOT be used by the CPE if the <<param|#.ManagementServer.UpgradesManaged>> parameter is <<true>>.",
+				"description": "The server where a user can check via a web browser if an update is available for download to a PC. This MUST NOT be used by the CPE if the <<param|#.ManagementServer.UpgradesManaged>> parameter is <<true>>.",
 				"datatype": "string",
 				"range": [
 					{
@@ -5053,15 +5761,15 @@
 					]
 				},
 				"Order": {
-					"type": "unsignedInt",
+					"type": "string",
 					"read": true,
 					"write": true,
 					"protocols": [
 						"cwmp",
 						"usp"
 					],
-					"description": "Position of the <<object>> entry in the order of precedence. A value of 1 indicates the first entry considered (highest precedence). For each incoming connection, the highest ordered entry that matches the Host: HTTP header and path prefix is applied. All lower <<param>> entries are ignored. When this value is set, if the value matches that of an existing entry, the <<param>> value for the existing entry and all lower <<param>> entries is 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.",
-					"datatype": "unsignedInt",
+					"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). | 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). For each incoming connection, the highest ordered entry that matches the Host: HTTP header and path prefix is applied. All lower <<param>> entries are ignored.",
+					"datatype": "Order",
 					"range": [
 						{
 							"min": 1
@@ -5148,7 +5856,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "The IP or Logical Interface associated with the <<object>> entry. Example: * Device.IP.Interface.1. * Device.Logical.Interface.1. <<template|INTERFACE-ROUTING>>",
+					"description": "The IP or Logical Interface associated with the <<object>> entry. Example: * Device.IP.Interface.1 * Device.Logical.Interface.1 <<template|INTERFACE-ROUTING>>",
 					"datatype": "string",
 					"range": [
 						{
@@ -5177,7 +5885,7 @@
 				"Protocol": {
 					"type": "string",
 					"read": true,
-					"write": false,
+					"write": true,
 					"protocols": [
 						"cwmp",
 						"usp"
@@ -5325,11 +6033,11 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "Web server session list.",
+					"description": "Web server session list. Note: This parameter was demoted to readOnly in the Device:2.17 version.",
 					"uniqueKeys": [
 						"SessionID"
 					],
-					"access": true,
+					"access": false,
 					"array": true,
 					"SessionID": {
 						"type": "string",
@@ -5350,12 +6058,12 @@
 					"User": {
 						"type": "string",
 						"read": true,
-						"write": true,
+						"write": false,
 						"protocols": [
 							"cwmp",
 							"usp"
 						],
-						"description": "The user to whom the session belongs. When the user is unknown <<empty>> string SHOULD be used.",
+						"description": "The user to whom the session belongs. When the user is unknown <<empty>> string SHOULD be used. Note: This parameter was demoted to readOnly in the Device:2.17 version.",
 						"datatype": "string",
 						"range": [
 							{
@@ -6807,6 +7515,38 @@
 					"datatype": "int",
 					"unit": "0.1dBmV"
 				},
+				"XTURVersion": {
+					"type": "string",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"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, encoded in this order and separated by a space character, i.e., (xTU-R firmware version) (xTU-R model).",
+					"datatype": "string",
+					"range": [
+						{
+							"max": 16
+						}
+					]
+				},
+				"XTURSerial": {
+					"type": "string",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"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 the equipment firmware version. All shall be encoded in this order and separated by space characters, i.e., (equipment serial number) (equipment model) (equipment firmware version).",
+					"datatype": "string",
+					"range": [
+						{
+							"max": 32
+						}
+					]
+				},
 				"XTURVendor": {
 					"type": "hexBinary",
 					"read": true,
@@ -6824,6 +7564,23 @@
 						}
 					]
 				},
+				"XTURVendorSpecific": {
+					"type": "hexBinary",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "xTU-R vendor-specific information as defined in <<bibref|G.994.1>>. This corresponds to the two-octet vendor-specific information, which MUST be represented as four hexadecimal digits. Note: This parameter is OPTIONAL at the G and S/T interfaces in G.997.1 Amendment 1. If the parameter is implemented but no value is available, it MUST have the value 0000. Note: In <<bibref|G.997.1>>, this parameter is called xTU-R G.994.1 Vendor ID. See ITU-T Recommendation <<bibref|G.997.1>>.",
+					"datatype": "hexBinary",
+					"range": [
+						{
+							"min": 2,
+							"max": 2
+						}
+					]
+				},
 				"XTURCountry": {
 					"type": "hexBinary",
 					"read": true,
@@ -6841,6 +7598,57 @@
 						}
 					]
 				},
+				"XTURSystemVendor": {
+					"type": "hexBinary",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"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 be represented as eight hexadecimal digits as defined in <<bibref|G.994.1>> as Vendor ID.",
+					"datatype": "hexBinary",
+					"range": [
+						{
+							"min": 4,
+							"max": 4
+						}
+					]
+				},
+				"XTURSystemVendorSpecific": {
+					"type": "hexBinary",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "xTU-R system vendor-specific information as defined in <<bibref|G.997.1|Section 7.4.4>>. This corresponds to the two-octet vendor-specific information, which MUST be represented as four hexadecimal digits as defined in <<bibref|G.994.1>> as Vendor ID. Note: If the parameter is implemented but no value is available, it MUST have the value 0000.",
+					"datatype": "hexBinary",
+					"range": [
+						{
+							"min": 2,
+							"max": 2
+						}
+					]
+				},
+				"XTURSystemCountry": {
+					"type": "hexBinary",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"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 in <<bibref|G.997.1>> MUST be represented as four hexadecimal digits.",
+					"datatype": "hexBinary",
+					"range": [
+						{
+							"min": 2,
+							"max": 2
+						}
+					]
+				},
 				"XTURANSIStd": {
 					"type": "unsignedInt",
 					"read": true,
@@ -6863,6 +7671,39 @@
 					"description": "xTU-R Vendor Revision Number as defined in T1.413 Issue 2. When T1.413 modulation is not in use, the parameter value SHOULD be 0.",
 					"datatype": "unsignedInt"
 				},
+				"XTUCVersion": {
+					"type": "hexBinary",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "The xTU-C version number is the version number as inserted by the xTU-C in the overhead messages (<<bibref|G.992.3>>, <<bibref|G.992.4>>, <<bibref|G.992.5>> and <<bibref|G.993.2>>). It is for version control and is vendor specific information. It consists of up to 16 binary octets.",
+					"datatype": "hexBinary",
+					"range": [
+						{
+							"min": 16,
+							"max": 16
+						}
+					]
+				},
+				"XTUCSerial": {
+					"type": "string",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "xTU-C serial number as defined in <<bibref|G.997.1|Section 7.4.7>>. This corresponds to the equipment serial number.",
+					"datatype": "string",
+					"range": [
+						{
+							"max": 32
+						}
+					]
+				},
 				"XTUCVendor": {
 					"type": "hexBinary",
 					"read": true,
@@ -6880,6 +7721,23 @@
 						}
 					]
 				},
+				"XTUCVendorSpecific": {
+					"type": "hexBinary",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "xTU-C vendor-specific information as defined in <<bibref|G.997.1|Section 7.4.3>>. This corresponds to the two-octet vendor-specific information, which MUST be represented as four hexadecimal digits as defined in G.994.1 as Vendor ID.",
+					"datatype": "hexBinary",
+					"range": [
+						{
+							"min": 2,
+							"max": 2
+						}
+					]
+				},
 				"XTUCCountry": {
 					"type": "hexBinary",
 					"read": true,
@@ -6897,6 +7755,57 @@
 						}
 					]
 				},
+				"XTUCSystemVendor": {
+					"type": "hexBinary",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"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 be represented as eight hexadecimal digits as defined in <<bibref|G.994.1>> as Vendor ID..",
+					"datatype": "hexBinary",
+					"range": [
+						{
+							"min": 4,
+							"max": 4
+						}
+					]
+				},
+				"XTUCSystemVendorSpecific": {
+					"type": "hexBinary",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "xTU-C system vendor-specific information as defined in <<bibref|G.997.1|Section 7.4.4>>. This corresponds to the two-octet vendor-specific information, which MUST be represented as four hexadecimal digits as defined in <<bibref|G.994.1>> as Vendor ID.. Note: If the parameter is implemented but no value is available, it MUST have the value 0000.",
+					"datatype": "hexBinary",
+					"range": [
+						{
+							"min": 2,
+							"max": 2
+						}
+					]
+				},
+				"XTUCSystemCountry": {
+					"type": "hexBinary",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"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 in G.997.1 MUST be represented as four hexadecimal digits.",
+					"datatype": "hexBinary",
+					"range": [
+						{
+							"min": 2,
+							"max": 2
+						}
+					]
+				},
 				"XTUCANSIStd": {
 					"type": "unsignedInt",
 					"read": true,
@@ -13230,7 +14139,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.>>",
+					"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>>",
 					"datatype": "Dbm1000"
 				},
 				"UpperOpticalThreshold": {
@@ -13241,7 +14150,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.>>",
+					"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>>",
 					"datatype": "Dbm1000"
 				},
 				"TransmitOpticalLevel": {
@@ -13263,7 +14172,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.>>",
+					"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>>",
 					"datatype": "Dbm1000"
 				},
 				"UpperTransmitPowerThreshold": {
@@ -13274,7 +14183,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.>>",
+					"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>>",
 					"datatype": "Dbm1000"
 				},
 				"Device.Optical.Interface.{i}.Stats.": {
@@ -17514,7 +18423,7 @@
 					"cwmp",
 					"usp"
 				],
-				"description": "Ethernet interface table (a stackable interface object as described in <<bibref|TR-181i2|Section 4.2>>). This table models physical Ethernet ports, but in terms of the interface stack it only models the PHY and Connection Access Method of the Ethernet interface MAC. A <<object|#.Interface>> is also required to model a full Ethernet device.",
+				"description": "Ethernet interface table (a stackable interface object as described in <<bibref|TR-181i2|Section 4.2>>). This table models physical Ethernet ports, but in terms of the interface stack it only models the PHY and Connection Access Method of the Ethernet interface MAC. A <<object|#.Link>> is also required to model a full Ethernet device.",
 				"uniqueKeys": [
 					"Alias",
 					"Name"
@@ -17721,6 +18630,23 @@
 					"description": "Whether Energy Efficient Ethernet <<bibref|802.3-2012_section6|Section 78>> support is currently enabled. When enabled, this ethernet port will be capable of entering or exiting Low Power Idle (LPI) mode.",
 					"datatype": "boolean"
 				},
+				"EEEStatus": {
+					"type": "string",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Indicates the active state of Energy Efficient Ethernet <<bibref|802.3-2012_section6|Section 78>>. The <<enum|Disabled>> value indicates that <<param|EEEEnable>> is disabled. The <<enum|Active>> value indicates that <<param|EEEEnable>> is enabled and that EEE support has been negotiated with the link partner. In this state EEE will be used. The <<enum|Inactive>> value indicates that <<param|EEEEnable>> is disabled, or that EEE support has not been negotiated with the link partner, either because the link parter is not EEE capable, or its support for EEE is disabled. The <<enum|Unsupported>> value indicates that this physical interface does not support EEE. In which case <<param|EEECapability>> will be <<false>>.",
+					"datatype": "string",
+					"enumerations": [
+						"Disabled",
+						"Active",
+						"Inactive",
+						"Unsupported"
+					]
+				},
 				"Device.Ethernet.Interface.{i}.Stats.": {
 					"type": "object",
 					"version": "2.0",
@@ -22314,6 +23240,72 @@
 				],
 				"access": false,
 				"array": true,
+				"AccessControlNumberOfEntries": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "<<numentries>>",
+					"datatype": "unsignedInt"
+				},
+				"RlapmNumberOfEntries": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "<<numentries>>",
+					"datatype": "unsignedInt"
+				},
+				"SapmNumberOfEntries": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "<<numentries>>",
+					"datatype": "unsignedInt"
+				},
+				"MeshNumberOfEntries": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "<<numentries>>",
+					"datatype": "unsignedInt"
+				},
+				"BridgeNumberOfEntries": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "<<numentries>>",
+					"datatype": "unsignedInt"
+				},
+				"MeshScModNumberOfEntries": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "<<numentries>>",
+					"datatype": "unsignedInt"
+				},
 				"Enable": {
 					"type": "boolean",
 					"read": true,
@@ -22323,6 +23315,7 @@
 						"usp"
 					],
 					"description": "Enables or disables the interface. This parameter is based on ifAdminStatus from <<bibref|RFC2863>>.",
+					"default": "true",
 					"datatype": "boolean"
 				},
 				"Status": {
@@ -22458,33 +23451,31 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "The maximum MoCA PHY bit rate (expressed in <<units>>).",
+					"description": "The maximum MoCA PHY bit rate (expressed in <<units>>). This parameter MUST NOT be implemented for MoCA 2.0 because it doesnt map to a MIB object.",
 					"datatype": "unsignedInt",
 					"unit": "Mbps"
 				},
 				"MaxIngressBW": {
-					"type": "unsignedInt",
+					"type": "string",
 					"read": true,
 					"write": false,
 					"protocols": [
 						"cwmp",
 						"usp"
 					],
-					"description": "The maximum bandwidth of this interface for flows onto the MoCA network in <<units>>. This parameter is based on mocaIfMaxIngressNodeBw from <<bibref|MOCA11-MIB>>.",
-					"datatype": "unsignedInt",
-					"unit": "Mbps"
+					"description": "The maximum bandwidth of this interface for flows onto the MoCA network. This parameter is based on mocaIfMaxIngressNodeBw from <<bibref|MOCA11-MIB>>.",
+					"datatype": "MocaMacRate"
 				},
 				"MaxEgressBW": {
-					"type": "unsignedInt",
+					"type": "string",
 					"read": true,
 					"write": false,
 					"protocols": [
 						"cwmp",
 						"usp"
 					],
-					"description": "The maximum bandwidth of this interface for flows from the MoCA network in <<units>>. This parameter is based on mocaIfMaxEgressNodeBw from <<bibref|MOCA11-MIB>>.",
-					"datatype": "unsignedInt",
-					"unit": "Mbps"
+					"description": "The maximum bandwidth of this interface for flows from the MoCA network. This parameter is based on mocaIfMaxEgressNodeBw from <<bibref|MOCA11-MIB>>.",
+					"datatype": "MocaMacRate"
 				},
 				"HighestVersion": {
 					"type": "string",
@@ -22525,7 +23516,7 @@
 					]
 				},
 				"NetworkCoordinator": {
-					"type": "unsignedInt",
+					"type": "string",
 					"read": true,
 					"write": false,
 					"protocols": [
@@ -22533,10 +23524,16 @@
 						"usp"
 					],
 					"description": "The Node ID of the current Network Coordinator (NC) for the MoCA network. This parameter is based on mocaIfNC from <<bibref|MOCA11-MIB>>.",
-					"datatype": "unsignedInt"
+					"datatype": "MocaNodeID",
+					"range": [
+						{
+							"min": 0,
+							"max": 15
+						}
+					]
 				},
 				"NodeID": {
-					"type": "unsignedInt",
+					"type": "string",
 					"read": true,
 					"write": false,
 					"protocols": [
@@ -22544,7 +23541,13 @@
 						"usp"
 					],
 					"description": "The Node ID of this interface. This parameter is based on mocaIfNodeID from <<bibref|MOCA11-MIB>>.",
-					"datatype": "unsignedInt"
+					"datatype": "MocaNodeID",
+					"range": [
+						{
+							"min": 0,
+							"max": 15
+						}
+					]
 				},
 				"MaxNodes": {
 					"type": "boolean",
@@ -22554,9 +23557,26 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "The maximum network node capability supported by the interface. If <<param>> is <<true>> then the interface supports 16 nodes (the maximum for a MoCA 1.1 network). If <<param>> is false then the interface supports 8 nodes (the maximum for a MoCA 1.0 network).",
+					"description": "The maximum network node capability supported by the interface. If <<param>> is <<true>> then the interface supports 16 nodes (the maximum for a MoCA 1.1 network). If <<param>> is false then the interface supports 8 nodes (the maximum for a MoCA 1.0 network). This parameter MUST NOT be implemented for MoCA 2.0 because it doesnt map to a MIB object.",
 					"datatype": "boolean"
 				},
+				"NumNodes": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "The numbers of 1s in the GCD_BITMASK field reported in Type I Probe Reports. This value corresponds to the number of MoCA Nodes that this MoCA Node communicates to in the MoCA network. This value may be smaller than the number of MoCA Nodes reported by the NC Node. See <<bibref|MoCAv1.1|Section 3.6.3.2>>.",
+					"datatype": "unsignedInt",
+					"range": [
+						{
+							"min": 0,
+							"max": 16
+						}
+					]
+				},
 				"PreferredNC": {
 					"type": "boolean",
 					"read": true,
@@ -22566,10 +23586,11 @@
 						"usp"
 					],
 					"description": "Whether this interface is a preferred Network Coordinator (NC). This parameter is based on mocaIfPreferredNC from <<bibref|MOCA11-MIB>>.",
+					"default": "false",
 					"datatype": "boolean"
 				},
 				"BackupNC": {
-					"type": "unsignedInt",
+					"type": "string",
 					"read": true,
 					"write": false,
 					"protocols": [
@@ -22577,7 +23598,13 @@
 						"usp"
 					],
 					"description": "The Node ID of the backup Network Coordinator node. This parameter is based on mocaIfBackupNC from <<bibref|MOCA11-MIB>>.",
-					"datatype": "unsignedInt"
+					"datatype": "MocaNodeID",
+					"range": [
+						{
+							"min": 0,
+							"max": 15
+						}
+					]
 				},
 				"PrivacyEnabledSetting": {
 					"type": "boolean",
@@ -22587,7 +23614,8 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "The configured privacy mode. This indicates whether link-layer security is enabled (<<true>>) or disabled (<<false>>) for network admission. The configured privacy setting MAY NOT match the current operational state (<<param|PrivacyEnabled>>), since this setting is only applied during network formation or admission.",
+					"description": "The configured privacy mode. This indicates whether link-layer security is enabled (<<true>>) or disabled (<<false>>) for network admission.",
+					"default": "false",
 					"datatype": "boolean"
 				},
 				"PrivacyEnabled": {
@@ -22598,19 +23626,134 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "Indicates whether link-layer security is enabled or disabled. This parameter is based on mocaIfPrivacyEnable from <<bibref|MOCA11-MIB>>.",
+					"description": "Indicates whether link-layer security is enabled or disabled. This parameter is based on mocaIfPrivacyEnable from <<bibref|MOCA11-MIB>>. <<deprecated|2.17|because it and <<param|PrivacyEnabledSetting>> are associated with the same underlying MIB object and it is therefore unnecessary. If implemented, it MUST return the same value as <<param|PrivacyEnabledSetting>>>>",
+					"datatype": "boolean"
+				},
+				"AccessControlEnable": {
+					"type": "boolean",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Enable MAC address access control on the MoCA interface if this value is <<true>>. Disable MAC address access control on the MoCA interface if this value is <<false>>. Access control applies to subsequent MoCA Node admission.",
+					"default": "false",
+					"datatype": "boolean"
+				},
+				"PhyThreshold": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "The minimum PHY rate. If transmit PHY rate between all pairs of MoCA Nodes are greater than or equal to this value, and subsequently the transmit PHY rate of one pair of MoCA Nodes is less than this value, send <<param|BelowPhyThresholdTrap>> if <<param|PhyThresholdTrapEnable>> is <<true>>. If transmit PHY rate between one or more pairs of MoCA Nodes are less than this value, and subsequently the transmit PHY rate between all pairs of MoCA Nodes are greater than or equal to this value, send <<param|AbovePhyThresholdTrap>> if <<param|PhyThresholdTrapEnable>> is <<true>>. See <<bibref|MoCAv2.0|Section 3, Unusable Link definition>>.",
+					"default": "123",
+					"datatype": "MocaPhyRate",
+					"range": [
+						{
+							"min": 0,
+							"max": 2048
+						}
+					]
+				},
+				"PhyThresholdTrapEnable": {
+					"type": "boolean",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "If transmit PHY rate between all pairs of MoCA Nodes are greater than or equal to <<param|PhyThreshold>>, and subsequently the transmit PHY rate of one pair of MoCA Node is less than <<param|PhyThreshold>>, send <<param|BelowPhyThresholdTrap>> if this value is <<true>>, do not send <<param|BelowPhyThresholdTrap>> if this value is <<false>>. If transmit PHY rate between one or more pairs of MoCA Nodes are less than <<param|PhyThreshold>>, and subsequently the transmit PHY rate between all pairs of MoCA Nodes are greater than or equal to <<param|PhyThreshold>>, send <<param|AbovePhyThresholdTrap>> if this value is <<true>>, do not send <<param|AbovePhyThresholdTrap>> if this value is <<false>>. Only one MoCA Node in the MoCA network should set <<param>> to <<true>>. Only one MoCA Node in the MoCA network should set <<param>> to <<true>>.",
+					"default": "false",
+					"datatype": "boolean"
+				},
+				"StatusChangeEnable": {
+					"type": "boolean",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "If <<param>> is <<true>> and <<param|Status>> changes, then the trap <<param|StatusChangeTrap>> is sent.",
+					"default": "false",
+					"datatype": "boolean"
+				},
+				"NumNodesChangeEnable": {
+					"type": "boolean",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "If <<param>> is <<true>> and <<param|NumNodes>> changes, then the trap <<param|NumNodesChangeTrap>> is sent. Only one MoCA Node in the MoCA network should set <<param>> to <<true>>.",
+					"default": "false",
+					"datatype": "boolean"
+				},
+				"TpcTargetRateNper": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"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 transmitting and receiving MoCA Nodes when TPC is enabled and PERMODE = NPER.",
+					"datatype": "MocaPhyRate",
+					"range": [
+						{
+							"min": 0,
+							"max": 2048
+						}
+					]
+				},
+				"Band": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Configure the band or sub-band for the MoCA Node to operate in (BND Managed Parameter). See <<bibref|MoCAv2.0|section 15>>.",
+					"datatype": "MocaBand",
+					"enumerations": [
+						"reserved",
+						"bandFCBL",
+						"bandFSAT",
+						"bandE",
+						"bandExD",
+						"bandDH",
+						"bandDL",
+						"noBand"
+					]
+				},
+				"LastOperFreqUpdateEnable": {
+					"type": "boolean",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Controls whether the LOF is updated when joining a network (LOF_UPDATE_EN Managed Parameter). See <<bibref|MoCAv2.0|section 8.1.1, and Table 17-1>>.",
 					"datatype": "boolean"
 				},
 				"FreqCapabilityMask": {
-					"type": "hexBinary",
+					"type": "string",
 					"read": true,
 					"write": false,
 					"protocols": [
 						"cwmp",
 						"usp"
 					],
-					"description": "Hexadecimal encoded 64-bit mask of supported frequencies. This is the bit map of the spectrum that the interface supports, and each bit represents 25 MHz of spectrum. The least significant bit of the rightmost character corresponds to 800MHz, which is the lowest frequency. For example, an interface that supports 1150 MHz through 1500 MHz would have a value of 0x000000001FFFC000. This parameter is based on mocaIfCapabilityMask from <<bibref|MOCA11-MIB>>.",
-					"datatype": "hexBinary",
+					"description": "The frequencies that the interface supports. Represents one or more MoCA channel RF center frequencies using a hexadecimal encoded 64-bit mask. Bit 63 (the leftmost bit of the leftmost character) is the most significant bit (highest frequency), and bit 0 (the rightmost bit of the rightmost character) is the least significant bit (lowest frequency). Not all bits are valid MoCA channels. Each bit represents 25 MHz of spectrum, but the mapping from bits to frequencies varies with the MoCA version: * MoCA 1.0 and MoCA 1.1: bits 63 through 32 are not used, bit 31 represents 1575 MHz and bit 0 represents 800 MHz * MoCA 2.0 and MoCA 2.5: bit 63 represents 1975 MHz and bit 0 represents 400 MHz For example, a MoCA 1.0 or MoCA 1.1 interface would use 0x000000001FFFC000 to represent 1150 MHz through 1500 MHz. Note that the MoCA version is indicated by the <<param|HighestVersion>> parameter. | Represents one or more MoCA channel RF center frequencies using a hexadecimal encoded 64-bit mask. Bit 63 (the leftmost bit of the leftmost character) is the most significant bit (highest frequency), and bit 0 (the rightmost bit of the rightmost character) is the least significant bit (lowest frequency). Not all bits are valid MoCA channels. Each bit represents 25 MHz of spectrum, but the mapping from bits to frequencies varies with the MoCA version: * MoCA 1.0 and MoCA 1.1: bits 63 through 32 are not used, bit 31 represents 1575 MHz and bit 0 represents 800 MHz * MoCA 2.0 and MoCA 2.5: bit 63 represents 1975 MHz and bit 0 represents 400 MHz For example, a MoCA 1.0 or MoCA 1.1 interface would use 0x000000001FFFC000 to represent 1150 MHz through 1500 MHz. Note that the MoCA version is indicated by the <<param|HighestVersion>> parameter.",
+					"datatype": "MocaChannelMask",
 					"range": [
 						{
 							"min": 8,
@@ -22619,15 +23762,15 @@
 					]
 				},
 				"FreqCurrentMaskSetting": {
-					"type": "hexBinary",
+					"type": "string",
 					"read": true,
 					"write": true,
 					"protocols": [
 						"cwmp",
 						"usp"
 					],
-					"description": "The configured hexadecimal encoded 64-bit mask of enabled frequencies for network admission. The configured frequencies MAY NOT match the current operational state (<<param|FreqCurrentMask>>), since this setting is only applied during network formation or admission.",
-					"datatype": "hexBinary",
+					"description": "The enabled frequencies that the interface supports for network admission. Represents one or more MoCA channel RF center frequencies using a hexadecimal encoded 64-bit mask. Bit 63 (the leftmost bit of the leftmost character) is the most significant bit (highest frequency), and bit 0 (the rightmost bit of the rightmost character) is the least significant bit (lowest frequency). Not all bits are valid MoCA channels. Each bit represents 25 MHz of spectrum, but the mapping from bits to frequencies varies with the MoCA version: * MoCA 1.0 and MoCA 1.1: bits 63 through 32 are not used, bit 31 represents 1575 MHz and bit 0 represents 800 MHz * MoCA 2.0 and MoCA 2.5: bit 63 represents 1975 MHz and bit 0 represents 400 MHz For example, a MoCA 1.0 or MoCA 1.1 interface would use 0x000000001FFFC000 to represent 1150 MHz through 1500 MHz. Note that the MoCA version is indicated by the <<param|HighestVersion>> parameter. | Represents one or more MoCA channel RF center frequencies using a hexadecimal encoded 64-bit mask. Bit 63 (the leftmost bit of the leftmost character) is the most significant bit (highest frequency), and bit 0 (the rightmost bit of the rightmost character) is the least significant bit (lowest frequency). Not all bits are valid MoCA channels. Each bit represents 25 MHz of spectrum, but the mapping from bits to frequencies varies with the MoCA version: * MoCA 1.0 and MoCA 1.1: bits 63 through 32 are not used, bit 31 represents 1575 MHz and bit 0 represents 800 MHz * MoCA 2.0 and MoCA 2.5: bit 63 represents 1975 MHz and bit 0 represents 400 MHz For example, a MoCA 1.0 or MoCA 1.1 interface would use 0x000000001FFFC000 to represent 1150 MHz through 1500 MHz. Note that the MoCA version is indicated by the <<param|HighestVersion>> parameter. The configured frequencies might not match the current operational state (<<param|FreqCurrentMask>>), since this setting is only applied during network formation or admission.",
+					"datatype": "MocaChannelMask",
 					"range": [
 						{
 							"min": 8,
@@ -22636,15 +23779,15 @@
 					]
 				},
 				"FreqCurrentMask": {
-					"type": "hexBinary",
+					"type": "string",
 					"read": true,
 					"write": false,
 					"protocols": [
 						"cwmp",
 						"usp"
 					],
-					"description": "Hexadecimal encoded 64-bit mask of used frequencies. This is the bit map of the spectrum that can be used and is a subset of the <<param|FreqCapabilityMask>>. Each bit represents 25 MHz of spectrum. The least significant bit of the rightmost character corresponds to 800MHz, which is the lowest frequency. This parameter is based on mocaIfChannelMask from <<bibref|MOCA11-MIB>>.",
-					"datatype": "hexBinary",
+					"description": "The frequencies that can be used. This is a subset of the <<param|FreqCapabilityMask>> frequencies. Represents one or more MoCA channel RF center frequencies using a hexadecimal encoded 64-bit mask. Bit 63 (the leftmost bit of the leftmost character) is the most significant bit (highest frequency), and bit 0 (the rightmost bit of the rightmost character) is the least significant bit (lowest frequency). Not all bits are valid MoCA channels. Each bit represents 25 MHz of spectrum, but the mapping from bits to frequencies varies with the MoCA version: * MoCA 1.0 and MoCA 1.1: bits 63 through 32 are not used, bit 31 represents 1575 MHz and bit 0 represents 800 MHz * MoCA 2.0 and MoCA 2.5: bit 63 represents 1975 MHz and bit 0 represents 400 MHz For example, a MoCA 1.0 or MoCA 1.1 interface would use 0x000000001FFFC000 to represent 1150 MHz through 1500 MHz. Note that the MoCA version is indicated by the <<param|HighestVersion>> parameter. | Represents one or more MoCA channel RF center frequencies using a hexadecimal encoded 64-bit mask. Bit 63 (the leftmost bit of the leftmost character) is the most significant bit (highest frequency), and bit 0 (the rightmost bit of the rightmost character) is the least significant bit (lowest frequency). Not all bits are valid MoCA channels. Each bit represents 25 MHz of spectrum, but the mapping from bits to frequencies varies with the MoCA version: * MoCA 1.0 and MoCA 1.1: bits 63 through 32 are not used, bit 31 represents 1575 MHz and bit 0 represents 800 MHz * MoCA 2.0 and MoCA 2.5: bit 63 represents 1975 MHz and bit 0 represents 400 MHz For example, a MoCA 1.0 or MoCA 1.1 interface would use 0x000000001FFFC000 to represent 1150 MHz through 1500 MHz. Note that the MoCA version is indicated by the <<param|HighestVersion>> parameter.",
+					"datatype": "MocaChannelMask",
 					"range": [
 						{
 							"min": 8,
@@ -22666,14 +23809,26 @@
 				"LastOperFreq": {
 					"type": "unsignedInt",
 					"read": true,
-					"write": false,
+					"write": true,
 					"protocols": [
 						"cwmp",
 						"usp"
 					],
-					"description": "Last Operational Frequency. The RF frequency in Hz to which the MoCA interface was tuned when last in the <<enum|Up|Status>> state. This parameter is based on mocaIfLOF from <<bibref|MOCA11-MIB>>.",
+					"description": "Last Operational Frequency. The RF frequency in Hz to which the MoCA interface was tuned when last in the <<enum|Up|Status>> state. This parameter is based on mocaIfLOF from <<bibref|MOCA11-MIB>>. (LOF Managed Parameter) This parameter is writable only for MoCA 2.0.",
 					"datatype": "unsignedInt"
 				},
+				"TpcEnable": {
+					"type": "boolean",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Enable automatic power control if this value is <<true>>. Use a fixed transmit power level if this value is <<false>>. (TPC_EN Managed Parameter)",
+					"default": "true",
+					"datatype": "boolean"
+				},
 				"KeyPassphrase": {
 					"type": "string",
 					"read": true,
@@ -22694,7 +23849,7 @@
 						"\\d+"
 					]
 				},
-				"TxPowerLimit": {
+				"PerMode": {
 					"type": "unsignedInt",
 					"read": true,
 					"write": true,
@@ -22702,10 +23857,34 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "Transmit Power attenuation in dB relative to the maximum transmit power. The MoCA interface SHOULD have <<param|Enable>> set to <<false>> for any change in this configuration. If the parameter is modified when <<param|Enable>> is <<true>> then this change might take several minutes to complete. This parameter is based on mocaIfTxPowerLimit from <<bibref|MOCA11-MIB>>.",
+					"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 indicates VLPER. By default PER mode is set to 1 in band E, while it is set to 0 for all other bands (PER_MODE Managed Parameter). See <<bibref|MoCAv2.0|section 8.2 and Table 17-2>>.",
 					"datatype": "unsignedInt"
 				},
-				"PowerCntlPhyTarget": {
+				"TurboModeEnable": {
+					"type": "boolean",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Controls whether the MoCA Node operates in point-to-point Turbo Mode or not. When set to <<true>> the turbo mode is enabled; when set to <<false>> the turbo mode is disabled (TURBO_MODE_EN Managed Parameter). See <<bibref|MoCAv2.0|section 10 and Table 17-1>>.",
+					"default": "false",
+					"datatype": "boolean"
+				},
+				"PolicingEnable": {
+					"type": "boolean",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Controls whether policing of PQoS Flows is enabled or disabled. When <<false>> the policy is disabled, and when <<true>> the policy is enabled (POLICING_EN Managed Parameter). See <<bibref|MoCAv2.0|section 8.8 and Table 17-1>>.",
+					"default": "false",
+					"datatype": "boolean"
+				},
+				"TlpMin": {
 					"type": "unsignedInt",
 					"read": true,
 					"write": true,
@@ -22713,31 +23892,644 @@
 						"cwmp",
 						"usp"
 					],
+					"description": "The minimum time (in milliseconds) a MoCA Node is required to stay in the Listening Phase of the Network Search (TLP_MIN Managed Parameter). See <<bibref|MoCAv2.0|Table 17-2>>.",
+					"default": "0",
+					"datatype": "unsignedInt"
+				},
+				"TlpMax": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "The maximum time (in milliseconds) a MoCA Node is required to stay in the Listening Phase of the Network Search (TLP_MAX Managed Parameter). Default value of <<param>> depends on the band configuration as follows: * 20 seconds for band E * 35 seconds for band F * 95 seconds for Band ExD * 10 seconds for Band D-Low * 55 seconds for Band D-High See <<bibref|MoCAv2.0|section 8.1>>.",
+					"datatype": "unsignedInt"
+				},
+				"RlapmEnable": {
+					"type": "boolean",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"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 MoCA Node needs to ignore it. RLAPM function is enabled when set to <<true>>. RLAPM function is disabled when set to <<false>>. The RLAPM function allows a Node to add a specific global PHY margin (RLAPM) to all the subcarriers bitloadings at each estimated aggregate receive power level. This RLAPM value is obtained from the RLAPM table <<object|Device.MoCA.Interface.<i>.Rlapm.<i>.>>. See <<bibref|MoCAv2.0|section 7.15 and Table 17-1>>.",
+					"datatype": "boolean"
+				},
+				"RlapmProfileSelect": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Controls which RLAPM (Receive Level Added PHY Margin) profile is Active. See <<bibref|MoCAv2.0|section 7.15.2 and Table 17-1>>.",
+					"datatype": "unsignedInt"
+				},
+				"SapmEnable": {
+					"type": "boolean",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"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 Node needs to ignore it. SAPM function is enabled when set to <<true>>. SAPM function is disabled when set to <<false>>. The SAPM function allows a Node to add a prespecified PHY margin to each subcarrier\u2019s bitloading (SAPM value) whenever the aggregate received power levels (ARPLs) are below a pre-specified threshold. This SAPM value is obtained from the SAPM table <<object|Device.MoCA.Interface.<i>.Sapm.<i>.>>. See <<bibref|MoCAv2.0|section 7.15 and Table 17-1>>.",
+					"datatype": "boolean"
+				},
+				"SapmProfileSelect": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Controls which SAPM (Subcarrier Added PHY Margin) profile is Active. See <<bibref|MoCAv2.0|section 7.15.1 and Table 17-1>>.",
+					"datatype": "unsignedInt"
+				},
+				"PowerStateRequest": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Carries a request to the MoCA Node to transition into a specified Power State (POWER_STATE_REQ Managed Parameter). See <<bibref|MoCAv2.0|section 12>>.",
+					"default": "m0Active",
+					"datatype": "MocaPowerState",
+					"enumerations": [
+						"m0Active",
+						"m1LowPowerIdle",
+						"m2Standby",
+						"m3Sleep"
+					]
+				},
+				"SeqNumMr": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Sequence Number used by the MR Transaction (SEQ_NUM_MR Managed Parameter). See <<bibref|MoCAv2.0|section 7.15 and Table 17-1>>.",
+					"default": "0",
+					"datatype": "unsignedInt",
+					"range": [
+						{
+							"min": 0,
+							"max": 65535
+						}
+					]
+				},
+				"PowerStateTrapEnable": {
+					"type": "boolean",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Used for power state message trap. * When set to <<true>> it allows the MoCA Node to report a trap on each Power State transition. * When set to <<false>> no trap report is generated when the MoCA Node Power State changes. See <<bibref|MoCAv2.0|section 12>>.",
+					"default": "false",
+					"datatype": "boolean"
+				},
+				"LmoTrapEnable": {
+					"type": "boolean",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Used for LMO (Link Maintenance Operation) message trap. * When set to <<true>> it allows the MoCA Node to report a trap on transitioning to LMO. * When set to <<false>> no trap report the MoCA Node is not transitioning to LMO. See <<bibref|MoCAv2.0|section 12>>.",
+					"default": "false",
+					"datatype": "boolean"
+				},
+				"PrimaryOffset": {
+					"type": "int",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "The offset in <<units>> of the primary channel relative to the beacon channel (PRIMARY_OFFSET Managed Parameter).",
+					"datatype": "int",
+					"range": [
+						{
+							"min": -25,
+							"max": 25
+						}
+					],
+					"unit": "MHz"
+				},
+				"SecondaryOffset": {
+					"type": "int",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "The offset in <<units>> of the secondary channel relative to the beacon channel (SECONDARY_OFFSET Managed Parameter). A value of 0 indicates that there is no secondary channel.",
+					"datatype": "int",
+					"range": [
+						{
+							"min": -125,
+							"max": 125
+						}
+					],
+					"unit": "MHz"
+				},
+				"BeaconPowerDistributed": {
+					"type": "int",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "The networkwide (see <<param|BeaconPowerMePie>>) value of Beacon transmit power in <<units>> sent by the NC (Network Coordinator) in Beacon Power PIEs (Power Information Elements). A value of 255 indicates that no networkwide PIE is sent. See <<bibref|MoCAv2.5|section 7.1.5 and Table 17-1>>.",
+					"datatype": "int",
+					"range": [
+						{
+							"min": -10,
+							"max": 7
+						},
+						{
+							"min": 255,
+							"max": 255
+						}
+					],
+					"unit": "dBm"
+				},
+				"BeaconPowerLocal": {
+					"type": "int",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "The value of Beacon transmit power in <<units>> used by the Node when it transmits beacons.",
+					"datatype": "int",
+					"range": [
+						{
+							"min": -10,
+							"max": 7
+						}
+					],
+					"unit": "dBm"
+				},
+				"BeaconPowerMePie": {
+					"type": "hexBinary",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "The Beacon Power PIE (Power Information Element) that the ME (Management Entity) wants the NC (Network Coordinator) to send to configure the Beacon Transmit Power of the different nodes. See <<bibref|MoCAv2.5|section 7.1.5>>. This parameter specifies if the Beacon transmit power is intended to set the Beacon Power Local (individual type) or the Beacon Power Distributed (networkwide type) of the selected nodes. It is encoded as specified in <<bibref|MOCA25-MIB|section 4.11>>.",
+					"datatype": "hexBinary",
+					"range": [
+						{
+							"min": 4,
+							"max": 4
+						}
+					]
+				},
+				"BeaconPowerMePieSend": {
+					"type": "boolean",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "When this parameter is written, instructs the Node (in case of Network Coordinator) to send a set of Beacon Power PIEs (Power Information Element) with the Beacon Power PIE fields set as specified in <<param|BeaconPowerMePie>>. See <<bibref|MoCAv2.5|section 7.1.5>>.",
+					"datatype": "boolean"
+				},
+				"BeaconPowerNetConfig": {
+					"type": "boolean",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Controls whether the Node is allowed to configure its Beacon power (both Beacon Power Distributed and Beacon Power Local) according to the Beacon Power PIE (Power Information Element) sent by the NC (Network Coordinator). * When set to true the Node is allowed to configure its Beacon power. * When set to false the Node is not allowed to configure its Beacon power. See <<bibref|MoCAv2.5|section 7.1.5 and Table 17-1>>.",
+					"datatype": "boolean"
+				},
+				"EnhancedPassword": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "The MoCA Enhanced Password using an ASCII printable character. This value must be 12 to 64 ASCII printable characters with decimal codes in the range 33 to 126 inclusive. Access is only allowed when used with SNMPv3 protocol, but not allowed when used with SNMPv1 or SNMPv2c protocol. If this value changes, this node will drop from the network if <<param|PrivacyEnabledSetting>> is <<true>>. If this managed object is changed, it may not be possible to change this object again via the SNMP protocol. The mechanism to change this object again is out of the scope of this MIB definition draft. See <<bibref|MoCAv2.5|section 11.3.1>>.",
+					"datatype": "string",
+					"range": [
+						{
+							"min": 12,
+							"max": 64
+						},
+						{
+							"min": 0,
+							"max": 0
+						}
+					]
+				},
+				"FirstOffset": {
+					"type": "int",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "The offset of the First Channels center frequency below the center frequency of the Primary Channel. Valid values are -4 to 0. See <<bibref|MoCAv2.5|Table 17-1>>.",
+					"datatype": "int",
+					"range": [
+						{
+							"min": -4,
+							"max": 0
+						}
+					]
+				},
+				"HandoffToLowerVersionEnable": {
+					"type": "boolean",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"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 <<false>>. See <<bibref|MoCAv2.5|section 8.11.1 and Table 17-1>>.",
+					"default": "false",
+					"datatype": "boolean"
+				},
+				"MgntEntityNetIePayloadRespTimeout": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "The number of Discovery Request transmission opportunities a NN has to wait for a response to a Management Entity Response Network IE before continuing its network search. See <<bibref|MoCAv2.5|section 8.3.3.2 and Table 17-1>>.",
+					"default": "1000",
+					"datatype": "unsignedInt"
+				},
+				"MgntEntityNetIePayloadTx": {
+					"type": "hexBinary",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "The payload of the Management Entity Request Network IE (when the Node is trying to join the network), or of the Management Entity Response Network IE (when the Node is the NC). 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) >",
+					"datatype": "hexBinary",
+					"range": [
+						{
+							"min": 2,
+							"max": 62
+						}
+					]
+				},
+				"MpsPrivacyDown": {
+					"type": "boolean",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Controls whether the Node, during its MPS (MoCA Protected Setup) session, is allowed to accept privacy setting of Privacy Disabled from another Node when its own setting is Privacy Enabled. This parameter is valid only when <<param|MpsPrivacyReceive>> is set to <<true>>. See <<bibref|MoCAv2.5|section 8.3.1 and Table 17-1>>.",
+					"default": "false",
+					"datatype": "boolean"
+				},
+				"MpsPrivacyReceive": {
+					"type": "boolean",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Controls whether the Node, during its MPS (MoCA Protected Setup) session, is allowed to accept privacy settings (Privacy Enabled / Disabled and Network Password and/or Enhanced Network Password) from another Node. See <<bibref|MoCAv2.5|section 8.3.1 and Table 17-1>>.",
+					"default": "true",
+					"datatype": "boolean"
+				},
+				"MpsReset": {
+					"type": "boolean",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Resets the MPS (MoCA Protected Setup) state of the Node <<param|MpsState>> to un-Paired and reinitializes MPS local variables and relevant parameters when this parameter is written. See <<bibref|MoCAv2.5|Section 8.3.1 and Table 17-1>>.",
+					"datatype": "boolean"
+				},
+				"MpsTriggered": {
+					"type": "boolean",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"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 written. See <<bibref|MoCAv2.5|Section 8.3.1 and Table 17-1>>.",
+					"datatype": "boolean"
+				},
+				"MpsUnpairedTime": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"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 joins a network without using MPS (MoCA Protected Setup). See <<bibref|MoCAv2.5|Section 8.3.1 and Table 17-1>>.",
+					"default": "300",
+					"datatype": "unsignedInt",
+					"unit": "seconds"
+				},
+				"MpsWalkTime": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "The allowed time interval in <<units>> to trigger MPS (MoCA Protected Setup) on two Nodes. See <<bibref|MoCAv2.5|Section 8.3.1 and Table 17-1>>.",
+					"default": "120",
+					"datatype": "unsignedInt",
+					"range": [
+						{
+							"min": 12,
+							"max": 1200
+						}
+					],
+					"unit": "seconds"
+				},
+				"NetworkJoin": {
+					"type": "boolean",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Instructs the NN to join the latest network from which the NN forwarded a Management Entity Response Network IE: Yes if this value is <<true>> and No if this value is <<false>>. See <<bibref|MoCAv2.5|Section 8.3.3 and Table 17-1>>.",
+					"datatype": "boolean"
+				},
+				"NetworkNameAdmissionRule": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Controls which Admission rule to follow. See <<bibref|MoCAv2.5|Section 8.3.3 and Table 17-1>>.",
+					"default": "none",
+					"datatype": "string",
+					"enumerations": [
+						"none",
+						"all",
+						"name",
+						"osp"
+					]
+				},
+				"NetworkNameNcNn": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "The Network Name the Node is to use for any MoCA network it creates. When <<param|NetworkNameAdmissionRule>> is set to <<enum|name|NetworkNameAdmissionRule>>, this object also indicates to the Node the name of the network to join. See <<bibref|MoCAv2.5|Section 8.3.3 and Table 17-1>>.",
+					"datatype": "string"
+				},
+				"NumChannels": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "The maximum number of 100MHz channels the Node uses when the Node forms the network. See <<bibref|MoCAv2.5|Table 17-1>>.",
+					"default": "5",
+					"datatype": "unsignedInt",
+					"range": [
+						{
+							"min": 1,
+							"max": 5
+						}
+					]
+				},
+				"Per25Mode": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"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 NPER and 1 indicates VLPER. See <<bibref|MoCAv2.5|Table 17-1>>.",
+					"default": "0",
+					"datatype": "unsignedInt"
+				},
+				"PrivacySupported": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"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",
+					"list": {
+						"datatype": "MocaPrivacy",
+						"enumerations": [
+							"mocaReserved5",
+							"mocaReserved4",
+							"mocaReserved3",
+							"mocaReserved2",
+							"mocaReserved1",
+							"moca2EnhancedPrivacy",
+							"moca20Privacy",
+							"moca1Privacy"
+						]
+					}
+				},
+				"TrafficPermissionEthertype": {
+					"type": "hexBinary",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "The EtherType value of MSDUs that are allowed to transmit/receive to/from a Non-Secured Admitted Node. See <<bibref|MoCAv2.5|Section 11.7 and Table 17-1>>.",
+					"default": "888E",
+					"datatype": "hexBinary",
+					"range": [
+						{
+							"min": 2,
+							"max": 2
+						}
+					]
+				},
+				"TrafficPermissionLink": {
+					"type": "hexBinary",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"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 with the given Node ID in an Authorized Link PIE that the ME of the Authorization Server wants to distribute if the Node is the Authorization Server; otherwise, the value of SOURCE_NODE_BITMASK in the last received Authorized Link PIE. 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]; >;",
+					"datatype": "hexBinary"
+				},
+				"ConnectedNodesChangeTrapEn": {
+					"type": "boolean",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Used to enable <<param|ConnectedNodesChangeTrap>>. * When set to <<true>> it allows the MoCA Node to report a trap on the change of <<param|NumNodes>>. * When set to <<false>> no trap report is generated when <<param|NumNodes>> changes.",
+					"default": "false",
+					"datatype": "boolean"
+				},
+				"MgntEntityNetwIePayloadRecTrapEn": {
+					"type": "boolean",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Used to enable <<param|MgntEntityNetwIePayloadRecTrap>>. * When set to <<true>> it allows the MoCA Node to report a trap on reception of a Management Entity Request/Response Network IE. * When set to <<false>> no trap report is generated when a Management Entity Request/Response Network IE is received.",
+					"default": "false",
+					"datatype": "boolean"
+				},
+				"MpsTrapEn": {
+					"type": "boolean",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Used to enable the MPS-related traps: <<param|MpsInitScanRecTrap>>, <<param|MpsPairFailTrap>>, and <<param|MpsPrivacyChangedTrap>>.",
+					"default": "false",
+					"datatype": "boolean"
+				},
+				"NcPrivSupportedRecTrapEn": {
+					"type": "boolean",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Used to enable <<param|NcPrivacySupportedRecTrap>>. * When set to <<true>> it allows the MoCA Node to report a trap on reception of a new NC_PRIVACY_SUPPORTED value. * When set to <<false>> no trap report is generated when a new NC_PRIVACY_SUPPORTED value is received.",
+					"default": "false",
+					"datatype": "boolean"
+				},
+				"NetworkNameRecTrapEn": {
+					"type": "boolean",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Used to enable <<param|NetworkNameRecTrap>>. * When set to <<true>> it allows the MoCA Node to report a trap on reception of a Network Name. * When set to <<false>> no trap report is generated when a Network Name is received.",
+					"default": "false",
+					"datatype": "boolean"
+				},
+				"NodeDropTrapEn": {
+					"type": "boolean",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Used to enable <<param|NodeDropAdmFailureTrap>>, <<param|NodeDropNcTrap>>, <<param|NodeDropMpsTriggeredTrap>>, and <<param|NodeDropNcChgTrap>>.",
+					"default": "false",
+					"datatype": "boolean"
+				},
+				"TxPowerLimit": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "The value in dB by which to reduce the transmit power of the node from its maximum transmit power. The transmit power SHALL only be changed when <<param|Status>> is not <<enum|Up|Status>>, which means the interface is not part of a MoCA network. If changed, the parameter may not take effect until the MoCA interface is restarted. This parameter is based on mocaIfTxPowerLimit from <<bibref|MOCA11-MIB>>.",
+					"default": "0",
+					"datatype": "MocaDB"
+				},
+				"PowerCntlPhyTarget": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
 					"description": "Target PHY rate in Mbps for the power control algorithm. The MoCA interface SHOULD have <<param|Enable>> set to <<false>> for any change in this configuration. If the parameter is modified when <<param|Enable>> is <<true>> then this change might take several minutes to complete. This parameter is based on mocaIfPowerControlTargetRate from <<bibref|MOCA11-MIB>>.",
-					"datatype": "unsignedInt"
+					"default": "630",
+					"datatype": "MocaPhyRate",
+					"range": [
+						{
+							"min": 0,
+							"max": 2048
+						}
+					]
 				},
 				"BeaconPowerLimit": {
-					"type": "unsignedInt",
+					"type": "string",
 					"read": true,
 					"write": true,
 					"protocols": [
 						"cwmp",
 						"usp"
 					],
-					"description": "Beacon Transmit Power attenuation in <<units>> relative to the maximum transmit power. The MoCA interface SHOULD have <<param|Enable>> set to <<false>> for any change in this configuration. If the parameter is modified when <<param|Enable>> is <<true>> then this change might take several minutes to complete. This parameter is based on mocaIfBeaconPowerLimit from <<bibref|MOCA11-MIB>>.",
-					"datatype": "unsignedInt",
-					"unit": "dB"
+					"description": "The value in dB by which to reduce the setting of the transmit power of the Beacon from the maximum transmit power (BEACON_PWR_BACKOFF Managed Parameter). The beacon transmit power SHALL only be changed when <<param|Status>> is not <<enum|Up|Status>>, which means the interface is not part of a MoCA network. If changed, the parameter may not take effect until the MoCA interface is restarted. This parameter is based on mocaIfBeaconPowerLimit from <<bibref|MOCA11-MIB>>. Note that this parameter maps to different MIB objects for MoCA 1.0/1.1 and MoCA 2.0. <<deprecated|2.17|for MoCA 2.5>>",
+					"default": "0",
+					"datatype": "MocaDB"
 				},
 				"NetworkTabooMask": {
-					"type": "hexBinary",
+					"type": "string",
 					"read": true,
 					"write": false,
 					"protocols": [
 						"cwmp",
 						"usp"
 					],
-					"description": "Hexadecimal encoded 64-bit mask of MoCA taboo channels identified for the home network. This is the bit map of the spectrum that the interface supports, and each bit represents 25 MHz of spectrum. The least significant bit of the rightmost character corresponds to 800MHz, which is the lowest frequency. This parameter is based on mocaIfTabooChannelMask from <<bibref|MOCA11-MIB>>.",
-					"datatype": "hexBinary",
+					"description": "The MoCA taboo channels identified for the home network. Represents one or more MoCA channel RF center frequencies using a hexadecimal encoded 64-bit mask. Bit 63 (the leftmost bit of the leftmost character) is the most significant bit (highest frequency), and bit 0 (the rightmost bit of the rightmost character) is the least significant bit (lowest frequency). Not all bits are valid MoCA channels. Each bit represents 25 MHz of spectrum, but the mapping from bits to frequencies varies with the MoCA version: * MoCA 1.0 and MoCA 1.1: bits 63 through 32 are not used, bit 31 represents 1575 MHz and bit 0 represents 800 MHz * MoCA 2.0 and MoCA 2.5: bit 63 represents 1975 MHz and bit 0 represents 400 MHz For example, a MoCA 1.0 or MoCA 1.1 interface would use 0x000000001FFFC000 to represent 1150 MHz through 1500 MHz. Note that the MoCA version is indicated by the <<param|HighestVersion>> parameter. | Represents one or more MoCA channel RF center frequencies using a hexadecimal encoded 64-bit mask. Bit 63 (the leftmost bit of the leftmost character) is the most significant bit (highest frequency), and bit 0 (the rightmost bit of the rightmost character) is the least significant bit (lowest frequency). Not all bits are valid MoCA channels. Each bit represents 25 MHz of spectrum, but the mapping from bits to frequencies varies with the MoCA version: * MoCA 1.0 and MoCA 1.1: bits 63 through 32 are not used, bit 31 represents 1575 MHz and bit 0 represents 800 MHz * MoCA 2.0 and MoCA 2.5: bit 63 represents 1975 MHz and bit 0 represents 400 MHz For example, a MoCA 1.0 or MoCA 1.1 interface would use 0x000000001FFFC000 to represent 1150 MHz through 1500 MHz. Note that the MoCA version is indicated by the <<param|HighestVersion>> parameter.",
+					"datatype": "MocaChannelMask",
 					"range": [
 						{
 							"min": 8,
@@ -22746,15 +24538,15 @@
 					]
 				},
 				"NodeTabooMask": {
-					"type": "hexBinary",
+					"type": "string",
 					"read": true,
 					"write": false,
 					"protocols": [
 						"cwmp",
 						"usp"
 					],
-					"description": "Hexadecimal encoded 64-bit mask of supported frequencies. This is the bit map of the spectrum that the interface supports, and each bit represents 25 MHz of spectrum. The least significant bit of the rightmost character corresponds to 800MHz, which is the lowest frequency. This parameter is based on mocaIfNodeTabooChannelMask from <<bibref|MOCA11-MIB>>.",
-					"datatype": "hexBinary",
+					"description": "The MoCA taboo channels identified for this device. Represents one or more MoCA channel RF center frequencies using a hexadecimal encoded 64-bit mask. Bit 63 (the leftmost bit of the leftmost character) is the most significant bit (highest frequency), and bit 0 (the rightmost bit of the rightmost character) is the least significant bit (lowest frequency). Not all bits are valid MoCA channels. Each bit represents 25 MHz of spectrum, but the mapping from bits to frequencies varies with the MoCA version: * MoCA 1.0 and MoCA 1.1: bits 63 through 32 are not used, bit 31 represents 1575 MHz and bit 0 represents 800 MHz * MoCA 2.0 and MoCA 2.5: bit 63 represents 1975 MHz and bit 0 represents 400 MHz For example, a MoCA 1.0 or MoCA 1.1 interface would use 0x000000001FFFC000 to represent 1150 MHz through 1500 MHz. Note that the MoCA version is indicated by the <<param|HighestVersion>> parameter. | Represents one or more MoCA channel RF center frequencies using a hexadecimal encoded 64-bit mask. Bit 63 (the leftmost bit of the leftmost character) is the most significant bit (highest frequency), and bit 0 (the rightmost bit of the rightmost character) is the least significant bit (lowest frequency). Not all bits are valid MoCA channels. Each bit represents 25 MHz of spectrum, but the mapping from bits to frequencies varies with the MoCA version: * MoCA 1.0 and MoCA 1.1: bits 63 through 32 are not used, bit 31 represents 1575 MHz and bit 0 represents 800 MHz * MoCA 2.0 and MoCA 2.5: bit 63 represents 1975 MHz and bit 0 represents 400 MHz For example, a MoCA 1.0 or MoCA 1.1 interface would use 0x000000001FFFC000 to represent 1150 MHz through 1500 MHz. Note that the MoCA version is indicated by the <<param|HighestVersion>> parameter.",
+					"datatype": "MocaChannelMask",
 					"range": [
 						{
 							"min": 8,
@@ -22762,29 +24554,54 @@
 						}
 					]
 				},
-				"TxBcastRate": {
-					"type": "unsignedInt",
+				"SupportedBands": {
+					"type": "string",
 					"read": true,
 					"write": false,
 					"protocols": [
 						"cwmp",
 						"usp"
 					],
-					"description": "The broadcast PHY transmit rate in <<units>> for this interface. This parameter is based on mocaIfTxGcdRate from <<bibref|MOCA11-MIB>>.",
-					"datatype": "unsignedInt",
-					"unit": "Mbps"
+					"description": "Lists all the supported bands and sub-bands by this device.",
+					"datatype": "MocaBand",
+					"enumerations": [
+						"reserved",
+						"bandFCBL",
+						"bandFSAT",
+						"bandE",
+						"bandExD",
+						"bandDH",
+						"bandDL",
+						"noBand"
+					]
+				},
+				"TxBcastRate": {
+					"type": "string",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "The broadcast PHY transmit rate for this interface. This parameter is based on mocaIfTxGcdRate from <<bibref|MOCA11-MIB>>.",
+					"datatype": "MocaPhyRate",
+					"range": [
+						{
+							"min": 0,
+							"max": 2048
+						}
+					]
 				},
 				"TxBcastPowerReduction": {
-					"type": "unsignedInt",
+					"type": "string",
 					"read": true,
 					"write": false,
 					"protocols": [
 						"cwmp",
 						"usp"
 					],
-					"description": "Transmit Power attenuation in <<units>> relative to the maximum transmit power for broadcast transmissions. This parameter is based on mocaIfTxGcdPowerReduction from <<bibref|MOCA11-MIB>>.",
-					"datatype": "unsignedInt",
-					"unit": "dB"
+					"description": "Transmit Power attenuation relative to the maximum transmit power for broadcast transmissions. This parameter is based on mocaIfTxGcdPowerReduction from <<bibref|MOCA11-MIB>>.",
+					"datatype": "MocaDB"
 				},
 				"QAM256Capable": {
 					"type": "boolean",
@@ -22794,7 +24611,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "Whether this interface supports the 256 QAM feature. This parameter is based on mocaIfQAM256Capable from <<bibref|MOCA11-MIB>>.",
+					"description": "Whether this interface supports the 256 QAM feature. This parameter is based on mocaIfQAM256Capable from <<bibref|MOCA11-MIB>>. This parameter MUST NOT be implemented for MoCA 2.0 because it doesnt map to a MIB object.",
 					"datatype": "boolean"
 				},
 				"PacketAggregationCapability": {
@@ -22805,14 +24622,8 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "The packet aggregation capability supported by the interface. Standard values are 0 (no support), 6 (6 <<units>>) or 10 (10 <<units>>). This parameter is based on mocaIfPacketsAggrCapability from <<bibref|MOCA11-MIB>>.",
+					"description": "The packet aggregation capability supported by the interface. Standard values are 0 (no support), 6 (6 <<units>>) or 10 (10 <<units>>). This parameter is based on mocaIfPacketsAggrCapability from <<bibref|MOCA11-MIB>>. Note that this parameter maps to different MIB objects for MoCA 1.0/1.1 and MoCA 2.0. [XXX1: Need to modify the syntax to unsignedInt because MoCA 2.0 requires a minimum of 20 packets and MoCA 2.5 requires a minimum of 80 packets.]",
 					"datatype": "unsignedInt",
-					"range": [
-						{
-							"min": 0,
-							"max": 10
-						}
-					],
 					"unit": "packets"
 				},
 				"AssociatedDeviceNumberOfEntries": {
@@ -22826,6 +24637,1489 @@
 					"description": "<<numentries>>",
 					"datatype": "unsignedInt"
 				},
+				"PasswordHash": {
+					"type": "hexBinary",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "The 16 LSBs of a SHA1 performed on a 0-extended password (<<param|KeyPassphrase>>) concatenated with the SALT string MocaPasswordHash. This parameter allows to remotely validate the MoCA password configuration without exposing its value. This value must be 4 hexadecimal digits long.",
+					"datatype": "hexBinary",
+					"range": [
+						{
+							"min": 2,
+							"max": 2
+						}
+					]
+				},
+				"AggregationSize": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "The maximum number of bytes in one aggregate which can be received by the MoCA Node.",
+					"datatype": "unsignedInt"
+				},
+				"AeNumber": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Maximum number of allocation elements, excluding the TAUs and the Dummy DAUs, in one MAP the MoCA Node can process.",
+					"datatype": "unsignedInt"
+				},
+				"SupportedIngressPqosFlows": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Maximum number of Ingress PQoS Flows supported by the MoCA Node.",
+					"datatype": "unsignedInt"
+				},
+				"SupportedEgressPqosFlows": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Maximum number of Egress PQoS Flows supported by the MoCA Node.",
+					"datatype": "unsignedInt"
+				},
+				"PowerStateCap": {
+					"type": "string",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "The Power State capabilities of the MoCA Node (e.g., which Power States it can transition to) (POWER_STATE_CAP Managed Parameter). This value can change over time (e.g. when a MoCA 1 Node joins the network).",
+					"datatype": "MocaPowerState",
+					"enumerations": [
+						"m0Active",
+						"m1LowPowerIdle",
+						"m2Standby",
+						"m3Sleep"
+					]
+				},
+				"AvbSupport": {
+					"type": "boolean",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"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 supported if this value is <<false>>.",
+					"datatype": "boolean"
+				},
+				"ResetCount": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Count of MoCA resets since the interface was enabled for this MoCA Node.",
+					"datatype": "StatsCounter32"
+				},
+				"LinkDownCount": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "The number of times that this MoCA Node has lost link with the MoCA network since the interface was enabled.",
+					"datatype": "StatsCounter32"
+				},
+				"LmoNodeID": {
+					"type": "string",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "The ID of the MoCA Node currently undergoing LMO (Link Maintenance Operation), i.e. the LMO node.",
+					"datatype": "MocaNodeID",
+					"range": [
+						{
+							"min": 0,
+							"max": 15
+						}
+					]
+				},
+				"NetworkState": {
+					"type": "string",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"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>>).",
+					"datatype": "string",
+					"enumerations": [
+						"beginNodeAdmissionState",
+						"newNodeTypeOneProbeTxState",
+						"newNodeTypeOneProbeRxState",
+						"newGcdDistributionState",
+						"beginPhyProfileState",
+						"steadyState",
+						"typeThreeProbeState",
+						"lmoTypeOneProbeState",
+						"lmoNodeGcdDistributionState",
+						"beginLmoPhyProfileState",
+						"lmoGcdTypeOneProbeLinkState",
+						"alternateChannelQuietLineState",
+						"alternateChannelEvmProbeState",
+						"unsolicitedProbeReportState",
+						"beginUnsolicitedPhyProfileState",
+						"rxDeterminedProbeState",
+						"calibrationState"
+					]
+				},
+				"PrimaryChannelOffset": {
+					"type": "int",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "The offset in MHz of the primary channel relative to the beacon channel. The allowed values are -25, 0, and +25.",
+					"datatype": "int"
+				},
+				"SecondaryChannelOffset": {
+					"type": "int",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"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 that there is no secondary channel.",
+					"datatype": "int"
+				},
+				"ResetReason": {
+					"type": "string",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Describes the reason for a MoCA link reset or failure to join a network.",
+					"datatype": "string",
+					"range": [
+						{
+							"min": 0,
+							"max": 80
+						}
+					]
+				},
+				"NcVersion": {
+					"type": "string",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Indicates the MoCA version of the NC. This element MUST be in the form of dot-delimited integers, where each successive integer represents a more minor category of variation. For example, 1.0, where the components mean major.minor revision number. Possible patterns: * \\d+(\\.\\d+)*",
+					"datatype": "string",
+					"range": [
+						{
+							"min": 0,
+							"max": 64
+						}
+					]
+				},
+				"LinkState": {
+					"type": "hexBinary",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"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 >;",
+					"datatype": "hexBinary",
+					"range": [
+						{
+							"min": 3,
+							"max": 3
+						}
+					]
+				},
+				"ConnectedNodesInfo": {
+					"type": "hexBinary",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"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]; >;",
+					"datatype": "hexBinary",
+					"range": [
+						{
+							"min": 12,
+							"max": 156
+						}
+					]
+				},
+				"MgntEntityNetIePayloadRx": {
+					"type": "hexBinary",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"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) >;",
+					"datatype": "hexBinary",
+					"range": [
+						{
+							"min": 2,
+							"max": 62
+						}
+					]
+				},
+				"Moca25PhyCapable": {
+					"type": "boolean",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Indicate the MoCA Node supports MoCA 2.5 PHY if the value is <<true>>. Indicate the MoCA Node does not support MoCA 2.5 PHY if this value is <<false>>. See <<bibref|MoCAv2.5|section 8.3.4.1.1>>.",
+					"datatype": "boolean"
+				},
+				"MpsInitScanPayload": {
+					"type": "hexBinary",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Reports the channel number, NCs (Network Coordinators) MoCA version, Network MPS (MoCA Protected Setup) trigger, and Network MPS parameters (if any) and Network Name of the latest MoCA network found during Initial MPS Scanning. See <<bibref|MoCAv2.5|section 8.3.1.1.1>>. It is encoded as specified in <<bibref|MOCA25-MIB|section 4.6>>.",
+					"datatype": "hexBinary",
+					"range": [
+						{
+							"min": 4,
+							"max": 4
+						}
+					]
+				},
+				"MpsState": {
+					"type": "boolean",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"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>>. See <<bibref|MoCAv2.5|section 8.3.1>>.",
+					"datatype": "boolean"
+				},
+				"NetworkNamePayload": {
+					"type": "hexBinary",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "The payload of the latest received Network Name from the NC. See <<bibref|MoCAv2.5|section 8.3.3.2>>.",
+					"datatype": "hexBinary",
+					"range": [
+						{
+							"min": 0,
+							"max": 32
+						}
+					]
+				},
+				"PrivacyNc": {
+					"type": "string",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "The latest NC_PRIVACY_SUPPORTED value received from the NC. Before any NC_PRIVACY_SUPPORTED is received, reflects the value of <<param|PrivacySupported>>. See <<bibref|MoCAv2.5|Table 17-1>>.",
+					"list": {
+						"datatype": "MocaPrivacy",
+						"enumerations": [
+							"mocaReserved5",
+							"mocaReserved4",
+							"mocaReserved3",
+							"mocaReserved2",
+							"mocaReserved1",
+							"moca2EnhancedPrivacy",
+							"moca20Privacy",
+							"moca1Privacy"
+						]
+					}
+				},
+				"PowerStateResp": {
+					"type": "boolean",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Carries the response of the MoCA Node to a request (through POWER_STATEREQ) to transition into a desired Power State: yes if the value if <<true>> and no if the value is <<false>>. See <<bibref|MoCAv2.5|section 12>>.",
+					"datatype": "boolean"
+				},
+				"PowerStateStatus": {
+					"type": "string",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Reports the current Power State of the Node (POWER_STATE_STATUS Managed Parameter).",
+					"datatype": "MocaPowerState",
+					"enumerations": [
+						"m0Active",
+						"m1LowPowerIdle",
+						"m2Standby",
+						"m3Sleep"
+					]
+				},
+				"ConnectedNodesDropReason": {
+					"type": "hexBinary",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Reports the GUID(s) of the dropped EN(s) and the reason of node drop for up to 15 nodes. This object is valid only when the Node is the NC. 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]; >;",
+					"datatype": "hexBinary"
+				},
+				"BelowPhyThresholdTrap": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp"
+					],
+					"description": "If transmit PHY rate between all pairs of MoCA Nodes are greater than or equal to <<param|PhyThreshold>>, and subsequently the transmit PHY rate of one pair of MoCA Nodes drops below <<param|PhyThreshold>>, send this notification if <<param|PhyThresholdTrapEnable>> is <<true>>. This parameter is a counter that is incremented whenever the event occurs.",
+					"datatype": "unsignedInt"
+				},
+				"AbovePhyThresholdTrap": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp"
+					],
+					"description": "If transmit PHY rate between one or more pairs of MoCA Nodes are less than <<param|PhyThreshold>>, and subsequently the transmit PHY rate between all pairs of MoCA Nodes goes above or is equal to <<param|PhyThreshold>>, send this notification if <<param|PhyThresholdTrapEnable>> is <<true>>. This parameter is a counter that is incremented whenever the event occurs.",
+					"datatype": "unsignedInt"
+				},
+				"StatusChangeTrap": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp"
+					],
+					"description": "This trap is sent when <<param|StatusChangeEnable>> is <<true>> and <<param|Status>> changes value. This parameter is a counter that is incremented whenever the event occurs.",
+					"datatype": "unsignedInt"
+				},
+				"NumNodesChangeTrap": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp"
+					],
+					"description": "This trap is sent when <<param|NumNodesChangeEnable>> is <<true>> and <<param|NumNodes>> changes value. This parameter is a counter that is incremented whenever the event occurs.",
+					"datatype": "unsignedInt"
+				},
+				"MrRstSuccessTrap": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp"
+					],
+					"description": "An MR Entry Node reports that the network got reset successfully (MRRST_SUCCESS Event). This parameter is a counter that is incremented whenever the event occurs.",
+					"datatype": "unsignedInt"
+				},
+				"MrRstFailTrap": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp"
+					],
+					"description": "An MR Entry Node reports that the network reset did not complete successfully (MRRST_FAIL Event). This parameter is a counter that is incremented whenever the event occurs.",
+					"datatype": "unsignedInt"
+				},
+				"MrNetworkSuccessTrap": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp"
+					],
+					"description": "An MR Entry Node reports that the network got reformed successfully following the MR transaction (MRNETWORK_SUCCESS Event). This parameter is a counter that is incremented whenever the event occurs.",
+					"datatype": "unsignedInt"
+				},
+				"MrNetworkFailTrap": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp"
+					],
+					"description": "An MR Entry Node reports that the MR transaction failed, and the network did not get reformed (MRNETWORK_FAIL Event). This parameter is a counter that is incremented whenever the event occurs.",
+					"datatype": "unsignedInt"
+				},
+				"PowerStateBcstRecTrap": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp"
+					],
+					"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 the data interface (POWER_STATEBCST_REC Event). This parameter is a counter that is incremented whenever the event occurs.",
+					"datatype": "unsignedInt"
+				},
+				"PowerStateM0NcTrap": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp"
+					],
+					"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. This parameter is a counter that is incremented whenever the event occurs (POWER_STATEM0_NC Event).",
+					"datatype": "unsignedInt"
+				},
+				"PowerStateNc1xTrap": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp"
+					],
+					"description": "When the MoCA Node is in Power State M1/M2/M3, indicates that MoCA 1 Node is the NC (POWER_STATENC_1X Event). This parameter is a counter that is incremented whenever the event occurs.",
+					"datatype": "unsignedInt"
+				},
+				"PowerStateNetVerTrap": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp"
+					],
+					"description": "When the MoCA Node is in Power State M2 or M3, indicates that the network MoCA version is changed (POWER_STATENET_VER Event). This parameter is a counter that is incremented whenever the event occurs.",
+					"datatype": "unsignedInt"
+				},
+				"PowerStateRespTrap": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp"
+					],
+					"description": "Carries the response of the MoCA Node to a request (through POWER_STATEREQ) to transition into a desired Power State (POWER_STATERESP Event). This parameter is a counter that is incremented whenever the event occurs.",
+					"datatype": "unsignedInt"
+				},
+				"PowerStateUcstPenTrap": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp"
+					],
+					"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 Event). This parameter is a counter that is incremented whenever the event occurs.",
+					"datatype": "unsignedInt"
+				},
+				"PowerStateTrnsReqTrap": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp"
+					],
+					"description": "When a MoCA Node is in Power State M1 or M2, requests to transition to Power State M0 (POWER_STATETRNS_REQ Event). This parameter is a counter that is incremented whenever the event occurs.",
+					"datatype": "unsignedInt"
+				},
+				"PowerStateWupUrTrap": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp"
+					],
+					"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). This parameter is a counter that is incremented whenever the event occurs.",
+					"datatype": "unsignedInt"
+				},
+				"LmoStatusTrap": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp"
+					],
+					"description": "When <<param|LmoTrapEnable>> is enabled, reports that the MoCA Node is starting LMO (Link Maintenance Operation). This parameter is a counter that is incremented whenever the event occurs.",
+					"datatype": "unsignedInt"
+				},
+				"LinkFailureTrap": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp"
+					],
+					"description": "Indicates a link failure. If the failure was an Admission or LMO failure, <<param|LinkState>> indicates when the link was dropped within the sequence. This parameter is a counter that is incremented whenever the event occurs.",
+					"datatype": "unsignedInt"
+				},
+				"ConnectedNodesChangeTrap": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp"
+					],
+					"description": "This trap is sent when <<param|ConnectedNodesChangeTrapEn>> is <<true>> and <<param|ConnectedNodesInfo>> changes value. This parameter is a counter that is incremented whenever the event occurs.",
+					"datatype": "unsignedInt"
+				},
+				"MgntEntityNetwIePayloadRecTrap": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp"
+					],
+					"description": "This trap is sent when <<param|MgntEntityNetwIePayloadRecTrapEn>> is <<true>> and <<param|MgntEntityNetIePayloadRx>> changes value. This parameter is a counter that is incremented whenever the event occurs.",
+					"datatype": "unsignedInt"
+				},
+				"MpsInitScanRecTrap": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp"
+					],
+					"description": "This trap is sent when <<param|MpsTrapEn>> is <<true>> and <<param|MpsInitScanPayload>> changes value. This parameter is a counter that is incremented whenever the event occurs.",
+					"datatype": "unsignedInt"
+				},
+				"MpsPairFailTrap": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp"
+					],
+					"description": "This trap is sent when <<param|MpsTrapEn>> is <<true>>, indicates a MPS pairing failure. This parameter is a counter that is incremented whenever the event occurs.",
+					"datatype": "unsignedInt"
+				},
+				"MpsPrivacyChangedTrap": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp"
+					],
+					"description": "This trap is sent when <<param|MpsTrapEn>> is <<true>>, indicates that the Nodes privacy settings (PRIVACYEN and/or PSWD) have been changed by MPS. This parameter is a counter that is incremented whenever the event occurs.",
+					"datatype": "unsignedInt"
+				},
+				"NcPrivacySupportedRecTrap": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp"
+					],
+					"description": "This trap is sent when <<param|NcPrivSupportedRecTrapEn>> is <<true>> and <<param|PrivacyNc>> changes value. This parameter is a counter that is incremented whenever the event occurs.",
+					"datatype": "unsignedInt"
+				},
+				"NetworkNameRecTrap": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp"
+					],
+					"description": "This trap is sent when <<param|NetworkNameRecTrapEn>> is <<true>> and <<param|NetworkNamePayload>> changes value. This parameter is a counter that is incremented whenever the event occurs.",
+					"datatype": "unsignedInt"
+				},
+				"NodeDropAdmFailureTrap": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp"
+					],
+					"description": "This trap is sent when <<param|NodeDropTrapEn>> is <<true>>, indicates that the Node drops from the network due to admission failure. This parameter is a counter that is incremented whenever the event occurs.",
+					"datatype": "unsignedInt"
+				},
+				"NodeDropNcTrap": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp"
+					],
+					"description": "This trap is sent when <<param|NodeDropTrapEn>> is <<true>>, indicates that the Node is dropped by the NC as indicated in the NODE_BITMASK and LOW_POWER_NODE_BITMASK. This parameter is a counter that is incremented whenever the event occurs.",
+					"datatype": "unsignedInt"
+				},
+				"NodeDropMpsTriggeredTrap": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp"
+					],
+					"description": "This trap is sent when <<param|NodeDropTrapEn>> is <<true>>, indicates that MPS is locally triggered when the Node is un-Paired. This parameter is a counter that is incremented whenever the event occurs.",
+					"datatype": "unsignedInt"
+				},
+				"NodeDropNcChgTrap": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp"
+					],
+					"description": "This trap is sent when <<param|NodeDropTrapEn>> is <<true>>>, indicates that there is a NC change when the Node is Non-Secured Admitted Node. This parameter is a counter that is incremented whenever the event occurs.",
+					"datatype": "unsignedInt"
+				},
+				"BelowPhyThresholdTrap!": {
+					"type": "event",
+					"protocols": [
+						"usp"
+					],
+					"output": {
+						"LowestPhyRate": {
+							"type": "hexBinary",
+							"read": true,
+							"write": true,
+							"protocols": [
+								"usp"
+							],
+							"description": "The lowest PHY rate in the MoCA network, of <<param|#.Mesh.<i>.TxRate>>, which is the transmit PHY rate from the MoCA Node specified with <<param|#.Mesh.<i>.TxNodeIndex>>, to the MoCA Node specified with <<param|#.Mesh.<i>.RxNodeIndex>>. If multiple links have the same lowest PHY rate, sends the PHY rate for the link with the lowest <<param|#.Mesh.<i>.TxNodeIndex>>. If multiple links with the same <<param|#.Mesh.<i>.TxNodeIndex>> have the same lowest PHY rate, sends the PHY rate for the link with the lowest <<param|#.Mesh.<i>.RxNodeIndex>>. Network management system should access the table to find if there are additional links below the threshold bandwidth.",
+							"datatype": "hexBinary",
+							"range": [
+								{
+									"min": 13,
+									"max": 13
+								}
+							]
+						}
+					}
+				},
+				"AbovePhyThresholdTrap!": {
+					"type": "event",
+					"protocols": [
+						"usp"
+					]
+				},
+				"StatusChangeTrap!": {
+					"type": "event",
+					"protocols": [
+						"usp"
+					],
+					"output": {
+						"Status": {
+							"type": "string",
+							"read": true,
+							"write": true,
+							"protocols": [
+								"usp"
+							],
+							"description": "The current value of <<param|#.Status>>.",
+							"datatype": "string"
+						}
+					}
+				},
+				"NumNodesChangeTrap!": {
+					"type": "event",
+					"protocols": [
+						"usp"
+					],
+					"output": {
+						"NumNodes": {
+							"type": "unsignedInt",
+							"read": true,
+							"write": true,
+							"protocols": [
+								"usp"
+							],
+							"description": "The current value of <<param|#.NumNodes>>.",
+							"datatype": "unsignedInt",
+							"range": [
+								{
+									"min": 0,
+									"max": 16
+								}
+							]
+						}
+					}
+				},
+				"MrRstSuccessTrap!": {
+					"type": "event",
+					"protocols": [
+						"usp"
+					]
+				},
+				"MrRstFailTrap!": {
+					"type": "event",
+					"protocols": [
+						"usp"
+					]
+				},
+				"MrNetworkSuccessTrap!": {
+					"type": "event",
+					"protocols": [
+						"usp"
+					]
+				},
+				"MrNetworkFailTrap!": {
+					"type": "event",
+					"protocols": [
+						"usp"
+					]
+				},
+				"PowerStateBcstRecTrap!": {
+					"type": "event",
+					"protocols": [
+						"usp"
+					]
+				},
+				"PowerStateM0NcTrap!": {
+					"type": "event",
+					"protocols": [
+						"usp"
+					]
+				},
+				"PowerStateNc1xTrap!": {
+					"type": "event",
+					"protocols": [
+						"usp"
+					]
+				},
+				"PowerStateNetVerTrap!": {
+					"type": "event",
+					"protocols": [
+						"usp"
+					]
+				},
+				"PowerStateRespTrap!": {
+					"type": "event",
+					"protocols": [
+						"usp"
+					]
+				},
+				"PowerStateUcstPenTrap!": {
+					"type": "event",
+					"protocols": [
+						"usp"
+					]
+				},
+				"PowerStateTrnsReqTrap!": {
+					"type": "event",
+					"protocols": [
+						"usp"
+					]
+				},
+				"PowerStateWupUrTrap!": {
+					"type": "event",
+					"protocols": [
+						"usp"
+					]
+				},
+				"LmoStatusTrap!": {
+					"type": "event",
+					"protocols": [
+						"usp"
+					]
+				},
+				"LinkFailureTrap!": {
+					"type": "event",
+					"protocols": [
+						"usp"
+					]
+				},
+				"ConnectedNodesChangeTrap!": {
+					"type": "event",
+					"protocols": [
+						"usp"
+					],
+					"output": {
+						"ConnectedNodesInfo": {
+							"type": "hexBinary",
+							"read": true,
+							"write": true,
+							"protocols": [
+								"usp"
+							],
+							"description": "The current value of <<param|#.ConnectedNodesInfo>>.",
+							"datatype": "hexBinary",
+							"range": [
+								{
+									"min": 12,
+									"max": 156
+								}
+							]
+						}
+					}
+				},
+				"MgntEntityNetwIePayloadRecTrap!": {
+					"type": "event",
+					"protocols": [
+						"usp"
+					]
+				},
+				"MpsInitScanRecTrap!": {
+					"type": "event",
+					"protocols": [
+						"usp"
+					],
+					"output": {
+						"MpsInitScanPayload": {
+							"type": "hexBinary",
+							"read": true,
+							"write": true,
+							"protocols": [
+								"usp"
+							],
+							"description": "The current value of <<param|#.MpsInitScanPayload>>.",
+							"datatype": "hexBinary",
+							"range": [
+								{
+									"min": 4,
+									"max": 4
+								}
+							]
+						}
+					}
+				},
+				"MpsPairFailTrap!": {
+					"type": "event",
+					"protocols": [
+						"usp"
+					]
+				},
+				"MpsPrivacyChangedTrap!": {
+					"type": "event",
+					"protocols": [
+						"usp"
+					]
+				},
+				"NcPrivacySupportedRecTrap!": {
+					"type": "event",
+					"protocols": [
+						"usp"
+					],
+					"output": {
+						"PrivacyNc": {
+							"type": "string",
+							"read": true,
+							"write": true,
+							"protocols": [
+								"usp"
+							],
+							"description": "The current value of <<param|#.PrivacyNc>>.",
+							"datatype": "string"
+						}
+					}
+				},
+				"NetworkNameRecTrap!": {
+					"type": "event",
+					"protocols": [
+						"usp"
+					],
+					"output": {
+						"NetworkNamePayload": {
+							"type": "hexBinary",
+							"read": true,
+							"write": true,
+							"protocols": [
+								"usp"
+							],
+							"description": "The current value of <<param|#.NetworkNamePayload>>.",
+							"datatype": "hexBinary",
+							"range": [
+								{
+									"min": 0,
+									"max": 32
+								}
+							]
+						}
+					}
+				},
+				"NodeDropAdmFailureTrap!": {
+					"type": "event",
+					"protocols": [
+						"usp"
+					]
+				},
+				"NodeDropNcTrap!": {
+					"type": "event",
+					"protocols": [
+						"usp"
+					]
+				},
+				"NodeDropMpsTriggeredTrap!": {
+					"type": "event",
+					"protocols": [
+						"usp"
+					]
+				},
+				"NodeDropNcChgTrap!": {
+					"type": "event",
+					"protocols": [
+						"usp"
+					]
+				},
+				"Device.MoCA.Interface.{i}.AccessControl.{i}.": {
+					"type": "object",
+					"version": "2.17",
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "MoCA interface MAC access control table. This table contains a list of MAC addresses that are allowed to connect to the MoCA network. In addition to being in this access control list, a MoCA Node must have the proper <<param|#.FreqCurrentMask>>, <<param|#.PrivacyEnabledSetting>>, and <<param|#.KeyPassphrase>> before the MoCA Node can form or join a MoCA network.",
+					"uniqueKeys": [
+						"MACAddress"
+					],
+					"access": true,
+					"array": true,
+					"Enable": {
+						"type": "boolean",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Enables or disables this MAC address to be allowed to connect to the MoCA network.",
+						"default": "true",
+						"datatype": "boolean"
+					},
+					"MACAddress": {
+						"type": "string",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "If <<param|#.AccessControlEnable>> is set to <<true>>, MoCA Node with this MAC address is allowed to join the MoCA network. It is not guaranteed that the MoCA Node with this MAC address can form or join a network.",
+						"datatype": "MACAddress",
+						"range": [
+							{
+								"max": 17
+							}
+						],
+						"pattern": [
+							"",
+							"([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])"
+						]
+					}
+				},
+				"Device.MoCA.Interface.{i}.Rlapm.{i}.": {
+					"type": "object",
+					"version": "2.17",
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Interface RLAPM Table supporting the configuration of RLAPM (Receive Level Added PHY Margin) function parameters for the selected profile. The pairs [<<param|GlobalAggrRxPwrLevel>> (GARPLi ), <<param|PhyMargin>> (RLAPMi)] are used to determine the subcarriers bitloadings according <<bibref|MoCAv2.0|section 7.15.2 and Table 17-1>>.",
+					"uniqueKeys": [
+						"Profile",
+						"Frequency",
+						"GlobalAggrRxPwrLevel"
+					],
+					"access": true,
+					"array": true,
+					"Enable": {
+						"type": "boolean",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Enables or disables this Rlamp entry.",
+						"default": "true",
+						"datatype": "boolean"
+					},
+					"Profile": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Profile index used for the RLAPM (Receive Level Added PHY Margin) table.",
+						"datatype": "unsignedInt"
+					},
+					"Frequency": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Frequency (band) index used for the RLAPM (Receive Level Added PHY Margin) table.",
+						"datatype": "unsignedInt"
+					},
+					"GlobalAggrRxPwrLevel": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Global Aggregated Receive Power Level (GARPL). The parameter contains the Ni value, where GARPLi = -Ni dBm.",
+						"datatype": "unsignedInt",
+						"range": [
+							{
+								"min": 0,
+								"max": 65
+							}
+						]
+					},
+					"PhyMargin": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Receive Level Added Phy Margin (RLAPM). The parameter contains the Ni value, where RLAPMi = 0.5*Ni dB.",
+						"datatype": "unsignedInt",
+						"range": [
+							{
+								"min": 0,
+								"max": 60
+							}
+						]
+					},
+					"Status": {
+						"type": "string",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Reflects the status of a row in this table.",
+						"datatype": "RowStatus",
+						"enumerations": [
+							"active",
+							"notInService",
+							"notReady",
+							"createAndGo",
+							"createAndWait",
+							"destroy"
+						]
+					}
+				},
+				"Device.MoCA.Interface.{i}.Sapm.{i}.": {
+					"type": "object",
+					"version": "2.17",
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Interface SAPM Table supporting the configuration of SAPM (Subcarrier Added PHY Margin) function parameters for the selected profile. When the aggregate received power level (ARPL) is below the pre-specified threshold <<param|AggrRxPwrLevelThreshold>>, for each subcarrier, its corresponding value on the list <<param|PhyMargin>> will be considered to determine the subcarriers bitloading according <<bibref|MoCAv2.0|section 7.15.2 and Table 17-1>>.",
+					"uniqueKeys": [
+						"Profile",
+						"Frequency"
+					],
+					"access": true,
+					"array": true,
+					"Enable": {
+						"type": "boolean",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Enables or disables this Sapm entry.",
+						"default": "true",
+						"datatype": "boolean"
+					},
+					"Profile": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Profile index used for the SAPM (Subcarrier Added PHY Margin) table.",
+						"datatype": "unsignedInt"
+					},
+					"Frequency": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Frequency (band) index used for the SAPM (Subcarrier Added PHY Margin) table.",
+						"datatype": "unsignedInt"
+					},
+					"AggrRxPwrLevelThreshold": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Aggregate Received Power Level Threshold (ARPL_THLD). The parameter contains the N value, where ARPL_THLD = -N dBm.",
+						"datatype": "unsignedInt",
+						"range": [
+							{
+								"min": 0,
+								"max": 65
+							}
+						]
+					},
+					"PhyMargin": {
+						"type": "string",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Subcarrier Added PHY Margin (SAPM). List of SAPM values representing the PHY margin the Node is required to add to the bitloading of each of the available subcarriers when the received power level is below ARPL_THLD (<<param|AggrRxPwrLevelThreshold>>). Each value contains the Ni value for a OFDM subcarrier i, where SAPMi = 0.5*Ni dB.",
+						"list": {
+							"datatype": "unsignedInt",
+							"range": [
+								{
+									"min": 0,
+									"max": 120
+								}
+							]
+						}
+					},
+					"Status": {
+						"type": "string",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Reflects the status of a row in this table.",
+						"datatype": "RowStatus",
+						"enumerations": [
+							"active",
+							"notInService",
+							"notReady",
+							"createAndGo",
+							"createAndWait",
+							"destroy"
+						]
+					}
+				},
+				"Device.MoCA.Interface.{i}.Aca.": {
+					"type": "object",
+					"version": "2.17",
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "This diagnostic test corresponds to the MoCA ACA (Alternate Channel Assessment) operation. When this test is <<enum|Requested|DiagnosticsState>> the managed MoCA Node will initiate a MoCA On Demand LMO (Link Maintenance Operation).",
+					"access": false,
+					"array": false,
+					"DiagnosticsState": {
+						"type": "string",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp"
+						],
+						"description": "Indicates the availability of diagnostics data. Enumeration of: Enumeration of: None, Requested, Canceled, Complete, Error. 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. | Indicates the availability of diagnostics data. Enumeration of: Enumeration of: None, Requested, Canceled, Complete, Error. 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.",
+						"datatype": "DiagnosticsState",
+						"enumerations": [
+							"None",
+							"Requested",
+							"Canceled",
+							"Complete",
+							"Error"
+						]
+					},
+					"NodeID": {
+						"type": "string",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp"
+						],
+						"description": "The Node ID of the MoCA Node to transmit the EVM Probe when the parameter <<param|Type>> = <<enum|evm|Type>>.",
+						"datatype": "MocaNodeID",
+						"range": [
+							{
+								"min": 0,
+								"max": 15
+							}
+						]
+					},
+					"Type": {
+						"type": "string",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp"
+						],
+						"description": "The ACA (Alternate Channel Assessment) type is either <<enum|evm>> or <<enum|quiet>>.",
+						"datatype": "string",
+						"enumerations": [
+							"quiet",
+							"evm"
+						]
+					},
+					"Channel": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp"
+						],
+						"description": "The channel number under assessment, starting from 0 in increments of 25 MHz.",
+						"datatype": "unsignedInt"
+					},
+					"ReportNodeMask": {
+						"type": "hexBinary",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp"
+						],
+						"description": "Specifies the MoCA Nodes that are requested to be part of the channel assessment: Setting bits corresponding to Node IDs of these MoCA Nodes to 1. See <<bibref|MoCAv2.0|Section 6.2.1>>",
+						"datatype": "hexBinary",
+						"range": [
+							{
+								"min": 2,
+								"max": 2
+							}
+						]
+					},
+					"TotalRxPower": {
+						"type": "string",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp"
+						],
+						"description": "dBm (-128 to +127 dBm).",
+						"datatype": "MocaDBm"
+					},
+					"PowerProfile": {
+						"type": "hexBinary",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp"
+						],
+						"description": "Binary string array with 1 byte (represented as two hexadecimal digits) for each subcarrier. See <<bibref|MOCA11-MIB|Appendix A>> for the encoding of this object.",
+						"datatype": "hexBinary"
+					},
+					"Aca()": {
+						"type": "command",
+						"async": true,
+						"protocols": [
+							"usp"
+						],
+						"input": {
+							"NodeID": {
+								"type": "string",
+								"read": true,
+								"write": true,
+								"protocols": [
+									"usp"
+								],
+								"description": "The Node ID of the MoCA Node to transmit the EVM Probe when the parameter <<param|Type>> = <<enum|evm|Type>>.",
+								"datatype": "MocaNodeID",
+								"range": [
+									{
+										"min": 0,
+										"max": 15
+									}
+								]
+							},
+							"Type": {
+								"type": "string",
+								"read": true,
+								"write": true,
+								"protocols": [
+									"usp"
+								],
+								"description": "The ACA (Alternate Channel Assessment) type is either <<enum|evm>> or <<enum|quiet>>.",
+								"datatype": "string",
+								"enumerations": [
+									"quiet",
+									"evm"
+								]
+							},
+							"Channel": {
+								"type": "unsignedInt",
+								"read": true,
+								"write": true,
+								"protocols": [
+									"usp"
+								],
+								"description": "The channel number under assessment, starting from 0 in increments of 25 MHz.",
+								"datatype": "unsignedInt"
+							},
+							"ReportNodeMask": {
+								"type": "hexBinary",
+								"read": true,
+								"write": true,
+								"protocols": [
+									"usp"
+								],
+								"description": "Specifies the MoCA Nodes that are requested to be part of the channel assessment: Setting bits corresponding to Node IDs of these MoCA Nodes to 1. See <<bibref|MoCAv2.0|Section 6.2.1>>",
+								"datatype": "hexBinary",
+								"range": [
+									{
+										"min": 2,
+										"max": 2
+									}
+								]
+							}
+						},
+						"output": {
+							"Status": {
+								"type": "string",
+								"read": true,
+								"write": true,
+								"protocols": [
+									"usp"
+								],
+								"description": "Status of the ACA operation. If the value of this parameter is anything other than <<enum|success>>, the values of the other output arguments for this operation are indeterminate.",
+								"datatype": "string",
+								"enumerations": [
+									"success",
+									"failBADCHANNEL",
+									"failNOEVMPROBE",
+									"fail",
+									"inPROGRESS"
+								]
+							},
+							"TotalRxPower": {
+								"type": "string",
+								"read": true,
+								"write": true,
+								"protocols": [
+									"usp"
+								],
+								"description": "dBm (-128 to +127 dBm).",
+								"datatype": "MocaDBm"
+							},
+							"PowerProfile": {
+								"type": "hexBinary",
+								"read": true,
+								"write": true,
+								"protocols": [
+									"usp"
+								],
+								"description": "Binary string array with 1 byte (represented as two hexadecimal digits) for each subcarrier. See <<bibref|MOCA11-MIB|Appendix A>> for the encoding of this object.",
+								"datatype": "hexBinary"
+							}
+						}
+					}
+				},
+				"Device.MoCA.Interface.{i}.Reset.": {
+					"type": "object",
+					"version": "2.17",
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Used by the managed MoCA Node to initiate MoCA Reset Transaction.",
+					"access": false,
+					"array": false,
+					"NodeMask": {
+						"type": "hexBinary",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "The MoCA Nodes that must respond to the MR transaction L2ME request sent by the NC except for the MR Entry Node (LSB corresponds to Node ID 0x0). See <<bibref|MoCAv2.0|Section 6.2.1>>",
+						"datatype": "hexBinary",
+						"range": [
+							{
+								"min": 2,
+								"max": 2
+							}
+						]
+					},
+					"StartTime": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Time in seconds after this parameter is written that a MoCA Node must initiate a MoCA Reset (MR). See <<bibref|MoCAv2.0|Section 7.15>>.",
+						"datatype": "unsignedInt"
+					},
+					"StatusTrapEnable": {
+						"type": "boolean",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Used to enable <<param|#.MrRstSuccessTrap>> and <<param|#.MrRstFailTrap>> that the network reset was completed successfully or failed for MR transaction status trap.",
+						"datatype": "boolean"
+					},
+					"NetworkTrapEnable": {
+						"type": "boolean",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Used to enable <<param|#.MrNetworkSuccessTrap>> and <<param|#.MrNetworkFailTrap>> that the network was reformed or not reformed successfully following the MR transaction.",
+						"datatype": "boolean"
+					}
+				},
 				"Device.MoCA.Interface.{i}.Stats.": {
 					"type": "object",
 					"version": "2.0",
@@ -22845,7 +26139,7 @@
 							"usp"
 						],
 						"description": "The total number of bytes transmitted out of the interface, including framing characters.",
-						"datatype": "unsignedLong"
+						"datatype": "StatsCounter64"
 					},
 					"BytesReceived": {
 						"type": "unsignedLong",
@@ -22856,7 +26150,7 @@
 							"usp"
 						],
 						"description": "The total number of bytes received on the interface, including framing characters.",
-						"datatype": "unsignedLong"
+						"datatype": "StatsCounter64"
 					},
 					"PacketsSent": {
 						"type": "unsignedLong",
@@ -22867,7 +26161,7 @@
 							"usp"
 						],
 						"description": "The total number of packets transmitted out of the interface.",
-						"datatype": "unsignedLong"
+						"datatype": "StatsCounter64"
 					},
 					"PacketsReceived": {
 						"type": "unsignedLong",
@@ -22878,7 +26172,18 @@
 							"usp"
 						],
 						"description": "The total number of packets received on the interface.",
-						"datatype": "unsignedLong"
+						"datatype": "StatsCounter64"
+					},
+					"RxCorrectedErrors": {
+						"type": "unsignedLong",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "The number of received Ethernet packets that have errors and are corrected by this MoCA interface.",
+						"datatype": "StatsCounter64"
 					},
 					"ErrorsSent": {
 						"type": "unsignedInt",
@@ -22888,8 +26193,8 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "The total number of outbound packets 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. This parameter MUST NOT be implemented for MoCA 2.0 because it doesnt map to a MIB object.",
+						"datatype": "StatsCounter32"
 					},
 					"ErrorsReceived": {
 						"type": "unsignedInt",
@@ -22899,8 +26204,8 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "The total number of inbound packets 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. This parameter MUST NOT be implemented for MoCA 2.0 because it doesnt map to a MIB object.",
+						"datatype": "StatsCounter32"
 					},
 					"UnicastPacketsSent": {
 						"type": "unsignedLong",
@@ -22911,7 +26216,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"
+						"datatype": "StatsCounter64"
 					},
 					"UnicastPacketsReceived": {
 						"type": "unsignedLong",
@@ -22922,7 +26227,7 @@
 							"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",
@@ -22944,7 +26249,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",
@@ -22955,7 +26260,7 @@
 							"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"
 					},
 					"MulticastPacketsReceived": {
 						"type": "unsignedLong",
@@ -22966,7 +26271,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",
@@ -22977,7 +26282,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",
@@ -22988,7 +26293,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",
@@ -22998,8 +26303,8 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "The total number of packets 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. This parameter MUST NOT be implemented for MoCA 2.0 because it doesnt map to a MIB object.",
+						"datatype": "StatsCounter32"
 					}
 				},
 				"Device.MoCA.Interface.{i}.QoS.": {
@@ -23059,15 +26364,24 @@
 						"access": false,
 						"array": true,
 						"FlowID": {
-							"type": "unsignedInt",
+							"type": "string",
 							"read": true,
 							"write": false,
 							"protocols": [
 								"cwmp",
 								"usp"
 							],
-							"description": "The flow ID used to identify a flow in the network. This parameter is based on mocaIfFlowID from <<bibref|MOCA11-MIB>>.",
-							"datatype": "unsignedInt"
+							"description": "The flow ID used to identify a flow in the network. This parameter is based on mocaIfFlowID from <<bibref|MOCA11-MIB>>. Note that the data type has changed from unsignedInt to MACAddress. This is because the original data type was an error and could not have been implemented as specified.",
+							"datatype": "MACAddress",
+							"range": [
+								{
+									"max": 17
+								}
+							],
+							"pattern": [
+								"",
+								"([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])"
+							]
 						},
 						"PacketDA": {
 							"type": "string",
@@ -23124,6 +26438,17 @@
 							"datatype": "unsignedInt",
 							"unit": "seconds"
 						},
+						"Tag": {
+							"type": "unsignedInt",
+							"read": true,
+							"write": false,
+							"protocols": [
+								"cwmp",
+								"usp"
+							],
+							"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 FLOW_TAG carries application specific content of this PQoS flow. See <<bibref|MoCAv2.0|Section 6.3.13.1>>.",
+							"datatype": "unsignedInt"
+						},
 						"LeaseTimeLeft": {
 							"type": "unsignedInt",
 							"read": true,
@@ -23145,6 +26470,130 @@
 								"usp"
 							],
 							"description": "The number of packets transmitted for this flow. This parameter is based on mocaIfTxPacketsFlow from <<bibref|MOCA11-MIB>>.",
+							"datatype": "StatsCounter32"
+						},
+						"IngressGuid": {
+							"type": "string",
+							"read": true,
+							"write": false,
+							"protocols": [
+								"cwmp",
+								"usp"
+							],
+							"description": "The MAC address of the MoCA Node specified by the INGRESS_NODE_ID parameter of the flow. See <<bibref|MoCAv2.0|Section 6.3.13.1>>.",
+							"datatype": "MACAddress",
+							"range": [
+								{
+									"max": 17
+								}
+							],
+							"pattern": [
+								"",
+								"([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])"
+							]
+						},
+						"EgressGuid": {
+							"type": "string",
+							"read": true,
+							"write": false,
+							"protocols": [
+								"cwmp",
+								"usp"
+							],
+							"description": "The MAC address of the MoCA Node specified by the EGRESS_NODE_ID parameter of the flow. See <<bibref|MoCAv2.0|section 6.3.13.1>>.",
+							"datatype": "MACAddress",
+							"range": [
+								{
+									"max": 17
+								}
+							],
+							"pattern": [
+								"",
+								"([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])"
+							]
+						},
+						"MaximumLatency": {
+							"type": "unsignedInt",
+							"read": true,
+							"write": false,
+							"protocols": [
+								"cwmp",
+								"usp"
+							],
+							"description": "The MAXIMUM_LATENCY parameter of the flow in units of milliseconds. A value of 0 indicates no value available. See <<bibref|MoCAv2.0|section 6.3.13.1>>.",
+							"datatype": "unsignedInt"
+						},
+						"ShortTermAvgRatio": {
+							"type": "unsignedInt",
+							"read": true,
+							"write": false,
+							"protocols": [
+								"cwmp",
+								"usp"
+							],
+							"description": "The SHORT_TERM_AVERAGE_RATIO parameter of the flow. See <<bibref|MoCAv2.0|section 6.3.13.1>>.",
+							"datatype": "unsignedInt"
+						},
+						"FlowPer": {
+							"type": "unsignedInt",
+							"read": true,
+							"write": false,
+							"protocols": [
+								"cwmp",
+								"usp"
+							],
+							"description": "The FLOW_PER parameter of this flow, where a value of 0 indicates NPER and 1 indicates VLPER. See <<bibref|MoCAv2.0|section 6.3.13.1>>.",
+							"datatype": "unsignedInt"
+						},
+						"IngressClassify": {
+							"type": "string",
+							"read": true,
+							"write": false,
+							"protocols": [
+								"cwmp",
+								"usp"
+							],
+							"description": "The INGRESS_CLASSIFICATION_RULE parameter of the flow. See <<bibref|MoCAv2.0|section 6.3.13.1>>.",
+							"datatype": "MocaFlowIngrClassRule",
+							"enumerations": [
+								"ruleDAVLANtag4or5",
+								"ruleDAonly",
+								"ruleDAandDSCPnoVLAN",
+								"ruleDAandVLANignoreDSCP",
+								"ruleDAandVLANorDSCP"
+							]
+						},
+						"VlanTag": {
+							"type": "unsignedInt",
+							"read": true,
+							"write": false,
+							"protocols": [
+								"cwmp",
+								"usp"
+							],
+							"description": "The VLAN_TAG parameter of the flow. See <<bibref|MoCAv2.0|section 6.3.13.1>>.",
+							"datatype": "unsignedInt"
+						},
+						"DscpMoca": {
+							"type": "unsignedInt",
+							"read": true,
+							"write": false,
+							"protocols": [
+								"cwmp",
+								"usp"
+							],
+							"description": "The DSCP_MOCA parameter of the flow. See <<bibref|MoCAv2.0|section 6.3.13.1>>.",
+							"datatype": "unsignedInt"
+						},
+						"Dfid": {
+							"type": "unsignedInt",
+							"read": true,
+							"write": false,
+							"protocols": [
+								"cwmp",
+								"usp"
+							],
+							"description": "The destination flow ID of the flow assigned by the Ingress Node. See <<bibref|MoCAv2.0|section 7.8.1.2>>.",
 							"datatype": "unsignedInt"
 						}
 					}
@@ -23156,7 +26605,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "This table contains information about other MoCA devices currently associated with this MoCA interface.",
+					"description": "This table contains information about other MoCA devices currently associated with this MoCA interface. Entries in this table cannot be created or deleted by the network management system. All entries are created or deleted by the device software.",
 					"uniqueKeys": [
 						"MACAddress"
 					],
@@ -23183,7 +26632,7 @@
 						]
 					},
 					"NodeID": {
-						"type": "unsignedInt",
+						"type": "string",
 						"read": true,
 						"write": false,
 						"protocols": [
@@ -23191,7 +26640,13 @@
 							"usp"
 						],
 						"description": "The Node ID of this remote device. This parameter is based on mocaNodeIndex from <<bibref|MOCA11-MIB>>.",
-						"datatype": "unsignedInt"
+						"datatype": "MocaNodeID",
+						"range": [
+							{
+								"min": 0,
+								"max": 15
+							}
+						]
 					},
 					"PreferredNC": {
 						"type": "boolean",
@@ -23202,6 +26657,7 @@
 							"usp"
 						],
 						"description": "Whether this remote device is a preferred Network Coordinator (NC). This parameter is based on mocaNodePreferredNC from <<bibref|MOCA11-MIB>>.",
+						"default": "false",
 						"datatype": "boolean"
 					},
 					"HighestVersion": {
@@ -23231,7 +26687,7 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "The PHY transmit rate (in <<units>>) to this remote device. This parameter is based on mocaMeshTxRate from <<bibref|MOCA11-MIB>>.",
+						"description": "The PHY transmit rate (in <<units>>) to this remote device. This parameter is based on mocaMeshTxRate from <<bibref|MOCA11-MIB>>. This parameter MUST NOT be implemented for MoCA 2.0 because it doesnt map to a MIB object.",
 						"datatype": "unsignedInt",
 						"unit": "Mbps"
 					},
@@ -23243,21 +26699,20 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "The PHY receive rate (in <<units>>) from this remote device.",
+						"description": "The PHY receive rate (in <<units>>) from this remote device. This parameter MUST NOT be implemented for MoCA 2.0 because it doesnt map to a MIB object.",
 						"datatype": "unsignedInt",
 						"unit": "Mbps"
 					},
 					"TxPowerControlReduction": {
-						"type": "unsignedInt",
+						"type": "string",
 						"read": true,
 						"write": false,
 						"protocols": [
 							"cwmp",
 							"usp"
 						],
-						"description": "The reduction in transmitter level (in <<units>>) due to power control. This parameter is based on mocaNodeTxPowerReduction from <<bibref|MOCA11-MIB>>.",
-						"datatype": "unsignedInt",
-						"unit": "dB"
+						"description": "The reduction in transmitter level due to power control. This parameter is based on mocaNodeTxPowerReduction from <<bibref|MOCA11-MIB>>. <<deprecated|2.17|since it is replaced by <<param|Device.MoCA.Interface.<i>.Mesh.<i>.PowerReduction>>. See <<bibref|MOCA20-MIB>>>>",
+						"datatype": "MocaDB"
 					},
 					"RxPowerLevel": {
 						"type": "unsignedInt",
@@ -23267,36 +26722,40 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "The power level (in <<units>>) received at the MoCA interface from this remote device. This parameter is based on mocaNodeRxPower from <<bibref|MOCA11-MIB>>.",
+						"description": "The power level (in <<units>>) received at the MoCA interface from this remote device. This parameter is based on mocaNodeRxPower from <<bibref|MOCA11-MIB>>. <<deprecated|2.17|since it is replaced by <<param|Device.MoCA.Interface.<i>.Mesh.<i>.Power>>. See <<bibref|MOCA20-MIB>>>>",
 						"datatype": "unsignedInt",
 						"unit": "dBm"
 					},
 					"TxBcastRate": {
-						"type": "unsignedInt",
+						"type": "string",
 						"read": true,
 						"write": false,
 						"protocols": [
 							"cwmp",
 							"usp"
 						],
-						"description": "The broadcast PHY transmit rate (in <<units>>) from this remote device. This parameter is based on mocaNodeTxGcdRate from <<bibref|MOCA11-MIB>>.",
-						"datatype": "unsignedInt",
-						"unit": "Mbps"
+						"description": "The broadcast PHY transmit rate from this remote device. This parameter is based on mocaNodeTxGcdRate from <<bibref|MOCA11-MIB>>.",
+						"datatype": "MocaPhyRate",
+						"range": [
+							{
+								"min": 0,
+								"max": 2048
+							}
+						]
 					},
 					"RxBcastPowerLevel": {
-						"type": "unsignedInt",
+						"type": "string",
 						"read": true,
 						"write": false,
 						"protocols": [
 							"cwmp",
 							"usp"
 						],
-						"description": "The power level (in <<units>>) received at the MoCA interface from this remote device. This parameter is based on mocaNodeRxGcdPower from <<bibref|MOCA11-MIB>>.",
-						"datatype": "unsignedInt",
-						"unit": "dBm"
+						"description": "The power level received at the MoCA interface from this remote device. This parameter is based on mocaNodeRxGcdPower from <<bibref|MOCA11-MIB>>.",
+						"datatype": "MocaDBm"
 					},
 					"TxPackets": {
-						"type": "unsignedInt",
+						"type": "unsignedLong",
 						"read": true,
 						"write": false,
 						"protocols": [
@@ -23304,9 +26763,9 @@
 							"usp"
 						],
 						"description": "The number of packets transmitted to this remote device (Note: Includes Broadcast, Multicast and Unicast packets).",
-						"datatype": "unsignedInt"
+						"datatype": "StatsCounter64"
 					},
-					"RxPackets": {
+					"TxDrops": {
 						"type": "unsignedInt",
 						"read": true,
 						"write": false,
@@ -23314,8 +26773,30 @@
 							"cwmp",
 							"usp"
 						],
+						"description": "The number of Unicast EPDUs received at the ECL, destined to the associated MoCA Node, and not transmitted by this MoCA interface.",
+						"datatype": "StatsCounter32"
+					},
+					"RxPackets": {
+						"type": "unsignedLong",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
 						"description": "The number of packets received from this remote device (Note: Includes Broadcast, Multicast and Unicast packets). This parameter is based on mocaNodeRxPackets from <<bibref|MOCA11-MIB>>.",
-						"datatype": "unsignedInt"
+						"datatype": "StatsCounter64"
+					},
+					"RxCorrected": {
+						"type": "unsignedLong",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "The number of Ethernet packets received by this MoCA interface that have errors and are corrected from the MoCA Node identified by <<param|MACAddress>>.",
+						"datatype": "StatsCounter64"
 					},
 					"RxErroredAndMissedPackets": {
 						"type": "unsignedInt",
@@ -23326,7 +26807,18 @@
 							"usp"
 						],
 						"description": "The number of errored and missed packets received from this remote device. This parameter is based on mocaNodeRxDrops from <<bibref|MOCA11-MIB>>.",
-						"datatype": "unsignedInt"
+						"datatype": "StatsCounter32"
+					},
+					"BondingCapable": {
+						"type": "boolean",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "The MoCA Node identified by <<param|MACAddress>> supports Bonding if the value is <<true>>. The MoCA Node identified by <<param|MACAddress>> does not support Bonding if this value is <<false>>.",
+						"datatype": "boolean"
 					},
 					"QAM256Capable": {
 						"type": "boolean",
@@ -23336,7 +26828,7 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "Whether this remote device supports the 256 QAM feature. This parameter is based on mocaNodeQAM256Capable from <<bibref|MOCA11-MIB>>.",
+						"description": "Whether this remote device supports the 256 QAM feature. This parameter is based on mocaNodeQAM256Capable from <<bibref|MOCA11-MIB>>. This parameter MUST NOT be implemented for MoCA 2.0 because it doesnt map to a MIB object.",
 						"datatype": "boolean"
 					},
 					"PacketAggregationCapability": {
@@ -23347,27 +26839,20 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "The packet aggregation capability supported by the remote device. Standard values are 0 (no support), 6 (6 <<units>>) or 10 (10 <<units>>). This parameter is based on mocaNodePacketsAggrCapability from <<bibref|MOCA11-MIB>>.",
+						"description": "The packet aggregation capability supported by the remote device. Standard values are 0 (no support), 6 (6 <<units>>) or 10 (10 <<units>>). This parameter is based on mocaNodePacketsAggrCapability from <<bibref|MOCA11-MIB>>. Note that this parameter maps to different MIB objects for MoCA 1.0/1.1 and MoCA 2.0. [XXX2: Need to modify the syntax to unsignedInt because MoCA 2.0 requires a minimum of 20 packets and MoCA 2.5 requires a minimum of 80 packets.]",
 						"datatype": "unsignedInt",
-						"range": [
-							{
-								"min": 0,
-								"max": 10
-							}
-						],
 						"unit": "packets"
 					},
 					"RxSNR": {
-						"type": "unsignedInt",
+						"type": "string",
 						"read": true,
 						"write": false,
 						"protocols": [
 							"cwmp",
 							"usp"
 						],
-						"description": "The signal to noise level (in <<units>>) received at this interface from this remote device. This parameter is based on mocaNodeSNR from <<bibref|MOCA11-MIB>>.",
-						"datatype": "unsignedInt",
-						"unit": "dBm"
+						"description": "The signal to noise level received at this interface from this remote device. This parameter is based on mocaNodeSNR from <<bibref|MOCA11-MIB>>. <<deprecated|2.17|since it is replaced by <<param|Device.MoCA.Interface.<i>.Mesh.<i>.RxSNR>>. See <<bibref|MOCA20-MIB>>>>",
+						"datatype": "MocaDB"
 					},
 					"Active": {
 						"type": "boolean",
@@ -23379,6 +26864,560 @@
 						],
 						"description": "Whether or not this remote device is currently present in the MoCA network. The ability to list inactive nodes is OPTIONAL. If the CPE 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.",
 						"datatype": "boolean"
+					},
+					"SupportedIngressPqosFlows": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "The number of Ingress PQoS Flows supported by this MoCA interface from the MoCA Node identified by <<param|MACAddress>>.",
+						"datatype": "unsignedInt"
+					},
+					"SupportedEgressPqosFlows": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "The number of Egress PQoS Flows supported by this MoCA interface from the MoCA Node identified by <<param|MACAddress>>.",
+						"datatype": "unsignedInt"
+					},
+					"AggregationSize": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "The maximum number of bytes that can be aggregated in a MoCA frame that this MoCA Node supports.",
+						"datatype": "unsignedInt"
+					},
+					"AeNumber": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "The maximum number of allocation elements, excluding the TAUs and the Dummy DAUs, in one MAP that this MoCA Node supports.",
+						"datatype": "unsignedInt"
+					},
+					"PowerState": {
+						"type": "string",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Power State of the MoCA Node identified by the <<param|MACAddress>>.",
+						"datatype": "MocaPowerState",
+						"enumerations": [
+							"m0Active",
+							"m1LowPowerIdle",
+							"m2Standby",
+							"m3Sleep"
+						]
+					},
+					"PowerStateCapability": {
+						"type": "string",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Power State capability of the MoCA Node identified by the <<param|MACAddress>>.",
+						"datatype": "MocaPowerState",
+						"enumerations": [
+							"m0Active",
+							"m1LowPowerIdle",
+							"m2Standby",
+							"m3Sleep"
+						]
+					},
+					"PDelay": {
+						"type": "int",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Propagation delay measured in units of 10ns between the local MoCA Node and the MoCA Node identified by the <<param|MACAddress>>.",
+						"datatype": "int"
+					},
+					"EnhancedPrivacyCapable": {
+						"type": "boolean",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Indicates the MoCA Node identified by <<param|MACAddress>> supports MoCA 2 Enhanced Privacy if the value is <<true>>. Indicates the MoCA Node identified by <<param|MACAddress>> does not support MoCA 2 Enhanced Privacy if this value is <<false>>.",
+						"datatype": "boolean"
+					},
+					"LinkType": {
+						"type": "string",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Indicates the type of link used for unicast data transmissions between the managed MoCA Node and the MoCA Node identified by <<param|MACAddress>>.",
+						"datatype": "string",
+						"enumerations": [
+							"moca1PHY",
+							"primary",
+							"bonded",
+							"m25300MHz",
+							"m25400MHz",
+							"m25500MHz"
+						]
+					},
+					"Moca25PhyCapable": {
+						"type": "boolean",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Indicates the MoCA Node identified by <<param|MACAddress>> supports MoCA 2.5 PHY if the value is <<true>>. Indicates the MoCA Node identified by <<param|MACAddress>> does not support MoCA 2.5 PHY if this value is <<false>>.",
+						"datatype": "boolean"
+					},
+					"RxPwrList": {
+						"type": "string",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Per channel list of Receive power levels in dBm from the MoCA Node identified by <<param|MACAddress>> to the managed MoCA Node. The power measurement should cover the preamble and/or at least a symbol time. The averaging method employed for this measurement is implementation specific and not specified. It is recommended but not required to utilize the LMO (Link Maintenance Operation) EVM probes for this measurement. The field numValues is a function of <<param|LinkType>>: * MoCA 1 PHY - 1 * Primary - 1 * Bonded - 2 * 300 MHz MoCA 2.5 PHY - 3 * 400 MHz MoCA 2.5 PHY - 4 * 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]; >;",
+						"datatype": "string",
+						"range": [
+							{
+								"min": 2,
+								"max": 6
+							}
+						]
+					},
+					"RxSNRList": {
+						"type": "string",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Per channel list of Average Receive Signal to Noise Ratio (SNR) across all available subcarriers based on the EVM probe from the MoCA Node identified by <<param|MACAddress>> to the managed MoCA Node. The field numValues is a function of <<param|LinkType>>: * MoCA 1 PHY - 1 * Primary - 1 * Bonded - 2 * 300 MHz MoCA 2.5 PHY - 3 * 400 MHz MoCA 2.5 PHY - 4 * 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]; >;",
+						"datatype": "string",
+						"range": [
+							{
+								"min": 2,
+								"max": 6
+							}
+						]
+					},
+					"TxPwrList": {
+						"type": "string",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Per channel list of Transmit power levels in dBm from the managed MoCA Node to the MoCA Node identified by <<param|MACAddress>>. The transmit power should be max power for the channel less the Transmit Power Control. The field numValues is a function of <<param|LinkType>>: * MoCA 1 PHY - 1 * Primary - 1 * Bonded - 2 * 300 MHz MoCA 2.5 PHY - 3 * 400 MHz MoCA 2.5 PHY - 4 * 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]; >;",
+						"datatype": "string",
+						"range": [
+							{
+								"min": 2,
+								"max": 6
+							}
+						]
+					},
+					"TxPwrReductionList": {
+						"type": "string",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"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 identified by <<param|MACAddress>>. <<param>> is identical to the TPC back-off utilized for transmission from the TPC backoff parameter TX_POWER_ADJUSTMENT_100MHZ. The field numValues is a function of <<param|LinkType>>: * MoCA 1 PHY - 1 * Primary - 1 * Bonded - 2 * 300 MHz MoCA 2.5 PHY - 3 * 400 MHz MoCA 2.5 PHY - 4 * 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]; >;",
+						"datatype": "string",
+						"range": [
+							{
+								"min": 2,
+								"max": 6
+							}
+						]
+					},
+					"EgressNodeNumFlows": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "The number of PQoS flows in which this MoCA interface is an Egress Node for these PQoS flows.",
+						"datatype": "unsignedInt"
+					},
+					"IngressNodeNumFlows": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "The number of PQoS flows in which this MoCA interface is an Ingress Node for these PQoS flows.",
+						"datatype": "unsignedInt"
+					}
+				},
+				"Device.MoCA.Interface.{i}.Mesh.{i}.": {
+					"type": "object",
+					"version": "2.17",
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "MoCA mesh PHY rate table. This table contains the unicast transmit PHY rate between all pairs of MoCA Nodes in the MoCA network. Since <<param|TxRate>> is the transmit PHY rate from <<param|TxNodeIndex>> to <<param|RxNodeIndex>>, this table does not contain any entries with <<param|TxNodeIndex>> equals <<param|RxNodeIndex>>. In addition, a MoCA network can have less than 16 Nodes, hence some values of <<param|TxNodeIndex>> and <<param|RxNodeIndex>> in the range of 0 to 15 may not exist. Entries in this table cannot be created or deleted by the network management system. All entries are created or deleted by the device software.",
+					"uniqueKeys": [
+						"TxNodeIndex",
+						"RxNodeIndex"
+					],
+					"access": false,
+					"array": true,
+					"TxNodeIndex": {
+						"type": "string",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "The Node ID of the transmit MoCA Node is used as one of the index to order the mesh PHY rate table.",
+						"datatype": "MocaNodeID",
+						"range": [
+							{
+								"min": 0,
+								"max": 15
+							}
+						]
+					},
+					"RxNodeIndex": {
+						"type": "string",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "The Node ID of the receive MoCA Node is used as one of the index to order the mesh PHY rate table.",
+						"datatype": "MocaNodeID",
+						"range": [
+							{
+								"min": 0,
+								"max": 15
+							}
+						]
+					},
+					"TxRate": {
+						"type": "string",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "The transmit MoCA 1 PHY rate in Mbps from the MoCA Node identified by <<param|TxNodeIndex>> to the MoCA Node identified by <<param|RxNodeIndex>>.",
+						"datatype": "MocaPhyRate",
+						"range": [
+							{
+								"min": 0,
+								"max": 2048
+							}
+						]
+					},
+					"TxRateNper": {
+						"type": "string",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "The transmit normal packet error PHY Rate from the MoCA Node identified by <<param|TxNodeIndex>> to the MoCA Node identified by <<param|RxNodeIndex>>.",
+						"datatype": "MocaPhyRate",
+						"range": [
+							{
+								"min": 0,
+								"max": 2048
+							}
+						]
+					},
+					"TxRateVlper": {
+						"type": "string",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "The transmit very low packet error PHY Rate from the MoCA Node identified by <<param|TxNodeIndex>> to the MoCA Node identified by <<param|RxNodeIndex>>.",
+						"datatype": "MocaPhyRate",
+						"range": [
+							{
+								"min": 0,
+								"max": 2048
+							}
+						]
+					},
+					"LinkType": {
+						"type": "string",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "The type of link which exists from the MoCA Node identified by <<param|TxNodeIndex>> to the MoCA Node identified by <<param|RxNodeIndex>>. Enumeration of: moca1PHY, primary, bonded. This parameter is only used for MoCA 2.0.",
+						"datatype": "string",
+						"enumerations": [
+							"moca1PHY",
+							"primary",
+							"bonded"
+						]
+					},
+					"Power": {
+						"type": "hexBinary",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Per channel list of Transmit or Receive power levels in dBm. If the MoCA Node identified by <<param|TxNodeIndex>> is equal to <<param|#.NodeID>>, then indicates the unicast transmit power in dBm from the MoCA Node identified by <<param|TxNodeIndex>> to the MoCA Node identified by <<param|RxNodeIndex>>, else indicates the unicast receive power in dBm from the MoCA Node identified by <<param|TxNodeIndex>> at the MoCA Node identified by <<param|RxNodeIndex>>. For transmit power, the power should be max power for the channel less the Transmit Power Control. For received power, the power measurement should cover the preamble and/or at least a symbol time. The averaging method employed for this measurement is implementation specific and not specified. It is recommended but not required to utilize the LMO (Link Maintenance Operation) EVM probes for this measurement. The field numValues is a function of <<param|LinkType>>: * <<enum|moca1PHY|LinkType>> - 1 * <<enum|primary|LinkType>> - 1 * <<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]; >; This parameter is only used for MoCA 2.0.",
+						"datatype": "hexBinary",
+						"range": [
+							{
+								"min": 2,
+								"max": 3
+							}
+						]
+					},
+					"PowerReduction": {
+						"type": "hexBinary",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Per channel list of The Transmit Power Control (TPC) back-off in dB. If the MoCA Node identified by <<param|TxNodeIndex>> is equal to <<param|#.NodeID>>, then indicates the TPC in dB utilized to back-off transmission to the MoCA Node identified by <<param|RxNodeIndex>>. Otherwise indicates the TPC in dB that the MoCA Node identified by <<param|TxNodeIndex>> utilized to back-off its transmission. <<param>> is identical to the TPC back-off utilized for transmission and determined from the TPC backoff parameters TPC_BACKOFF_MAJOR and TPC_BACKOFF_MINOR as follows: <<param>> = TPC_BACKOFF_MAJOR * 3 +TPC_BACKOFF_MINOR. The field numValues is a function of <<param|LinkType>>: * <<enum|moca1PHY|LinkType>> - 1 * <<enum|primary|LinkType>> - 1 * <<enum|bonded|LinkType>> - 2 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.",
+						"datatype": "hexBinary",
+						"range": [
+							{
+								"min": 2,
+								"max": 3
+							}
+						]
+					},
+					"RxSNR": {
+						"type": "hexBinary",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Per channel list of average received Signal to Noise Ratio (SNR) in dB. If the MoCA Node identified by <<param|RxNodeIndex>> is not equal to <<param|#.NodeID>> or the MoCA Node identified by <<param|TxNodeIndex>> is equal to <<param|#.NodeID>>, then this parameter is not present. Otherwise indicates the average received SNR across all the available carriers based on the EVM probe from the MoCA Node identified by <<param|TxNodeIndex>>. The field numValues is a function of <<param|LinkType>>: * <<enum|moca1PHY|LinkType>> - 1 * <<enum|primary|LinkType>> - 1 * <<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]; >; This parameter is only used for MoCA 2.0.",
+						"datatype": "hexBinary",
+						"range": [
+							{
+								"min": 2,
+								"max": 3
+							}
+						]
+					}
+				},
+				"Device.MoCA.Interface.{i}.Bridge.{i}.": {
+					"type": "object",
+					"version": "2.17",
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "MoCA bridge Ethernet MAC address table. This table contains an entry for every MoCA Node in the MoCA network. Entries in this table cannot be created or deleted by the network management system. All entries are created or deleted by the device software.",
+					"uniqueKeys": [
+						"NodeIndex"
+					],
+					"access": false,
+					"array": true,
+					"NodeIndex": {
+						"type": "string",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "The Node ID is used as an index to order the MAC entries in the MoCA bridge table.",
+						"datatype": "MocaNodeID",
+						"range": [
+							{
+								"min": 0,
+								"max": 15
+							}
+						]
+					},
+					"MACAddresses": {
+						"type": "string",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "The Ethernet MAC addresses identified by the Node ID.",
+						"list": {
+							"datatype": "MACAddress",
+							"range": [
+								{
+									"max": 17
+								}
+							],
+							"pattern": [
+								"",
+								"([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])"
+							]
+						}
+					}
+				},
+				"Device.MoCA.Interface.{i}.MeshScMod.{i}.": {
+					"type": "object",
+					"version": "2.17",
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "MoCA mesh Subcarrier Modulation table. This table contains the Unicast transmit subcarrier modulation between all pairs of MoCA Nodes in the MoCA network. Since <<param|Mod>> is the subcarrier modulation from <<param|TxNodeIndex>> to <<param|RxNodeIndex>>, this table does not contain any entries with <<param|TxNodeIndex>> equals <<param|RxNodeIndex>>. In addition, a MoCA network can have less than 16 MoCA Nodes, hence some values of <<param|TxNodeIndex>> and <<param|RxNodeIndex>> in the range of 0 to 15 may not exist. The <<param|ChannelIndex>> index is used to differentiate between the primary and secondary channels in a bonded channel network. The primary channel index is always present, the secondary channel index may not always be present. Entries in this table cannot be created or deleted by the network management system. All entries are created or deleted by the device software.",
+					"uniqueKeys": [
+						"TxNodeIndex",
+						"RxNodeIndex",
+						"ChannelIndex"
+					],
+					"access": false,
+					"array": true,
+					"TxNodeIndex": {
+						"type": "string",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "The Node ID of the transmit MoCA Node is used as one of the index to order the mesh PHY rate table.",
+						"datatype": "MocaNodeID",
+						"range": [
+							{
+								"min": 0,
+								"max": 15
+							}
+						]
+					},
+					"RxNodeIndex": {
+						"type": "string",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "The Node ID of the receive MoCA Node is used as one of the index to order the mesh subcarrier modulation.",
+						"datatype": "MocaNodeID",
+						"range": [
+							{
+								"min": 0,
+								"max": 15
+							}
+						]
+					},
+					"ChannelIndex": {
+						"type": "string",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "<<enum|primary>> or <<enum|secondary>> channel for MoCA 2.0 Node associated with <<param|Nper>> and <<param|Vlper>>. For MoCA 1 Node, the same as the <<enum|primary>> channel associated with <<param|Mod>>. In a bonded MoCA 2.0 network, the <<enum|primary>> and <<enum|secondary>> channels each have their own subcarrier modulation data. <<enum|m25first>>, <<enum|m25second>>, <<enum|m25third>>, <<enum|m25fourth>> or <<enum|m25fifth>> channel for MoCA 2.5 Node associated with <<param|ModM25>>.",
+						"datatype": "MocaChannelIndex",
+						"enumerations": [
+							"primary",
+							"secondary",
+							"m25first",
+							"m25second",
+							"m25third",
+							"m25fourth",
+							"m25fifth"
+						]
+					},
+					"Mod": {
+						"type": "string",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "1 Byte Hex array values with no delimiters where each byte indicates the subcarrier modulation of one subcarrier from the MoCA Node identified by <<param|TxNodeIndex>> to the MoCA Node identified by <<param|RxNodeIndex>> for the MoCA 1 Unicast transmission PHY profile.",
+						"datatype": "MocaScMod"
+					},
+					"Nper": {
+						"type": "string",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "1 Byte Hex array values with no delimiters where each byte indicates the unicast NPER subcarrier modulation of one subcarrier from the MoCA Node identified by <<param|TxNodeIndex>> to the MoCA Node identified by <<param|RxNodeIndex>> for the associated <<param|ChannelIndex>>.",
+						"datatype": "MocaScMod"
+					},
+					"Vlper": {
+						"type": "string",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "1 Byte Hex array values with no delimiters where each byte indicates the unicast VLPER subcarrier modulation of one subcarrier from the MoCA Node identified by <<param|TxNodeIndex>> to the MoCA Node identified by <<param|RxNodeIndex>> for the associated <<param|ChannelIndex>>.",
+						"datatype": "MocaScMod"
+					},
+					"ModM25": {
+						"type": "string",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "1 Byte Hex array values with no delimiters where each byte indicates the MoCA 2.5 unicast subcarrier modulation for all subcarriers from the MoCA Node identified by <<param|TxNodeIndex>> to the MoCA Node identified by <<param|RxNodeIndex>> for the associated <<param|ChannelIndex>>. For MoCA 2.5 First Channel, Second Channel, Third Channel, Fourth Channel and Fifth Channel, the total number of subcarriers is 512.",
+						"datatype": "MocaScMod"
 					}
 				}
 			}
@@ -27031,7 +31070,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>>",
+				"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>>",
 				"access": false,
 				"array": false,
 				"APDeviceNumberOfEntries": {
@@ -27042,7 +31081,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "<<numentries>> <<deprecated|2.15| because the <<object|APDevice.<i>>>>> is being deprecated.",
+					"description": "<<numentries>> <<deprecated|2.15| because the <<object|APDevice.<i>>> is being deprecated>> <<obsoleted|2.17>>",
 					"datatype": "unsignedInt"
 				},
 				"Device.WiFi.MultiAP.SteeringSummaryStats.": {
@@ -27052,7 +31091,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>>>>",
+					"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>>",
 					"access": false,
 					"array": false,
 					"NoCandidateAPFailures": {
@@ -27151,7 +31190,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.",
+					"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>>",
 					"uniqueKeys": [
 						"MACAddress"
 					],
@@ -27165,7 +31204,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>>>>",
+						"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>>",
 						"datatype": "MACAddress",
 						"range": [
 							{
@@ -27185,7 +31224,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>>",
+						"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>>",
 						"datatype": "string"
 					},
 					"ManufacturerOUI": {
@@ -27216,7 +31255,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>>",
+						"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>>",
 						"datatype": "string",
 						"range": [
 							{
@@ -27232,7 +31271,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>>",
+						"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>>",
 						"datatype": "string",
 						"range": [
 							{
@@ -27248,7 +31287,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>>",
+						"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>>",
 						"datatype": "string",
 						"range": [
 							{
@@ -27397,7 +31436,7 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "Enables or disables Dynamic Frequency Selection (DFS). <<deprecated|2.15|because this information will be part of Data Elements R2>>",
+						"description": "Enables or disables Dynamic Frequency Selection (DFS). <<deprecated|2.15|because this information will be part of Data Elements R2>> <<obsoleted|2.17>>",
 						"datatype": "boolean"
 					},
 					"RadioNumberOfEntries": {
@@ -27408,7 +31447,7 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "<<numentries>> <<deprecated|2.15| because the <<object|Radio.<i>>>>> is being deprecated",
+						"description": "<<numentries>> <<deprecated|2.15| because the <<object|Radio.<i>>> is being deprecated>> <<obsoleted|2.17>>",
 						"datatype": "unsignedInt"
 					},
 					"Device.WiFi.MultiAP.APDevice.{i}.Radio.{i}.": {
@@ -27418,7 +31457,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.",
+						"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>>",
 						"uniqueKeys": [
 							"MACAddress"
 						],
@@ -27432,7 +31471,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>>>>",
+							"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>>",
 							"datatype": "MACAddress",
 							"range": [
 								{
@@ -27452,7 +31491,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>>>>",
+							"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>>",
 							"datatype": "string",
 							"enumerations": [
 								"2.4GHz",
@@ -27468,7 +31507,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>>",
+							"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>>",
 							"list": {
 								"datatype": "string",
 								"enumerations": [
@@ -27489,7 +31528,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>>>>",
+							"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>>",
 							"datatype": "unsignedInt",
 							"range": [
 								{
@@ -27506,7 +31545,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>>",
+							"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>>",
 							"datatype": "string",
 							"enumerations": [
 								"None",
@@ -27522,7 +31561,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>>",
+							"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>>",
 							"list": {
 								"datatype": "string",
 								"maxsize": 1024
@@ -27536,7 +31575,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>>",
+							"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>>",
 							"datatype": "string",
 							"enumerations": [
 								"20MHz",
@@ -27553,7 +31592,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>>",
+							"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>>",
 							"datatype": "int",
 							"range": [
 								{
@@ -27574,7 +31613,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>>>>",
+							"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>>",
 							"datatype": "int",
 							"range": [
 								{
@@ -27592,7 +31631,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>>",
+							"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>>",
 							"datatype": "int",
 							"range": [
 								{
@@ -27610,7 +31649,7 @@
 								"cwmp",
 								"usp"
 							],
-							"description": "<<numentries>> <<deprecated|2.15| because the <<object|AP.<i>.>>>> is being deprecated.",
+							"description": "<<numentries>> <<deprecated|2.15| because the <<object|AP.<i>.>> is being deprecated>> <<obsoleted|2.17>>",
 							"datatype": "unsignedInt"
 						},
 						"Device.WiFi.MultiAP.APDevice.{i}.Radio.{i}.AP.{i}.": {
@@ -27620,7 +31659,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>.>>>>",
+							"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>>",
 							"uniqueKeys": [
 								"BSSID"
 							],
@@ -27698,7 +31737,7 @@
 									"cwmp",
 									"usp"
 								],
-								"description": "<<numentries>> <<deprecated|2.15| because the <<object|AssociatedDevice.<i>.>>>> is being deprecated.",
+								"description": "<<numentries>> <<deprecated|2.15| because the <<object|AssociatedDevice.<i>.>> is being deprecated>> <<obsoleted|2.17>>",
 								"datatype": "unsignedInt"
 							},
 							"Device.WiFi.MultiAP.APDevice.{i}.Radio.{i}.AP.{i}.AssociatedDevice.{i}.": {
@@ -27708,7 +31747,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.",
+								"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>>",
 								"uniqueKeys": [
 									"MACAddress"
 								],
@@ -27742,7 +31781,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>>",
+									"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>>",
 									"datatype": "string",
 									"enumerations": [
 										"a",
@@ -27761,7 +31800,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>>",
+									"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>>",
 									"datatype": "boolean"
 								},
 								"AssociationTime": {
@@ -27840,7 +31879,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.",
+									"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>>",
 									"datatype": "unsignedInt"
 								},
 								"Device.WiFi.MultiAP.APDevice.{i}.Radio.{i}.AP.{i}.AssociatedDevice.{i}.Stats.": {
@@ -27850,7 +31889,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>.>>>>",
+									"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>>",
 									"access": false,
 									"array": false,
 									"BytesSent": {
@@ -27938,7 +31977,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.>>>>",
+									"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>>",
 									"access": false,
 									"array": false,
 									"NoCandidateAPFailures": {
@@ -28049,7 +32088,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>.>>>>",
+									"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>>",
 									"uniqueKeys": [
 										"Time",
 										"APOrigin",
@@ -28249,6 +32288,26 @@
 							]
 						}
 					},
+					"ColocatedAgentID": {
+						"type": "string",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "AL MAC address of the EasyMesh Agent that is co-located in the same device with the Wi-Fi EasyMesh Controller. Set to null if there is no such collocated agent.",
+						"datatype": "MACAddress",
+						"range": [
+							{
+								"max": 17
+							}
+						],
+						"pattern": [
+							"",
+							"([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])"
+						]
+					},
 					"SSIDNumberOfEntries": {
 						"type": "unsignedInt",
 						"read": true,
@@ -28260,6 +32319,27 @@
 						"description": "<<numentries>>",
 						"datatype": "unsignedInt"
 					},
+					"STABlockNumberOfEntries": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "<<numentries>>",
+						"datatype": "unsignedInt"
+					},
+					"PreferredBackhaulsNumberOfEntries": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"usp"
+						],
+						"description": "<<numentries>>",
+						"datatype": "unsignedInt"
+					},
 					"SetTrafficSeparation()": {
 						"type": "command",
 						"async": true,
@@ -28323,7 +32403,7 @@
 								"protocols": [
 									"usp"
 								],
-								"description": "A hexadecimal string of 64 PCP values (one octet per value) corresponding to the DSCP markings 0x00 to 0x3F, ordered by increasing DSCP value. Each octet is in the range 0x00 \u2013 0x07. This is used to select a PCP value if a Service Prioritization Rule specifies Rule Output: 0x08. If this input is not provided, then the existing <<param|#.Device.<i>.DSCPMap>> applies.",
+								"description": "A hexadecimal string of 64 PCP values (one octet per value) corresponding to the DSCP markings 0x00 to 0x3F, ordered by increasing DSCP value. Each octet is in the range 0x00 - 0x07. This is used to select a PCP value if a Service Prioritization Rule specifies Rule Output: 0x08. If this input is not provided, then the existing <<param|#.Device.<i>.DSCPMap>> applies.",
 								"datatype": "hexBinary",
 								"range": [
 									{
@@ -28395,7 +32475,17 @@
 								"description": "The SSID for fronthaul use across this Wi-Fi Multi-AP network.",
 								"datatype": "string"
 							},
-							"AddRemove": {
+							"Enable": {
+								"type": "boolean",
+								"read": true,
+								"write": true,
+								"protocols": [
+									"usp"
+								],
+								"description": "Enable or disable this <<param|SSID>>. Disable stops the use of this <<param|SSID>>, but the object is retained. : <<true>>: this <<param|SSID>> is to be enabled. : <<false>>: this <<param|SSID>> is to be disabled.",
+								"datatype": "boolean"
+							},
+							"AddRemoveChange": {
 								"type": "string",
 								"read": true,
 								"write": true,
@@ -28403,8 +32493,13 @@
 								"protocols": [
 									"usp"
 								],
-								"description": "Indicates whether to add or remove this <<param|SSID>>. : <<true>>: add this SSID, : <<false>>: remove this SSID. Status is to be returned after implementation or failed implementation on all agents/devices/APs in this Multi-AP network. If set to <<true>>, and this <<param|SSID>> already exists for this <<param|Band>>, then there is no change to the <<param|SSID>>, but the <<param|PassPhrase>> is set.",
-								"datatype": "string"
+								"description": "Indicates whether to add, remove or change this <<param|SSID>>. Enumeration of: Add, Remove, Change. Status is to be returned after implementation or failed implementation on all agents/devices/APs in this Multi-AP network. If set to <<enum|Change>>, then all input parameters for this <<param|SSID>> that do not have null values are to be changed.",
+								"datatype": "string",
+								"enumerations": [
+									"Add",
+									"Remove",
+									"Change"
+								]
 							},
 							"PassPhrase": {
 								"type": "string",
@@ -28441,6 +32536,105 @@
 										"6_UNII_8"
 									]
 								}
+							},
+							"AKMsAllowed": {
+								"type": "string",
+								"read": true,
+								"write": true,
+								"protocols": [
+									"usp"
+								],
+								"description": "<<list>> List items indicate Authentication and Key Management (AKM) suites/security modes allowed on this BSS. Enumeration of: psk, dpp, sae, psk+sae, dpp+sae, dpp+psk+sae, SuiteSelector.",
+								"list": {
+									"datatype": "string",
+									"enumerations": [
+										"psk",
+										"dpp",
+										"sae",
+										"psk+sae",
+										"dpp+sae",
+										"dpp+psk+sae",
+										"SuiteSelector"
+									]
+								}
+							},
+							"SuiteSelector": {
+								"type": "hexBinary",
+								"read": true,
+								"write": true,
+								"protocols": [
+									"usp"
+								],
+								"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. 506F9A02 <<bibref|802.11-2020|Table 9-151>>. This parameter applies if <<param|AKMsAllowed>> includes value SuiteSelector.",
+								"datatype": "hexBinary",
+								"range": [
+									{
+										"min": 4,
+										"max": 4
+									}
+								]
+							},
+							"AdvertisementEnabled": {
+								"type": "boolean",
+								"read": true,
+								"write": true,
+								"protocols": [
+									"usp"
+								],
+								"description": "Indicates if the SSID is advertised in beacons, or not. : <<true>>: this <<param|SSID>> is to be advertised in beacons. : <<false>>: this <<param|SSID>> is not to be advertised in beacons.",
+								"datatype": "boolean"
+							},
+							"MFPConfig": {
+								"type": "string",
+								"read": true,
+								"write": true,
+								"protocols": [
+									"usp"
+								],
+								"description": "Management Frame Protection (MFP) configuration. Enumeration of: Disabled, Optional, Required.",
+								"datatype": "string",
+								"enumerations": [
+									"Disabled",
+									"Optional",
+									"Required"
+								]
+							},
+							"MobilityDomain": {
+								"type": "string",
+								"read": true,
+								"write": true,
+								"protocols": [
+									"usp"
+								],
+								"description": "The IEEE 802.11 mobility domain <<bibref|802.11-2020|Section 9.4.2.46>>.",
+								"list": {
+									"datatype": "MACAddress",
+									"range": [
+										{
+											"max": 17
+										}
+									],
+									"pattern": [
+										"",
+										"([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])"
+									]
+								}
+							},
+							"HaulType": {
+								"type": "string",
+								"read": true,
+								"write": true,
+								"protocols": [
+									"usp"
+								],
+								"description": "Indicates the use of this <<param|SSID>>. Enumeration of: Fronthaul, Backhaul.",
+								"list": {
+									"datatype": "string",
+									"enumerations": [
+										"Fronthaul",
+										"Backhaul"
+									]
+								}
 							}
 						},
 						"output": {
@@ -28567,7 +32761,7 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "This object specifies SSIDs for fronthaul use across all agents in this Wi-Fi Multi-AP network, or on this single-AP. Also specifies the <<param|Band>> for each <<param|SSID>>.",
+						"description": "This object specifies SSIDs for fronthaul use across all agents in this 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>>>.",
 						"uniqueKeys": [
 							"SSID"
 						],
@@ -28615,6 +32809,276 @@
 									"6_UNII_8"
 								]
 							}
+						},
+						"Enable": {
+							"type": "boolean",
+							"read": true,
+							"write": false,
+							"protocols": [
+								"cwmp",
+								"usp"
+							],
+							"description": "Enable or disable of this <<param|SSID>>. Disable stops the use of this <<param|SSID>>, but the object is retained. : <<true>>: this <<param|SSID>> is enabled. : <<false>>: this <<param|SSID>> is disabled.",
+							"datatype": "boolean"
+						},
+						"AKMsAllowed": {
+							"type": "string",
+							"read": true,
+							"write": false,
+							"protocols": [
+								"cwmp",
+								"usp"
+							],
+							"description": "<<list>> List items indicate Authentication and Key Management (AKM) suites/security modes allowed on this BSS. Enumeration of: psk, dpp, sae, psk+sae, dpp+sae, dpp+psk+sae, SuiteSelector.",
+							"list": {
+								"datatype": "string",
+								"enumerations": [
+									"psk",
+									"dpp",
+									"sae",
+									"psk+sae",
+									"dpp+sae",
+									"dpp+psk+sae",
+									"SuiteSelector"
+								]
+							}
+						},
+						"SuiteSelector": {
+							"type": "hexBinary",
+							"read": true,
+							"write": false,
+							"protocols": [
+								"cwmp",
+								"usp"
+							],
+							"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. 506F9A02 <<bibref|802.11-2020|Table 9-151>>. This parameter applies if <<param|AKMsAllowed>> includes value SuiteSelector.",
+							"datatype": "hexBinary",
+							"range": [
+								{
+									"min": 4,
+									"max": 4
+								}
+							]
+						},
+						"AdvertisementEnabled": {
+							"type": "boolean",
+							"read": true,
+							"write": false,
+							"protocols": [
+								"cwmp",
+								"usp"
+							],
+							"description": "Indicates if the SSID is advertised in beacons, or not. : <<true>>: this <<param|SSID>> is to be advertised in beacons. : <<false>>: this <<param|SSID>> is not to be advertised in beacons.",
+							"datatype": "boolean"
+						},
+						"MFPConfig": {
+							"type": "string",
+							"read": true,
+							"write": false,
+							"protocols": [
+								"cwmp",
+								"usp"
+							],
+							"description": "Management Frame Protection (MFP) configuration. Enumeration of: Disabled, Optional, Required.",
+							"datatype": "string",
+							"enumerations": [
+								"Disabled",
+								"Optional",
+								"Required"
+							]
+						},
+						"MobilityDomain": {
+							"type": "string",
+							"read": true,
+							"write": false,
+							"protocols": [
+								"cwmp",
+								"usp"
+							],
+							"description": "The IEEE 802.11 mobility domain <<bibref|802.11-2020|Section 9.4.2.46>>.",
+							"datatype": "MACAddress",
+							"range": [
+								{
+									"max": 17
+								}
+							],
+							"pattern": [
+								"",
+								"([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])"
+							]
+						},
+						"HaulType": {
+							"type": "string",
+							"read": true,
+							"write": false,
+							"protocols": [
+								"cwmp",
+								"usp"
+							],
+							"description": "Indicates the use of this <<param|SSID>>. Enumeration of: Fronthaul, Backhaul.",
+							"list": {
+								"datatype": "string",
+								"enumerations": [
+									"Fronthaul",
+									"Backhaul"
+								]
+							}
+						}
+					},
+					"Device.WiFi.DataElements.Network.STABlock.{i}.": {
+						"type": "object",
+						"version": "2.17",
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "This object indicates stations (STAs) for which client association is blocked. optionally the BSSID(s) the STA is blocked from associating to. In multi-AP cases, this should be implemented by Wi-Fi EasyMesh <<bibref|EasyMesh>> client association control. Stations that are already associated shall be disassociated if <<object|#.STABlock.<i>.Schedule.<i>.>> indicates so.",
+						"uniqueKeys": [
+							"BlockedSTA"
+						],
+						"access": true,
+						"array": true,
+						"BlockedSTA": {
+							"type": "string",
+							"read": true,
+							"write": true,
+							"protocols": [
+								"cwmp",
+								"usp"
+							],
+							"description": "MAC addresses of the STA that is blocked.",
+							"datatype": "MACAddress",
+							"range": [
+								{
+									"max": 17
+								}
+							],
+							"pattern": [
+								"",
+								"([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])"
+							]
+						},
+						"BSSID": {
+							"type": "string",
+							"read": true,
+							"write": true,
+							"protocols": [
+								"cwmp",
+								"usp"
+							],
+							"description": "<<list>> Indicates BSS from which the <<param|BlockedSTA>> is blocked from association and cannot associate to. A null list indicates that all SSIDs are blocked.",
+							"list": {
+								"datatype": "MACAddress",
+								"range": [
+									{
+										"max": 17
+									}
+								],
+								"pattern": [
+									"",
+									"([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])"
+								]
+							}
+						},
+						"ScheduleNumberOfEntries": {
+							"type": "unsignedInt",
+							"read": true,
+							"write": false,
+							"protocols": [
+								"cwmp",
+								"usp"
+							],
+							"description": "<<numentries>>",
+							"datatype": "unsignedInt"
+						},
+						"Device.WiFi.DataElements.Network.STABlock.{i}.Schedule.{i}.": {
+							"type": "object",
+							"version": "2.17",
+							"protocols": [
+								"cwmp",
+								"usp"
+							],
+							"description": "Each instance of this object provides a schedule where client association is blocked for <<param|#.BlockedSTA>> <<bibref|EasyMesh|Section 11.6>>.",
+							"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": "Alias",
+								"range": [
+									{
+										"max": 64
+									}
+								]
+							},
+							"Day": {
+								"type": "string",
+								"read": true,
+								"write": true,
+								"protocols": [
+									"cwmp",
+									"usp"
+								],
+								"description": "<<list|the days for which the STA is blocked>> 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 STA block 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 STA is blocked. If <<param|StartTime>> is defined, the STA is blocked for the <<param>> period starting from <<param|StartTime>>.",
+								"datatype": "unsignedInt",
+								"range": [
+									{
+										"min": 1
+									}
+								],
+								"unit": "seconds"
+							}
 						}
 					},
 					"Device.WiFi.DataElements.Network.MultiAPSteeringSummaryStats.": {
@@ -28723,7 +33187,7 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "Each instance of this object represents an individual Access Point device in the Wi-Fi network.",
+						"description": "Each instance of this object represents an individual EasyMesh Agent or single-AP device in the Wi-Fi network.",
 						"uniqueKeys": [
 							"ID"
 						],
@@ -28809,7 +33273,24 @@
 								"cwmp",
 								"usp"
 							],
-							"description": "AP Metrics Reporting Interval. : 0: Do not report AP Metrics periodically; : 1 \u2013 255: AP Metrics reporting interval in <<units>>.",
+							"description": "AP Metrics Reporting Interval. : 0: Do not report AP Metrics periodically; : 1 - 255: AP Metrics reporting interval in <<units>>.",
+							"datatype": "unsignedInt",
+							"range": [
+								{
+									"max": 255
+								}
+							],
+							"unit": "seconds"
+						},
+						"AssociatedSTAReportingInterval": {
+							"type": "unsignedInt",
+							"read": true,
+							"write": true,
+							"protocols": [
+								"cwmp",
+								"usp"
+							],
+							"description": "Associated STA Reporting Interval. 0: Do not report associated STA Metrics periodically; 1 - 255: Associated STA Metrics reporting interval in <<units>>.",
 							"datatype": "unsignedInt",
 							"range": [
 								{
@@ -28881,7 +33362,7 @@
 								"cwmp",
 								"usp"
 							],
-							"description": "A hexadecimal string of 64 Priority Code Point (PCP) values (one octet per value) corresponding to the Differentiated Services Code Point (DSCP) markings 0x00 to 0x3F, ordered by increasing DSCP value. Each octet is in the range 0x00 \u2013 0x07. This is used to select a PCP value if a Service Prioritization Rule specifies Rule Output: 0x08",
+							"description": "A hexadecimal string of 64 Priority Code Point (PCP) values (one octet per value) corresponding to the Differentiated Services Code Point (DSCP) markings 0x00 to 0x3F, ordered by increasing DSCP value. Each octet is in the range 0x00 - 0x07. This is used to select a PCP value if a Service Prioritization Rule specifies Rule Output: 0x08",
 							"datatype": "hexBinary",
 							"range": [
 								{
@@ -29088,6 +33569,158 @@
 							"description": "This parameter indicates if EasyMesh service prioritization <<bibref|EasyMesh|Section 20>> is allowed or disallowed.",
 							"datatype": "boolean"
 						},
+						"ControllerOperationMode": {
+							"type": "string",
+							"read": true,
+							"write": false,
+							"protocols": [
+								"cwmp",
+								"usp"
+							],
+							"description": "This parameter represents the status of Wi-Fi EasyMesh controller functionality. Enumeration of: NotSupported, SupportedNotEnabled, Running.",
+							"datatype": "string",
+							"enumerations": [
+								"NotSupported",
+								"SupportedNotEnabled",
+								"Running"
+							]
+						},
+						"BackhaulMACAddress": {
+							"type": "string",
+							"read": true,
+							"write": false,
+							"protocols": [
+								"cwmp",
+								"usp"
+							],
+							"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 BSSID or AP MLD address of the backhaul BSS.",
+							"datatype": "MACAddress",
+							"range": [
+								{
+									"max": 17
+								}
+							],
+							"pattern": [
+								"",
+								"([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])"
+							]
+						},
+						"BackhaulALID": {
+							"type": "string",
+							"read": true,
+							"write": false,
+							"protocols": [
+								"cwmp",
+								"usp"
+							],
+							"description": "The IEEE 1905 <<bibref|IEEE1905.1a>> Abstraction-Layer ID (ALID) of the EasyMesh Agent on the network that is providing the backhaul for this EasyMesh Agent.",
+							"datatype": "MACAddress",
+							"range": [
+								{
+									"max": 17
+								}
+							],
+							"pattern": [
+								"",
+								"([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])"
+							]
+						},
+						"BackhaulDownMACAddress": {
+							"type": "string",
+							"read": true,
+							"write": false,
+							"protocols": [
+								"cwmp",
+								"usp"
+							],
+							"description": "<<list>> Each MAC address is that of a downstream EasyMesh agents backhaul link.",
+							"list": {
+								"datatype": "MACAddress",
+								"range": [
+									{
+										"max": 17
+									}
+								],
+								"pattern": [
+									"",
+									"([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])"
+								]
+							}
+						},
+						"BackhaulMediaType": {
+							"type": "string",
+							"read": true,
+							"write": false,
+							"protocols": [
+								"cwmp",
+								"usp"
+							],
+							"description": "Media type of the backhaul link of this EasyMesh Agent. This value can be derived from the neighbors topology response message 1905 device information type TLV Media Type field defined in <<bibref|IEEE1905.1a|Table 6-12>>. Enumeration of: IEEE 802.3u, IEEE 802.3ab, IEEE 802.11b, IEEE 802.11g, IEEE 802.11a, IEEE 802.11n 2.4, IEEE 802.11n 5.0, IEEE 802.11ac, IEEE 802.11ad, IEEE 802.11af, IEEE 802.11ax, IEEE 802.11be, IEEE 1901 Wavelet, IEEE 1901 FFT, MoCAv1.1, Generic PHY.",
+							"datatype": "string",
+							"enumerations": [
+								"IEEE 802.3u",
+								"IEEE 802.3ab",
+								"IEEE 802.11b",
+								"IEEE 802.11g",
+								"IEEE 802.11a",
+								"IEEE 802.11n 2.4",
+								"IEEE 802.11n 5.0",
+								"IEEE 802.11ac",
+								"IEEE 802.11ad",
+								"IEEE 802.11af",
+								"IEEE 802.11ax",
+								"IEEE 802.11be",
+								"IEEE 1901 Wavelet",
+								"IEEE 1901 FFT",
+								"MoCAv1.1",
+								"Generic PHY"
+							]
+						},
+						"BackhaulPHYRate": {
+							"type": "unsignedInt",
+							"read": true,
+							"write": false,
+							"protocols": [
+								"cwmp",
+								"usp"
+							],
+							"description": "The Physical Layer (PHY) rate in <<units>> on the backhaul link of this EasyMesh agent.",
+							"datatype": "unsignedInt",
+							"unit": "Mb/s"
+						},
+						"TrafficSeparationCapability": {
+							"type": "boolean",
+							"read": true,
+							"write": false,
+							"protocols": [
+								"cwmp",
+								"usp"
+							],
+							"description": "Indicator of EasyMesh Agent capability to support EasyMesh <<bibref|EasyMesh>> 802.1Q C-TAG Traffic Separation.",
+							"datatype": "boolean"
+						},
+						"EasyConnectCapability": {
+							"type": "boolean",
+							"read": true,
+							"write": false,
+							"protocols": [
+								"cwmp",
+								"usp"
+							],
+							"description": "Indicator of the device capability to support Wi-Fi Easy Connect onboarding. Indicated in the DPP Onboarding field of the EasyMesh Profile-2 AP Capability TLV <<bibref|EasyMesh>>.",
+							"datatype": "boolean"
+						},
+						"TestCapabilities": {
+							"type": "unsignedInt",
+							"read": true,
+							"write": false,
+							"protocols": [
+								"cwmp",
+								"usp"
+							],
+							"description": "Indicates EasyMesh agent support for running a throughput or latency test. 0 indicates that the EasyMesh Agent or single-AP does not support any throughput test and does not support a latency test. 1 indicates that the EasyMesh Agent or single-AP supports a throughput test but does not support a latency test. 2 indicates that the EasyMesh Agent or single-AP supports a latency test but does not support a throughput test. 3 indicates that the EasyMesh Agent or single-AP supports a throughput test and a latency test.",
+							"datatype": "unsignedInt"
+						},
 						"RadioNumberOfEntries": {
 							"type": "unsignedInt",
 							"read": true,
@@ -29176,6 +33809,78 @@
 							"description": "<<numentries>>",
 							"datatype": "unsignedInt"
 						},
+						"MaxNumMLDs": {
+							"type": "unsignedInt",
+							"read": true,
+							"write": false,
+							"protocols": [
+								"cwmp",
+								"usp"
+							],
+							"description": "The maximum number of MLDs that the EasyMesh Agent can support. <<bibref|EasyMesh>> source: Wi-Fi 7 Agent Capabilities TLV.",
+							"datatype": "unsignedInt"
+						},
+						"APMLDMaxLinks": {
+							"type": "unsignedInt",
+							"read": true,
+							"write": false,
+							"protocols": [
+								"cwmp",
+								"usp"
+							],
+							"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 of affiliated APs minus 1. The value of 15 is reserved. <<bibref|EasyMesh>> source: Wi-Fi 7 Agent Capabilities TLV.",
+							"datatype": "unsignedInt",
+							"range": [
+								{
+									"min": 0,
+									"max": 15
+								}
+							]
+						},
+						"bSTAMLDMaxLinks": {
+							"type": "unsignedInt",
+							"read": true,
+							"write": false,
+							"protocols": [
+								"cwmp",
+								"usp"
+							],
+							"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 number of affiliated bSTAs minus 1. The value of 15 is reserved. <<bibref|EasyMesh>> source: Wi-Fi 7 Agent Capabilities TLV.",
+							"datatype": "unsignedInt",
+							"range": [
+								{
+									"min": 0,
+									"max": 15
+								}
+							]
+						},
+						"TIDLinkMapCapability": {
+							"type": "string",
+							"read": true,
+							"write": false,
+							"protocols": [
+								"cwmp",
+								"usp"
+							],
+							"description": "Indicates the EasyMesh Agent support for TID to Link mapping. <<bibref|EasyMesh>> source: Wi-Fi 7 Agent Capabilities TLV. Enumeration of: 0, 1, 2.",
+							"datatype": "string",
+							"enumerations": [
+								"0",
+								"1",
+								"2"
+							]
+						},
+						"APMLDNumberOfEntries": {
+							"type": "unsignedInt",
+							"read": true,
+							"write": false,
+							"protocols": [
+								"cwmp",
+								"usp"
+							],
+							"description": "<<numentries>>",
+							"datatype": "unsignedInt"
+						},
 						"SetSTASteeringState()": {
 							"type": "command",
 							"async": true,
@@ -29313,6 +34018,31 @@
 								}
 							}
 						},
+						"InitiateWPSPBC()": {
+							"type": "command",
+							"async": true,
+							"protocols": [
+								"usp"
+							],
+							"output": {
+								"Status": {
+									"type": "string",
+									"read": true,
+									"write": true,
+									"protocols": [
+										"usp"
+									],
+									"description": "Indicates the response to the request to start Wi-Fi Protected Setup (WPS) Push Button Configuration (PBC). Enumeration of: Success, Error_Invalid_Input, Error_Timeout, Error_Other.",
+									"datatype": "string",
+									"enumerations": [
+										"Success",
+										"Error_Invalid_Input",
+										"Error_Timeout",
+										"Error_Other"
+									]
+								}
+							}
+						},
 						"Device.WiFi.DataElements.Network.Device.{i}.Default8021Q.{i}.": {
 							"type": "object",
 							"version": "2.15",
@@ -29691,7 +34421,7 @@
 									"cwmp",
 									"usp"
 								],
-								"description": "Rule Precedence \u2013 higher number means higher priority.",
+								"description": "Rule Precedence - higher number means higher priority.",
 								"datatype": "unsignedInt",
 								"range": [
 									{
@@ -29988,7 +34718,7 @@
 										"cwmp",
 										"usp"
 									],
-									"description": "One of: : MAC address: if the entry corresponds to channel usage by a single client STA associated to an AP of the Agent; : BSSID: if the entry corresponds to channel usage by multiple or unspecified client STAs associated to an AP of the Agent; : BSS Color: (first 42-bits are zero) if the channel usage is caused by a source external to the BSSs operated by the Agent and the BSSID can\u2019t be decoded (since frame sent at high MCS) but the BSS Color in the PHY headers could still be identified; : Zero: if the channel usage is caused by a source external to the BSSs operated by the Agent.",
+									"description": "One of: : MAC address: if the entry corresponds to channel usage by a single client STA associated to the BSS of the Agent; : BSSID: if the entry corresponds to channel usage by multiple or unspecified client STAs associated to the BSS of the Agent; : BSS Color: (first 42-bits are zero) if the channel usage is caused by a source external to the BSSs operated by the Agent and the BSSID cannot be decoded (since frame sent at high MCS) but the BSS Color in the PHY headers could still be identified; : Zero: if the channel usage is caused by a source external to the BSSs operated by the Agent.",
 									"datatype": "MACAddress",
 									"range": [
 										{
@@ -30715,7 +35445,7 @@
 									"cwmp",
 									"usp"
 								],
-								"description": "Station (STA) Metrics Reporting RCPI Threshold. : 0: Do not report STA Metrics based on RCPI threshold. : 1 \u2013 220: RCPI threshold (encoded per <<bibref|802.11-2020|Table 9-176>>).",
+								"description": "Station (STA) Metrics Reporting RCPI Threshold. : 0: Do not report STA Metrics based on RCPI threshold. : 1 - 220: RCPI threshold (encoded per <<bibref|802.11-2020|Table 9-176>>).",
 								"datatype": "unsignedInt",
 								"range": [
 									{
@@ -30856,11 +35586,10 @@
 										"type": "unsignedInt",
 										"read": true,
 										"write": true,
-										"mandatory": true,
 										"protocols": [
 											"usp"
 										],
-										"description": "The Operating Class per <<bibref|802.11-2020|Table E-4>> For 2.4GHz and 5GHz bands, only 20MHz Operating Classes are valid. Note that the operating class identifies the band and channel width.",
+										"description": "The Operating Class per <<bibref|802.11-2020|Table E-4>>. For 2.4GHz and 5GHz bands, only 20MHz Operating Classes are valid. If this input is not provided, then all available opclasses and channels are to be scanned. Note that the operating class identifies the band, and channel width.",
 										"datatype": "unsignedInt",
 										"range": [
 											{
@@ -30872,7 +35601,6 @@
 										"type": "string",
 										"read": true,
 										"write": true,
-										"mandatory": true,
 										"protocols": [
 											"usp"
 										],
@@ -30885,6 +35613,55 @@
 												}
 											]
 										}
+									},
+									"ScanType": {
+										"type": "string",
+										"read": true,
+										"write": true,
+										"protocols": [
+											"usp"
+										],
+										"description": "Indicates the type of scan to perform. If this is omitted, or is not supported by the device, then it should be ignored. Enumeration of: Interrupt_Radio, Time_Sliced, Spatial_Stream, Unused_Radio.",
+										"datatype": "string",
+										"enumerations": [
+											"Interrupt_Radio",
+											"Time_Sliced",
+											"Spatial_Stream",
+											"Unused_Radio"
+										]
+									},
+									"DwellTime": {
+										"type": "unsignedInt",
+										"read": true,
+										"write": true,
+										"protocols": [
+											"usp"
+										],
+										"description": "The duration of the time to scan each channel in <<units>>. A value of 50 <<units>> is suggested. If this is omitted, or is not supported by the device, then it should be ignored.",
+										"datatype": "unsignedInt",
+										"unit": "milliseconds"
+									},
+									"DFSDwellTime": {
+										"type": "unsignedInt",
+										"read": true,
+										"write": true,
+										"protocols": [
+											"usp"
+										],
+										"description": "The duration of time to scan each Dynamic Frequency Selection (DFS) channel in <<units>>. Note that this is the time to scan the channel, and is not the time to perform DFS. A value of at least one beacon interval, typically 100 <<units>>, is suggested. If this is omitted, or is not supported by the device, then it should be ignored.",
+										"datatype": "unsignedInt",
+										"unit": "milliseconds"
+									},
+									"HomeTime": {
+										"type": "unsignedInt",
+										"read": true,
+										"write": true,
+										"protocols": [
+											"usp"
+										],
+										"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.",
+										"datatype": "unsignedInt",
+										"unit": "milliseconds"
 									}
 								},
 								"output": {
@@ -31190,6 +35967,29 @@
 									"description": "The timestamp of the last scan. Formatted with the date-and-time string format as defined in <<bibref|RFC3339|Section 3>>.",
 									"datatype": "string"
 								},
+								"AggregateScanDuration": {
+									"type": "unsignedInt",
+									"read": true,
+									"write": false,
+									"protocols": [
+										"cwmp",
+										"usp"
+									],
+									"description": "Total time spent performing the scan of this channel in <<units>>.",
+									"datatype": "unsignedInt",
+									"unit": "milliseconds"
+								},
+								"ScanType": {
+									"type": "boolean",
+									"read": true,
+									"write": false,
+									"protocols": [
+										"cwmp",
+										"usp"
+									],
+									"description": "Indicates whether the scan was performed passively (false) or with active probing (true).",
+									"datatype": "boolean"
+								},
 								"OpClassScanNumberOfEntries": {
 									"type": "unsignedInt",
 									"read": true,
@@ -31313,6 +36113,27 @@
 												}
 											]
 										},
+										"ScanStatus": {
+											"type": "string",
+											"read": true,
+											"write": false,
+											"protocols": [
+												"cwmp",
+												"usp"
+											],
+											"description": "Status code to indicate whether a scan has been performed and if not the reason for failure Enumeration of: 0, 1, 2, 3, 4, 5, 6, 7.",
+											"datatype": "string",
+											"enumerations": [
+												"0",
+												"1",
+												"2",
+												"3",
+												"4",
+												"5",
+												"6",
+												"7"
+											]
+										},
 										"NeighborBSSNumberOfEntries": {
 											"type": "unsignedInt",
 											"read": true,
@@ -31376,7 +36197,7 @@
 													"cwmp",
 													"usp"
 												],
-												"description": "An indicator of radio signal strength (RSSI) of the Beacon or Probe Response frames of the neighboring BSS as received by the radio measured in <<units>>. (RSSI is encoded per <<bibref|802.11-2020|Table 9-176>>). Reserved: 221 - 255. NOTE: The underlying WFA specification is in the process of being reviewed for possible clarification. Please refer to that specification for more details.",
+												"description": "An indicator of radio signal strength (RSSI) of the Beacon or Probe Response frames of the neighboring BSS as received by the radio measured in <<units>>. (RSSI is encoded per <<bibref|802.11-2020|Table 9-176>>). Reserved: 221 - 255.",
 												"datatype": "unsignedInt",
 												"range": [
 													{
@@ -31422,6 +36243,84 @@
 												],
 												"description": "The number of Associated Devices (STA) reported by this neighboring BSS per the BSS Load element if present in Beacon or Probe Response frames as defined by <<bibref|802.11-2020|Section 9.4.2.27>>.",
 												"datatype": "unsignedInt"
+											},
+											"MLDMACAddress": {
+												"type": "string",
+												"read": true,
+												"write": false,
+												"protocols": [
+													"cwmp",
+													"usp"
+												],
+												"description": "The Multi-Link Device (MLD) MAC address of the Multi-Link Operation (MLO) capable access point this neighboring BSS is affiliated to. Null if the neighboring BSS is not an affiliated AP.",
+												"datatype": "MACAddress",
+												"range": [
+													{
+														"max": 17
+													}
+												],
+												"pattern": [
+													"",
+													"([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])"
+												]
+											},
+											"ReportingBSSID": {
+												"type": "string",
+												"read": true,
+												"write": false,
+												"protocols": [
+													"cwmp",
+													"usp"
+												],
+												"description": "The BSSID of the reporting BSSID if different from <<param|BSSID>>. This will be set if the NeigborBSS was discovered through, for example, a Reduced Neighbor Report. EasyMesh <<bibref|EasyMesh>> source: Channel Scan Result TLV.",
+												"datatype": "MACAddress",
+												"range": [
+													{
+														"max": 17
+													}
+												],
+												"pattern": [
+													"",
+													"([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])"
+												]
+											},
+											"MultiBSSID": {
+												"type": "boolean",
+												"read": true,
+												"write": false,
+												"protocols": [
+													"cwmp",
+													"usp"
+												],
+												"description": "Indicates if the neighboring BSS is part of a MultiBSSID set and may be a non-transmitted BSSID.",
+												"datatype": "boolean"
+											},
+											"BSSLoadElementPresent": {
+												"type": "boolean",
+												"read": true,
+												"write": false,
+												"protocols": [
+													"cwmp",
+													"usp"
+												],
+												"description": "Set to true if the neighbour BSS Beacon/Probe Responses include a BSSLoad Element as defined in <<bibref|802.11-2020|Section 9.4.2.28>>.",
+												"datatype": "boolean"
+											},
+											"BSSColor": {
+												"type": "unsignedInt",
+												"read": true,
+												"write": false,
+												"protocols": [
+													"cwmp",
+													"usp"
+												],
+												"description": "Set to the BSS Color from the BSS Color Information field in the BSSs HE Operation element.",
+												"datatype": "unsignedInt",
+												"range": [
+													{
+														"max": 63
+													}
+												]
 											}
 										}
 									}
@@ -31476,7 +36375,7 @@
 										"cwmp",
 										"usp"
 									],
-									"description": "\u201cOn boot only\u201d flag, Indicates whether the specified radio is capable only of \u201cOn boot\u201d scans.",
+									"description": "On boot only flag, Indicates whether the specified radio is capable only of On boot scans.",
 									"datatype": "boolean"
 								},
 								"Impact": {
@@ -31737,7 +36636,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>>.>>",
+									"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>>",
 									"datatype": "base64",
 									"range": [
 										{
@@ -31746,6 +36645,61 @@
 										}
 									]
 								},
+								"MSCSCapability": {
+									"type": "boolean",
+									"read": true,
+									"write": false,
+									"protocols": [
+										"cwmp",
+										"usp"
+									],
+									"description": "This parameter indicates support for Mirrored Stream Classification Service (MSCS) and EasyMesh configuration of MSCS <<bibref|EasyMesh|AP Radio Advanced Capabilities TLV>>.",
+									"datatype": "boolean"
+								},
+								"SCSCapability": {
+									"type": "boolean",
+									"read": true,
+									"write": false,
+									"protocols": [
+										"cwmp",
+										"usp"
+									],
+									"description": "This parameter indicates support for Stream Classification Service (SCS) and EasyMesh <<bibref|EasyMesh>> configuration of SCS <<bibref|EasyMesh|AP Radio Advanced Capabilities TLV>>.",
+									"datatype": "boolean"
+								},
+								"QoSMapCapability": {
+									"type": "boolean",
+									"read": true,
+									"write": false,
+									"protocols": [
+										"cwmp",
+										"usp"
+									],
+									"description": "This parameter indicates support for QoS Map <<bibref|EasyMesh|AP Radio Advanced Capabilities TLV>>.",
+									"datatype": "boolean"
+								},
+								"DSCPPolicyCapability": {
+									"type": "boolean",
+									"read": true,
+									"write": false,
+									"protocols": [
+										"cwmp",
+										"usp"
+									],
+									"description": "This parameter indicates support for DSCP Mapping Table TLV based DSCP-to-UP mapping and EasyMesh distribution of QoS Map elements to associated STAs <<bibref|EasyMesh|AP Radio Advanced Capabilities TLV>>.",
+									"datatype": "boolean"
+								},
+								"SCSTrafficDescriptionCapability": {
+									"type": "boolean",
+									"read": true,
+									"write": false,
+									"protocols": [
+										"cwmp",
+										"usp"
+									],
+									"description": "This parameter indicates support for QoS Management Stream Classification Service (SCS) Traffic Description and EasyMesh configuration of and/or extensions to SCS using traffic descriptions <<bibref|EasyMesh|AP Radio Advanced Capabilities TLV>>.",
+									"datatype": "boolean"
+								},
 								"CapableOperatingClassProfileNumberOfEntries": {
 									"type": "unsignedInt",
 									"read": true,
@@ -31905,6 +36859,17 @@
 										"description": "Indicates support for UL Orthogonal Frequency Division Multiplexing (OFDMA).",
 										"datatype": "boolean"
 									},
+									"DLOFDMA": {
+										"type": "boolean",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "Indicates support for Downlink (DL) Orthogonal Frequency Division Multiplexing (OFDMA).",
+										"datatype": "boolean"
+									},
 									"MaxDLMUMIMO": {
 										"type": "unsignedInt",
 										"read": true,
@@ -31913,7 +36878,7 @@
 											"cwmp",
 											"usp"
 										],
-										"description": "Max number of users supported per DL MU-MIMO Transmitter (TX) in an AP role.",
+										"description": "Max number of users supported per DL MU-MIMO Transmitter (TX) in the BSS role.",
 										"datatype": "unsignedInt",
 										"range": [
 											{
@@ -31929,7 +36894,7 @@
 											"cwmp",
 											"usp"
 										],
-										"description": "Max number of users supported per UL MU-MIMO Receiver (RX) in an AP role.",
+										"description": "Max number of users supported per UL MU-MIMO Receiver (RX) in the BSS role.",
 										"datatype": "unsignedInt",
 										"range": [
 											{
@@ -31945,7 +36910,7 @@
 											"cwmp",
 											"usp"
 										],
-										"description": "Max number of users supported per Downlink (DL) OFDMA TX in an AP role.",
+										"description": "Max number of users supported per Downlink (DL) OFDMA TX in the BSS role.",
 										"datatype": "unsignedInt",
 										"range": [
 											{
@@ -31961,7 +36926,7 @@
 											"cwmp",
 											"usp"
 										],
-										"description": "Max number of users supported per UL OFDMA RX in an AP role.",
+										"description": "Max number of users supported per UL OFDMA RX in the BSS role.",
 										"datatype": "unsignedInt",
 										"range": [
 											{
@@ -32184,6 +37149,17 @@
 										"description": "Indicates support for UL Orthogonal Frequency Division Multiplexing (OFDMA).",
 										"datatype": "boolean"
 									},
+									"DLOFDMA": {
+										"type": "boolean",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "Indicates support for Downlink (DL) Orthogonal Frequency Division Multiplexing (OFDMA).",
+										"datatype": "boolean"
+									},
 									"MaxDLMUMIMO": {
 										"type": "unsignedInt",
 										"read": true,
@@ -32192,7 +37168,7 @@
 											"cwmp",
 											"usp"
 										],
-										"description": "Max number of users supported per DL MU-MIMO Transmitter (TX) in an AP role.",
+										"description": "Max number of users supported per DL MU-MIMO Transmitter (TX) in the BSS role.",
 										"datatype": "unsignedInt",
 										"range": [
 											{
@@ -32208,7 +37184,7 @@
 											"cwmp",
 											"usp"
 										],
-										"description": "Max number of users supported per UL MU-MIMO Receiver (RX) in an AP role.",
+										"description": "Max number of users supported per UL MU-MIMO Receiver (RX) in the BSS role.",
 										"datatype": "unsignedInt",
 										"range": [
 											{
@@ -32224,7 +37200,7 @@
 											"cwmp",
 											"usp"
 										],
-										"description": "Max number of users supported per Downlink (DL) OFDMA TX in an AP role.",
+										"description": "Max number of users supported per Downlink (DL) OFDMA TX in the BSS role.",
 										"datatype": "unsignedInt",
 										"range": [
 											{
@@ -32240,7 +37216,7 @@
 											"cwmp",
 											"usp"
 										],
-										"description": "Max number of users supported per UL OFDMA RX in an AP role.",
+										"description": "Max number of users supported per UL OFDMA RX in the BSS role.",
 										"datatype": "unsignedInt",
 										"range": [
 											{
@@ -32337,6 +37313,522 @@
 										"datatype": "boolean"
 									}
 								},
+								"Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi7APRole.": {
+									"type": "object",
+									"version": "2.17",
+									"protocols": [
+										"cwmp",
+										"usp"
+									],
+									"description": "This object describes the Wi-Fi 7 capabilities for the AP role including Multi-Link Operation (MLO) capabilities. <<bibref|EasyMesh>> Source: Wi-Fi 7 Agent Capabilities TLV.",
+									"access": false,
+									"array": false,
+									"EMLMRSupport": {
+										"type": "boolean",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "Indicates if the Enhanced Multi-Link Multi-Radio (EMLMR) operation is supported.",
+										"datatype": "boolean"
+									},
+									"EMLSRSupport": {
+										"type": "boolean",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "Indicates if Enhanced Multi-Link Single-Radio (EMLSR) operation is supported.",
+										"datatype": "boolean"
+									},
+									"STRSupport": {
+										"type": "boolean",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "Indicates if Simultaneous Transmit and Receive (STR) operation is supported.",
+										"datatype": "boolean"
+									},
+									"NSTRSupport": {
+										"type": "boolean",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "Indicates if Non-Simultaneous Transmit and Receive (NSTR) operation is supported.",
+										"datatype": "boolean"
+									},
+									"TIDLinkMapNegotiation": {
+										"type": "boolean",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "Indicates if Traffic Identifier (TID) to Link Mapping Negotiation is supported.",
+										"datatype": "boolean"
+									},
+									"EMLMRFreqSeparationNumberOfEntries": {
+										"type": "unsignedInt",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "<<numentries>>",
+										"datatype": "unsignedInt"
+									},
+									"EMLSRFreqSeparationNumberOfEntries": {
+										"type": "unsignedInt",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "<<numentries>>",
+										"datatype": "unsignedInt"
+									},
+									"STRFreqSeparationNumberOfEntries": {
+										"type": "unsignedInt",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "<<numentries>>",
+										"datatype": "unsignedInt"
+									},
+									"NSTRFreqSeparationNumberOfEntries": {
+										"type": "unsignedInt",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "<<numentries>>",
+										"datatype": "unsignedInt"
+									},
+									"Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi7APRole.EMLMRFreqSeparation.{i}.": {
+										"type": "object",
+										"version": "2.17",
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "This object describes the required frequency separation from the specified radio <<param|RUID>> for MLO Enhanced Multi-Link Multi-Radio (EMLMR) operation. <<bibref|EasyMesh>> Source: Wi-Fi 7 Agent Capabilities TLV.",
+										"uniqueKeys": [
+											"RUID"
+										],
+										"access": false,
+										"array": true,
+										"RUID": {
+											"type": "base64",
+											"read": true,
+											"write": false,
+											"protocols": [
+												"cwmp",
+												"usp"
+											],
+											"description": "The Radio unique identifier (RUID) of another radio to which the specified frequency separation gap applies.",
+											"datatype": "base64"
+										},
+										"FreqSeparation": {
+											"type": "unsignedInt",
+											"read": true,
+											"write": false,
+											"protocols": [
+												"cwmp",
+												"usp"
+											],
+											"description": "Frequency separation to the specified radio for the particular MLO operation mode. A value of 0 indicates that no frequency separation information is provided. Set to a nonzero value to indicate the required frequency gap is (<<param>> - 1) x <<units>>.",
+											"datatype": "unsignedInt",
+											"unit": "80 MHz"
+										}
+									},
+									"Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi7APRole.EMLSRFreqSeparation.{i}.": {
+										"type": "object",
+										"version": "2.17",
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "This object describes the required frequency separation from the specified radio <<param|RUID>> for MLO Enhanced Multi-Link Single-Radio (EMLSR) operation. <<bibref|EasyMesh>> Source: Wi-Fi 7 Agent Capabilities TLV.",
+										"uniqueKeys": [
+											"RUID"
+										],
+										"access": false,
+										"array": true,
+										"RUID": {
+											"type": "base64",
+											"read": true,
+											"write": false,
+											"protocols": [
+												"cwmp",
+												"usp"
+											],
+											"description": "The Radio unique identifier (RUID) of another radio to which the specified frequency separation gap applies.",
+											"datatype": "base64"
+										},
+										"FreqSeparation": {
+											"type": "unsignedInt",
+											"read": true,
+											"write": false,
+											"protocols": [
+												"cwmp",
+												"usp"
+											],
+											"description": "Frequency separation to the specified radio for the particular MLO operation mode. A value of 0 indicates that no frequency separation information is provided. Set to a nonzero value to indicate the required frequency gap is (<<param>> - 1) x <<units>>.",
+											"datatype": "unsignedInt",
+											"unit": "80 MHz"
+										}
+									},
+									"Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi7APRole.STRFreqSeparation.{i}.": {
+										"type": "object",
+										"version": "2.17",
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "This object describes the required frequency separation from the specified radio <<param|RUID>> for MLO Simultaneous Transmit and Receive (STR) operation. <<bibref|EasyMesh>> Source: Wi-Fi 7 Agent Capabilities TLV.",
+										"uniqueKeys": [
+											"RUID"
+										],
+										"access": false,
+										"array": true,
+										"RUID": {
+											"type": "base64",
+											"read": true,
+											"write": false,
+											"protocols": [
+												"cwmp",
+												"usp"
+											],
+											"description": "The Radio unique identifier (RUID) of another radio to which the specified frequency separation gap applies.",
+											"datatype": "base64"
+										},
+										"FreqSeparation": {
+											"type": "unsignedInt",
+											"read": true,
+											"write": false,
+											"protocols": [
+												"cwmp",
+												"usp"
+											],
+											"description": "Frequency separation to the specified radio for the particular MLO operation mode. A value of 0 indicates that no frequency separation information is provided. Set to a nonzero value to indicate the required frequency gap is (<<param>> - 1) x <<units>>.",
+											"datatype": "unsignedInt",
+											"unit": "80 MHz"
+										}
+									},
+									"Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi7APRole.NSTRFreqSeparation.{i}.": {
+										"type": "object",
+										"version": "2.17",
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "This object describes the required frequency separation from the specified radio <<param|RUID>> for MLO Non-Simultaneous Transmit and Receive (NSTR) operation. <<bibref|EasyMesh>> Source: Wi-Fi 7 Agent Capabilities TLV.",
+										"uniqueKeys": [
+											"RUID"
+										],
+										"access": false,
+										"array": true,
+										"RUID": {
+											"type": "base64",
+											"read": true,
+											"write": false,
+											"protocols": [
+												"cwmp",
+												"usp"
+											],
+											"description": "The Radio unique identifier (RUID) of another radio to which the specified frequency separation gap applies.",
+											"datatype": "base64"
+										},
+										"FreqSeparation": {
+											"type": "unsignedInt",
+											"read": true,
+											"write": false,
+											"protocols": [
+												"cwmp",
+												"usp"
+											],
+											"description": "Frequency separation to the specified radio for the particular MLO operation mode. A value of 0 indicates that no frequency separation information is provided. Set to a nonzero value to indicate the required frequency gap is (<<param>> - 1) x <<units>>.",
+											"datatype": "unsignedInt",
+											"unit": "80 MHz"
+										}
+									}
+								},
+								"Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi7bSTARole.": {
+									"type": "object",
+									"version": "2.17",
+									"protocols": [
+										"cwmp",
+										"usp"
+									],
+									"description": "This object describes the Wi-Fi 7 capabilities for the backhaul Station (bSTA) role including Multi-Link Operation (MLO) capabilities. <<bibref|EasyMesh>> Source: Wi-Fi 7 Agent Capabilities TLV.",
+									"access": false,
+									"array": false,
+									"EMLMRSupport": {
+										"type": "boolean",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "Indicates if the Enhanced Multi-Link Multi-Radio (EMLMR) operation is supported.",
+										"datatype": "boolean"
+									},
+									"EMLSRSupport": {
+										"type": "boolean",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "Indicates if Enhanced Multi-Link Single-Radio (EMLSR) operation is supported.",
+										"datatype": "boolean"
+									},
+									"STRSupport": {
+										"type": "boolean",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "Indicates if Simultaneous Transmit and Receive (STR) operation is supported.",
+										"datatype": "boolean"
+									},
+									"NSTRSupport": {
+										"type": "boolean",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "Indicates if Non-Simultaneous Transmit and Receive (NSTR) operation is supported.",
+										"datatype": "boolean"
+									},
+									"TIDLinkMapNegotiation": {
+										"type": "boolean",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "Indicates if Traffic Identifier (TID) to Link Mapping Negotiation is supported.",
+										"datatype": "boolean"
+									},
+									"EMLMRFreqSeparationNumberOfEntries": {
+										"type": "unsignedInt",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "<<numentries>>",
+										"datatype": "unsignedInt"
+									},
+									"EMLSRFreqSeparationNumberOfEntries": {
+										"type": "unsignedInt",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "<<numentries>>",
+										"datatype": "unsignedInt"
+									},
+									"STRFreqSeparationNumberOfEntries": {
+										"type": "unsignedInt",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "<<numentries>>",
+										"datatype": "unsignedInt"
+									},
+									"NSTRFreqSeparationNumberOfEntries": {
+										"type": "unsignedInt",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "<<numentries>>",
+										"datatype": "unsignedInt"
+									},
+									"Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi7bSTARole.EMLMRFreqSeparation.{i}.": {
+										"type": "object",
+										"version": "2.17",
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "This object describes the required frequency separation from the specified radio <<param|RUID>> for MLO Enhanced Multi-Link Multi-Radio (EMLMR) operation. <<bibref|EasyMesh>> Source: Wi-Fi 7 Agent Capabilities TLV.",
+										"uniqueKeys": [
+											"RUID"
+										],
+										"access": false,
+										"array": true,
+										"RUID": {
+											"type": "base64",
+											"read": true,
+											"write": false,
+											"protocols": [
+												"cwmp",
+												"usp"
+											],
+											"description": "The Radio unique identifier (RUID) of another radio to which the specified frequency separation gap applies.",
+											"datatype": "base64"
+										},
+										"FreqSeparation": {
+											"type": "unsignedInt",
+											"read": true,
+											"write": false,
+											"protocols": [
+												"cwmp",
+												"usp"
+											],
+											"description": "Frequency separation to the specified radio for the particular MLO operation mode. A value of 0 indicates that no frequency separation information is provided. Set to a nonzero value to indicate the required frequency gap is (<<param>> - 1) x <<units>>.",
+											"datatype": "unsignedInt",
+											"unit": "80 MHz"
+										}
+									},
+									"Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi7bSTARole.EMLSRFreqSeparation.{i}.": {
+										"type": "object",
+										"version": "2.17",
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "This object describes the required frequency separation from the specified radio <<param|RUID>> for MLO Enhanced Multi-Link Single-Radio (EMLSR) operation. <<bibref|EasyMesh>> Source: Wi-Fi 7 Agent Capabilities TLV.",
+										"uniqueKeys": [
+											"RUID"
+										],
+										"access": false,
+										"array": true,
+										"RUID": {
+											"type": "base64",
+											"read": true,
+											"write": false,
+											"protocols": [
+												"cwmp",
+												"usp"
+											],
+											"description": "The Radio unique identifier (RUID) of another radio to which the specified frequency separation gap applies.",
+											"datatype": "base64"
+										},
+										"FreqSeparation": {
+											"type": "unsignedInt",
+											"read": true,
+											"write": false,
+											"protocols": [
+												"cwmp",
+												"usp"
+											],
+											"description": "Frequency separation to the specified radio for the particular MLO operation mode. A value of 0 indicates that no frequency separation information is provided. Set to a nonzero value to indicate the required frequency gap is (<<param>> - 1) x <<units>>.",
+											"datatype": "unsignedInt",
+											"unit": "80 MHz"
+										}
+									},
+									"Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi7bSTARole.STRFreqSeparation.{i}.": {
+										"type": "object",
+										"version": "2.17",
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "This object describes the required frequency separation from the specified radio <<param|RUID>> for MLO Simultaneous Transmit and Receive (STR) operation. <<bibref|EasyMesh>> Source: Wi-Fi 7 Agent Capabilities TLV.",
+										"uniqueKeys": [
+											"RUID"
+										],
+										"access": false,
+										"array": true,
+										"RUID": {
+											"type": "base64",
+											"read": true,
+											"write": false,
+											"protocols": [
+												"cwmp",
+												"usp"
+											],
+											"description": "The Radio unique identifier (RUID) of another radio to which the specified frequency separation gap applies.",
+											"datatype": "base64"
+										},
+										"FreqSeparation": {
+											"type": "unsignedInt",
+											"read": true,
+											"write": false,
+											"protocols": [
+												"cwmp",
+												"usp"
+											],
+											"description": "Frequency separation to the specified radio for the particular MLO operation mode. A value of 0 indicates that no frequency separation information is provided. Set to a nonzero value to indicate the required frequency gap is (<<param>> - 1) x <<units>>.",
+											"datatype": "unsignedInt",
+											"unit": "80 MHz"
+										}
+									},
+									"Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi7bSTARole.NSTRFreqSeparation.{i}.": {
+										"type": "object",
+										"version": "2.17",
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "This object describes the required frequency separation from the specified radio <<param|RUID>> for MLO Non-Simultaneous Transmit and Receive (NSTR) operation. <<bibref|EasyMesh>> Source: Wi-Fi 7 Agent Capabilities TLV.",
+										"uniqueKeys": [
+											"RUID"
+										],
+										"access": false,
+										"array": true,
+										"RUID": {
+											"type": "base64",
+											"read": true,
+											"write": false,
+											"protocols": [
+												"cwmp",
+												"usp"
+											],
+											"description": "The Radio unique identifier (RUID) of another radio to which the specified frequency separation gap applies.",
+											"datatype": "base64"
+										},
+										"FreqSeparation": {
+											"type": "unsignedInt",
+											"read": true,
+											"write": false,
+											"protocols": [
+												"cwmp",
+												"usp"
+											],
+											"description": "Frequency separation to the specified radio for the particular MLO operation mode. A value of 0 indicates that no frequency separation information is provided. Set to a nonzero value to indicate the required frequency gap is (<<param>> - 1) x <<units>>.",
+											"datatype": "unsignedInt",
+											"unit": "80 MHz"
+										}
+									}
+								},
 								"Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.AKMFrontHaul.{i}.": {
 									"type": "object",
 									"version": "2.15",
@@ -33167,6 +38659,23 @@
 										]
 									}
 								},
+								"FronthaulSuiteSelector": {
+									"type": "hexBinary",
+									"read": true,
+									"write": true,
+									"protocols": [
+										"cwmp",
+										"usp"
+									],
+									"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. 506F9A02 <<bibref|802.11-2020|Table 9-151>>. This parameter applies if <<param|FronthaulAKMsAllowed>> includes value SuiteSelector.",
+									"datatype": "hexBinary",
+									"range": [
+										{
+											"min": 4,
+											"max": 4
+										}
+									]
+								},
 								"BackhaulAKMsAllowed": {
 									"type": "string",
 									"read": true,
@@ -33189,6 +38698,37 @@
 										]
 									}
 								},
+								"BackhaulSuiteSelector": {
+									"type": "hexBinary",
+									"read": true,
+									"write": true,
+									"protocols": [
+										"cwmp",
+										"usp"
+									],
+									"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. 506F9A02 <<bibref|802.11-2020|Table 9-151>>. This parameter applies if <<param|BackhaulAKMsAllowed>> includes value SuiteSelector.",
+									"datatype": "hexBinary",
+									"range": [
+										{
+											"min": 4,
+											"max": 4
+										}
+									]
+								},
+								"BasicDataTransmitRates": {
+									"type": "string",
+									"read": true,
+									"write": false,
+									"protocols": [
+										"cwmp",
+										"usp"
+									],
+									"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 join this BSS. The stations have to be able to receive and transmit at each of the data rates listed in <<param>>. Most control packets use a data rate in <<param>>.",
+									"list": {
+										"datatype": "unsignedInt",
+										"unit": "kbps"
+									}
+								},
 								"STANumberOfEntries": {
 									"type": "unsignedInt",
 									"read": true,
@@ -33237,6 +38777,236 @@
 										}
 									}
 								},
+								"ThroughputTest()": {
+									"type": "command",
+									"async": true,
+									"protocols": [
+										"usp"
+									],
+									"input": {
+										"STAMACAddress": {
+											"type": "string",
+											"read": true,
+											"write": true,
+											"protocols": [
+												"usp"
+											],
+											"description": "MAC address of the STA that the throughput test is to be run to.",
+											"datatype": "MACAddress",
+											"range": [
+												{
+													"max": 17
+												}
+											],
+											"pattern": [
+												"",
+												"([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])"
+											]
+										},
+										"VID": {
+											"type": "unsignedInt",
+											"read": true,
+											"write": true,
+											"protocols": [
+												"usp"
+											],
+											"description": "The VLAN ID (VID) that the throughput test is to run on.",
+											"datatype": "unsignedInt",
+											"range": [
+												{
+													"max": 4095
+												}
+											]
+										},
+										"WMMUP": {
+											"type": "unsignedInt",
+											"read": true,
+											"write": true,
+											"protocols": [
+												"usp"
+											],
+											"description": "Wi-Fi MultiMedia (WMM) User Priority <<bibref|AMB>> that the throughput test is to run on. A value of 8 indicates that the WMM UP is not specified. If WMM is not supported by the BSS and the STA, then this is ignored.",
+											"datatype": "unsignedInt",
+											"range": [
+												{
+													"max": 8
+												}
+											]
+										},
+										"TestDuration": {
+											"type": "unsignedInt",
+											"read": true,
+											"write": true,
+											"protocols": [
+												"usp"
+											],
+											"description": "Duration of the throughput test in <<units>>.",
+											"datatype": "unsignedInt",
+											"range": [
+												{
+													"max": 65535
+												}
+											],
+											"unit": "milliseconds"
+										},
+										"TestDirection": {
+											"type": "string",
+											"read": true,
+											"write": true,
+											"protocols": [
+												"usp"
+											],
+											"description": "Direction to run the throughput test. Enumeration of: Downlink, Uplink, Roundtrip.",
+											"datatype": "string",
+											"enumerations": [
+												"Downlink",
+												"Uplink",
+												"Roundtrip"
+											]
+										}
+									},
+									"output": {
+										"Status": {
+											"type": "string",
+											"read": true,
+											"write": true,
+											"protocols": [
+												"usp"
+											],
+											"description": "Indicates the type of outcome of the throughput test request. Enumeration of: Success, Error_Invalid_Input, Error_Timeout, Error_Other.",
+											"datatype": "string",
+											"enumerations": [
+												"Success",
+												"Error_Invalid_Input",
+												"Error_Timeout",
+												"Error_Other"
+											]
+										}
+									}
+								},
+								"LatencyTest()": {
+									"type": "command",
+									"async": true,
+									"protocols": [
+										"usp"
+									],
+									"input": {
+										"STAMACAddress": {
+											"type": "string",
+											"read": true,
+											"write": true,
+											"protocols": [
+												"usp"
+											],
+											"description": "MAC address of the STA that the latency test is to be run to.",
+											"datatype": "MACAddress",
+											"range": [
+												{
+													"max": 17
+												}
+											],
+											"pattern": [
+												"",
+												"([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])"
+											]
+										},
+										"VID": {
+											"type": "unsignedInt",
+											"read": true,
+											"write": true,
+											"protocols": [
+												"usp"
+											],
+											"description": "The VLAN ID (VID) that the latency test is to run on.",
+											"datatype": "unsignedInt",
+											"range": [
+												{
+													"max": 4095
+												}
+											]
+										},
+										"WMMUP": {
+											"type": "unsignedInt",
+											"read": true,
+											"write": true,
+											"protocols": [
+												"usp"
+											],
+											"description": "Wi-Fi MultiMedia (WMM) User Priority <<bibref|AMB>> that the latency test is to run on. A value of 8 indicates that the WMM UP is not specified. If WMM is not supported by the BSS and the STA, then this is ignored.",
+											"datatype": "unsignedInt",
+											"range": [
+												{
+													"max": 8
+												}
+											]
+										},
+										"NumberOfRepetitions": {
+											"type": "unsignedInt",
+											"read": true,
+											"write": true,
+											"protocols": [
+												"usp"
+											],
+											"description": "Number of echo tests to run in the latency test set. If the value of this field is 0, then this field is ignored.",
+											"datatype": "unsignedInt",
+											"range": [
+												{
+													"max": 65535
+												}
+											]
+										},
+										"Timeout": {
+											"type": "unsignedInt",
+											"read": true,
+											"write": true,
+											"protocols": [
+												"usp"
+											],
+											"description": "If any echo test duration exceeds this time in <<units>>, then the echo test is declared a failure. A value of 0 indicates that no Timeout is specified.",
+											"datatype": "unsignedInt",
+											"range": [
+												{
+													"max": 65535
+												}
+											],
+											"unit": "milliseconds"
+										},
+										"DataBlockSize": {
+											"type": "unsignedInt",
+											"read": true,
+											"write": true,
+											"protocols": [
+												"usp"
+											],
+											"description": "The size of each data block, in <<units>>, transmitted in each echo test. A value of 0 indicates that no DataBlockSize is specified.",
+											"datatype": "unsignedInt",
+											"range": [
+												{
+													"max": 65535
+												}
+											],
+											"unit": "bytes"
+										}
+									},
+									"output": {
+										"Status": {
+											"type": "string",
+											"read": true,
+											"write": true,
+											"protocols": [
+												"usp"
+											],
+											"description": "Indicates the type of outcome of the latency test request. Enumeration of: Success, Error_Invalid_Input, Error_Timeout, Error_Other.",
+											"datatype": "string",
+											"enumerations": [
+												"Success",
+												"Error_Invalid_Input",
+												"Error_Timeout",
+												"Error_Other"
+											]
+										}
+									}
+								},
 								"Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.QMDescriptor.{i}.": {
 									"type": "object",
 									"version": "2.15",
@@ -33250,6 +39020,26 @@
 									],
 									"access": false,
 									"array": true,
+									"BSSID": {
+										"type": "string",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "The BSSID of BSS for which this descriptor applies.",
+										"datatype": "MACAddress",
+										"range": [
+											{
+												"max": 17
+											}
+										],
+										"pattern": [
+											"",
+											"([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])"
+										]
+									},
 									"ClientMAC": {
 										"type": "string",
 										"read": true,
@@ -33282,6 +39072,358 @@
 										"datatype": "hexBinary"
 									}
 								},
+								"Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.MUConfig.": {
+									"type": "object",
+									"version": "2.17",
+									"protocols": [
+										"cwmp",
+										"usp"
+									],
+									"description": "This object provides Multiuser (MU)-specific BSS configuration.",
+									"access": true,
+									"array": false,
+									"DLOFDMAEnable": {
+										"type": "boolean",
+										"read": true,
+										"write": true,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "Enable downlink (DL) Orthogonal Frequency-Division Multiple Access (OFDMA).",
+										"datatype": "boolean"
+									},
+									"ULOFDMAEnable": {
+										"type": "boolean",
+										"read": true,
+										"write": true,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "Enable uplink (UL) OFDMA.",
+										"datatype": "boolean"
+									},
+									"DLMUMIMOEnable": {
+										"type": "boolean",
+										"read": true,
+										"write": true,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "Enable DL Multi-User Multi-Input Multi-Output (MU-MIMO).",
+										"datatype": "boolean"
+									},
+									"ULMUMIMOEnable": {
+										"type": "boolean",
+										"read": true,
+										"write": true,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "Enable UL MU-MIMO.",
+										"datatype": "boolean"
+									}
+								},
+								"Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.MUStats.": {
+									"type": "object",
+									"version": "2.17",
+									"protocols": [
+										"cwmp",
+										"usp"
+									],
+									"description": "This object provides packet statistics for a Multiuser (MU) BSS.",
+									"access": true,
+									"array": false,
+									"DLTotalPPDUCount": {
+										"type": "unsignedInt",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "Total number of Physical-layer Protocol Data Units (PPDUs) transmitted by the Wi-Fi Basic Service Set (BSS).",
+										"datatype": "StatsCounter32"
+									},
+									"DLHEPPDUCount": {
+										"type": "unsignedInt",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "Number of High-Efficiency (HE) PPDUs transmitted by the BSS.",
+										"datatype": "StatsCounter32"
+									},
+									"DLMUPPDUCount": {
+										"type": "unsignedInt",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "Number of Multi-User (MU) PPDUs transmitted by the BSS.",
+										"datatype": "StatsCounter32"
+									},
+									"DLOFDMAPPDUCount": {
+										"type": "unsignedInt",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "Number of Orthogonal Frequency-Division Multiple Access (OFDMA) PPDUs transmitted by the BSS.",
+										"datatype": "StatsCounter32"
+									},
+									"DLMUMIMOPPDUCount": {
+										"type": "unsignedInt",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "Number of Multi-Input Multi-Output (MU-MIMO) PPDUs transmitted by the BSS.",
+										"datatype": "StatsCounter32"
+									},
+									"DLOFDMAMUMIMOPPDUCount": {
+										"type": "unsignedInt",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "Number of PPDUs transmitted by the BSS with OFDMA and MU-MIMO.",
+										"datatype": "StatsCounter32"
+									},
+									"ULTotalPPDUCount": {
+										"type": "unsignedInt",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "Total number of PPDUs received by the BSS.",
+										"datatype": "StatsCounter32"
+									},
+									"ULHEPPDUCount": {
+										"type": "unsignedInt",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "Number of High-Efficiency (HE) PPDUs received by the BSS.",
+										"datatype": "StatsCounter32"
+									},
+									"ULMUPPDUCount": {
+										"type": "unsignedInt",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "Number of MU PPDUs received by the BSS.",
+										"datatype": "StatsCounter32"
+									},
+									"ULOFDMAPPDUCount": {
+										"type": "unsignedInt",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "Number of OFDMA PPDUs received by the BSS.",
+										"datatype": "StatsCounter32"
+									},
+									"ULMUMIMOPPDUCount": {
+										"type": "unsignedInt",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "Number of MU-MIMO PDDUs received by the BSS.",
+										"datatype": "StatsCounter32"
+									},
+									"ULOFDMAMUMIMOPPDUCount": {
+										"type": "unsignedInt",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "Number of PPDUs received by the BSS with OFDMA and MU-MIMO.",
+										"datatype": "StatsCounter32"
+									},
+									"DLRU26PPDUCount": {
+										"type": "unsignedInt",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "Number of PPDUs sent on the downlink using Resource Unit (RU) RU26.",
+										"datatype": "StatsCounter32"
+									},
+									"DLRU52PPDUCount": {
+										"type": "unsignedInt",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "Number of PPDUs sent on the downlink using RU52.",
+										"datatype": "StatsCounter32"
+									},
+									"DLRU106PPDUCount": {
+										"type": "unsignedInt",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "Number of PPDUs sent on the downlink using RU106.",
+										"datatype": "StatsCounter32"
+									},
+									"DLRU242PPDUCount": {
+										"type": "unsignedInt",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "Number of PPDUs sent on the downlink using RU242.",
+										"datatype": "StatsCounter32"
+									},
+									"DLRU484PPDUCount": {
+										"type": "unsignedInt",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "Number of PPDUs sent on the downlink using RU484.",
+										"datatype": "StatsCounter32"
+									},
+									"DLRU996PPDUCount": {
+										"type": "unsignedInt",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "Number of PPDUs sent on the downlink using RU996.",
+										"datatype": "StatsCounter32"
+									},
+									"DLRU1992PPDUCount": {
+										"type": "unsignedInt",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "Number of PPDUs sent on the downlink using RU1992.",
+										"datatype": "StatsCounter32"
+									},
+									"ULRU26PPDUCount": {
+										"type": "unsignedInt",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "Number of PPDUs received on the uplink using RU26.",
+										"datatype": "StatsCounter32"
+									},
+									"ULRU52PPDUCount": {
+										"type": "unsignedInt",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "Number of PPDUs received on the uplink using RU52.",
+										"datatype": "StatsCounter32"
+									},
+									"ULRU106PPDUCount": {
+										"type": "unsignedInt",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "Number of PPDUs received on the uplink using RU106.",
+										"datatype": "StatsCounter32"
+									},
+									"ULRU242PPDUCount": {
+										"type": "unsignedInt",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "Number of PPDUs received on the uplink using RU242.",
+										"datatype": "StatsCounter32"
+									},
+									"ULRU484PPDUCount": {
+										"type": "unsignedInt",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "Number of PPDUs received on the uplink using RU484.",
+										"datatype": "StatsCounter32"
+									},
+									"ULRU996PPDUCount": {
+										"type": "unsignedInt",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "Number of PPDUs received on the uplink using RU996.",
+										"datatype": "StatsCounter32"
+									},
+									"ULRU1992PPDUCount": {
+										"type": "unsignedInt",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "Number of PPDUs received on the uplink using RU1992.",
+										"datatype": "StatsCounter32"
+									}
+								},
 								"Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.MultiAPSteering.": {
 									"type": "object",
 									"version": "2.15",
@@ -33311,7 +39453,7 @@
 											"cwmp",
 											"usp"
 										],
-										"description": "Number of times a BTM (BSS Transition Management; <<bibref|802.11k>>) steer was attempted for this Access Point.",
+										"description": "Number of times a BTM (BSS Transition Management; <<bibref|802.11-2020|sections 4.3.19.3 and 6.3.57>> steer was attempted for this Access Point.",
 										"datatype": "StatsCounter64"
 									},
 									"BTMQueryResponses": {
@@ -33322,10 +39464,312 @@
 											"cwmp",
 											"usp"
 										],
-										"description": "Number of asynchronous BTM (BSS Transition Management; <<bibref|802.11k>>) Queries for which a BTM Request was issued by this Access Point.",
+										"description": "Number of asynchronous BTM (BSS Transition Management; <<bibref|802.11-2020|sections 4.3.19.3 and 6.3.57>> Queries for which a BTM Request was issued by this Access Point.",
 										"datatype": "StatsCounter64"
 									}
 								},
+								"Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.ThroughputTestResult.": {
+									"type": "object",
+									"version": "2.17",
+									"protocols": [
+										"cwmp",
+										"usp"
+									],
+									"description": "Object containing the results of the most recent throughput (speed) test from the BSS to a station (STA).",
+									"access": false,
+									"array": false,
+									"TimeStamp": {
+										"type": "dateTime",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "Timestamp for the throughput test, indicating when the test completed.",
+										"datatype": "dateTime"
+									},
+									"ClientMAC": {
+										"type": "string",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "MAC address of the STA that the throughput test ran to.",
+										"datatype": "MACAddress",
+										"range": [
+											{
+												"max": 17
+											}
+										],
+										"pattern": [
+											"",
+											"([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])"
+										]
+									},
+									"VID": {
+										"type": "unsignedInt",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "The VLAN ID (VID) that the throughput test ran on. A value of 0 indicates that no VLAN was specified.",
+										"datatype": "unsignedInt",
+										"range": [
+											{
+												"min": 0,
+												"max": 4095
+											}
+										]
+									},
+									"WMMUP": {
+										"type": "unsignedInt",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "Wireless MultiMedia (WMM) User Priority (UP) <<bibref|WMM>> that the throughput test was requested to run on. A value of 8 indicates that no UP was specified.",
+										"datatype": "unsignedInt",
+										"range": [
+											{
+												"min": 0,
+												"max": 8
+											}
+										]
+									},
+									"TestDuration": {
+										"type": "unsignedInt",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "Duration of the throughput test in <<units>>.",
+										"datatype": "unsignedInt",
+										"unit": "milliseconds"
+									},
+									"TestLayer": {
+										"type": "unsignedInt",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "The OSI layer that the throughput test ran on.",
+										"datatype": "unsignedInt"
+									},
+									"TestAlgorithm": {
+										"type": "string",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "The test algorithm that the throughput test used.",
+										"datatype": "string"
+									},
+									"DownlinkSpeed": {
+										"type": "unsignedInt",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "Downlink speed found by the throughput test in <<units>>.",
+										"datatype": "unsignedInt",
+										"unit": "kbps"
+									},
+									"UplinkSpeed": {
+										"type": "unsignedInt",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "Uplink speed found by the throughput test in <<units>>.",
+										"datatype": "unsignedInt",
+										"unit": "kbps"
+									}
+								},
+								"Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.LatencyTestResult.": {
+									"type": "object",
+									"version": "2.17",
+									"protocols": [
+										"cwmp",
+										"usp"
+									],
+									"description": "Object containing the results of the most recent latency test set from the BSS to a station (STA). Each latency test set includes a number of individual echo tests. Each echo test result provides a sample of round-trip times and statistics on all the echo tests in this latency test are reported in this object.",
+									"access": false,
+									"array": false,
+									"TimeStamp": {
+										"type": "dateTime",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "Timestamp for the latency test, indicating when the last echo in the latency test set was received or timed-out.",
+										"datatype": "dateTime"
+									},
+									"ClientMAC": {
+										"type": "string",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "MAC address of the station (STA) or EasyMesh Agent that the latency test ran to.",
+										"datatype": "MACAddress",
+										"range": [
+											{
+												"max": 17
+											}
+										],
+										"pattern": [
+											"",
+											"([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])"
+										]
+									},
+									"VID": {
+										"type": "unsignedInt",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "The VLAN ID (VID) that the latency test ran on. A value of 0 indicates that no VLAN was specified.",
+										"datatype": "unsignedInt",
+										"range": [
+											{
+												"min": 0,
+												"max": 4095
+											}
+										]
+									},
+									"WMMUP": {
+										"type": "unsignedInt",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "Wireless MultiMedia (WMM) User Priority (UP) <<bibref|WMM>> that the latency test was requested to run on. A value of 8 indicates that no UP was specified.",
+										"datatype": "unsignedInt",
+										"range": [
+											{
+												"min": 0,
+												"max": 8
+											}
+										]
+									},
+									"DataBlockSize": {
+										"type": "unsignedInt",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "The size of each data block, in <<units>>, that was transmitted in each echo test. The data block excludes the packet or frame header. A value of 0 indicates that no DataBlockSize was specified.",
+										"datatype": "unsignedInt",
+										"unit": "bytes"
+									},
+									"TestLayer": {
+										"type": "unsignedInt",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "The OSI layer that the latency test ran on.",
+										"datatype": "unsignedInt"
+									},
+									"TestAlgorithm": {
+										"type": "string",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "The test algorithm that the latency test used.",
+										"datatype": "string"
+									},
+									"SuccessCount": {
+										"type": "unsignedInt",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "The number of successfully received echo responses. This parameter is an output of the latency test.",
+										"datatype": "unsignedInt"
+									},
+									"LostCount": {
+										"type": "unsignedInt",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "The number of lost echoes in the latency test set. This parameter is an output of the latency test.",
+										"datatype": "unsignedInt"
+									},
+									"AverageResponseTime": {
+										"type": "unsignedInt",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "The average round-trip time of the results of the latency test set in <<units>>. This average is across successfully received echoes only. This parameter is an output of the latency test.",
+										"datatype": "unsignedInt",
+										"unit": "milliseconds"
+									},
+									"MinimumResponseTime": {
+										"type": "unsignedInt",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "The minimum round-trip time of the results of the latency test set in <<units>>. This minimum is across successfully received echoes only. This parameter is an output of the latency test.",
+										"datatype": "unsignedInt",
+										"unit": "milliseconds"
+									},
+									"MaximumResponseTime": {
+										"type": "unsignedInt",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "The maximum round-trip time of the results of the latency test set in <<units>>. This maximum is across successfully received echoes only. This parameter is an output of the latency test.",
+										"datatype": "unsignedInt",
+										"unit": "milliseconds"
+									}
+								},
 								"Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.": {
 									"type": "object",
 									"version": "2.13",
@@ -33412,7 +39856,7 @@
 											"cwmp",
 											"usp"
 										],
-										"description": "Describes the HE capabilities of the Associated Device (STA). <<deprecated|2.15|because it is superseded by <<object|WiFi6Capabilities>>.>>",
+										"description": "Describes the HE capabilities of the Associated Device (STA). <<deprecated|2.15|because it is superseded by <<object|WiFi6Capabilities>>>> <<obsoleted|2.17>>",
 										"datatype": "base64",
 										"range": [
 											{
@@ -33512,7 +39956,7 @@
 											"cwmp",
 											"usp"
 										],
-										"description": "An indicator of radio signal strength of the uplink from the associated STA to the access point - measured in <<units>>. RCPI is encoded per <<bibref|802.11-2020|Table 9-176>>, and described in <<bibref|EasyMesh|Section 10.3.1>>). Reserved: 221 - 255. NOTE: The underlying WFA specification is in the process of being reviewed for possible clarification. Please refer to that specification for more details. 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>.SignalStrength>>.",
+										"description": "An indicator of radio signal strength of the uplink from the associated STA to the access point - measured in <<units>>. RCPI is encoded per <<bibref|802.11-2020|Table 9-176>>, and described in <<bibref|EasyMesh|Section 10.3.1>>). Reserved: 221 - 255. 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>.SignalStrength>>.",
 										"datatype": "unsignedInt",
 										"range": [
 											{
@@ -33709,6 +40153,52 @@
 										],
 										"unit": "seconds"
 									},
+									"SleepMode": {
+										"type": "string",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "This parameter indicates the current operating sleep mode as recorded by the BSS <<bibref|802.11-2020>>. Enumeration of: Not_Asleep, WNM_Sleep_Mode, TPU_Sleep, TDLS_Peer_Power_Save_Mode_(PSM), AP_PS-Poll, TWT_Sleep, Light_Sleep, Deep_Sleep.",
+										"datatype": "string",
+										"enumerations": [
+											"Not_Asleep",
+											"WNM_Sleep_Mode",
+											"TPU_Sleep",
+											"TDLS_Peer_Power_Save_Mode_(PSM)",
+											"AP_PS-Poll",
+											"TWT_Sleep",
+											"Light_Sleep",
+											"Deep_Sleep"
+										]
+									},
+									"SecurityAssociation": {
+										"type": "string",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "This parameter indicates the current operating security state as defined in <<bibref|802.11-2020|Section 12.6.1.1>>. Enumeration of: PMKSA, PMK-R0, PMK-R1, Mesh_PMKSA, Mesh_TKSA, PTKSA, GTKSA, IGTKSA, Mesh_GTKSA, BIGTKSA, TPKSA, Other.",
+										"datatype": "string",
+										"enumerations": [
+											"PMKSA",
+											"PMK-R0",
+											"PMK-R1",
+											"Mesh_PMKSA",
+											"Mesh_TKSA",
+											"PTKSA",
+											"GTKSA",
+											"IGTKSA",
+											"Mesh_GTKSA",
+											"BIGTKSA",
+											"TPKSA",
+											"Other"
+										]
+									},
 									"TIDQueueSizesNumberOfEntries": {
 										"type": "unsignedInt",
 										"read": true,
@@ -33720,6 +40210,148 @@
 										"description": "<<numentries>>",
 										"datatype": "unsignedInt"
 									},
+									"ClientSteer()": {
+										"type": "command",
+										"async": true,
+										"protocols": [
+											"usp"
+										],
+										"input": {
+											"TargetBSSID": {
+												"type": "string",
+												"read": true,
+												"write": true,
+												"protocols": [
+													"usp"
+												],
+												"description": "Basic Service Set Identifier (BSSID) or AP MLD MAC Address of the target BSS which the associated device(s) is to be steered to. Wildcard BSSID is represented by FFFFFFFFFFFF.",
+												"datatype": "MACAddress",
+												"range": [
+													{
+														"max": 17
+													}
+												],
+												"pattern": [
+													"",
+													"([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])"
+												]
+											},
+											"RequestMode": {
+												"type": "string",
+												"read": true,
+												"write": true,
+												"protocols": [
+													"usp"
+												],
+												"description": "The request mode. Enumeration of: Steering_Opportunity, Steering_Mandate.",
+												"datatype": "string",
+												"enumerations": [
+													"Steering_Opportunity",
+													"Steering_Mandate"
+												]
+											},
+											"BTMDisassociationImminent": {
+												"type": "boolean",
+												"read": true,
+												"write": true,
+												"protocols": [
+													"usp"
+												],
+												"description": "BTM disassociation imminent.",
+												"datatype": "boolean"
+											},
+											"BTMAbridged": {
+												"type": "boolean",
+												"read": true,
+												"write": true,
+												"protocols": [
+													"usp"
+												],
+												"description": "BTM abridged.",
+												"datatype": "boolean"
+											},
+											"LinkRemovalImminent": {
+												"type": "boolean",
+												"read": true,
+												"write": true,
+												"protocols": [
+													"usp"
+												],
+												"description": "Link removal imminent.",
+												"datatype": "boolean"
+											},
+											"SteeringOpportunityWindow": {
+												"type": "unsignedInt",
+												"read": true,
+												"write": true,
+												"protocols": [
+													"usp"
+												],
+												"description": "Time period in <<units>> (from reception of the Steering Request message) for which the request is valid. If <<param|RequestMode>> is Steering_Mandate, then this is ignored.",
+												"datatype": "unsignedInt",
+												"unit": "seconds"
+											},
+											"BTMDisassociationTimer": {
+												"type": "unsignedInt",
+												"read": true,
+												"write": true,
+												"protocols": [
+													"usp"
+												],
+												"description": "Time period in <<units>> of the disassociation timer in the BTM Request.",
+												"datatype": "unsignedInt",
+												"unit": "TUs"
+											},
+											"TargetBSSOperatingClass": {
+												"type": "unsignedInt",
+												"read": true,
+												"write": true,
+												"protocols": [
+													"usp"
+												],
+												"description": "The Target BSS Operating Class per <<bibref|802.11-2020|Table E-4>>. If the <<param|TargetBSSID>> is set to Wildcard BSSID, then this is ignored.",
+												"datatype": "unsignedInt",
+												"range": [
+													{
+														"max": 255
+													}
+												]
+											},
+											"TargetBSSChannel": {
+												"type": "unsignedInt",
+												"read": true,
+												"write": true,
+												"protocols": [
+													"usp"
+												],
+												"description": "Target BSS channel number for channel on which the Target BSS is transmitting Beacon frames. If the <<param|TargetBSSID>> is set to Wildcard BSSID, then then this is ignored.",
+												"datatype": "unsignedInt",
+												"range": [
+													{
+														"max": 255
+													}
+												]
+											}
+										},
+										"output": {
+											"Status": {
+												"type": "string",
+												"read": true,
+												"write": true,
+												"protocols": [
+													"usp"
+												],
+												"description": "Indicates the response to the Wi-Fi backhaul steering request. Enumeration of: Success, Error_Invalid_Input, Error_Timeout, Error_Other.",
+												"datatype": "string",
+												"enumerations": [
+													"Success",
+													"Error_Invalid_Input",
+													"Error_Timeout",
+													"Error_Other"
+												]
+											}
+										}
+									},
 									"Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.MultiAPSTA.": {
 										"type": "object",
 										"version": "2.15",
@@ -34268,6 +40900,17 @@
 											"description": "Indicates support for UL Orthogonal Frequency Division Multiplexing (OFDMA).",
 											"datatype": "boolean"
 										},
+										"DLOFDMA": {
+											"type": "boolean",
+											"read": true,
+											"write": false,
+											"protocols": [
+												"cwmp",
+												"usp"
+											],
+											"description": "Indicates support for Downlink (DL) Orthogonal Frequency Division Multiplexing (OFDMA).",
+											"datatype": "boolean"
+										},
 										"MaxDLMUMIMO": {
 											"type": "unsignedInt",
 											"read": true,
@@ -34276,7 +40919,7 @@
 												"cwmp",
 												"usp"
 											],
-											"description": "Max number of users supported per DL MU-MIMO Transmitter (TX) in an AP role.",
+											"description": "Max number of users supported per DL MU-MIMO Transmitter (TX) in the BSS role.",
 											"datatype": "unsignedInt",
 											"range": [
 												{
@@ -34292,7 +40935,7 @@
 												"cwmp",
 												"usp"
 											],
-											"description": "Max number of users supported per UL MU-MIMO Receiver (RX) in an AP role.",
+											"description": "Max number of users supported per UL MU-MIMO Receiver (RX) in the BSS role.",
 											"datatype": "unsignedInt",
 											"range": [
 												{
@@ -34308,7 +40951,7 @@
 												"cwmp",
 												"usp"
 											],
-											"description": "Max number of users supported per Downlink (DL) OFDMA TX in an AP role.",
+											"description": "Max number of users supported per Downlink (DL) OFDMA TX in the BSS role.",
 											"datatype": "unsignedInt",
 											"range": [
 												{
@@ -34324,7 +40967,7 @@
 												"cwmp",
 												"usp"
 											],
-											"description": "Max number of users supported per UL OFDMA RX in an AP role.",
+											"description": "Max number of users supported per UL OFDMA RX in the BSS role.",
 											"datatype": "unsignedInt",
 											"range": [
 												{
@@ -34649,7 +41292,7 @@
 									"cwmp",
 									"usp"
 								],
-								"description": "Each instance represents a Non-AP STA that has been discovered by the Radio but is not associated to any of the BSS operating on the Radio.",
+								"description": "Each instance represents a station (STA) that has been discovered by the Radio but is not associated to any of the BSS operating on the Radio.",
 								"uniqueKeys": [
 									"MACAddress"
 								],
@@ -34683,7 +41326,7 @@
 										"cwmp",
 										"usp"
 									],
-									"description": "An indicator of radio signal strength (RCPI) of the uplink from the Non-AP STA - measured in <<units>>. RCPI is encoded per <<bibref|802.11-2020|Table 9-176>>, and described in <<bibref|EasyMesh|Section 10.3.2>>. Reserved: 221 - 255. NOTE: The underlying WFA specification is in the process of being reviewed for possible clarification. Please refer to that specification for more details.",
+									"description": "An indicator of radio signal strength (RCPI) of the uplink from the Non-AP STA - measured in <<units>>. RCPI is encoded per <<bibref|802.11-2020|Table 9-176>>, and described in <<bibref|EasyMesh|Section 10.3.2>>. Reserved: 221 - 255.",
 									"datatype": "unsignedInt",
 									"range": [
 										{
@@ -34691,6 +41334,1291 @@
 										}
 									],
 									"unit": "dBm"
+								},
+								"OperatingClass": {
+									"type": "unsignedInt",
+									"read": true,
+									"write": false,
+									"protocols": [
+										"cwmp",
+										"usp"
+									],
+									"description": "Operating class on which this unassociated STA was last detected, per <<bibref|802.11-2020|Table E-4>>.",
+									"datatype": "unsignedInt",
+									"range": [
+										{
+											"max": 255
+										}
+									]
+								},
+								"Channel": {
+									"type": "unsignedInt",
+									"read": true,
+									"write": false,
+									"protocols": [
+										"cwmp",
+										"usp"
+									],
+									"description": "Channel on which this unassociated STA was last detected.",
+									"datatype": "unsignedInt",
+									"range": [
+										{
+											"max": 255
+										}
+									]
+								}
+							}
+						},
+						"Device.WiFi.DataElements.Network.Device.{i}.WPS.": {
+							"type": "object",
+							"version": "2.17",
+							"protocols": [
+								"cwmp",
+								"usp"
+							],
+							"description": "This object contains Wi-Fi Protected Setup (WPS) Push Button Configuration (PBC) configuration and status as specified in <<bibref|WPSv1.0>> or <<bibref|WPS 2.0>>). In EasyMesh <<bibref|EasyMesh>> this object applies to fronthaul only.",
+							"access": false,
+							"array": false,
+							"Enable": {
+								"type": "boolean",
+								"read": true,
+								"write": true,
+								"protocols": [
+									"cwmp",
+									"usp"
+								],
+								"description": "Enables or disables WPS functionality for this EasyMesh agent or single AP.",
+								"datatype": "boolean"
+							},
+							"Status": {
+								"type": "string",
+								"read": true,
+								"write": false,
+								"protocols": [
+									"cwmp",
+									"usp"
+								],
+								"description": "Indicates the current status of WPS. If the device goes to <<enum|SetupLocked>> the WPS needs to be disabled and re-enabled to come out of this state.",
+								"datatype": "string",
+								"enumerations": [
+									"Disabled",
+									"Error",
+									"Unconfigured",
+									"Configured",
+									"SetupLocked",
+									"InProgress"
+								]
+							}
+						},
+						"Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.": {
+							"type": "object",
+							"version": "2.17",
+							"protocols": [
+								"cwmp",
+								"usp"
+							],
+							"description": "Table of Multi-Link Operation (MLO) capable Access Points (APs) on this EasyMesh Agent or Single AP device. <<bibref|EasyMesh>> source: Agent AP MLD Configuration TLV.",
+							"uniqueKeys": [
+								"MLDMACAddress"
+							],
+							"access": false,
+							"array": true,
+							"MLDMACAddress": {
+								"type": "string",
+								"read": true,
+								"write": false,
+								"protocols": [
+									"cwmp",
+									"usp"
+								],
+								"description": "The Multi-Link Device (MLD) MAC Address of the MLO Capable access point (AP). <<bibref|EasyMesh>> Source: Agent AP MLD Configuration TLV.",
+								"datatype": "MACAddress",
+								"range": [
+									{
+										"max": 17
+									}
+								],
+								"pattern": [
+									"",
+									"([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])"
+								]
+							},
+							"TIDLinkMapNumberOfEntries": {
+								"type": "unsignedInt",
+								"read": true,
+								"write": false,
+								"protocols": [
+									"cwmp",
+									"usp"
+								],
+								"description": "<<numentries>>",
+								"datatype": "unsignedInt"
+							},
+							"AffiliatedAPNumberOfEntries": {
+								"type": "unsignedInt",
+								"read": true,
+								"write": false,
+								"protocols": [
+									"cwmp",
+									"usp"
+								],
+								"description": "<<numentries>>",
+								"datatype": "unsignedInt"
+							},
+							"STAMLDNumberOfEntries": {
+								"type": "unsignedInt",
+								"read": true,
+								"write": false,
+								"protocols": [
+									"cwmp",
+									"usp"
+								],
+								"description": "<<numentries>>",
+								"datatype": "unsignedInt"
+							},
+							"Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.APMLDConfig.": {
+								"type": "object",
+								"version": "2.17",
+								"protocols": [
+									"cwmp",
+									"usp"
+								],
+								"description": "This object describes the Wi-Fi 7 Multi-Link Operation (MLO) configuration of the Multi-Link Device (MLD) Access Point (AP), <<bibref|EasyMesh>> source: Agent AP MLD Configuration TLV.",
+								"access": false,
+								"array": false,
+								"EMLMREnabled": {
+									"type": "boolean",
+									"read": true,
+									"write": false,
+									"protocols": [
+										"cwmp",
+										"usp"
+									],
+									"description": "Indicates if the Enhanced Multi-Link Multi-Radio (EMLMR) operation is enabled.",
+									"datatype": "boolean"
+								},
+								"EMLSREnabled": {
+									"type": "boolean",
+									"read": true,
+									"write": false,
+									"protocols": [
+										"cwmp",
+										"usp"
+									],
+									"description": "Indicates if Enhanced Multi-Link Single-Radio (EMLSR) operation is enabled.",
+									"datatype": "boolean"
+								},
+								"STREnabled": {
+									"type": "boolean",
+									"read": true,
+									"write": false,
+									"protocols": [
+										"cwmp",
+										"usp"
+									],
+									"description": "Indicates if Simultaneous Transmit and Receive (STR) operation is enabled.",
+									"datatype": "boolean"
+								},
+								"NSTREnabled": {
+									"type": "boolean",
+									"read": true,
+									"write": false,
+									"protocols": [
+										"cwmp",
+										"usp"
+									],
+									"description": "Indicates if Non-Simultaneous Transmit and Receive (NSTR) operation is enabled.",
+									"datatype": "boolean"
+								},
+								"TIDLinkMapNegotiation": {
+									"type": "boolean",
+									"read": true,
+									"write": false,
+									"protocols": [
+										"cwmp",
+										"usp"
+									],
+									"description": "Indicates if Traffic Identifier (TID) to Link Mapping Negotiation is enabled. <<bibref|EasyMesh>> source: TID-to-Link Mapping Policy TLV.",
+									"datatype": "boolean"
+								}
+							},
+							"Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.TIDLinkMap.{i}.": {
+								"type": "object",
+								"version": "2.17",
+								"protocols": [
+									"cwmp",
+									"usp"
+								],
+								"description": "Table of Traffic Identifier (TID) to Link Mappings of the Multi-Link Operation (MLO) capable access point (AP). Each table entry describes the mapping between a particular TID and direction and preferred link. <<bibref|EasyMesh>> source: TID-to-Link Mapping Policy TLV.",
+								"uniqueKeys": [
+									"TID"
+								],
+								"access": false,
+								"array": true,
+								"Direction": {
+									"type": "string",
+									"read": true,
+									"write": false,
+									"protocols": [
+										"cwmp",
+										"usp"
+									],
+									"description": "The direction of the traffic flow from the perspective of the APMLD. Enumeration of: Up, Down.",
+									"datatype": "string",
+									"enumerations": [
+										"Up",
+										"Down"
+									]
+								},
+								"TID": {
+									"type": "unsignedInt",
+									"read": true,
+									"write": false,
+									"protocols": [
+										"cwmp",
+										"usp"
+									],
+									"description": "The traffic identifier (TID) for this mapping.",
+									"datatype": "unsignedInt",
+									"range": [
+										{
+											"min": 0,
+											"max": 255
+										}
+									]
+								},
+								"BSSID": {
+									"type": "string",
+									"read": true,
+									"write": false,
+									"protocols": [
+										"cwmp",
+										"usp"
+									],
+									"description": "The BSSID of the preferred link (affiliated AP) to use for traffic with matching direction and TID values.",
+									"datatype": "MACAddress",
+									"range": [
+										{
+											"max": 17
+										}
+									],
+									"pattern": [
+										"",
+										"([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])"
+									]
+								},
+								"LinkID": {
+									"type": "unsignedInt",
+									"read": true,
+									"write": false,
+									"protocols": [
+										"cwmp",
+										"usp"
+									],
+									"description": "The Link ID of the preferred link (affiliated AP) to use for traffic with matching direction and TID values.",
+									"datatype": "unsignedInt",
+									"range": [
+										{
+											"min": 0,
+											"max": 255
+										}
+									]
+								}
+							},
+							"Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.AffiliatedAP.{i}.": {
+								"type": "object",
+								"version": "2.17",
+								"protocols": [
+									"cwmp",
+									"usp"
+								],
+								"description": "The Access Points (APs) affiliated to the AP MLD. <<bibref|EasyMesh>> Source: Agent AP MLD Configuration TLV. Counters in this object include all traffic, MLD and non-MLD.",
+								"uniqueKeys": [
+									"BSSID"
+								],
+								"access": false,
+								"array": true,
+								"BSSID": {
+									"type": "string",
+									"read": true,
+									"write": false,
+									"protocols": [
+										"cwmp",
+										"usp"
+									],
+									"description": "The BSSID of the affiliated AP. This should be set to one of the values of <<param|##.Radio.<i>.BSS.<i>.BSSID>>. <<bibref|EasyMesh>> source: Agent AP MLD Configuration TLV.",
+									"datatype": "MACAddress",
+									"range": [
+										{
+											"max": 17
+										}
+									],
+									"pattern": [
+										"",
+										"([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])"
+									]
+								},
+								"LinkID": {
+									"type": "unsignedInt",
+									"read": true,
+									"write": false,
+									"protocols": [
+										"cwmp",
+										"usp"
+									],
+									"description": "The Link ID assigned to this affiliated AP. <<bibref|EasyMesh>> source: Agent AP MLD Configuration TLV.",
+									"datatype": "unsignedInt",
+									"range": [
+										{
+											"min": 0,
+											"max": 255
+										}
+									]
+								},
+								"RUID": {
+									"type": "base64",
+									"read": true,
+									"write": false,
+									"protocols": [
+										"cwmp",
+										"usp"
+									],
+									"description": "The Radio unique identifier (RUID) of the Radio that this affiliated AP is operating on. <<bibref|EasyMesh>> source: Agent AP MLD Configuration TLV.",
+									"datatype": "base64"
+								},
+								"DisabledSubChannels": {
+									"type": "unsignedInt",
+									"read": true,
+									"write": false,
+									"protocols": [
+										"cwmp",
+										"usp"
+									],
+									"description": "Disabled Subchannel Bitmap subfield from the EHT Operation element in transmitted Management frames. Null value or not present for stations. <<bibref|EasyMesh>> source: Static Puncturing Configuration TLV.",
+									"datatype": "unsignedInt",
+									"range": [
+										{
+											"min": 0,
+											"max": 65535
+										}
+									]
+								},
+								"PacketsSent": {
+									"type": "unsignedInt",
+									"read": true,
+									"write": false,
+									"protocols": [
+										"cwmp",
+										"usp"
+									],
+									"description": "The number of packets transmitted by the Affiliated AP. Note: this counter counts only MLD traffic through this BSSID, not legacy (non-MLD) traffic. <<bibref|EasyMesh>> source: Associated STA Traffic Stats TLV.",
+									"datatype": "StatsCounter32"
+								},
+								"PacketsReceived": {
+									"type": "unsignedInt",
+									"read": true,
+									"write": false,
+									"protocols": [
+										"cwmp",
+										"usp"
+									],
+									"description": "The total number of packets received from the affiliated STAs by this Affiliated AP. <<bibref|EasyMesh>> source: Associated STA Traffic Stats TLV.",
+									"datatype": "StatsCounter32"
+								},
+								"UnicastBytesSent": {
+									"type": "unsignedInt",
+									"read": true,
+									"write": false,
+									"protocols": [
+										"cwmp",
+										"usp"
+									],
+									"description": "Total number of unicast bytes transmitted to MLD STAs associated with the affiliated AP. <<bibref|EasyMesh>> source: Affiliated AP Metrics TLV.",
+									"datatype": "StatsCounter32"
+								},
+								"UnicastBytesReceived": {
+									"type": "unsignedInt",
+									"read": true,
+									"write": false,
+									"protocols": [
+										"cwmp",
+										"usp"
+									],
+									"description": "Total number of unicast bytes received from MLD STAs associated with the affiliated AP. <<bibref|EasyMesh>> source: Affiliated AP Metrics TLV.",
+									"datatype": "StatsCounter32"
+								},
+								"ErrorsSent": {
+									"type": "unsignedInt",
+									"read": true,
+									"write": false,
+									"protocols": [
+										"cwmp",
+										"usp"
+									],
+									"description": "The number of packets which could not be transmitted by the Affiliated AP due to errors. This counter counts only MLD traffic through this BSSID, not legacy (non-MLD) traffic. <<bibref|EasyMesh>> source: Affiliated AP Metrics TLV.",
+									"datatype": "StatsCounter32"
+								},
+								"MulticastBytesSent": {
+									"type": "unsignedInt",
+									"read": true,
+									"write": false,
+									"protocols": [
+										"cwmp",
+										"usp"
+									],
+									"description": "Total multicast bytes transmitted to MLD STAs associated with the affiliated AP. <<bibref|EasyMesh>> source: Affiliated AP Metrics TLV.",
+									"datatype": "StatsCounter32"
+								},
+								"MulticastBytesReceived": {
+									"type": "unsignedInt",
+									"read": true,
+									"write": false,
+									"protocols": [
+										"cwmp",
+										"usp"
+									],
+									"description": "Total multicast bytes received from MLD STAs associated with the affiliated AP. <<bibref|EasyMesh>> source: Affiliated AP Metrics TLV.",
+									"datatype": "StatsCounter32"
+								},
+								"BroadcastBytesSent": {
+									"type": "unsignedInt",
+									"read": true,
+									"write": false,
+									"protocols": [
+										"cwmp",
+										"usp"
+									],
+									"description": "Total broadcast bytes transmitted to MLD STAs associated with the affiliated AP. <<bibref|EasyMesh>> source: Affiliated AP Metrics TLV.",
+									"datatype": "StatsCounter32"
+								},
+								"BroadcastBytesReceived": {
+									"type": "unsignedInt",
+									"read": true,
+									"write": false,
+									"protocols": [
+										"cwmp",
+										"usp"
+									],
+									"description": "Total broadcast bytes received from MLD STAs associated with the affiliated AP. <<bibref|EasyMesh>> source: Affiliated AP Metrics TLV.",
+									"datatype": "StatsCounter32"
+								},
+								"EstServiceParametersBE": {
+									"type": "base64",
+									"read": true,
+									"write": false,
+									"protocols": [
+										"cwmp",
+										"usp"
+									],
+									"description": "Estimated Service Parameters information field for AC=BE, defined per <<bibref|802.11-2020|Figure 9-637>> and referenced in <<bibref|EasyMesh|Section 17.2.22>>.",
+									"datatype": "base64",
+									"range": [
+										{
+											"min": 0,
+											"max": 3
+										}
+									]
+								},
+								"EstServiceParametersBK": {
+									"type": "base64",
+									"read": true,
+									"write": false,
+									"protocols": [
+										"cwmp",
+										"usp"
+									],
+									"description": "Estimated Service Parameters information field for AC=BK, defined per <<bibref|802.11-2020|Figure 9-637>> and referenced in <<bibref|EasyMesh|Section 17.2.22>>.",
+									"datatype": "base64",
+									"range": [
+										{
+											"min": 0,
+											"max": 3
+										}
+									]
+								},
+								"EstServiceParametersVI": {
+									"type": "base64",
+									"read": true,
+									"write": false,
+									"protocols": [
+										"cwmp",
+										"usp"
+									],
+									"description": "Estimated Service Parameters information field for AC=VI, defined per <<bibref|802.11-2020|Figure 9-637>> and referenced in <<bibref|EasyMesh|Section 17.2.22>>.",
+									"datatype": "base64",
+									"range": [
+										{
+											"min": 0,
+											"max": 3
+										}
+									]
+								},
+								"EstServiceParametersVO": {
+									"type": "base64",
+									"read": true,
+									"write": false,
+									"protocols": [
+										"cwmp",
+										"usp"
+									],
+									"description": "Estimated Service Parameters information field for AC=VO, defined per <<bibref|802.11-2020|Figure 9-637>> and referenced in <<bibref|EasyMesh|Section 17.2.22>>.",
+									"datatype": "base64",
+									"range": [
+										{
+											"min": 0,
+											"max": 3
+										}
+									]
+								}
+							},
+							"Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.STAMLD.{i}.": {
+								"type": "object",
+								"version": "2.17",
+								"protocols": [
+									"cwmp",
+									"usp"
+								],
+								"description": "This object describes Multi-Link Operation (MLO) capable stations (STAs), also known as client Multilink Devices (MLDs), associated to this MLO capable Access Point. <<bibref|EasyMesh>> source: Associated Clients TLV.",
+								"uniqueKeys": [
+									"MLDMACAddress"
+								],
+								"access": false,
+								"array": true,
+								"MLDMACAddress": {
+									"type": "string",
+									"read": true,
+									"write": false,
+									"protocols": [
+										"cwmp",
+										"usp"
+									],
+									"description": "The Multi-Link Device (MLD) MAC Address of the client MLD STA. <<bibref|EasyMesh>> source: Associated STA MLD Configuration Report TLV.",
+									"datatype": "MACAddress",
+									"range": [
+										{
+											"max": 17
+										}
+									],
+									"pattern": [
+										"",
+										"([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])"
+									]
+								},
+								"Hostname": {
+									"type": "string",
+									"read": true,
+									"write": false,
+									"protocols": [
+										"cwmp",
+										"usp"
+									],
+									"description": "The Hostname for the client MLD STA.",
+									"datatype": "string"
+								},
+								"IPv4Address": {
+									"type": "string",
+									"read": true,
+									"write": false,
+									"protocols": [
+										"cwmp",
+										"usp"
+									],
+									"description": "The IPv4 address allocated to the MLD MAC Address of this device.",
+									"datatype": "IPv4Address",
+									"range": [
+										{
+											"max": 15
+										}
+									],
+									"pattern": [
+										"",
+										"((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])"
+									]
+								},
+								"IPv6Address": {
+									"type": "string",
+									"read": true,
+									"write": false,
+									"protocols": [
+										"cwmp",
+										"usp"
+									],
+									"description": "The IPv6 address allocated to the MLD MAC Address of this device.",
+									"datatype": "IPv6Address"
+								},
+								"IsbSTA": {
+									"type": "boolean",
+									"read": true,
+									"write": false,
+									"protocols": [
+										"cwmp",
+										"usp"
+									],
+									"description": "Indicates if the client MLD STA is a backhaul MLD STA (bSTAMLD). This is useful when the same AP MLD has both client MLD and bSTAMLDs associated. <<bibref|EasyMesh>> source: Backhaul STA MLD Configuration TLV.",
+									"datatype": "boolean"
+								},
+								"LastConnectTime": {
+									"type": "unsignedInt",
+									"read": true,
+									"write": false,
+									"protocols": [
+										"cwmp",
+										"usp"
+									],
+									"description": "The time in <<units>> since this client MLD STA was associated.",
+									"datatype": "unsignedInt",
+									"unit": "seconds"
+								},
+								"BytesSent": {
+									"type": "unsignedInt",
+									"read": true,
+									"write": false,
+									"protocols": [
+										"cwmp",
+										"usp"
+									],
+									"description": "The total number of bytes transmitted to the client MLD STA. <<bibref|EasyMesh>> source: Associated STA Traffic Stats TLV.",
+									"datatype": "StatsCounter32"
+								},
+								"BytesReceived": {
+									"type": "unsignedInt",
+									"read": true,
+									"write": false,
+									"protocols": [
+										"cwmp",
+										"usp"
+									],
+									"description": "The total number of bytes received from the client MLD STA. <<bibref|EasyMesh>> source: Associated STA Traffic Stats TLV.",
+									"datatype": "StatsCounter32"
+								},
+								"PacketsSent": {
+									"type": "unsignedInt",
+									"read": true,
+									"write": false,
+									"protocols": [
+										"cwmp",
+										"usp"
+									],
+									"description": "The total number of packets transmitted to the client MLD STA. <<bibref|EasyMesh>> source: Associated STA Traffic Stats TLV.",
+									"datatype": "StatsCounter32"
+								},
+								"PacketsReceived": {
+									"type": "unsignedInt",
+									"read": true,
+									"write": false,
+									"protocols": [
+										"cwmp",
+										"usp"
+									],
+									"description": "The total number of packets received from the client MLD STA. <<bibref|EasyMesh>> source: Associated STA Traffic Stats TLV.",
+									"datatype": "StatsCounter32"
+								},
+								"ErrorsSent": {
+									"type": "unsignedInt",
+									"read": true,
+									"write": false,
+									"protocols": [
+										"cwmp",
+										"usp"
+									],
+									"description": "The number of packets which could not be transmitted to the client MLD STA due to errors. <<bibref|EasyMesh>> source: Associated STA Traffic Stats TLV.",
+									"datatype": "StatsCounter32"
+								},
+								"ErrorsReceived": {
+									"type": "unsignedInt",
+									"read": true,
+									"write": false,
+									"protocols": [
+										"cwmp",
+										"usp"
+									],
+									"description": "The number of packets which were received with error from the client MLD STA. <<bibref|EasyMesh>> source: Associated STA Traffic Stats TLV.",
+									"datatype": "StatsCounter32"
+								},
+								"RetransCount": {
+									"type": "unsignedInt",
+									"read": true,
+									"write": false,
+									"protocols": [
+										"cwmp",
+										"usp"
+									],
+									"description": "The number of packets transmitted with the retry flag sent to the client MLD STA. <<bibref|EasyMesh>> source: Associated STA Traffic Stats TLV.",
+									"datatype": "StatsCounter32"
+								},
+								"STATIDLinkMapNumberOfEntries": {
+									"type": "unsignedInt",
+									"read": true,
+									"write": false,
+									"protocols": [
+										"cwmp",
+										"usp"
+									],
+									"description": "<<numentries>>",
+									"datatype": "unsignedInt"
+								},
+								"AffiliatedSTANumberOfEntries": {
+									"type": "unsignedInt",
+									"read": true,
+									"write": false,
+									"protocols": [
+										"cwmp",
+										"usp"
+									],
+									"description": "<<numentries>>",
+									"datatype": "unsignedInt"
+								},
+								"Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.STAMLD.{i}.WiFi7Capabilities.": {
+									"type": "object",
+									"version": "2.17",
+									"protocols": [
+										"cwmp",
+										"usp"
+									],
+									"description": "This object describes the Wi-Fi 7 capabilities for this STAMLD including Multi-Link Operation (MLO) capabilities. <<bibref|EasyMesh>> Source: Wi-Fi 7 Agent Capabilities TLV.",
+									"access": false,
+									"array": false,
+									"EMLMRSupport": {
+										"type": "boolean",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "Indicates if the Enhanced Multi-Link Multi-Radio (EMLMR) operation is supported by this STAMLD.",
+										"datatype": "boolean"
+									},
+									"EMLSRSupport": {
+										"type": "boolean",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "Indicates if Enhanced Multi-Link Single-Radio (EMLSR) operation is supported by this STAMLD.",
+										"datatype": "boolean"
+									},
+									"STRSupport": {
+										"type": "boolean",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "Indicates if Simultaneous Transmit and Receive (STR) operation is supported by this STAMLD.",
+										"datatype": "boolean"
+									},
+									"NSTRSupport": {
+										"type": "boolean",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "Indicates if Non-Simultaneous Transmit and Receive (NSTR) operation is supported by this STAMLD.",
+										"datatype": "boolean"
+									},
+									"TIDLinkMapNegotiation": {
+										"type": "boolean",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "Indicates if Traffic Identifier (TID) to Link Mapping Negotiation is supported by this STAMLD.",
+										"datatype": "boolean"
+									}
+								},
+								"Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.STAMLD.{i}.STAMLDConfig.": {
+									"type": "object",
+									"version": "2.17",
+									"protocols": [
+										"cwmp",
+										"usp"
+									],
+									"description": "This object describes the Wi-Fi 7 Multi-Link Operation (MLO) configuration of the Multi-Link Device (MLD) station (STA, also called associated device). Note this may differ from the WiFi7 capabilities of the device. <<bibref|EasyMesh>> source: Associated STA MLD Configuration Report TLV.",
+									"access": false,
+									"array": false,
+									"EMLMREnabled": {
+										"type": "boolean",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "Indicates if the Enhanced Multi-Link Multi-Radio (EMLMR) operation is enabled.",
+										"datatype": "boolean"
+									},
+									"EMLSREnabled": {
+										"type": "boolean",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "Indicates if Enhanced Multi-Link Single-Radio (EMLSR) operation is enabled.",
+										"datatype": "boolean"
+									},
+									"STREnabled": {
+										"type": "boolean",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "Indicates if Simultaneous Transmit and Receive (STR) operation is enabled.",
+										"datatype": "boolean"
+									},
+									"NSTREnabled": {
+										"type": "boolean",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "Indicates if Non-Simultaneous Transmit and Receive (NSTR) operation is enabled.",
+										"datatype": "boolean"
+									},
+									"TIDLinkMapNegotiation": {
+										"type": "boolean",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "Indicates if Traffic Identifier (TID) to Link Mapping Negotiation is enabled. <<bibref|EasyMesh>> source: TID-to-Link Mapping Policy TLV.",
+										"datatype": "boolean"
+									}
+								},
+								"Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.STAMLD.{i}.STATIDLinkMap.{i}.": {
+									"type": "object",
+									"version": "2.17",
+									"protocols": [
+										"cwmp",
+										"usp"
+									],
+									"description": "Table of Traffic Identifier (TID) to Link Mappings of the Multi-Link Operation (MLO) capable station (STA). Each table entry describes the mapping between a particular TID and direction and preferred link. <<bibref|EasyMesh>> source: TID-to-Link Mapping Policy TLV.",
+									"uniqueKeys": [
+										"TID"
+									],
+									"access": false,
+									"array": true,
+									"Direction": {
+										"type": "string",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "The direction of the traffic flow from the perspective of the APMLD. Enumeration of: Up, Down.",
+										"datatype": "string",
+										"enumerations": [
+											"Up",
+											"Down"
+										]
+									},
+									"TID": {
+										"type": "unsignedInt",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "The traffic identifier (TID) for this mapping.",
+										"datatype": "unsignedInt",
+										"range": [
+											{
+												"min": 0,
+												"max": 255
+											}
+										]
+									},
+									"BSSID": {
+										"type": "string",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "The BSSID of the preferred link (affiliated AP) to use for traffic with matching direction and TID values.",
+										"datatype": "MACAddress",
+										"range": [
+											{
+												"max": 17
+											}
+										],
+										"pattern": [
+											"",
+											"([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])"
+										]
+									},
+									"LinkID": {
+										"type": "unsignedInt",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "The Link ID of the preferred link (affiliated AP) to use for traffic with matching direction and TID values.",
+										"datatype": "unsignedInt",
+										"range": [
+											{
+												"min": 0,
+												"max": 255
+											}
+										]
+									}
+								},
+								"Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.STAMLD.{i}.AffiliatedSTA.{i}.": {
+									"type": "object",
+									"version": "2.17",
+									"protocols": [
+										"cwmp",
+										"usp"
+									],
+									"description": "This object describes stations (STAs, also called associated devices) that are affiliated to this Multi-Link Device (MLD) STA. <<bibref|EasyMesh>> source: Associated STA MLD Configuration TLV.",
+									"uniqueKeys": [
+										"MACAddress"
+									],
+									"access": false,
+									"array": true,
+									"MACAddress": {
+										"type": "string",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "The MAC address of the affiliated STA. <<bibref|EasyMesh>> source: Associated STA MLD Configuration Report TLV.",
+										"datatype": "MACAddress",
+										"range": [
+											{
+												"max": 17
+											}
+										],
+										"pattern": [
+											"",
+											"([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])"
+										]
+									},
+									"BSSID": {
+										"type": "string",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "The BSSID of the affiliated AP that the affiliated STA is associated to. <<bibref|EasyMesh>> source: Associated STA MLD Configuration Report TLV.",
+										"datatype": "MACAddress",
+										"range": [
+											{
+												"max": 17
+											}
+										],
+										"pattern": [
+											"",
+											"([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])"
+										]
+									},
+									"BytesSent": {
+										"type": "unsignedInt",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "The total number of bytes transmitted to the affiliated STA. <<bibref|EasyMesh>> source: Associated STA Traffic Stats TLV.",
+										"datatype": "StatsCounter32"
+									},
+									"BytesReceived": {
+										"type": "unsignedInt",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "The total number of bytes received from the affiliated STA. <<bibref|EasyMesh>> source: Associated STA Traffic Stats TLV.",
+										"datatype": "StatsCounter32"
+									},
+									"PacketsSent": {
+										"type": "unsignedInt",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "The total number of packets transmitted to the affiliated STA. <<bibref|EasyMesh>> source: Associated STA Traffic Stats TLV.",
+										"datatype": "StatsCounter32"
+									},
+									"PacketsReceived": {
+										"type": "unsignedInt",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "The total number of packets received from the affiliated STA. <<bibref|EasyMesh>> source: Associated STA Traffic Stats TLV.",
+										"datatype": "StatsCounter32"
+									},
+									"ErrorsSent": {
+										"type": "unsignedInt",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "The number of packets which could not be transmitted to the affiliated STA due to errors. <<bibref|EasyMesh>> source: Associated STA Traffic Stats TLV.",
+										"datatype": "StatsCounter32"
+									},
+									"SignalStrength": {
+										"type": "unsignedInt",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "An indicator of radio signal strength of the uplink from the affiliated STA to the access point - measured in <<units>>. RCPI is encoded per <<bibref|802.11-2020|Table 9-176>>, and described in <<bibref|EasyMesh|Section 10.3.1>>). Reserved: 221 - 255.",
+										"datatype": "unsignedInt",
+										"range": [
+											{
+												"max": 255
+											}
+										],
+										"unit": "dBm"
+									},
+									"EstMACDataRateDownlink": {
+										"type": "unsignedInt",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "Estimate of the MAC layer throughput in <<units>> achievable in the downlink direction if 100% of channel airtime and BSS operating bandwidth were available, as defined in <<bibref|EasyMesh|Section 10.3.1>>.",
+										"datatype": "unsignedInt",
+										"unit": "Mbps"
+									},
+									"EstMACDataRateUplink": {
+										"type": "unsignedInt",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "Estimate of the MAC layer throughput in <<units>> achievable in the uplink direction if 100% of channel airtime and BSS operating bandwidth were available, as defined in <<bibref|EasyMesh|Section 10.3.1>>.",
+										"datatype": "unsignedInt",
+										"unit": "Mbps"
+									},
+									"LastDataDownlinkRate": {
+										"type": "unsignedInt",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "The data transmit rate in <<units>> that was most recently used for transmission of data from the access point to the affiliated STA.",
+										"datatype": "unsignedInt",
+										"unit": "kbps"
+									},
+									"LastDataUplinkRate": {
+										"type": "unsignedInt",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "The data transmit rate in <<units>> that was most recently used for transmission of data from the affiliated STA to the access point.",
+										"datatype": "unsignedInt",
+										"unit": "kbps"
+									},
+									"UtilizationReceive": {
+										"type": "unsignedLong",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "The amount of time in <<units>> that the APMLD Radio has spent on the channel receiving data from the affiliated STA.",
+										"datatype": "unsignedLong",
+										"unit": "milliseconds"
+									},
+									"UtilizationTransmit": {
+										"type": "unsignedLong",
+										"read": true,
+										"write": false,
+										"protocols": [
+											"cwmp",
+											"usp"
+										],
+										"description": "The amount of time in <<units>> that the APMLD Radio has spent on the channel transmitting data to the affiliated STA.",
+										"datatype": "unsignedLong",
+										"unit": "milliseconds"
+									}
+								}
+							}
+						},
+						"Device.WiFi.DataElements.Network.Device.{i}.bSTAMLD.": {
+							"type": "object",
+							"version": "2.17",
+							"protocols": [
+								"cwmp",
+								"usp"
+							],
+							"description": "This object represents the Multi-Link Operation (MLO) capable backhaul station (bSTA) operating on this EasyMesh Agent. Only one MLO capable bSTA per EasyMesh Agent is allowed. <<bibref|EasyMesh>> source: Backhaul STA MLD Configuration TLV.",
+							"access": false,
+							"array": false,
+							"MLDMACAddress": {
+								"type": "string",
+								"read": true,
+								"write": false,
+								"protocols": [
+									"cwmp",
+									"usp"
+								],
+								"description": "The Multi-Link Device (MLD) MAC Address of the MLO Capable bSTA. <<bibref|EasyMesh>> Source: Backhaul STA MLD Configuration TLV.",
+								"datatype": "MACAddress",
+								"range": [
+									{
+										"max": 17
+									}
+								],
+								"pattern": [
+									"",
+									"([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])"
+								]
+							},
+							"BSSID": {
+								"type": "string",
+								"read": true,
+								"write": false,
+								"protocols": [
+									"cwmp",
+									"usp"
+								],
+								"description": "The MLD MAC address of the upstream APMLD that this bSTAMLD is associated to. <<bibref|EasyMesh>> source: Associated Clients TLV.",
+								"datatype": "MACAddress",
+								"range": [
+									{
+										"max": 17
+									}
+								],
+								"pattern": [
+									"",
+									"([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])"
+								]
+							},
+							"AffiliatedbSTAList": {
+								"type": "string",
+								"read": true,
+								"write": false,
+								"protocols": [
+									"cwmp",
+									"usp"
+								],
+								"description": "<<list>> backhaul STA MAC addresses affiliated to this bSTAMLD. <<bibref|EasyMesh>> source: Backhaul STA MLD Configuration TLV.",
+								"list": {
+									"datatype": "MACAddress",
+									"range": [
+										{
+											"max": 17
+										}
+									],
+									"pattern": [
+										"",
+										"([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])"
+									]
+								}
+							},
+							"Device.WiFi.DataElements.Network.Device.{i}.bSTAMLD.bSTAMLDConfig.": {
+								"type": "object",
+								"version": "2.17",
+								"protocols": [
+									"cwmp",
+									"usp"
+								],
+								"description": "This object describes the Multi-Link Operation (MLO) configuration of a Multi-Link Device (MLD) backhaul STA (bSTA). <<bibref|EasyMesh>> source: Backhaul STA MLD Configuration TLV.",
+								"access": false,
+								"array": false,
+								"EMLMREnabled": {
+									"type": "boolean",
+									"read": true,
+									"write": false,
+									"protocols": [
+										"cwmp",
+										"usp"
+									],
+									"description": "Indicates if the Enhanced Multi-Link Multi-Radio (EMLMR) operation is enabled.",
+									"datatype": "boolean"
+								},
+								"EMLSREnabled": {
+									"type": "boolean",
+									"read": true,
+									"write": false,
+									"protocols": [
+										"cwmp",
+										"usp"
+									],
+									"description": "Indicates if Enhanced Multi-Link Single-Radio (EMLSR) operation is enabled.",
+									"datatype": "boolean"
+								},
+								"STREnabled": {
+									"type": "boolean",
+									"read": true,
+									"write": false,
+									"protocols": [
+										"cwmp",
+										"usp"
+									],
+									"description": "Indicates if Simultaneous Transmit and Receive (STR) operation is enabled.",
+									"datatype": "boolean"
+								},
+								"NSTREnabled": {
+									"type": "boolean",
+									"read": true,
+									"write": false,
+									"protocols": [
+										"cwmp",
+										"usp"
+									],
+									"description": "Indicates if Non-Simultaneous Transmit and Receive (NSTR) operation is enabled.",
+									"datatype": "boolean"
+								},
+								"TIDLinkMapNegotiation": {
+									"type": "boolean",
+									"read": true,
+									"write": false,
+									"protocols": [
+										"cwmp",
+										"usp"
+									],
+									"description": "Indicates if Traffic Identifier (TID) to Link Mapping Negotiation is enabled. <<bibref|EasyMesh>> source: TID-to-Link Mapping Policy TLV.",
+									"datatype": "boolean"
 								}
 							}
 						}
@@ -34714,7 +42642,7 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "<<numentries>>",
+						"description": "<<numentries>> <<deprecated|2.17|because a corresponding USP event is defined instead>>",
 						"datatype": "unsignedInt"
 					},
 					"Associated!": {
@@ -34848,7 +42776,7 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "The events generated when an Associated Device (STA) associates to a BSS.",
+						"description": "The events generated when an Associated Device (STA) associates to a BSS. <<deprecated|2.17|because a corresponding USP event is defined instead>>",
 						"access": false,
 						"array": true,
 						"TimeStamp": {
@@ -34982,7 +42910,7 @@
 								"cwmp",
 								"usp"
 							],
-							"description": "Describes the Wi-Fi 6 capabilities of the Associated Device (STA).",
+							"description": "Describes the Wi-Fi 6 capabilities of the Associated Device (STA). <<deprecated|2.17|because a corresponding USP event is defined instead>>",
 							"access": false,
 							"array": false,
 							"HE160": {
@@ -35101,6 +43029,17 @@
 								"description": "Indicates support for UL Orthogonal Frequency Division Multiplexing (OFDMA).",
 								"datatype": "boolean"
 							},
+							"DLOFDMA": {
+								"type": "boolean",
+								"read": true,
+								"write": false,
+								"protocols": [
+									"cwmp",
+									"usp"
+								],
+								"description": "Indicates support for Downlink (DL) Orthogonal Frequency Division Multiplexing (OFDMA).",
+								"datatype": "boolean"
+							},
 							"MaxDLMUMIMO": {
 								"type": "unsignedInt",
 								"read": true,
@@ -35109,7 +43048,7 @@
 									"cwmp",
 									"usp"
 								],
-								"description": "Max number of users supported per DL MU-MIMO Transmitter (TX) in an AP role.",
+								"description": "Max number of users supported per DL MU-MIMO Transmitter (TX) in the BSS role.",
 								"datatype": "unsignedInt",
 								"range": [
 									{
@@ -35125,7 +43064,7 @@
 									"cwmp",
 									"usp"
 								],
-								"description": "Max number of users supported per UL MU-MIMO Receiver (RX) in an AP role.",
+								"description": "Max number of users supported per UL MU-MIMO Receiver (RX) in the BSS role.",
 								"datatype": "unsignedInt",
 								"range": [
 									{
@@ -35141,7 +43080,7 @@
 									"cwmp",
 									"usp"
 								],
-								"description": "Max number of users supported per Downlink (DL) OFDMA TX in an AP role.",
+								"description": "Max number of users supported per Downlink (DL) OFDMA TX in the BSS role.",
 								"datatype": "unsignedInt",
 								"range": [
 									{
@@ -35157,7 +43096,7 @@
 									"cwmp",
 									"usp"
 								],
-								"description": "Max number of users supported per UL OFDMA RX in an AP role.",
+								"description": "Max number of users supported per UL OFDMA RX in the BSS role.",
 								"datatype": "unsignedInt",
 								"range": [
 									{
@@ -35274,7 +43213,7 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "<<numentries>>",
+						"description": "<<numentries>> <<deprecated|2.17|because a corresponding USP event is defined instead>>",
 						"datatype": "unsignedInt"
 					},
 					"Disassociated!": {
@@ -35290,7 +43229,7 @@
 								"protocols": [
 									"usp"
 								],
-								"description": "The MAC Address of the logical BSS ( BSSID) which is reporting the Disassociation Event.",
+								"description": "The MAC Address of the logical BSS (BSSID) which is reporting the Disassociation Event.",
 								"datatype": "MACAddress",
 								"range": [
 									{
@@ -35410,6 +43349,131 @@
 								],
 								"description": "The time this event happened. Formatted with the date-and-time string format as defined in <<bibref|RFC3339|Section 3>>.",
 								"datatype": "string"
+							},
+							"LastDataDownlinkRate": {
+								"type": "unsignedInt",
+								"read": true,
+								"write": true,
+								"protocols": [
+									"usp"
+								],
+								"description": "The data transmit rate in <<units>> that was most recently used for transmission of data from the access point to the Associated Device (STA).",
+								"datatype": "unsignedInt",
+								"unit": "kbps"
+							},
+							"LastDataUplinkRate": {
+								"type": "unsignedInt",
+								"read": true,
+								"write": true,
+								"protocols": [
+									"usp"
+								],
+								"description": "The data transmit rate in <<units>> that was most recently used for transmission of data from the Associated Device (STA) to the access point.",
+								"datatype": "unsignedInt",
+								"unit": "kbps"
+							},
+							"UtilizationReceive": {
+								"type": "unsignedLong",
+								"read": true,
+								"write": true,
+								"protocols": [
+									"usp"
+								],
+								"description": "The amount of time in <<units>> that the Radio has spent on the Channel receiving data from the Associated Device (STA).",
+								"datatype": "unsignedLong",
+								"unit": "milliseconds"
+							},
+							"UtilizationTransmit": {
+								"type": "unsignedLong",
+								"read": true,
+								"write": true,
+								"protocols": [
+									"usp"
+								],
+								"description": "The amount of time in <<units>> that the Radio has spent on the Channel transmitting data to the Associated Device (STA).",
+								"datatype": "unsignedLong",
+								"unit": "milliseconds"
+							},
+							"EstMACDataRateDownlink": {
+								"type": "unsignedInt",
+								"read": true,
+								"write": true,
+								"protocols": [
+									"usp"
+								],
+								"description": "Estimate of the MAC layer throughput in <<units>> achievable in the downlink direction to the Associated Device (STA) if 100% of channel airtime and BSS operating bandwidth were available, as defined in <<bibref|EasyMesh|Section 10.3.1>>.",
+								"datatype": "unsignedInt",
+								"unit": "Mbps"
+							},
+							"EstMACDataRateUplink": {
+								"type": "unsignedInt",
+								"read": true,
+								"write": true,
+								"protocols": [
+									"usp"
+								],
+								"description": "Estimate of the MAC layer throughput in <<units>> achievable in the uplink direction from the Associated Device (STA) if 100% of channel airtime and BSS operating bandwidth were available, as defined in <<bibref|EasyMesh|Section 10.3.1>>.",
+								"datatype": "unsignedInt",
+								"unit": "Mbps"
+							},
+							"SignalStrength": {
+								"type": "unsignedInt",
+								"read": true,
+								"write": true,
+								"protocols": [
+									"usp"
+								],
+								"description": "An indicator of radio signal strength of the uplink from the Associated Device (STA) to the access point - measured in <<units>>. RCPI is encoded per <<bibref|802.11-2020|Table 9-176>>, and described in <<bibref|EasyMesh|Section 10.3.1>>). Reserved: 221 - 255.",
+								"datatype": "unsignedInt",
+								"range": [
+									{
+										"max": 255
+									}
+								],
+								"unit": "dBm"
+							},
+							"LastConnectTime": {
+								"type": "unsignedInt",
+								"read": true,
+								"write": true,
+								"protocols": [
+									"usp"
+								],
+								"description": "The time in <<units>> since this Assocated Device (STA) was associated.",
+								"datatype": "unsignedInt",
+								"unit": "seconds"
+							},
+							"Noise": {
+								"type": "unsignedInt",
+								"read": true,
+								"write": true,
+								"protocols": [
+									"usp"
+								],
+								"description": "An indicator of the average radio noise plus interference power at the access point measured for the primary operating channel to this Associated Device (STA). Encoded as defined for ANPI in <<bibref|802.11-2020|Section 11.10.9.4>>.",
+								"datatype": "unsignedInt",
+								"range": [
+									{
+										"max": 255
+									}
+								]
+							},
+							"InitiatedBy": {
+								"type": "string",
+								"read": true,
+								"write": true,
+								"protocols": [
+									"usp"
+								],
+								"description": "This parameter indicates the entity that initiated this Disassociation Event. Enumeration of: STA, EasyMesh_Agent, EasyMesh_Controller, DE_Collector, Unknown.",
+								"datatype": "string",
+								"enumerations": [
+									"STA",
+									"EasyMesh_Agent",
+									"EasyMesh_Controller",
+									"DE_Collector",
+									"Unknown"
+								]
 							}
 						}
 					},
@@ -35420,7 +43484,7 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "The events generated when an Associated Device (STA) disassociates from a BSS.",
+						"description": "The events generated when an Associated Device (STA) disassociates from a BSS. <<deprecated|2.17|because a corresponding USP event is defined instead>>",
 						"access": false,
 						"array": true,
 						"BSSID": {
@@ -35431,7 +43495,7 @@
 								"cwmp",
 								"usp"
 							],
-							"description": "The MAC Address of the logical BSS ( BSSID) which is reporting the Disassociation Event.",
+							"description": "The MAC Address of the logical BSS (BSSID) which is reporting the Disassociation Event.",
 							"datatype": "MACAddress",
 							"range": [
 								{
@@ -35561,6 +43625,141 @@
 							],
 							"description": "The time this event happened. Formatted with the date-and-time string format as defined in <<bibref|RFC3339|Section 3>>.",
 							"datatype": "string"
+						},
+						"LastDataDownlinkRate": {
+							"type": "unsignedInt",
+							"read": true,
+							"write": false,
+							"protocols": [
+								"cwmp",
+								"usp"
+							],
+							"description": "The data transmit rate in <<units>> that was most recently used for transmission of data from the access point to the Associated Device (STA).",
+							"datatype": "unsignedInt",
+							"unit": "kbps"
+						},
+						"LastDataUplinkRate": {
+							"type": "unsignedInt",
+							"read": true,
+							"write": false,
+							"protocols": [
+								"cwmp",
+								"usp"
+							],
+							"description": "The data transmit rate in <<units>> that was most recently used for transmission of data from the Associated Device (STA) to the access point.",
+							"datatype": "unsignedInt",
+							"unit": "kbps"
+						},
+						"UtilizationReceive": {
+							"type": "unsignedLong",
+							"read": true,
+							"write": false,
+							"protocols": [
+								"cwmp",
+								"usp"
+							],
+							"description": "The amount of time in <<units>> that the Radio has spent on the Channel receiving data from the Associated Device (STA).",
+							"datatype": "unsignedLong",
+							"unit": "milliseconds"
+						},
+						"UtilizationTransmit": {
+							"type": "unsignedLong",
+							"read": true,
+							"write": false,
+							"protocols": [
+								"cwmp",
+								"usp"
+							],
+							"description": "The amount of time in <<units>> that the Radio has spent on the Channel transmitting data to the Associated Device (STA).",
+							"datatype": "unsignedLong",
+							"unit": "milliseconds"
+						},
+						"EstMACDataRateDownlink": {
+							"type": "unsignedInt",
+							"read": true,
+							"write": false,
+							"protocols": [
+								"cwmp",
+								"usp"
+							],
+							"description": "Estimate of the MAC layer throughput in <<units>> achievable in the downlink direction to the Associated Device (STA) if 100% of channel airtime and BSS operating bandwidth were available, as defined in <<bibref|EasyMesh|Section 10.3.1>>.",
+							"datatype": "unsignedInt",
+							"unit": "Mbps"
+						},
+						"EstMACDataRateUplink": {
+							"type": "unsignedInt",
+							"read": true,
+							"write": false,
+							"protocols": [
+								"cwmp",
+								"usp"
+							],
+							"description": "Estimate of the MAC layer throughput in <<units>> achievable in the uplink direction from the Associated Device (STA) if 100% of channel airtime and BSS operating bandwidth were available, as defined in <<bibref|EasyMesh|Section 10.3.1>>.",
+							"datatype": "unsignedInt",
+							"unit": "Mbps"
+						},
+						"SignalStrength": {
+							"type": "unsignedInt",
+							"read": true,
+							"write": false,
+							"protocols": [
+								"cwmp",
+								"usp"
+							],
+							"description": "An indicator of radio signal strength of the uplink from the Associated Device (STA) to the access point - measured in <<units>>. RCPI is encoded per <<bibref|802.11-2020|Table 9-176>>, and described in <<bibref|EasyMesh|Section 10.3.1>>). Reserved: 221 - 255.",
+							"datatype": "unsignedInt",
+							"range": [
+								{
+									"max": 255
+								}
+							],
+							"unit": "dBm"
+						},
+						"LastConnectTime": {
+							"type": "unsignedInt",
+							"read": true,
+							"write": false,
+							"protocols": [
+								"cwmp",
+								"usp"
+							],
+							"description": "The time in <<units>> since this Assocated Device (STA) was associated.",
+							"datatype": "unsignedInt",
+							"unit": "seconds"
+						},
+						"Noise": {
+							"type": "unsignedInt",
+							"read": true,
+							"write": false,
+							"protocols": [
+								"cwmp",
+								"usp"
+							],
+							"description": "An indicator of the average radio noise plus interference power at the access point measured for the primary operating channel to this Associated Device (STA). Encoded as defined for ANPI in <<bibref|802.11-2020|Section 11.10.9.4>>.",
+							"datatype": "unsignedInt",
+							"range": [
+								{
+									"max": 255
+								}
+							]
+						},
+						"InitiatedBy": {
+							"type": "string",
+							"read": true,
+							"write": false,
+							"protocols": [
+								"cwmp",
+								"usp"
+							],
+							"description": "This parameter indicates the entity that initiated this Disassociation Event. Enumeration of: STA, EasyMesh_Agent, EasyMesh_Controller, DE_Collector, Unknown.",
+							"datatype": "string",
+							"enumerations": [
+								"STA",
+								"EasyMesh_Agent",
+								"EasyMesh_Controller",
+								"DE_Collector",
+								"Unknown"
+							]
 						}
 					}
 				},
@@ -35582,7 +43781,7 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "<<numentries>>",
+						"description": "<<numentries>> <<deprecated|2.17|because a corresponding USP event is defined instead>>",
 						"datatype": "unsignedInt"
 					},
 					"FailedConnection!": {
@@ -35591,6 +43790,25 @@
 							"usp"
 						],
 						"output": {
+							"BSSID": {
+								"type": "string",
+								"read": true,
+								"write": true,
+								"protocols": [
+									"usp"
+								],
+								"description": "The MAC Address of the logical BSS (BSSID) which is reporting the failed connection event.",
+								"datatype": "MACAddress",
+								"range": [
+									{
+										"max": 17
+									}
+								],
+								"pattern": [
+									"",
+									"([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])"
+								]
+							},
 							"MACAddress": {
 								"type": "string",
 								"read": true,
@@ -35598,7 +43816,7 @@
 								"protocols": [
 									"usp"
 								],
-								"description": "STA MAC Address identifying the client that has attempted to connect.",
+								"description": "MAC Address identifying the associated device (STA) that has attempted to connect.",
 								"datatype": "MACAddress",
 								"range": [
 									{
@@ -35649,9 +43867,29 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "This object describes the data provided with a failed connection event",
+						"description": "This object describes the data provided with a failed connection event <<deprecated|2.17|because a corresponding USP event is defined instead>>",
 						"access": false,
 						"array": true,
+						"BSSID": {
+							"type": "string",
+							"read": true,
+							"write": false,
+							"protocols": [
+								"cwmp",
+								"usp"
+							],
+							"description": "The MAC Address of the logical BSS (BSSID) which is reporting the failed connection event.",
+							"datatype": "MACAddress",
+							"range": [
+								{
+									"max": 17
+								}
+							],
+							"pattern": [
+								"",
+								"([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])"
+							]
+						},
 						"MACAddress": {
 							"type": "string",
 							"read": true,
@@ -35660,7 +43898,7 @@
 								"cwmp",
 								"usp"
 							],
-							"description": "STA MAC Address identifying the client that has attempted to connect.",
+							"description": "MAC Address identifying the associated device (STA) that has attempted to connect.",
 							"datatype": "MACAddress",
 							"range": [
 								{
@@ -35871,7 +44109,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "<<list>> List items indicate which IEEE 802.11 standards this <<object>> instance can support simultaneously, in the frequency band specified by <<param|OperatingFrequencyBand>>. Enumeration of: a, b, g, n, ac, ax. Each value indicates support for the indicated standard. If <<param|OperatingFrequencyBand>> is set to <<enum|2.4GHz|OperatingFrequencyBand>>, only values <<enum|b>>, <<enum|g>>, <<enum|n>>, <<enum|ax>> are allowed. If <<param|OperatingFrequencyBand>> is set to <<enum|5GHz|OperatingFrequencyBand>>, only values <<enum|a>>, <<enum|n>>, <<enum|ac>>, <<enum|ax>> are allowed. If <<param|OperatingFrequencyBand>> is set to <<enum|6GHz|OperatingFrequencyBand>>, only value <<enum|ax>> is allowed.",
+					"description": "<<list>> List items indicate which IEEE 802.11 standards this <<object>> instance can support simultaneously, in the frequency band specified by <<param|OperatingFrequencyBand>>. Enumeration of: a, b, g, n, ac, ax, be. Each value indicates support for the indicated standard. If <<param|OperatingFrequencyBand>> is set to <<enum|2.4GHz|OperatingFrequencyBand>>, only values <<enum|b>>, <<enum|g>>, <<enum|n>>, <<enum|ax>>, <<enum|be>> are allowed. If <<param|OperatingFrequencyBand>> is set to <<enum|5GHz|OperatingFrequencyBand>>, only values <<enum|a>>, <<enum|n>>, <<enum|ac>>, <<enum|ax>>, <<enum|be>> are allowed. If <<param|OperatingFrequencyBand>> is set to <<enum|6GHz|OperatingFrequencyBand>>, only values <<enum|ax>>, <<enum|be>> are allowed.",
 					"list": {
 						"datatype": "string",
 						"enumerations": [
@@ -35880,7 +44118,8 @@
 							"g",
 							"n",
 							"ac",
-							"ax"
+							"ax",
+							"be"
 						]
 					}
 				},
@@ -35892,7 +44131,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "<<list>> List items indicate which IEEE 802.11 standard this <<object>> instance is configured for. Each value indicates support for the indicated standard. If <<param|OperatingFrequencyBand>> is set to <<enum|2.4GHz|OperatingFrequencyBand>>, only values <<enum|b>>, <<enum|g>>, <<enum|n>>, <<enum|ax>> are allowed. If <<param|OperatingFrequencyBand>> is set to <<enum|5GHz|OperatingFrequencyBand>>, only values <<enum|a>>, <<enum|n>>, <<enum|ac>>, <<enum|ax>> are allowed. 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 can be used.",
+					"description": "<<list>> List items indicate which IEEE 802.11 standard this <<object>> instance is configured for. Each value indicates support for the indicated standard. If <<param|OperatingFrequencyBand>> is set to <<enum|2.4GHz|OperatingFrequencyBand>>, only values <<enum|b>>, <<enum|g>>, <<enum|n>>, <<enum|ax>>, <<enum|be>> are allowed. If <<param|OperatingFrequencyBand>> is set to <<enum|5GHz|OperatingFrequencyBand>>, only values <<enum|a>>, <<enum|n>>, <<enum|ac>>, <<enum|ax>>, <<enum|be>> are allowed. If <<param|OperatingFrequencyBand>> is set to <<enum|6GHz|OperatingFrequencyBand>>, only values <<enum|ax>>, <<enum|be>> are 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 can be used.",
 					"list": {
 						"datatype": "string"
 					}
@@ -35905,7 +44144,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.",
+					"description": "<<list>> List items represent possible radio channels for the wireless standard (a, b, g, n, ac, ax, be) and the regulatory domain. Ranges in the form n-m are permitted. For example, for 802.11b and North America, would be 1-11.",
 					"list": {
 						"datatype": "string",
 						"maxsize": 1024
@@ -36064,7 +44303,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "<<list>> These are the valid writable values for <<param|OperatingChannelBandwidth>>. Each list item is an enumeration of: Enumeration of: 20MHz, 40MHz, 80MHz, 160MHz, 80+80MHz, Auto.",
+					"description": "<<list>> These are the valid writable values for <<param|OperatingChannelBandwidth>>. Each list item is an enumeration of: Enumeration of: 20MHz, 40MHz, 80MHz, 160MHz, 80+80MHz, 320MHz-1, 320MHz-2, Auto.",
 					"list": {
 						"datatype": "string",
 						"enumerations": [
@@ -36073,6 +44312,8 @@
 							"80MHz",
 							"160MHz",
 							"80+80MHz",
+							"320MHz-1",
+							"320MHz-2",
 							"Auto"
 						]
 					}
@@ -36085,7 +44326,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "The preferred channel bandwidth to be used (applicable to 802.11n, 802.11ac, and 802.11ax specifications only).",
+					"description": "The preferred channel bandwidth to be used (applicable to 802.11n, 802.11ac, 802.11ax and 802.11be specifications only).",
 					"datatype": "string"
 				},
 				"CurrentOperatingChannelBandwidth": {
@@ -36096,14 +44337,16 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "The channel bandwidth currently in use. Enumeration of: 20MHz, 40MHz, 80MHz, 160MHz, 80+80MHz.",
+					"description": "The channel bandwidth currently in use. Enumeration of: 20MHz, 40MHz, 80MHz, 160MHz, 80+80MHz, 320MHz-1, 320MHz-2.",
 					"datatype": "string",
 					"enumerations": [
 						"20MHz",
 						"40MHz",
 						"80MHz",
 						"160MHz",
-						"80+80MHz"
+						"80+80MHz",
+						"320MHz-1",
+						"320MHz-2"
 					]
 				},
 				"ExtensionChannel": {
@@ -36152,7 +44395,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "When operating in <<enum|80+80MHz|CurrentOperatingChannelBandwidth>>, this parameter determines the Center Frequency Segment 0 for the first 80 MHz channel. See <<bibref|802.11-2016|Section 9.4.2.161>> and Table 9-252. <<deprecated|2.14|due to a typo. Use <<param|CenterFrequencySegment0>> instead>> <<obsoleted|2.16>>",
+					"description": "When operating in <<enum|80+80MHz|CurrentOperatingChannelBandwidth>>, this parameter determines the Center Frequency Segment 0 for the first 80 MHz channel. See <<bibref|802.11-2016|Section 9.4.2.161>> and Table 9-252. <<deprecated|2.14|due to a typo. Use <<param|CenterFrequencySegment0>> instead>> <<obsoleted|2.16>> <<deleted|2.17>>",
 					"datatype": "unsignedInt"
 				},
 				"CenterFrequencySegement1": {
@@ -36163,7 +44406,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "When operating in <<enum|80+80MHz|CurrentOperatingChannelBandwidth>>, this parameter determines the Center Frequency Segment 1 for the second 80 MHz channel. See <<bibref|802.11-2016|Section 9.4.2.161>> and Table 9-252. <<deprecated|2.14|due to a typo. Use <<param|CenterFrequencySegment1>> instead>> <<obsoleted|2.16>>",
+					"description": "When operating in <<enum|80+80MHz|CurrentOperatingChannelBandwidth>>, this parameter determines the Center Frequency Segment 1 for the second 80 MHz channel. See <<bibref|802.11-2016|Section 9.4.2.161>> and Table 9-252. <<deprecated|2.14|due to a typo. Use <<param|CenterFrequencySegment1>> instead>> <<obsoleted|2.16>> <<deleted|2.17>>",
 					"datatype": "unsignedInt"
 				},
 				"CenterFrequencySegment0": {
@@ -36196,7 +44439,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "The Modulation Coding Scheme index (applicable to 802.11n, 802.11ac, and 802.11ax specifications only). Values from 0 to 15 MUST be supported for (<<bibref|802.11n-2009>>). Values from 0 to 9 MUST be supported for <<bibref|802.11ac-2013>>. Values from 0 to 11 MUST be supported for <<bibref|802.11ax>>. A value of -1 indicates automatic selection of the MCS index.",
+					"description": "The Modulation Coding Scheme index (applicable to 802.11n, 802.11ac, 802.11ax and 802.11be specifications only). Values from 0 to 15 MUST be supported for (<<bibref|802.11n-2009>>). Values from 0 to 9 MUST be supported for <<bibref|802.11ac-2013>>. Values from 0 to 11 MUST be supported for <<bibref|802.11ax>>. Values from 0 to 15 MUST be supported for <<bibref|802.11be>>. A value of -1 indicates automatic selection of the MCS index.",
 					"datatype": "int",
 					"range": [
 						{
@@ -37601,7 +45844,7 @@
 						"protocols": [
 							"cwmp"
 						],
-						"description": "<<list>> List items indicate which IEEE 802.11 standards this <<object>> instance can support simultaneously, in the frequency band specified by <<param|OperatingFrequencyBand>>. Enumeration of: a, b, g, n, ac, ax. Each value indicates support for the indicated standard. If <<param|OperatingFrequencyBand>> is set to <<enum|2.4GHz|OperatingFrequencyBand>>, only values <<enum|b>>, <<enum|g>>, <<enum|n>>, <<enum|ax>> are allowed. If <<param|OperatingFrequencyBand>> is set to <<enum|5GHz|OperatingFrequencyBand>>, only values <<enum|a>>, <<enum|n>>, <<enum|ac>>, <<enum|ax>> are allowed. If <<param|OperatingFrequencyBand>> is set to <<enum|6GHz|OperatingFrequencyBand>>, only value <<enum|ax>> is allowed.",
+						"description": "<<list>> List items indicate which IEEE 802.11 standards this <<object>> instance can support simultaneously, in the frequency band specified by <<param|OperatingFrequencyBand>>. Enumeration of: a, b, g, n, ac, ax, be. Each value indicates support for the indicated standard. If <<param|OperatingFrequencyBand>> is set to <<enum|2.4GHz|OperatingFrequencyBand>>, only values <<enum|b>>, <<enum|g>>, <<enum|n>>, <<enum|ax>>, <<enum|be>> are allowed. If <<param|OperatingFrequencyBand>> is set to <<enum|5GHz|OperatingFrequencyBand>>, only values <<enum|a>>, <<enum|n>>, <<enum|ac>>, <<enum|ax>>, <<enum|be>> are allowed. If <<param|OperatingFrequencyBand>> is set to <<enum|6GHz|OperatingFrequencyBand>>, only values <<enum|ax>>, <<enum|be>> are allowed.",
 						"list": {
 							"datatype": "string",
 							"enumerations": [
@@ -37610,7 +45853,8 @@
 								"g",
 								"n",
 								"ac",
-								"ax"
+								"ax",
+								"be"
 							]
 						}
 					},
@@ -37621,7 +45865,7 @@
 						"protocols": [
 							"cwmp"
 						],
-						"description": "<<list>> List items indicate which IEEE 802.11 standard that is detected for this <<object>>. Each value indicates support for the indicated standard. If <<param|OperatingFrequencyBand>> is set to <<enum|2.4GHz|##.Radio.<i>.SupportedFrequencyBands>>, only values <<enum|b>>, <<enum|g>>, <<enum|n>>, <<enum|ax>> are allowed. If <<param|OperatingFrequencyBand>> is set to <<enum|5GHz|##.Radio.<i>.SupportedFrequencyBands>>, only values <<enum|a>>, <<enum|n>>, <<enum|ac>>, <<enum|ax>> are allowed. If <<param|OperatingFrequencyBand>> is set to <<enum|6GHz|##.Radio.<i>.SupportedFrequencyBands>>, 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 can be used.",
+						"description": "<<list>> List items indicate which IEEE 802.11 standard that is detected for this <<object>>. Each value indicates support for the indicated standard. If <<param|OperatingFrequencyBand>> is set to <<enum|2.4GHz|##.Radio.<i>.SupportedFrequencyBands>>, only values <<enum|b>>, <<enum|g>>, <<enum|n>>, <<enum|ax>>, <<enum|be>> are allowed. If <<param|OperatingFrequencyBand>> is set to <<enum|5GHz|##.Radio.<i>.SupportedFrequencyBands>>, only values <<enum|a>>, <<enum|n>>, <<enum|ac>>, <<enum|ax>>, <<enum|be>> are allowed. If <<param|OperatingFrequencyBand>> is set to <<enum|6GHz|##.Radio.<i>.SupportedFrequencyBands>>, only value <<enum|ax>>, <<enum|be>> are 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 can be used.",
 						"list": {
 							"datatype": "string"
 						}
@@ -37640,6 +45884,8 @@
 							"40MHz",
 							"80MHz",
 							"160MHz",
+							"320MHz-1",
+							"320MHz-2",
 							"Auto"
 						]
 					},
@@ -37872,6 +46118,28 @@
 						}
 					]
 				},
+				"MLDUnit": {
+					"type": "int",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "MLD-BSS unit number specifying BSS across multiple radios that form a single Multi Link Device. Assigning the same MLD unit groups Basic Service Sets (BSS) across radios. A (default) value of -1 indicates that the interface is not part of any MLD.",
+					"default": "-1",
+					"datatype": "int",
+					"range": [
+						{
+							"min": -1,
+							"max": -1
+						},
+						{
+							"min": 0,
+							"max": 24
+						}
+					]
+				},
 				"Upstream": {
 					"type": "boolean",
 					"read": true,
@@ -38996,7 +47264,8 @@
 							"g",
 							"n",
 							"ac",
-							"ax"
+							"ax",
+							"be"
 						]
 					},
 					"AuthenticationState": {
@@ -39027,6 +47296,23 @@
 						],
 						"unit": "kbps"
 					},
+					"MaxSupportedDataDownlinkRate": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Maximum supported data rate on the downlink from the associated device to the access point, measured in <<units>>.",
+						"datatype": "unsignedInt",
+						"range": [
+							{
+								"min": 1000
+							}
+						],
+						"unit": "kbps"
+					},
 					"LastDataUplinkRate": {
 						"type": "unsignedInt",
 						"read": true,
@@ -39044,6 +47330,23 @@
 						],
 						"unit": "kbps"
 					},
+					"MaxSupportedDataUplinkRate": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Maximum supported data rate on the uplink from the associated device to the access point, measured in <<units>>.",
+						"datatype": "unsignedInt",
+						"range": [
+							{
+								"min": 1000
+							}
+						],
+						"unit": "kbps"
+					},
 					"AssociationTime": {
 						"type": "dateTime",
 						"read": true,
@@ -39091,6 +47394,18 @@
 						],
 						"unit": "dBm"
 					},
+					"SNR": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "An indicator of signal to noise ratio, in <<units>>, 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.",
+						"datatype": "unsignedInt",
+						"unit": "dB"
+					},
 					"Retransmissions": {
 						"type": "unsignedInt",
 						"read": true,
@@ -39120,6 +47435,25 @@
 						"description": "Whether or not this node is currently present in the WiFi AccessPoint network. The ability to list inactive nodes is OPTIONAL. If the CPE 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.",
 						"datatype": "boolean"
 					},
+					"MaxSupportedBandwidth": {
+						"type": "string",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Specifies the maximum supported bandwidth for the associated device to the access point.",
+						"datatype": "string",
+						"enumerations": [
+							"20MHz",
+							"40MHz",
+							"80MHz",
+							"160MHz",
+							"320MHz",
+							"Unknown"
+						]
+					},
 					"Device.WiFi.AccessPoint.{i}.AssociatedDevice.{i}.Stats.": {
 						"type": "object",
 						"version": "2.8",
@@ -39296,7 +47630,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.>>",
+						"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>>",
 						"datatype": "unsignedInt",
 						"range": [
 							{
@@ -39313,7 +47647,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.>>",
+						"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>>",
 						"datatype": "unsignedInt",
 						"range": [
 							{
@@ -39331,7 +47665,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.>>",
+						"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>>",
 						"datatype": "unsignedInt",
 						"range": [
 							{
@@ -39349,7 +47683,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.>>",
+						"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>>",
 						"datatype": "unsignedInt",
 						"range": [
 							{
@@ -40244,7 +48578,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.>>",
+						"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>>",
 						"datatype": "unsignedInt",
 						"range": [
 							{
@@ -40261,7 +48595,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.>>",
+						"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>>",
 						"datatype": "unsignedInt",
 						"range": [
 							{
@@ -40279,7 +48613,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.>>",
+						"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>>",
 						"datatype": "unsignedInt",
 						"range": [
 							{
@@ -40297,7 +48631,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.>>",
+						"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>>",
 						"datatype": "unsignedInt",
 						"range": [
 							{
@@ -43544,15 +51878,15 @@
 					]
 				},
 				"Order": {
-					"type": "unsignedInt",
+					"type": "string",
 					"read": true,
 					"write": true,
 					"protocols": [
 						"cwmp",
 						"usp"
 					],
-					"description": "Position of the <<object>> entry in the order of precedence. A value of 1 indicates the first entry considered (highest precedence). For each ingress frame on the <<param|Interface>>, the highest ordered entry that matches the filter criteria is applied. All lower order entries are ignored. When this value is modified, if the value matches that of an existing entry, the <<param>> value for the existing entry and all lower <<param>> entries is 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. The value of <<param>> on creation of a <<object>> table entry MUST be one greater than the largest current value (initially assigned the lowest precedence).",
-					"datatype": "unsignedInt",
+					"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). | 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). For each ingress frame on the <<param|Interface>>, the highest ordered entry that matches the filter criteria is applied. All lower order entries are ignored.",
+					"datatype": "Order",
 					"range": [
 						{
 							"min": 1
@@ -48062,11 +56396,10 @@
 							"type": "string",
 							"read": true,
 							"write": true,
-							"mandatory": true,
 							"protocols": [
 								"usp"
 							],
-							"description": "The Fully Qualified Domain Name (FQDN) or IP address of the Test Endpoint to perform the UDP Capacity tests with.",
+							"description": "The Fully Qualified Domain Name (FQDN) or IP address of the Test Endpoint to perform the UDP Capacity tests with. <<deprecated|2.17|because it is superseded by <<param|ServerList>> with multi-flow and server capability. Refer to <<bibref|TR-471>> for details>>",
 							"datatype": "string",
 							"range": [
 								{
@@ -48074,15 +56407,35 @@
 								}
 							]
 						},
-						"Port": {
-							"type": "unsignedInt",
+						"ServerList": {
+							"type": "string",
 							"read": true,
 							"write": true,
 							"mandatory": true,
 							"protocols": [
 								"usp"
 							],
-							"description": "Port on the Test Endpoint host.",
+							"description": "A list of servers intended as testing partners for the client. The client works through the server list attempting individual test flows in a round-robin sequence. One flow is attempted to each server and all flows are required for testing, unless the optional <<param|FlowCount>> and <<param|MaximumFlows>> parameters are specified. The list contains each server\u2019s Fully Qualified Domain Name or IP address and listening port in the format server:port.",
+							"list": {
+								"datatype": "string",
+								"item": {
+									"max": 100
+								},
+								"range": [
+									{
+										"max": 256
+									}
+								]
+							}
+						},
+						"Port": {
+							"type": "unsignedInt",
+							"read": true,
+							"write": true,
+							"protocols": [
+								"usp"
+							],
+							"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>>",
 							"datatype": "unsignedInt",
 							"range": [
 								{
@@ -48108,7 +56461,7 @@
 							"protocols": [
 								"usp"
 							],
-							"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 <<param|<<template|IP-DIAGNOSTICS-PARENT>>IPLayerMaxConnections>>.",
+							"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 <<param|<<template|IP-DIAGNOSTICS-PARENT>>IPLayerMaxConnections>>. <<deprecated|2.17|because it is superseded by <<param|ServerList>> with multi-flow and server capability and related parameters. Refer to <<bibref|TR-471>> for details>>",
 							"datatype": "unsignedInt",
 							"range": [
 								{
@@ -48116,6 +56469,26 @@
 								}
 							]
 						},
+						"FlowCount": {
+							"type": "unsignedInt",
+							"read": true,
+							"write": true,
+							"protocols": [
+								"usp"
+							],
+							"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>> MUST NOT be set to a value greater than <<param|<<template|IP-DIAGNOSTICS-PARENT>>IPLayerMaxConnections>>.",
+							"datatype": "unsignedInt"
+						},
+						"MaximumFlows": {
+							"type": "unsignedInt",
+							"read": true,
+							"write": true,
+							"protocols": [
+								"usp"
+							],
+							"description": "Optional number of flows to attempt. MaximumFlows must be greater than the size of ServerList or FlowCount. The default SHOULD be 0 (a magic number that indicates the parameter is not used). <<param>> MUST NOT be set to a value greater than <<param|<<template|IP-DIAGNOSTICS-PARENT>>IPLayerMaxConnections>>.",
+							"datatype": "unsignedInt"
+						},
 						"EthernetPriority": {
 							"type": "unsignedInt",
 							"read": true,
@@ -48452,7 +56825,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>>",
+							"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>>",
 							"datatype": "unsignedInt",
 							"range": [
 								{
@@ -48982,6 +57355,21 @@
 							"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>>.",
 							"datatype": "unsignedInt",
 							"unit": "microseconds"
+						},
+						"ActiveFlows": {
+							"type": "unsignedInt",
+							"read": true,
+							"write": true,
+							"protocols": [
+								"usp"
+							],
+							"description": "Number of flows set-up and used for a test.",
+							"datatype": "unsignedInt",
+							"range": [
+								{
+									"min": 0
+								}
+							]
 						}
 					}
 				},
@@ -51153,7 +59541,7 @@
 						"protocols": [
 							"cwmp"
 						],
-						"description": "This object provides the results from individual UDPEchoPlus test packets collected during a test if <<param|#.EnableIndividualPacketResults>> is set to true. When <<param|#.DiagnosticsState>> is set to <<enum|Completed|#.DiagnosticsState>> it should contain <<param|#.NumberOfRepetitions>> objects. Instance numbers MUST start at 1 and sequentially increment as new instances are created. The instance number should match the TestIterationNumber field of the request and response packet. All instances are removed when <<param|#.DiagnosticsState>> is set to <<enum|Requested|#.DiagnosticsState>> or <<enum|None|#.DiagnosticsState>>.",
+						"description": "This object provides the results from individual UDPEchoPlus test packets collected during a test if <<param|#.EnableIndividualPacketResults>> is set to true. When <<param|#.DiagnosticsState>> is set to <<enum|Complete|#.DiagnosticsState>> it should contain <<param|#.NumberOfRepetitions>> objects. Instance numbers MUST start at 1 and sequentially increment as new instances are created. The instance number should match the TestIterationNumber field of the request and response packet. All instances are removed when <<param|#.DiagnosticsState>> is set to <<enum|Requested|#.DiagnosticsState>> or <<enum|None|#.DiagnosticsState>>.",
 						"access": false,
 						"array": true,
 						"PacketSuccess": {
@@ -51381,7 +59769,7 @@
 						"protocols": [
 							"cwmp"
 						],
-						"description": "The Fully Qualified Domain Name (FQDN) or IP address of the Test Endpoint to perform the UDP Capacity tests with.",
+						"description": "The Fully Qualified Domain Name (FQDN) or IP address of the Test Endpoint to perform the UDP Capacity tests with. <<deprecated|2.17|because it is superseded by <<param|ServerList>> with multi-flow and server capability. Refer to <<bibref|TR-471>> for details>>",
 						"datatype": "string",
 						"range": [
 							{
@@ -51389,6 +59777,26 @@
 							}
 						]
 					},
+					"ServerList": {
+						"type": "string",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp"
+						],
+						"description": "A list of servers intended as testing partners for the client. The client works through the server list attempting individual test flows in a round-robin sequence. One flow is attempted to each server and all flows are required for testing, unless the optional <<param|FlowCount>> and <<param|MaximumFlows>> parameters are specified. The list contains each server\u2019s Fully Qualified Domain Name or IP address and listening port in the format server:port.",
+						"list": {
+							"datatype": "string",
+							"item": {
+								"max": 100
+							},
+							"range": [
+								{
+									"max": 256
+								}
+							]
+						}
+					},
 					"Port": {
 						"type": "unsignedInt",
 						"read": true,
@@ -51396,7 +59804,7 @@
 						"protocols": [
 							"cwmp"
 						],
-						"description": "Port on the Test Endpoint host.",
+						"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>>",
 						"datatype": "unsignedInt",
 						"range": [
 							{
@@ -51422,7 +59830,7 @@
 						"protocols": [
 							"cwmp"
 						],
-						"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 <<param|<<template|IP-DIAGNOSTICS-PARENT>>IPLayerMaxConnections>>.",
+						"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 <<param|<<template|IP-DIAGNOSTICS-PARENT>>IPLayerMaxConnections>>. <<deprecated|2.17|because it is superseded by <<param|ServerList>> with multi-flow and server capability and related parameters. Refer to <<bibref|TR-471>> for details>>",
 						"datatype": "unsignedInt",
 						"range": [
 							{
@@ -51430,6 +59838,26 @@
 							}
 						]
 					},
+					"FlowCount": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp"
+						],
+						"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>> MUST NOT be set to a value greater than <<param|<<template|IP-DIAGNOSTICS-PARENT>>IPLayerMaxConnections>>.",
+						"datatype": "unsignedInt"
+					},
+					"MaximumFlows": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp"
+						],
+						"description": "Optional number of flows to attempt. MaximumFlows must be greater than the size of ServerList or FlowCount. The default SHOULD be 0 (a magic number that indicates the parameter is not used). <<param>> MUST NOT be set to a value greater than <<param|<<template|IP-DIAGNOSTICS-PARENT>>IPLayerMaxConnections>>.",
+						"datatype": "unsignedInt"
+					},
 					"EthernetPriority": {
 						"type": "unsignedInt",
 						"read": true,
@@ -51766,7 +60194,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>>",
+						"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>>",
 						"datatype": "unsignedInt",
 						"range": [
 							{
@@ -52291,6 +60719,21 @@
 						"datatype": "unsignedInt",
 						"unit": "microseconds"
 					},
+					"ActiveFlows": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp"
+						],
+						"description": "Number of flows set-up and used for a test.",
+						"datatype": "unsignedInt",
+						"range": [
+							{
+								"min": 0
+							}
+						]
+					},
 					"Device.IP.Diagnostics.IPLayerCapacityMetrics.ModalResult.{i}.": {
 						"type": "object",
 						"version": "2.15",
@@ -53602,15 +62045,15 @@
 					]
 				},
 				"Order": {
-					"type": "unsignedInt",
+					"type": "string",
 					"read": true,
 					"write": true,
 					"protocols": [
 						"cwmp",
 						"usp"
 					],
-					"description": "Position of the <<object>> entry in the order of precedence. A value of 1 indicates the first entry considered (highest precedence). For each packet, the highest ordered entry that matches the filter criteria is applied. All lower order entries are ignored. When this value is modified, if the value matches that of an existing entry, the <<param>> value for the existing entry and all lower <<param>> entries is 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. The value of <<param>> on creation of a <<object>> table entry MUST be one greater than the largest current value (initially assigned the lowest precedence).",
-					"datatype": "unsignedInt",
+					"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). | 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). For each packet, the highest ordered entry that matches the filter criteria is applied. All lower order entries are ignored.",
+					"datatype": "Order",
 					"range": [
 						{
 							"min": 1
@@ -55642,15 +64085,15 @@
 					]
 				},
 				"Order": {
-					"type": "unsignedInt",
+					"type": "string",
 					"read": true,
 					"write": true,
 					"protocols": [
 						"cwmp",
 						"usp"
 					],
-					"description": "Position of the <<object>> entry in the order of precedence. A value of 1 indicates the first entry considered (highest precedence). For each packet, the highest ordered entry that matches the filter criteria is applied. All lower order entries are ignored. When this value is modified, if the value matches that of an existing entry, the <<param>> value for the existing entry and all lower <<param>> entries is 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. The value of <<param>> on creation of a <<object>> table entry MUST be one greater than the largest current value (initially assigned the lowest precedence).",
-					"datatype": "unsignedInt",
+					"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). | 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). For each packet, the highest ordered entry that matches the filter criteria is applied. All lower order entries are ignored.",
+					"datatype": "Order",
 					"range": [
 						{
 							"min": 1
@@ -56423,15 +64866,15 @@
 					]
 				},
 				"Order": {
-					"type": "unsignedInt",
+					"type": "string",
 					"read": true,
 					"write": true,
 					"protocols": [
 						"cwmp",
 						"usp"
 					],
-					"description": "Position of the <<object>> entry in the order of precedence. A value of 1 indicates the first entry considered (highest precedence). For each packet, the highest ordered entry that matches the filter criteria is applied. All lower order entries are ignored. When this value is modified, if the value matches that of an existing entry, the <<param>> value for the existing entry and all lower <<param>> entries is 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. The value of <<param>> on creation of a <<object>> table entry MUST be one greater than the largest current value (initially assigned the lowest precedence).",
-					"datatype": "unsignedInt",
+					"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). | 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). For each packet, the highest ordered entry that matches the filter criteria is applied. All lower order entries are ignored.",
+					"datatype": "Order",
 					"range": [
 						{
 							"min": 1
@@ -57137,15 +65580,15 @@
 					]
 				},
 				"Order": {
-					"type": "unsignedInt",
+					"type": "string",
 					"read": true,
 					"write": true,
 					"protocols": [
 						"cwmp",
 						"usp"
 					],
-					"description": "Position of the <<object>> entry in the order of precedence. A value of 1 indicates the first entry considered (highest precedence). For each packet, the highest ordered entry that matches the filter criteria is applied. All lower order entries are ignored. When this value is modified, if the value matches that of an existing entry, the <<param>> value for the existing entry and all lower <<param>> entries is 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. The value of <<param>> on creation of a <<object>> table entry MUST be one greater than the largest current value (initially assigned the lowest precedence).",
-					"datatype": "unsignedInt",
+					"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). | 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). For each packet, the highest ordered entry that matches the filter criteria is applied. All lower order entries are ignored.",
+					"datatype": "Order",
 					"range": [
 						{
 							"min": 1
@@ -57410,7 +65853,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.16>>",
+					"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>>",
 					"default": "6",
 					"datatype": "unsignedInt",
 					"range": [
@@ -57429,7 +65872,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.16>>",
+					"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>>",
 					"default": "0",
 					"datatype": "unsignedInt",
 					"range": [
@@ -57448,7 +65891,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.16>>",
+					"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>>",
 					"default": "0",
 					"datatype": "unsignedInt",
 					"range": [
@@ -57466,7 +65909,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>>",
+					"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>>",
 					"default": "false",
 					"datatype": "boolean"
 				},
@@ -58043,7 +66486,7 @@
 				"cwmp",
 				"usp"
 			],
-			"description": "Routing object that contains the <<object|Router>> table and <<object|RIP>> protocol object.",
+			"description": "Routing object that contains the <<object|Router>> table, the received router advertisement information <<object|RouteInformation>>, <<object|Babel>>, and <<object|RIP>> protocol objects.",
 			"access": false,
 			"array": false,
 			"RouterNumberOfEntries": {
@@ -60495,6 +68938,50 @@
 					"description": "This is the IP interface associated with this <<object>> entry.",
 					"datatype": "string"
 				},
+				"RDNSSMode": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Describes which IPv6 address information MUST be specified in the RDNSS option field specified in <<bibref|RFC8106|5.1. Recursive DNS Server Option>>.",
+					"default": "Static",
+					"datatype": "string",
+					"enumerations": [
+						"Static",
+						"LLA",
+						"GUA",
+						"LLA_GUA"
+					]
+				},
+				"RDNSS": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"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.",
+					"list": {
+						"datatype": "IPv6Address"
+					}
+				},
+				"DNSSL": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"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.",
+					"list": {
+						"datatype": "string"
+					}
+				},
 				"ManualPrefixes": {
 					"type": "string",
 					"read": true,
@@ -60708,6 +69195,42 @@
 						}
 					]
 				},
+				"AdvRDNSSLifetime": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "The Lifetime field in RDNSS specifies the maximum duration, in <<units>>, during which the provided RDNSS addresses can be used for name resolution relative to the time the packet is received. By default, the value of Lifetime is recommended to be at least 3 times the MaxRtrAdvInterval. The MaxRtrAdvInterval is defined in <<bibref|RFC4861>> and refers to the maximum interval between Router Advertisement (RA) messages. When the Lifetime value is set to all one bits (0xffffffff), it indicates an infinite duration. The Lifetime value of zero signifies that the RDNSS addresses must not be used anymore, as specified in <<bibref|RFC8106|5.1. Recursive DNS Server Option>>.",
+					"default": "0",
+					"datatype": "unsignedInt",
+					"range": [
+						{
+							"max": 4294967295
+						}
+					],
+					"unit": "seconds"
+				},
+				"AdvDNSSLLifetime": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "The Lifetime field in DNSSL specifies the maximum duration, in <<units>>, during which the provided DNSSL domain names can be used for name resolution relative to the time the packet is received. By default, the value of Lifetime is recommended to be at least 3 times the MaxRtrAdvInterval. The MaxRtrAdvInterval is defined in <<bibref|RFC4861>> and refers to the maximum interval between Router Advertisement (RA) messages. When the Lifetime value is set to all one bits (0xffffffff), it indicates an infinite duration. The Lifetime value of zero signifies that the DNSSL domain names must not be used anymore, as specified in <<bibref|RFC8106|5.2. DNS Search List Option>>.",
+					"default": "0",
+					"datatype": "unsignedInt",
+					"range": [
+						{
+							"max": 4294967295
+						}
+					],
+					"unit": "seconds"
+				},
 				"OptionNumberOfEntries": {
 					"type": "unsignedInt",
 					"read": true,
@@ -61542,15 +70065,15 @@
 					]
 				},
 				"Order": {
-					"type": "unsignedInt",
+					"type": "string",
 					"read": true,
 					"write": true,
 					"protocols": [
 						"cwmp",
 						"usp"
 					],
-					"description": "Position of the <<object>> entry in the order of precedence. A value of 1 indicates the first entry considered (highest precedence). For each packet, the highest ordered entry that matches the classification criteria is applied. All lower order entries are ignored. When this value is modified, if the value matches that of an existing entry, the <<param>> value for the existing entry and all lower <<param>> entries is 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. The value of <<param>> on creation of a <<object>> table entry MUST be one greater than the largest current value (initially assigned the lowest precedence).",
-					"datatype": "unsignedInt",
+					"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). | 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). For each packet, the highest ordered entry that matches the classification criteria is applied. All lower order entries are ignored.",
+					"datatype": "Order",
 					"range": [
 						{
 							"min": 1
@@ -64775,6 +73298,23 @@
 						}
 					]
 				},
+				"Origin": {
+					"type": "string",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Indicates the owner of the <<object>> instance.",
+					"default": "Controller",
+					"datatype": "string",
+					"enumerations": [
+						"User",
+						"System",
+						"Controller"
+					]
+				},
 				"PhysAddress": {
 					"type": "string",
 					"read": true,
@@ -64791,6 +73331,22 @@
 						}
 					]
 				},
+				"PhysAddressMask": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"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 host. Other possible values FF:FF:FF:00:00:00 to apply access control to a specific OUI. When <<empty>> is set, no mask will be applied and the <<param|PhysAddress>> MUST be used as is.",
+					"datatype": "string",
+					"range": [
+						{
+							"max": 64
+						}
+					]
+				},
 				"HostName": {
 					"type": "string",
 					"read": true,
@@ -64978,6 +73534,221 @@
 					]
 				}
 			},
+			"ZoneNumberOfEntries": {
+				"type": "unsignedInt",
+				"read": true,
+				"write": false,
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"description": "<<numentries>>",
+				"datatype": "unsignedInt"
+			},
+			"Device.DNS.Zone.{i}.": {
+				"type": "object",
+				"version": "2.17",
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"description": "This object specifies Zone file configuration of the DNS server.",
+				"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": "Alias",
+					"range": [
+						{
+							"max": 64
+						}
+					]
+				},
+				"Enable": {
+					"type": "boolean",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Enables or disables the DNS zone.",
+					"datatype": "boolean"
+				},
+				"Name": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Domain name that is associated with the zone.",
+					"datatype": "string",
+					"range": [
+						{
+							"max": 128
+						}
+					]
+				},
+				"Origin": {
+					"type": "string",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "The mechanism via which the Zone was created.",
+					"default": "System",
+					"datatype": "string",
+					"enumerations": [
+						"User",
+						"System",
+						"Controller"
+					]
+				},
+				"Interface": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Specifies the Layer 3 interface on which the zone should be available. Example: Device.IP.Interface.1 or Device.Logical.Interface.1.",
+					"datatype": "string",
+					"range": [
+						{
+							"max": 256
+						}
+					]
+				},
+				"HostNumberOfEntries": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "<<numentries>>",
+					"datatype": "unsignedInt"
+				},
+				"Device.DNS.Zone.{i}.Host.{i}.": {
+					"type": "object",
+					"version": "2.17",
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "This object specifies the resource records (RR) of the DNS zone.",
+					"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": "Alias",
+						"range": [
+							{
+								"max": 64
+							}
+						]
+					},
+					"Enable": {
+						"type": "boolean",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Enables or disables the entry in the zone file.",
+						"datatype": "boolean"
+					},
+					"Name": {
+						"type": "string",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "List of hostnames that are associated with the <<object>>.",
+						"list": {
+							"datatype": "string",
+							"range": [
+								{
+									"max": 128
+								}
+							]
+						}
+					},
+					"Origin": {
+						"type": "string",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Indicates the owner of the <<object>> instance.",
+						"default": "System",
+						"datatype": "string",
+						"enumerations": [
+							"User",
+							"System",
+							"Controller"
+						]
+					},
+					"Host": {
+						"type": "string",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Host table entries associated with the device.",
+						"datatype": "string",
+						"range": [
+							{
+								"max": 256
+							}
+						]
+					},
+					"LastUpdate": {
+						"type": "dateTime",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "The date and time in UTC when the entry was last changed.",
+						"datatype": "dateTime"
+					}
+				}
+			},
 			"Device.DNS.Client.": {
 				"type": "object",
 				"version": "2.0",
@@ -65176,6 +73947,17 @@
 						"Error"
 					]
 				},
+				"ConfigNumberOfEntries": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "<<numentries>>",
+					"datatype": "unsignedInt"
+				},
 				"ForwardNumberOfEntries": {
 					"type": "unsignedInt",
 					"read": true,
@@ -65187,6 +73969,115 @@
 					"description": "<<numentries>>",
 					"datatype": "unsignedInt"
 				},
+				"Device.DNS.Relay.Config.{i}.": {
+					"type": "object",
+					"version": "2.17",
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "This object is used to specify the cache configuration for each Forwarding relay.",
+					"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": "Alias",
+						"range": [
+							{
+								"max": 64
+							}
+						]
+					},
+					"Forwarders": {
+						"type": "string",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Specifies the list of the DNS forwarders to be used.",
+						"list": {
+							"datatype": "string",
+							"range": [
+								{
+									"max": 256
+								}
+							]
+						}
+					},
+					"Interface": {
+						"type": "string",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "<<reference>> Specifies the IP interface over which the DNS query is received. This is usually the LAN interface. <<template|INTERFACE-ROUTING>>",
+						"datatype": "string",
+						"range": [
+							{
+								"max": 256
+							}
+						]
+					},
+					"CacheSize": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Specifies the size of cache in kilobytes. When 0 is specified, no DNS results will be cached.",
+						"default": "0",
+						"datatype": "unsignedInt"
+					},
+					"CacheMinTTL": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"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.",
+						"default": "0",
+						"datatype": "unsignedInt",
+						"unit": "seconds"
+					},
+					"CacheMaxTTL": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Specifies the maximum TTL amount of time, in <<units>>, than 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": "86400",
+						"datatype": "unsignedInt",
+						"unit": "seconds"
+					},
+					"FlushCache()": {
+						"type": "command",
+						"async": true,
+						"protocols": [
+							"usp"
+						]
+					}
+				},
 				"Device.DNS.Relay.Forwarding.{i}.": {
 					"type": "object",
 					"version": "2.0",
@@ -65654,6 +74545,17 @@
 					"description": "The parameter, when <<true>>, enables the discovery of DNS-SD services hosted by other devices.",
 					"datatype": "boolean"
 				},
+				"AdvertiseNumberOfEntries": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "<<numentries>>",
+					"datatype": "unsignedInt"
+				},
 				"ServiceNumberOfEntries": {
 					"type": "unsignedInt",
 					"read": true,
@@ -65673,11 +74575,220 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "<<reference|the <<object|##.IP.Interface>> object instance from which DNS-SD services are advertised>> If this parameter is not supported by an implementation then DNS-SD services are advertised on all LAN interfaces.",
+					"description": "<<reference|the <<object|##.IP.Interface>> object instance from which DNS-SD services are advertised>> If this parameter is not supported by an implementation then DNS-SD services are advertised on all LAN interfaces. <<deprecated|2.17|in favor of <<param|Advertise.<i>.Interface>>>>",
 					"list": {
 						"datatype": "string"
 					}
 				},
+				"Device.DNS.SD.Advertise.{i}.": {
+					"type": "object",
+					"version": "2.17",
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "The <<object>> table contains DNS-SD services that MUST be advertised. DNS.SD service information is provided in DNS RR SRV records <<bibref|RFC2782>>. The Service Instance Name <<bibref|DNS-SD|Section 4.1 Structured Instance Names>> further specifies information about the service name (RFC2782 Service field) and domain name (RFC2782 Name field) in the form: Service Instance Name = [InstanceName] . [Service] . [Domain] [Service] = _[ApplicationProtocol] . _[TransportProtocol] RFC2782 Service field will always be equal to [InstanceName]. [Service] RFC2782 Name field will always be equal to [Domain] For example, an SSH service might have: *<<param|InstanceName>> = Secure Shell (SSH)) *<<param|ApplicationProtocol>> = ssh *<<param|TransportProtocol>> = TCP *<<param|Port>> = 22",
+					"uniqueKeys": [
+						"Alias"
+					],
+					"access": true,
+					"array": true,
+					"Enable": {
+						"type": "boolean",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Enables or disables the advertisement of the DNS-SD service.",
+						"datatype": "boolean"
+					},
+					"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
+							}
+						]
+					},
+					"Status": {
+						"type": "string",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "The status of the advertised <<object>>.",
+						"default": "Disabled",
+						"datatype": "string",
+						"enumerations": [
+							"Disabled",
+							"Enabled",
+							"Error_Misconfigured",
+							"Error"
+						]
+					},
+					"Interface": {
+						"type": "string",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "<<reference>> The layer 3 interface on which the DNS-SD service MUST be advertised. Example: Device.IP.Interface.1 or Device.Logical.Interface.1. <<template|INTERFACE-ROUTING>>",
+						"datatype": "string",
+						"range": [
+							{
+								"max": 256
+							}
+						]
+					},
+					"InstanceName": {
+						"type": "string",
+						"read": true,
+						"write": false,
+						"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).",
+						"datatype": "string",
+						"range": [
+							{
+								"max": 63
+							}
+						]
+					},
+					"ApplicationProtocol": {
+						"type": "string",
+						"read": true,
+						"write": false,
+						"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>>.",
+						"datatype": "string",
+						"range": [
+							{
+								"max": 15
+							}
+						]
+					},
+					"TransportProtocol": {
+						"type": "string",
+						"read": true,
+						"write": false,
+						"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>>.",
+						"datatype": "string",
+						"enumerations": [
+							"TCP",
+							"UDP"
+						]
+					},
+					"Domain": {
+						"type": "string",
+						"read": true,
+						"write": false,
+						"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>>.",
+						"default": "local",
+						"datatype": "string",
+						"range": [
+							{
+								"max": 256
+							}
+						]
+					},
+					"Port": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": false,
+						"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.",
+						"datatype": "unsignedInt",
+						"range": [
+							{
+								"max": 65535
+							}
+						]
+					},
+					"TextRecordNumberOfEntries": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "<<numentries>>",
+						"datatype": "unsignedInt"
+					},
+					"Device.DNS.SD.Advertise.{i}.TextRecord.{i}.": {
+						"type": "object",
+						"version": "2.17",
+						"protocols": [
+							"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,
+						"array": true,
+						"Key": {
+							"type": "string",
+							"read": true,
+							"write": true,
+							"protocols": [
+								"cwmp",
+								"usp"
+							],
+							"description": "The key that identifies the text record",
+							"datatype": "string",
+							"range": [
+								{
+									"max": 255
+								}
+							]
+						},
+						"Value": {
+							"type": "string",
+							"read": true,
+							"write": true,
+							"protocols": [
+								"cwmp",
+								"usp"
+							],
+							"description": "The value of the text record.",
+							"datatype": "string",
+							"range": [
+								{
+									"max": 255
+								}
+							]
+						}
+					}
+				},
 				"Device.DNS.SD.Service.{i}.": {
 					"type": "object",
 					"version": "2.6",
@@ -65685,7 +74796,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "The <<object>> table contains discovered DNS-SD services. DNS.SD service information is provided in DNS RR SRV records <<bibref|RFC2782>>. The Service Instance Name <<bibref|DNS-SD|Section 4.1 Structured Instance Names>> further specifies information about the service name (RFC2782 Service field) and domain name (RFC2782 Name field) in the form: Service Instance Name = <InstanceName> . <Service> . <Domain> <Service> = _<ApplicationProtocol> . _<TransportProtocol> RFC2782 Service field will always be equal to <InstanceName>. <Service> RFC2782 Name field will always be equal to <Domain> For example, an SSH service might have: *<<param|InstanceName>> = Secure Shell (SSH)) *<<param|ApplicationProtocol>> = ssh *<<param|TransportProtocol>> = TCP *<<param|Domain>> = example.com *<<param|Port>> = 22 *<<param|Target>> = ssh.example.com.",
+					"description": "The <<object>> table contains discovered DNS-SD services. DNS.SD service information is provided in DNS RR SRV records <<bibref|RFC2782>>. The Service Instance Name <<bibref|DNS-SD|Section 4.1 Structured Instance Names>> further specifies information about the service name (RFC2782 Service field) and domain name (RFC2782 Name field) in the form: Service Instance Name = [InstanceName] . [Service] . [Domain] [Service] = _[ApplicationProtocol] . _[TransportProtocol] RFC2782 Service field will always be equal to [InstanceName]. [Service] RFC2782 Name field will always be equal to [Domain] For example, an SSH service might have: *<<param|InstanceName>> = Secure Shell (SSH)) *<<param|ApplicationProtocol>> = ssh *<<param|TransportProtocol>> = TCP *<<param|Domain>> = example.com *<<param|Port>> = 22 *<<param|Target>> = ssh.example.com.",
 					"uniqueKeys": [
 						"InstanceName",
 						"ApplicationProtocol",
@@ -65702,7 +74813,7 @@
 							"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).",
 						"datatype": "string",
 						"range": [
 							{
@@ -65971,6 +75082,17 @@
 				"description": "<<numentries>>",
 				"datatype": "unsignedInt"
 			},
+			"MaxNumberOfPortMappings": {
+				"type": "unsignedInt",
+				"read": true,
+				"write": false,
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"description": "The maximum number of port mappings that can exist at any given time. If the value of this parameter is 0, then it means that the device doesnt have a limit to the number of port mappings that can exist.",
+				"datatype": "unsignedInt"
+			},
 			"PortTriggerNumberOfEntries": {
 				"type": "unsignedInt",
 				"read": true,
@@ -65982,6 +75104,17 @@
 				"description": "<<numentries>>",
 				"datatype": "unsignedInt"
 			},
+			"MaxNumberOfPortTriggers": {
+				"type": "unsignedInt",
+				"read": true,
+				"write": false,
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"description": "The maximum number of port triggers that can exist at any given time. If the value of this parameter is 0, then it means that the device doesnt have a limit to the number of port mappings that can exist.",
+				"datatype": "unsignedInt"
+			},
 			"Device.NAT.InterfaceSetting.{i}.": {
 				"type": "object",
 				"version": "2.0",
@@ -66161,6 +75294,24 @@
 						"Error"
 					]
 				},
+				"Origin": {
+					"type": "string",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Indicates the Origin of the <<object>> instance.",
+					"default": "Controller",
+					"datatype": "string",
+					"enumerations": [
+						"User",
+						"System",
+						"UPnP",
+						"Controller"
+					]
+				},
 				"Alias": {
 					"type": "string",
 					"read": true,
@@ -68269,15 +77420,15 @@
 						"datatype": "boolean"
 					},
 					"Order": {
-						"type": "unsignedInt",
+						"type": "string",
 						"read": true,
 						"write": true,
 						"protocols": [
 							"cwmp",
 							"usp"
 						],
-						"description": "Position of the option in the DHCP client request. A value of 1 indicates the first entry. When this value is modified, if the value matches that of an existing entry, the <<param>> value for the existing entry and all lower <<param>> entries is incremented to ensure uniqueness of this value. A deletion causes <<param>> values to be compacted. When a value is changed, incrementing occurs before compaction. The value of <<param>> on creation of a <<object>> table entry MUST be one greater than the largest current value.",
-						"datatype": "unsignedInt",
+						"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). | 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). This indicates the position of the option in the DHCP client request.",
+						"datatype": "Order",
 						"range": [
 							{
 								"min": 1
@@ -68429,15 +77580,15 @@
 						]
 					},
 					"Order": {
-						"type": "unsignedInt",
+						"type": "string",
 						"read": true,
 						"write": true,
 						"protocols": [
 							"cwmp",
 							"usp"
 						],
-						"description": "Position of the <<object>> entry in the order of precedence. A value of 1 indicates the first entry considered (highest precedence). For each DHCP request, the highest ordered entry that matches the association criteria is applied. All lower order entries are ignored. When this value is modified, if the value matches that of an existing entry, the <<param>> value for the existing entry and all lower <<param>> entries is 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. The value of <<param>> on creation of a <<object>> table entry MUST be one greater than the largest current value (initially assigned the lowest precedence).",
-						"datatype": "unsignedInt",
+						"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). | 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). For each DHCP request, the highest ordered entry that matches the association criteria is applied. All lower order entries are ignored.",
+						"datatype": "Order",
 						"range": [
 							{
 								"min": 1
@@ -69276,15 +78427,15 @@
 						]
 					},
 					"Order": {
-						"type": "unsignedInt",
+						"type": "string",
 						"read": true,
 						"write": true,
 						"protocols": [
 							"cwmp",
 							"usp"
 						],
-						"description": "Position of the <<object>> entry in the order of precedence. A value of 1 indicates the first entry considered (highest precedence). For each DHCP request, the highest ordered entry that matches the association criteria is applied. All lower order entries are ignored. When this value is modified, if the value matches that of an existing entry, the <<param>> value for the existing entry and all lower <<param>> entries is 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. The value of <<param>> on creation of a <<object>> table entry MUST be one greater than the largest current value (initially assigned the lowest precedence).",
-						"datatype": "unsignedInt",
+						"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). | 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). For each DHCP request, the highest ordered entry that matches the association criteria is applied. All lower order entries are ignored.",
+						"datatype": "Order",
 						"range": [
 							{
 								"min": 1
@@ -70035,15 +79186,15 @@
 						]
 					},
 					"Order": {
-						"type": "unsignedInt",
+						"type": "string",
 						"read": true,
 						"write": true,
 						"protocols": [
 							"cwmp",
 							"usp"
 						],
-						"description": "Position of the <<object>> entry in the order of precedence. A value of 1 indicates the first entry considered (highest precedence). For each DHCPv6 request, the highest ordered entry that matches the association criteria is applied. All lower order entries are ignored. When this value is modified, if the value matches that of an existing entry, the <<param>> value for the existing entry and all lower <<param>> entries is 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. The value of <<param>> on creation of a <<object>> table entry MUST be one greater than the largest current value (initially assigned the lowest precedence).",
-						"datatype": "unsignedInt",
+						"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). | 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). For each DHCPv6 request, the highest ordered entry that matches the association criteria is applied. All lower order entries are ignored.",
+						"datatype": "Order",
 						"range": [
 							{
 								"min": 1
@@ -73486,6 +82637,17 @@
 				"description": "<<numentries>>",
 				"datatype": "unsignedInt"
 			},
+			"InterfaceSettingNumberOfEntries": {
+				"type": "unsignedInt",
+				"read": true,
+				"write": false,
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"description": "<<numentries>>",
+				"datatype": "unsignedInt"
+			},
 			"Device.Firewall.Level.{i}.": {
 				"type": "object",
 				"version": "2.2",
@@ -73549,15 +82711,15 @@
 					]
 				},
 				"Order": {
-					"type": "unsignedInt",
+					"type": "string",
 					"read": true,
 					"write": true,
 					"protocols": [
 						"cwmp",
 						"usp"
 					],
-					"description": "Position of the <<object>> entry for user interface display; levels can be presented according to an increasing or decreasing level of security. When this value is modified, if the value matches that of an existing entry, the <<param>> value for the existing entry and all greater-valued <<param>> entries is incremented to ensure uniqueness of this value. A deletion causes <<param>> values to be compacted. When a value is changed, incrementing occurs before compaction. The value of <<param>> on creation of a <<object>> table entry MUST be one greater than the largest current value.",
-					"datatype": "unsignedInt",
+					"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). | 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). This indicates the order of the <<object>> entry in the user interface display. Levels can be presented according to increasing or decreasing level of security.",
+					"datatype": "Order",
 					"range": [
 						{
 							"min": 1
@@ -73930,15 +83092,15 @@
 						]
 					},
 					"Order": {
-						"type": "unsignedInt",
+						"type": "string",
 						"read": true,
 						"write": true,
 						"protocols": [
 							"cwmp",
 							"usp"
 						],
-						"description": "Position of the <<object>> entry in the order of precedence. A value of 1 indicates the first entry considered (highest precedence). For each packet, the highest ordered entry that matches the rule criteria is applied. All lower order entries are ignored. When this value is modified, if the value matches that of an existing entry, the <<param>> value for the existing entry and all lower <<param>> entries is 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. The value of <<param>> on creation of a <<object>> table entry MUST be one greater than the largest current value (initially assigned the lowest precedence).",
-						"datatype": "unsignedInt",
+						"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). | 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). For each packet, the highest ordered entry that matches the rule criteria is applied. All lower order entries are ignored.",
+						"datatype": "Order",
 						"range": [
 							{
 								"min": 1
@@ -74498,17 +83660,18 @@
 				"Origin": {
 					"type": "string",
 					"read": true,
-					"write": true,
+					"write": false,
 					"protocols": [
 						"cwmp",
 						"usp"
 					],
-					"description": "Indicates the owner of the <<object>> instance.",
+					"description": "Indicates the Origin of the <<object>> instance.",
 					"default": "Controller",
 					"datatype": "string",
 					"enumerations": [
 						"User",
 						"System",
+						"UPnP",
 						"Controller"
 					]
 				},
@@ -74544,6 +83707,30 @@
 						}
 					]
 				},
+				"LeaseDuration": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"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 expires. A value of 0 means the pin hole is static. Support for dynamic (non-static) pin hole is OPTIONAL. That is, the only value for <<param>> that MUST be supported is 0.",
+					"datatype": "unsignedInt",
+					"unit": "seconds"
+				},
+				"RemainingLeaseTime": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"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 lease. That is, for a dynamic pin hole, the value counts down toward 0. When a dynamic pin hole lease expires, the device MUST automatically terminate that pin hole, and MUST automatically delete the corresponding <<object>> table entry. For a static pin hole, this parameter is irrelevant and should return 0.",
+					"datatype": "unsignedInt",
+					"unit": "seconds"
+				},
 				"SourcePort": {
 					"type": "int",
 					"read": true,
@@ -74782,6 +83969,30 @@
 						}
 					]
 				},
+				"LeaseDuration": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"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. A value of 0 means the DMZ rule is static. Support for dynamic (non-static) DMZ rules is OPTIONAL. That is, the only value for <<param>> that MUST be supported is 0.",
+					"datatype": "unsignedInt",
+					"unit": "seconds"
+				},
+				"RemainingLeaseTime": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"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 lease. That is, for a dynamic DMZ rule, the value counts down toward 0. When a dynamic DMZ rule lease expires, the device MUST automatically terminate that DMZ rule, and MUST automatically delete the corresponding <<object>> table entry. For a static DMZ rule, this parameter is irrelevant and should return 0.",
+					"datatype": "unsignedInt",
+					"unit": "seconds"
+				},
 				"DestIP": {
 					"type": "string",
 					"read": true,
@@ -75013,6 +84224,476 @@
 						"Reject"
 					]
 				}
+			},
+			"Device.Firewall.InterfaceSetting.{i}.": {
+				"type": "object",
+				"version": "2.17",
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"description": "Firewall settings for an associated IP Interface. For enabled table entries, 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>>. Note: The <<object>> includes a unique key that is a strong reference. If a strongly referenced object is deleted, the device 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 device MUST set <<param|Status>> to <<enum|Error_Misconfigured|Status>> and disable the offending <<object>> row.",
+				"uniqueKeys": [
+					"Alias",
+					"Interface"
+				],
+				"access": true,
+				"array": true,
+				"Enable": {
+					"type": "boolean",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Enables or disables the <<object>> entry, indicating if NAT is enabled for the referenced IP Interface instance. On creation, an <<object>> entry is disabled by default.",
+					"default": "false",
+					"datatype": "boolean"
+				},
+				"Status": {
+					"type": "string",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"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 device to indicate a locally defined error condition.",
+					"default": "Disabled",
+					"datatype": "string",
+					"enumerations": [
+						"Disabled",
+						"Enabled",
+						"Error_Misconfigured",
+						"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
+						}
+					]
+				},
+				"Interface": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "<<reference>> The associated IP interface on which NAT is to be enabled.",
+					"datatype": "string",
+					"range": [
+						{
+							"max": 256
+						}
+					]
+				},
+				"IPv4SpoofingProtection": {
+					"type": "boolean",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Enables or disables the IPv4 spoofing protection. Spoofing protection prevents LAN devices from sending packets with a wrong source IP address. A number of DDoS attacks are known to modify the source IP address of packets to initiate a DDoS attack. Spoofing protection checks if the source IP address of packets initiated in the LAN belongs to the LAN interface Address range, otherwise the packet will be dropped early in the network stack.",
+					"datatype": "boolean"
+				},
+				"IPv6SpoofingProtection": {
+					"type": "boolean",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Enables or disables the IPv6 spoofing protection. Spoofing protection prevents LAN devices from sending packets with a wrong source IP address. A number of DDoS attacks are known to modify the source IP address of packets to initiate a DDoS attack. Spoofing protection checks if the source IP address of packets initiated in the LAN belongs to the LAN interface Address range, otherwise the packet will be dropped early in the network stack.",
+					"datatype": "boolean"
+				},
+				"IPv4AcceptICMPEchoRequest": {
+					"type": "boolean",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "When <<true>> the ICMPv4 echo request packet must be answered with an ICMPv4 echo reply. When <<false>> the ICMPv4 echo request packet must be dropped.",
+					"datatype": "boolean"
+				},
+				"IPv6AcceptICMPEchoRequest": {
+					"type": "boolean",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"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"
+				},
+				"StealthMode": {
+					"type": "boolean",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Enables or disables the stealth mode. Stealth mode defines how the firewall must treat unwanted packets. Typically the feature is enabled for WAN facing interface(s). Stealth mode is applicable for both IPv4 and IPv6, and UDP and TCP based protocols. If set to <<true>> all UDP/TCP packets are dropped silently. This prevents a possible attacker from knowing which ports are opened/closed on a gateway. When <<param>> is set to <<false>>, the firewall will reply with an ICMP port unreachable. If there are other firewall rules in effect, they will have priority over this parameter. i.e: If an UDP port is set to ACCEPT, and the <<param>> is activated, then the port will be accepted and all the other UDP ports will be blocked.",
+					"datatype": "boolean"
+				}
+			},
+			"Device.Firewall.ConnectionTracking.": {
+				"type": "object",
+				"version": "2.17",
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"description": "This Object contains the IP connection tracking related parameters. Application Layer Gateway (ALG) are used to provide Network Address Translation (NAT) support for various application-layer protocols.",
+				"access": false,
+				"array": false,
+				"Device.Firewall.ConnectionTracking.SIP.": {
+					"type": "object",
+					"version": "2.17",
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "SIP is an application-layer control protocol used to establish, modify, and terminate multimedia sessions.",
+					"access": false,
+					"array": false,
+					"Enable": {
+						"type": "boolean",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Enables or disables the connection tracking support for the SIP protocol (SIP ALG).",
+						"datatype": "boolean"
+					},
+					"Ports": {
+						"type": "string",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Port numbers of the SIP servers that need to be monitored.",
+						"list": {
+							"datatype": "int",
+							"range": [
+								{
+									"min": 0,
+									"max": 65535
+								}
+							]
+						}
+					},
+					"DirectMedia": {
+						"type": "boolean",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Allow media streams between signaling endpoints.",
+						"default": "true",
+						"datatype": "boolean"
+					},
+					"DirectSignaling": {
+						"type": "boolean",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Allow incoming calls from registrar.",
+						"default": "true",
+						"datatype": "boolean"
+					},
+					"ExternalMedia": {
+						"type": "boolean",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Allow media streams that are not passing through this router. When this feature is activated, the logic will maintain the SDP payload as is when it identifies that the interface towards the invited party is the same as the one towards the media endpoint.",
+						"default": "false",
+						"datatype": "boolean"
+					},
+					"TimeOut": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "SIP time out session.",
+						"datatype": "unsignedInt"
+					}
+				},
+				"Device.Firewall.ConnectionTracking.H323.": {
+					"type": "object",
+					"version": "2.17",
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "H.323 is a VoIP signalling protocol from ITU-T",
+					"access": false,
+					"array": false,
+					"Enable": {
+						"type": "boolean",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Enables or disables the connection tracking support for the H323 protocol (H323 ALG).",
+						"datatype": "boolean"
+					},
+					"RegistrationRequestTTL": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "When no TTL is specified in the registration request message the TTL specified here will be used.",
+						"datatype": "unsignedInt"
+					},
+					"GKRoutedOnly": {
+						"type": "boolean",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Only accept calls from the gatekeeper.",
+						"datatype": "boolean"
+					},
+					"CallForwardFilter": {
+						"type": "boolean",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Create call forwarding expectations only when both endpoints are on different sides, as determined by routing information.",
+						"datatype": "boolean"
+					}
+				},
+				"Device.Firewall.ConnectionTracking.FTP.": {
+					"type": "object",
+					"version": "2.17",
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Tracking FTP connections is difficult due to the requirement for specialized helpers to handle them, along with the complexities of masquerading and Network Address Translation. This involves supporting FTP on Layer 3 with independent connection tracking.",
+					"access": false,
+					"array": false,
+					"Enable": {
+						"type": "boolean",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Enables or disables the connection tracking support for the FTP protocol (FTP ALG).",
+						"datatype": "boolean"
+					},
+					"Ports": {
+						"type": "string",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Port numbers of the FTP servers that need to be monitored.",
+						"list": {
+							"datatype": "int",
+							"item": {
+								"max": 8
+							},
+							"range": [
+								{
+									"min": 0,
+									"max": 65535
+								}
+							]
+						}
+					},
+					"Loose": {
+						"type": "boolean",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "The FTP protocol can enable a user to connect a FTP server to another FTP server. This could lead to a hole in the DMZ and it is therefore recommended to disable this feature.",
+						"datatype": "boolean"
+					}
+				},
+				"Device.Firewall.ConnectionTracking.PPTP.": {
+					"type": "object",
+					"version": "2.17",
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "PPTP Connection Tracking configuration object.",
+					"access": false,
+					"array": false,
+					"Enable": {
+						"type": "boolean",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Enables or disables the connection tracking support for the PPTP protocol (PPTP ALG).",
+						"datatype": "boolean"
+					}
+				},
+				"Device.Firewall.ConnectionTracking.TFTP.": {
+					"type": "object",
+					"version": "2.17",
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "TFTP Connection Tracking configuration object.",
+					"access": false,
+					"array": false,
+					"Enable": {
+						"type": "boolean",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Enables or disables the connection tracking support for the TFTP protocol (TFTP ALG).",
+						"datatype": "boolean"
+					},
+					"Ports": {
+						"type": "string",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Port numbers of the TFTP servers that need to be monitored.",
+						"list": {
+							"datatype": "int",
+							"item": {
+								"max": 8
+							},
+							"range": [
+								{
+									"min": 0,
+									"max": 65535
+								}
+							]
+						}
+					}
+				},
+				"Device.Firewall.ConnectionTracking.IRC.": {
+					"type": "object",
+					"version": "2.17",
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "IRC Connection Tracking configuration object.",
+					"access": false,
+					"array": false,
+					"Enable": {
+						"type": "boolean",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Enables or disables the connection tracking support for the IRC protocol (IRC ALG).",
+						"datatype": "boolean"
+					},
+					"Ports": {
+						"type": "string",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Port numbers of the IRC servers that need to be monitored.",
+						"list": {
+							"datatype": "int",
+							"range": [
+								{
+									"min": 0,
+									"max": 65535
+								}
+							]
+						}
+					},
+					"MAXDCCChannels": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Maximum number of Direct Client-to-Client (DCC) channels allowed per IRC session.",
+						"datatype": "unsignedInt"
+					},
+					"DCCTimeout": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Timeout duration for unestablished Direct Client-to-Client (DCC) channels.",
+						"datatype": "unsignedInt"
+					}
+				}
 			}
 		},
 		"Device.PeriodicStatistics.": {
@@ -75125,7 +84806,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "The sample interval in <<units>>. Each statistic is measured over this sample interval. The CPE MAY reject a request to set <<param>> to less than <<param|#.MinSampleInterval>>. Sample intervals MUST begin every <<param>> <<units>>, with no delay between samples. If <<param>> is changed while collection of periodic statistics is enabled, any stored samples are discarded, and the first sample interval begins immediately. For example, if <<param|ReportSamples>> is 24 and <<param>> is 3600 (an hour), the CPE can store up to a days worth of samples for each statistic.",
+					"description": "The sample interval in <<units>>. Each statistic is measured over this sample interval. The CPE MAY also support an internal sampling rate (implementation dependent) that is faster than the <<param>> and allows the CPE to support the various options available in <<param|Parameter.<i>.CalculationMode>>. The CPE MAY reject a request to set <<param>> to less than <<param|#.MinSampleInterval>>. Sample intervals MUST begin every <<param>> <<units>>, with no delay between samples. If <<param>> is changed while collection of periodic statistics is enabled, any stored samples are discarded, and the first sample interval begins immediately. For example, if <<param|ReportSamples>> is 24 and <<param>> is 3600 (an hour), the CPE can store up to a days worth of samples for each statistic.",
 					"default": "3600",
 					"datatype": "unsignedInt",
 					"range": [
@@ -75365,7 +85046,7 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "Controls how this parameters statistic is calculated from the sampled value(s). 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. 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": [
@@ -76460,7 +86141,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "<<list>> Each item is a DNS Name. The Subject Alternative Names extension field in an X.509 certificate, see <<bibref|RFC5280>>.",
+					"description": "<<list>> Each item specifies an identity that is bound to the certificates subject, and thus bound to the Public Key. The Subject Alternative Names extension field in an X.509 certificate, see <<bibref|RFC5280>>.",
 					"list": {
 						"datatype": "string",
 						"maxsize": 256
@@ -79448,6 +89129,21 @@
 								}
 							]
 						}
+					},
+					"ModuleVersion": {
+						"type": "string",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"usp"
+						],
+						"description": "Version of the <<object>> as optionally set by the Controller.",
+						"datatype": "string",
+						"range": [
+							{
+								"max": 32
+							}
+						]
 					}
 				}
 			},
@@ -79912,7 +89608,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "Indicates whether or not this <<object>> is enabled. Disabling an enabled Execution Environment stops it, while enabling a disabled Execution Environment starts it. When an Execution Environment is disabled, Deployment Units installed to that Execution Environment will be unaffected, but any Execution Units currently running on that Execution Environment will automatically transition to <<enum|Idle|#.ExecutionUnit.<i>.Status>>.<<np>>If a ChangeDUState is attempted on a <<object|#.DeploymentUnit>> that is to be applied against a disabled <<object>>, that ChangeDUState operation fails and the associated DUStateChangeComplete RPC will contain a FaultStruct for that operation. If a SetParameterValues is attempted against the <<param|#.ExecutionUnit.<i>.RequestedState>> for an <<object|#.ExecutionUnit>> that is associated with a disabled <<object>> a CWMP Fault will be issued in response. Disabling an Execution Environment could place the device in a non-manageable state. For example, if the operating system itself was modeled as an <<object>> and the ACS disabled it, the CWMP management agent might be terminated leaving the device unmanageable.",
+					"description": "Indicates whether or not this <<object>> is enabled. Disabling an enabled Execution Environment stops it, while enabling a disabled Execution Environment starts it. When an Execution Environment is disabled, Deployment Units installed to that Execution Environment will be unaffected, but any Execution Units currently running on that Execution Environment will automatically transition to <<enum|Idle|#.ExecutionUnit.<i>.Status>>. If a ChangeDUState is attempted on a <<object|#.DeploymentUnit>> that is to be applied against a disabled <<object>>, that ChangeDUState operation fails and the associated DUStateChangeComplete RPC will contain a FaultStruct for that operation. If a SetParameterValues is attempted against the <<param|#.ExecutionUnit.<i>.RequestedState>> for an <<object|#.ExecutionUnit>> that is associated with a disabled <<object>> a CWMP Fault will be issued in response. Disabling an Execution Environment could place the device in a non-manageable state. For example, if the operating system itself was modeled as an <<object>> and the ACS disabled it, the CWMP management agent might be terminated leaving the device unmanageable.",
 					"datatype": "boolean"
 				},
 				"Status": {
@@ -80323,6 +90019,18 @@
 						"datatype": "string"
 					}
 				},
+				"AvailableAccessInterfaces": {
+					"type": "string",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"usp"
+					],
+					"description": "Represents the network interface through which the outgoing traffic from the ExecutionUnit running in this <<object>> may be allowed. This value can be altered by executing the <<command|ModifyAvailableAccessInterfaces()>>.",
+					"list": {
+						"datatype": "string"
+					}
+				},
 				"SetRunLevel()": {
 					"type": "command",
 					"async": true,
@@ -80448,6 +90156,33 @@
 						}
 					}
 				},
+				"ModifyAvailableAccessInterfaces()": {
+					"type": "command",
+					"async": true,
+					"protocols": [
+						"usp"
+					],
+					"input": {
+						"AccessInterfaces": {
+							"type": "string",
+							"read": true,
+							"write": true,
+							"mandatory": true,
+							"protocols": [
+								"usp"
+							],
+							"description": "The new list of access interfaces which may be assigned to any DeploymentUnit installed into the <<object>> this list replaces the previous value of <<param|#.AvailableAccessInterfaces>>. If this parameter is an empty string then no access interface may be assigned to any DeploymentUnit installed into the <<object>>. Each entry in the list is the Name of a row in <<object|.Logical.Interface>>.",
+							"list": {
+								"datatype": "string",
+								"range": [
+									{
+										"max": 256
+									}
+								]
+							}
+						}
+					}
+				},
 				"Restart()": {
 					"type": "command",
 					"async": true,
@@ -80574,22 +90309,6 @@
 							}
 						]
 					},
-					"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
-							}
-						]
-					},
 					"Capacity": {
 						"type": "unsignedInt",
 						"read": true,
@@ -80644,6 +90363,22 @@
 							}
 						]
 					},
+					"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
+							}
+						]
+					},
 					"ApplicationUUID": {
 						"type": "string",
 						"read": true,
@@ -80939,6 +90674,21 @@
 					"description": "The internal Controller which the application installed by this <<object>> uses to access the Data Model. Will be <<empty>> if the application does not require Data Model access.",
 					"datatype": "string"
 				},
+				"ModuleVersion": {
+					"type": "string",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"usp"
+					],
+					"description": "Version of the <<object>> as optionally set by the Controller during <<command|#.InstallDU()>> command or <<command|Update()>>.",
+					"datatype": "string",
+					"range": [
+						{
+							"max": 32
+						}
+					]
+				},
 				"Update()": {
 					"type": "command",
 					"async": true,
@@ -81003,7 +90753,7 @@
 							"protocols": [
 								"usp"
 							],
-							"description": "If this argument is present, it lists the 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 roles are unchanged from the previous version. If any of these roles are not present in the <<param|##.ExecEnv.<i>.AvailableRoles>> of the <<object|###.ExecEnv>> in which the DU is installed then the command will fail. Some Agents may apply further filtering for roles which are considered security- or privacy-sensitive. Each entry in the list is the Name of a row in <<object|###.LocalAgent.ControllerTrust.Role>>. If there is no such row then the command will fail, as installation requires a role which is not available on the Device. If this argument is absent or empty then no roles are required in order for the application to function.",
+							"description": "If this argument is present, it lists the 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 roles are unchanged from the previous version. If any of these roles are not present in the <<param|##.ExecEnv.<i>.AvailableRoles>> of the <<object|###.ExecEnv>> in which the DU is installed then the command will fail. Some Agents may apply further filtering for roles which are considered security- or privacy-sensitive. Each entry in the list is the Name of a row in <<object|###.LocalAgent.ControllerTrust.Role>>. If there is no such row then the command will fail, as installation requires a role which is not available on the Device. If this argument is empty then no roles are required in order for the application to function.",
 							"list": {
 								"datatype": "string",
 								"range": [
@@ -81020,7 +90770,7 @@
 							"protocols": [
 								"usp"
 							],
-							"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 provide its full functionality after this update. If it is absent then the required roles are unchanged from the previous version. Each entry in the list is the Name of a row in <<object|###.LocalAgent.ControllerTrust.Role>>. If there is no such row, or the matching row is not present in the <<param|##.ExecEnv.<i>.AvailableRoles>> of the Execution Environment into which the DU is to be installed, then the entry will be ignored. Some Agents may apply further filtering, for roles which are considered security- or privacy-sensitive. If this argument is absent or empty then no additional roles are required in order for the application to be able to provide its full functionality.",
+							"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 provide its full functionality after this update. If it is absent then the required roles are unchanged from the previous version. Each entry in the list is the Name of a row in <<object|###.LocalAgent.ControllerTrust.Role>>. If there is no such row, or the matching row is not present in the <<param|##.ExecEnv.<i>.AvailableRoles>> of the Execution Environment into which the DU is to be installed, then the entry will be ignored. Some Agents may apply further filtering, for roles which are considered security- or privacy-sensitive. If this argument is empty then no additional roles are required in order for the application to be able to provide its full functionality.",
 							"list": {
 								"datatype": "string",
 								"range": [
@@ -81040,6 +90790,21 @@
 							"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>>.",
 							"default": "false",
 							"datatype": "boolean"
+						},
+						"ModuleVersion": {
+							"type": "string",
+							"read": true,
+							"write": true,
+							"protocols": [
+								"usp"
+							],
+							"description": "Version of the <<object>> as optionally set by the Controller. When the argument is absent then <<param>> is unchanged.",
+							"datatype": "string",
+							"range": [
+								{
+									"max": 32
+								}
+							]
 						}
 					}
 				},
@@ -81396,7 +91161,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "Represents the instances of multi-instanced objects that are directly controlled by, and have come into existence because of, this <<object>>.<<np>>See <<bibref|TR-069|Appendix VI.3.2>> for more description and some examples. NOTE: All other objects and parameters (i.e. not multi-instanced objects) that this <<object>> has caused to come into existence can be discovered via the <<object|##.DeviceInfo.SupportedDataModel>> table.",
+					"description": "Represents the instances of multi-instanced objects that are directly controlled by, and have come into existence because of, this <<object>>. See <<bibref|TR-069|Appendix VI.3.2>> for more description and some examples. NOTE: All other objects and parameters (i.e. not multi-instanced objects) that this <<object>> has caused to come into existence can be discovered via the <<object|##.DeviceInfo.SupportedDataModel>> table.",
 					"list": {
 						"datatype": "string"
 					}
@@ -81487,6 +91252,17 @@
 					"description": "<<numentries>>",
 					"datatype": "unsignedInt"
 				},
+				"EnvVariableNumberOfEntries": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "<<numentries>>",
+					"datatype": "unsignedInt"
+				},
 				"SetRequestedState()": {
 					"type": "command",
 					"async": true,
@@ -81525,7 +91301,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "Configures the parameters of the auto-restart algorithm for this <<object|#>>. 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": {
@@ -81536,7 +91312,7 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "Enable the auto-restart feature for this <<object|#>>.",
+						"description": "Enable the auto-restart feature for this EU.",
 						"default": "false",
 						"datatype": "boolean"
 					},
@@ -81594,7 +91370,7 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "If the <<object|#>> runs for this number of <<units>> without terminating abnormally the Agent MAY reset the <<param|RetryCount>> to zero, thereby resetting the exponential backoff algorithm. A value of zero disables this behavior.",
+						"description": "If the EU runs for this number of <<units>> without terminating abnormally the Agent MAY reset the <<param|RetryCount>> to zero, thereby resetting the exponential backoff algorithm. A value of zero disables this behavior.",
 						"datatype": "unsignedInt",
 						"unit": "seconds"
 					},
@@ -81606,7 +91382,7 @@
 							"cwmp",
 							"usp"
 						],
-						"description": "The number of restart attempts which have been initiated so far. Resetting this parameter to zero has the effect of re-initialising the exponential back-off algorithm.",
+						"description": "The number times the EU has terminated abnormally and a restart has been attempted. Resetting this parameter to zero has the effect of re-initialising the exponential back-off algorithm.",
 						"datatype": "unsignedInt"
 					},
 					"LastRestarted": {
@@ -81632,6 +91408,43 @@
 						"datatype": "dateTime"
 					}
 				},
+				"Device.SoftwareModules.ExecutionUnit.{i}.NetworkConfig.": {
+					"type": "object",
+					"version": "2.17",
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Parameters of the network configuration for this ExecutionUnit. When no network configuration is provided, the EU will not have any network access.",
+					"access": false,
+					"array": false,
+					"AccessInterfaceRefList": {
+						"type": "string",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Represents the network interface through which the traffic from the EU will be allowed.",
+						"list": {
+							"datatype": "string"
+						}
+					},
+					"PortMappingRefList": {
+						"type": "string",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Represents the list of Port mappings associated with this EU.",
+						"list": {
+							"datatype": "string"
+						}
+					}
+				},
 				"Device.SoftwareModules.ExecutionUnit.{i}.HostObject.{i}.": {
 					"type": "object",
 					"version": "2.16",
@@ -81662,22 +91475,6 @@
 							}
 						]
 					},
-					"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
-							}
-						]
-					},
 					"Destination": {
 						"type": "string",
 						"read": true,
@@ -81709,6 +91506,85 @@
 								"max": 256
 							}
 						]
+					},
+					"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
+							}
+						]
+					}
+				},
+				"Device.SoftwareModules.ExecutionUnit.{i}.EnvVariable.{i}.": {
+					"type": "object",
+					"version": "2.17",
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "This parameter describes the environment variables which are accessible to the ExecutionUnit.",
+					"uniqueKeys": [
+						"Alias",
+						"Key"
+					],
+					"access": false,
+					"array": true,
+					"Key": {
+						"type": "string",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "The Environment variable name that needs to be passed to the Execution unit when the execution unit is activated.",
+						"datatype": "string",
+						"range": [
+							{
+								"max": 2048
+							}
+						]
+					},
+					"Value": {
+						"type": "string",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "The Environment variable value associated with the name that needs to be passed to the Execution unit it is activated.",
+						"datatype": "string",
+						"range": [
+							{
+								"max": 2048
+							}
+						]
+					},
+					"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
+							}
+						]
 					}
 				},
 				"Device.SoftwareModules.ExecutionUnit.{i}.Extensions.": {
@@ -81718,7 +91594,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "This object proposes a general location for vendor extensions specific to this Execution Unit, which allows multiple Execution Units to expose parameters without the concern of conflicting parameter names. These vendor extensions are related to displaying status and maintaining configuration for this Execution Unit.<<np>>It is also possible for the Execution Unit to expose status and configuration parameters within Service objects or as embedded objects and parameters directly within the root data model, in which case the combination of <<param|#.References>> and <<param|#.SupportedDataModelList>> will be used to determine their locations. See <<bibref|TR-069|Appendix VI.3.2>> for more description and some examples.",
+					"description": "This object proposes a general location for vendor extensions specific to this Execution Unit, which allows multiple Execution Units to expose parameters without the concern of conflicting parameter names. These vendor extensions are related to displaying status and maintaining configuration for this Execution Unit. It is also possible for the Execution Unit to expose status and configuration parameters within Service objects or as embedded objects and parameters directly within the root data model, in which case the combination of <<param|#.References>> and <<param|#.SupportedDataModelList>> will be used to determine their locations. See <<bibref|TR-069|Appendix VI.3.2>> for more description and some examples.",
 					"access": false,
 					"array": false
 				}
@@ -83422,7 +93298,7 @@
 								"cwmp",
 								"usp"
 							],
-							"description": "<<reference||deprecated>><<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": "<<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.",
 							"datatype": "string"
 						},
 						"VendorPropertiesNumberOfEntries": {
@@ -84670,7 +94546,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>>",
+					"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>>",
 					"default": "true",
 					"datatype": "boolean"
 				},
@@ -92465,6 +102341,44 @@
 								]
 							}
 						},
+						"Device.XPON.ONU.{i}.ANI.{i}.TC.Authentication.": {
+							"type": "object",
+							"version": "2.17",
+							"protocols": [
+								"cwmp",
+								"usp"
+							],
+							"description": "This object shows info related to authentication of the ONU to the OLT.",
+							"access": false,
+							"array": false,
+							"Password": {
+								"type": "string",
+								"read": true,
+								"write": true,
+								"protocols": [
+									"cwmp",
+									"usp"
+								],
+								"description": "All ITU based PON standards specify authentication by PLOAM password or registration ID. See: * <<bibref|G.9807.1|Section C.15.2.1>> * <<bibref|G.984.3|Section VI.2>> * <<bibref|G.987.3|Section 15.2.1>> * <<bibref|G.989.3|Section 15.2.1>> All those standards mention that a method to enter the password is beyond their scope. This parameter and the parameter <<param|HexadecimalPassword>> standardize a method to enter the password. In case of G-PON as PON mode, the password can be up to 10 bytes long. See <<bibref|G.984.3|Section 9.2.4.2>>. For the other PON modes, the password can be up to 36 bytes long. See: * <<bibref|G.9807.1|Section C.11.3.4.2>> * <<bibref|G.987.3|Section 11.3.4.2>> * <<bibref|G.989.3|Section 11.3.4.2>> If <<param|HexadecimalPassword>> is <<false>>, the password is in ASCII format. Then all 95 printable characters with decimal codes in the range 32 to 126 inclusive are allowed. Each character corresponds with 1 byte in the password. If <<param|HexadecimalPassword>> is <<true>>, the password is in hexadecimal format. Then only the characters 0 to 9, a to f, and A to F are allowed. Each character corresponds with 1 nibble in the password. Depending on the value of <<param|HexadecimalPassword>> and the PON mode, a different number of characters are applicable. If <<param|HexadecimalPassword>> is <<false>>: * In case of G-PON as PON mode, only the 1st 10 characters are applicable. * In case of another PON mode, only the 1st 36 characters are applicable. If <<param|HexadecimalPassword>> is <<true>>: * In case of G-PON as PON mode, the 1st 20 characters are all relevant. The other characters are not applicable. * In case of another PON mode, all 72 characters are relevant. This parameter is set to <<empty>> if no authentication via a password is required.",
+								"datatype": "string",
+								"range": [
+									{
+										"max": 72
+									}
+								]
+							},
+							"HexadecimalPassword": {
+								"type": "boolean",
+								"read": true,
+								"write": true,
+								"protocols": [
+									"cwmp",
+									"usp"
+								],
+								"description": "If <<false>>, <<param|Password>> is in ASCII format. If <<true>>, <<param|Password>> is in hexadecimal format. See <<param|Password>> for more info.",
+								"datatype": "boolean"
+							}
+						},
 						"Device.XPON.ONU.{i}.ANI.{i}.TC.PM.": {
 							"type": "object",
 							"version": "2.16",
@@ -93573,7 +103487,7 @@
 				"AutoDisableDuration": {
 					"type": "unsignedInt",
 					"read": true,
-					"write": false,
+					"write": true,
 					"protocols": [
 						"cwmp",
 						"usp"
@@ -93877,12 +103791,12 @@
 				"Protocol": {
 					"type": "string",
 					"read": true,
-					"write": true,
+					"write": false,
 					"protocols": [
 						"cwmp",
 						"usp"
 					],
-					"description": "The Message Transport Protocol (MTP) to be used for communications by a USP Endpoint.",
+					"description": "The Message Transfer Protocol (MTP) to be used for communications by a USP Endpoint. Note: This parameter was demoted to readOnly in the Device:2.17 version.",
 					"datatype": "string",
 					"enumerations": [
 						"WebSocket",
@@ -93934,6 +103848,714 @@
 				}
 			}
 		},
+		"Device.Syslog.": {
+			"type": "object",
+			"version": "2.17",
+			"protocols": [
+				"cwmp",
+				"usp"
+			],
+			"description": "This object contains global parameters relating to the syslog implementations that is active in the Device. Based on <<bibref|YANGSYSLOG|A YANG Data Model for Syslog Configuration>>.",
+			"access": false,
+			"array": false,
+			"Enable": {
+				"type": "boolean",
+				"read": true,
+				"write": true,
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"description": "Enables or disables the Syslog service.",
+				"datatype": "boolean"
+			},
+			"Status": {
+				"type": "string",
+				"read": true,
+				"write": false,
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"description": "Indicates the syslog service operational state.",
+				"datatype": "string",
+				"enumerations": [
+					"Disabled",
+					"Enabled",
+					"Error"
+				]
+			},
+			"FilterNumberOfEntries": {
+				"type": "unsignedInt",
+				"read": true,
+				"write": false,
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"description": "<<numentries>>",
+				"datatype": "unsignedInt"
+			},
+			"SourceNumberOfEntries": {
+				"type": "unsignedInt",
+				"read": true,
+				"write": false,
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"description": "<<numentries>>",
+				"datatype": "unsignedInt"
+			},
+			"TemplateNumberOfEntries": {
+				"type": "unsignedInt",
+				"read": true,
+				"write": false,
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"description": "<<numentries>>",
+				"datatype": "unsignedInt"
+			},
+			"ActionNumberOfEntries": {
+				"type": "unsignedInt",
+				"read": true,
+				"write": false,
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"description": "<<numentries>>",
+				"datatype": "unsignedInt"
+			},
+			"Device.Syslog.Filter.{i}.": {
+				"type": "object",
+				"version": "2.17",
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"description": "This table defines the processing used to select log messages by comparing syslog message with the provided rules. A rule can consist either of <<param|FacilityLevel>> - <<param|Severity>> and or <<param|PatternMatch>>.",
+				"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": "Alias",
+					"range": [
+						{
+							"max": 64
+						}
+					]
+				},
+				"FacilityLevel": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Only the log messages with following Facility levels must be logged.",
+					"default": "All",
+					"list": {
+						"datatype": "string",
+						"enumerations": [
+							"Kern",
+							"User",
+							"Mail",
+							"Daemon",
+							"Auth",
+							"Syslog",
+							"LPR",
+							"News",
+							"UUCP",
+							"Cron",
+							"AuthPriv",
+							"FTP",
+							"NTP",
+							"Audit",
+							"Console",
+							"Cron2",
+							"Local0",
+							"Local1",
+							"Local2",
+							"Local3",
+							"Local4",
+							"Local5",
+							"Local6",
+							"Local7",
+							"All"
+						]
+					}
+				},
+				"Severity": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Specifies the Severity level filter rules. Defines the processing used to select log messages by comparing syslog message severity using the following processing rules: - if none, do not match. - if all, match. - else compare message severity with the specified severity according to the default compare rule (all messages of the specified severity and greater match). This must be used inconjuction with <<param|SeverityCompare>> and <<param|SeverityCompareAction>>.",
+					"default": "All",
+					"datatype": "string",
+					"enumerations": [
+						"Emergency",
+						"Alert",
+						"Critical",
+						"Error",
+						"Warning",
+						"Notice",
+						"Debug",
+						"All",
+						"None"
+					]
+				},
+				"SeverityCompare": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Describes the comparison method that must be applied when a syslog message is received. Not applicable when severity <<enum|All|Severity>> and <<enum|None|Severity>> is configured.",
+					"default": "EqualOrHigher",
+					"datatype": "string",
+					"enumerations": [
+						"Equal",
+						"EqualOrHigher"
+					]
+				},
+				"SeverityCompareAction": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Specifies the process of handling a syslog message based on specified conditions. It defines the action that will be taken when the criteria of both <<param|Severity>> and <<param|SeverityCompare>> are met, determining the response to the syslog message.",
+					"default": "Log",
+					"datatype": "string",
+					"enumerations": [
+						"Log",
+						"Block",
+						"Stop"
+					]
+				},
+				"PatternMatch": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Regular expression pattern designed to match a syslog message that must be logged. The format is implementation specific.",
+					"datatype": "string"
+				}
+			},
+			"Device.Syslog.Source.{i}.": {
+				"type": "object",
+				"version": "2.17",
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"description": "This table describes where and how the syslog service receives log messages.",
+				"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": "Alias",
+					"range": [
+						{
+							"max": 64
+						}
+					]
+				},
+				"KernelMessages": {
+					"type": "boolean",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "This option enables the collection of kernel log messages that are specific to the Device.",
+					"default": "true",
+					"datatype": "boolean"
+				},
+				"SystemMessages": {
+					"type": "boolean",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "This option enables the collection of the system log messages that are specific to the Device.",
+					"default": "true",
+					"datatype": "boolean"
+				},
+				"Severity": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Specifies the default Severity. When an incoming message lacks a valid syslog header, this parameter can be used to configure the required Severity level.",
+					"default": "All",
+					"datatype": "string",
+					"enumerations": [
+						"Emergency",
+						"Alert",
+						"Critical",
+						"Error",
+						"Warning",
+						"Notice",
+						"Debug",
+						"All",
+						"None"
+					]
+				},
+				"FacilityLevel": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Specifies the default Facility Level. When an incoming message lacks a valid syslog header, this parameter can be used to configure the required Facility level.",
+					"default": "All",
+					"datatype": "string",
+					"enumerations": [
+						"Kern",
+						"User",
+						"Mail",
+						"Daemon",
+						"Auth",
+						"Syslog",
+						"LPR",
+						"News",
+						"UUCP",
+						"Cron",
+						"AuthPriv",
+						"FTP",
+						"NTP",
+						"Audit",
+						"Console",
+						"Cron2",
+						"Local0",
+						"Local1",
+						"Local2",
+						"Local3",
+						"Local4",
+						"Local5",
+						"Local6",
+						"Local7",
+						"All"
+					]
+				},
+				"Device.Syslog.Source.{i}.Network.": {
+					"type": "object",
+					"version": "2.17",
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "This object describes the configuration parameters for receiving syslog information on a network socket.",
+					"access": false,
+					"array": false,
+					"Enable": {
+						"type": "boolean",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Enables or disables the functionality to receive syslog information on a network socket.",
+						"datatype": "boolean"
+					},
+					"Interface": {
+						"type": "string",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"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>>",
+						"datatype": "string",
+						"range": [
+							{
+								"max": 256
+							}
+						]
+					},
+					"Port": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Specifies the port number on which the syslog information will be received.",
+						"default": "1099",
+						"datatype": "unsignedInt",
+						"range": [
+							{
+								"min": 1,
+								"max": 65535
+							}
+						]
+					},
+					"Protocol": {
+						"type": "string",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "The protocol to be used for receiving syslog information.",
+						"default": "UDP",
+						"datatype": "string",
+						"enumerations": [
+							"TCP",
+							"UDP",
+							"TLS"
+						]
+					}
+				}
+			},
+			"Device.Syslog.Template.{i}.": {
+				"type": "object",
+				"version": "2.17",
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"description": "This table the describes the templates that can be referenced by objects that can use the template syntax. With templates, you have the flexibility to establish uniform message formats or even define standard filenames for different objects.",
+				"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": "Alias",
+					"range": [
+						{
+							"max": 64
+						}
+					]
+				},
+				"Expression": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Describes the template syntax used for transforming the syslog message. The format is implementation specific and can consist of strings, macros, and template functions.",
+					"datatype": "string"
+				},
+				"EscapeMessage": {
+					"type": "boolean",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Enabling this option will cause the following characters to be escaped , and \\. in the syslog message.",
+					"default": "false",
+					"datatype": "boolean"
+				}
+			},
+			"Device.Syslog.Action.{i}.": {
+				"type": "object",
+				"version": "2.17",
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"description": "This object describes the log action parameters for syslog.",
+				"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": "Alias",
+					"range": [
+						{
+							"max": 64
+						}
+					]
+				},
+				"SourceRef": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "Mandatory parameter. Specifies one or multiple sources from where the log messages originate.",
+					"list": {
+						"datatype": "string",
+						"range": [
+							{
+								"max": 256
+							}
+						]
+					}
+				},
+				"FilterRef": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"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.",
+					"list": {
+						"datatype": "string",
+						"range": [
+							{
+								"max": 256
+							}
+						]
+					}
+				},
+				"TemplateRef": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "The Template associated with the <<object>> entry. When no Template is specified the log message will not be altered by the template system.",
+					"datatype": "string",
+					"range": [
+						{
+							"max": 256
+						}
+					]
+				},
+				"StructuredData": {
+					"type": "boolean",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "This feature represents the ability to log messages in structured-data format. Reference <<bibref|RFC5424|The Syslog Protocol>>.",
+					"default": "false",
+					"datatype": "boolean"
+				},
+				"LogEvent!": {
+					"type": "event",
+					"protocols": [
+						"usp"
+					],
+					"output": {
+						"LogLine": {
+							"type": "string",
+							"read": true,
+							"write": true,
+							"protocols": [
+								"usp"
+							],
+							"description": "Contains the complete syslog message.",
+							"datatype": "string"
+						}
+					}
+				},
+				"Device.Syslog.Action.{i}.LogFile.": {
+					"type": "object",
+					"version": "2.17",
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "This object describes the configuration parameters for file logging. If file-archive limits are not supplied, it is assumed that the local implementation defined limits will be used.",
+					"access": false,
+					"array": false,
+					"Enable": {
+						"type": "boolean",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Enables or disables the LogFile functionality.",
+						"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 logfiles. Which MUST use the uri scheme file <<bibref|RFC8089|The file URI Scheme>>.",
+						"datatype": "string"
+					}
+				},
+				"Device.Syslog.Action.{i}.LogRemote.": {
+					"type": "object",
+					"version": "2.17",
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"description": "This object describes the configuration parameters for forwarding syslog messages to remote relays or collectors.",
+					"access": false,
+					"array": false,
+					"Enable": {
+						"type": "boolean",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Enables or disables the LogRemote functionality.",
+						"datatype": "boolean"
+					},
+					"Address": {
+						"type": "string",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Host name or IP address of the remote server.",
+						"datatype": "string"
+					},
+					"Protocol": {
+						"type": "string",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Protocol to be used to deliver the syslog messages to the remote server.",
+						"datatype": "string",
+						"enumerations": [
+							"TCP",
+							"UDP",
+							"TLS"
+						]
+					},
+					"Port": {
+						"type": "unsignedInt",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Port number of the remote server.",
+						"default": "514",
+						"datatype": "unsignedInt",
+						"range": [
+							{
+								"min": 1,
+								"max": 65535
+							}
+						]
+					},
+					"Certificate": {
+						"type": "string",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Certificate that must be used by the syslog service.",
+						"datatype": "string"
+					},
+					"PeerVerify": {
+						"type": "boolean",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"description": "Ensures authentic and secure connections by validating entity credentials such as certificates or tokens. Only applicable when <<enum|TLS|Protocol>> In order to validate a certificate, the entire certificate chain, including the CA certificate, must be valid. If any certificate in the chain is found to be invalid, the syslog service must reject the connection.",
+						"default": "false",
+						"datatype": "boolean"
+					}
+				}
+			}
+		},
 		"Device.GatewayInfo.": {
 			"type": "object",
 			"version": "2.0",
@@ -94425,7 +105047,7 @@
 				"protocols": [
 					"cwmp"
 				],
-				"description": "<<list|each entry is an algorithm for calculating firgerprints that is supported by the Agent>>",
+				"description": "<<list|each entry is an algorithm for calculating fingerprints that is supported by the Agent>>",
 				"list": {
 					"datatype": "string",
 					"enumerations": [
@@ -94570,7 +105192,7 @@
 					"protocols": [
 						"cwmp"
 					],
-					"description": "The Message Transport Protocol (MTP) to be used for communications by a USP Endpoint.",
+					"description": "The Message Transfer Protocol (MTP) to be used for communications by a USP Endpoint.",
 					"datatype": "string"
 				},
 				"EnableMDNS": {
@@ -94580,7 +105202,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.AdvertisedInterfaces>> 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 restriced 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"
 				},
@@ -94590,7 +105212,7 @@
 					"protocols": [
 						"cwmp"
 					],
-					"description": "If the USP Endpoint uses the CoAP Message Transport Protocol (MTP), then this object contains CoAP specific configuration parameters. <<deprecated|2.15|because the CoAP MTP was deprecated in USP 1.2>>",
+					"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>>",
 					"access": false,
 					"array": false,
 					"Interfaces": {
@@ -94639,7 +105261,7 @@
 						"protocols": [
 							"cwmp"
 						],
-						"description": "This parameter represents whether or not communications that utilize this <<object>> object instance are encrypted. <<deprecated|2.14|because the <<param|EnableEncryption>> parameter will dictate whether all connections to this CoAP server instance are or are not encrypted>> <<obsoleted|2.16>>",
+						"description": "This parameter represents whether or not communications that utilize this <<object>> object instance are encrypted. <<deprecated|2.14|because the <<param|EnableEncryption>> parameter will dictate whether all connections to this CoAP server instance are or are not encrypted>> <<obsoleted|2.16>> <<deleted|2.17>>",
 						"datatype": "boolean"
 					},
 					"EnableEncryption": {
@@ -94660,7 +105282,7 @@
 					"protocols": [
 						"cwmp"
 					],
-					"description": "If the USP Endpoint uses the STOMP Message Transport Protocol (MTP), then this object contains STOMP Client specific configuration parameters related to how the Agent communicates with the STOMP Server.",
+					"description": "If the USP Endpoint uses the STOMP Message Transfer Protocol (MTP), then this object contains STOMP Client specific configuration parameters related to how the Agent communicates with the STOMP Server.",
 					"access": false,
 					"array": false,
 					"Reference": {
@@ -94700,7 +105322,7 @@
 					"protocols": [
 						"cwmp"
 					],
-					"description": "If the USP Endpoint uses the WebSocket Message Transport Protocol (MTP) as a WebSocket server, then this object contains WebSocket specific configuration parameters.",
+					"description": "If the USP Endpoint uses the WebSocket Message Transfer Protocol (MTP) as a WebSocket server, then this object contains WebSocket specific configuration parameters.",
 					"access": false,
 					"array": false,
 					"Interfaces": {
@@ -94723,7 +105345,7 @@
 							"cwmp"
 						],
 						"description": "The port number used by the WebSocket Server to receive USP messages.",
-						"default": "5683",
+						"default": "8443",
 						"datatype": "unsignedInt",
 						"range": [
 							{
@@ -94777,7 +105399,7 @@
 					"protocols": [
 						"cwmp"
 					],
-					"description": "If the USP Endpoint uses the MQTT Message Transport Protocol (MTP), then this object contains MQTT Client specific configuration parameters related to how the Agent communicates with the MQTT broker.",
+					"description": "If the USP Endpoint uses the MQTT Message Transfer Protocol (MTP), then this object contains MQTT Client specific configuration parameters related to how the Agent communicates with the MQTT broker.",
 					"access": false,
 					"array": false,
 					"Reference": {
@@ -94843,7 +105465,7 @@
 					"protocols": [
 						"cwmp"
 					],
-					"description": "If the USP Endpoint uses the Unix Domain Socket (UDS) Message Transfer Protocol (MTP), then this object contains UDS Client specific configuration parameters related to how the Agent communicates with the UDS Server.",
+					"description": "If the USP Endpoint uses the Unix Domain Socket (UDS) Message Transfer Protocol (MTP), then this object contains UDS specific configuration parameters related to how this Agent communicates with a Controller on another USP Endpoint. An example of how to set up this MTP can be found in <<bibref|TR-369| Section Example Data Models for a USP Broker and USP Services>>.",
 					"access": false,
 					"array": false,
 					"UnixDomainSocketRef": {
@@ -95100,7 +105722,7 @@
 						"protocols": [
 							"cwmp"
 						],
-						"description": "The Message Transport Protocol (MTP) to be used for communications by a USP Endpoint.",
+						"description": "The Message Transfer Protocol (MTP) to be used for communications by a USP Endpoint.",
 						"datatype": "string"
 					},
 					"Order": {
@@ -95124,7 +105746,7 @@
 						"protocols": [
 							"cwmp"
 						],
-						"description": "If the USP Endpoint uses the CoAP Message Transport Protocol (MTP), then this object contains CoAP specific configuration parameters. <<deprecated|2.15|because the CoAP MTP was deprecated in USP 1.2>>",
+						"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>>",
 						"access": false,
 						"array": false,
 						"Host": {
@@ -95186,7 +105808,7 @@
 						"protocols": [
 							"cwmp"
 						],
-						"description": "If the USP Endpoint uses the STOMP Message Transport Protocol (MTP), then this object contains STOMP Client specific configuration parameters related to how this Controller communicates with the STOMP Server.",
+						"description": "If the USP Endpoint uses the STOMP Message Transfer Protocol (MTP), then this object contains STOMP Client specific configuration parameters related to how this Controller communicates with the STOMP Server.",
 						"access": false,
 						"array": false,
 						"Reference": {
@@ -95226,7 +105848,7 @@
 						"protocols": [
 							"cwmp"
 						],
-						"description": "If the USP Endpoint uses the WebSocket Message Transport Protocol (MTP) as a WebSocket client, then this object contains WebSocket specific configuration parameters.",
+						"description": "If the USP Endpoint uses the WebSocket Message Transfer Protocol (MTP) as a WebSocket client, then this object contains WebSocket specific configuration parameters.",
 						"access": false,
 						"array": false,
 						"Host": {
@@ -95277,7 +105899,7 @@
 							"protocols": [
 								"cwmp"
 							],
-							"description": "This parameter represents whether or not communications that utilize this <<object>> object instance are encrypted. <<deprecated|2.14|because the <<param|EnableEncryption>> parameter will dictate whether this <<object>> is or is not encrypted>> <<obsoleted|2.16>>",
+							"description": "This parameter represents whether or not communications that utilize this <<object>> object instance are encrypted. <<deprecated|2.14|because the <<param|EnableEncryption>> parameter will dictate whether this <<object>> is or is not encrypted>> <<obsoleted|2.16>> <<deleted|2.17>>",
 							"datatype": "boolean"
 						},
 						"EnableEncryption": {
@@ -95369,7 +105991,7 @@
 						"protocols": [
 							"cwmp"
 						],
-						"description": "If the USP Endpoint uses the MQTT Message Transport Protocol (MTP), then this object contains MQTT Client specific configuration parameters related to how this Controller communicates with the MQTT broker.",
+						"description": "If the USP Endpoint uses the MQTT Message Transfer Protocol (MTP), then this object contains MQTT Client specific configuration parameters related to how this Controller communicates with the MQTT broker.",
 						"access": false,
 						"array": false,
 						"Reference": {
@@ -95446,7 +106068,7 @@
 						"protocols": [
 							"cwmp"
 						],
-						"description": "If the USP Endpoint uses the Unix Domain Socket (UDS) Message Transport Protocol (MTP), then this object contains UDS Client specific configuration parameters related to how the Controller communicates with the UDS Server.",
+						"description": "If the USP Endpoint uses the Unix Domain Socket (UDS) Message Transfer Protocol (MTP), then this object contains UDS specific configuration parameters related to how this Agent communicates with a Controller on another USP Endpoint. An example of how to set up this MTP can be found in <<bibref|TR-369| Section Example Data Models for a USP Broker and USP Services>>.",
 						"access": false,
 						"array": false,
 						"UnixDomainSocketRef": {
@@ -97313,7 +107935,7 @@
 						"cwmp",
 						"usp"
 					],
-					"description": "This parameter represents whether or not communications that utilize this <<object>> object instance are encrypted. <<deprecated|2.14|because the <<param|EnableEncryption>> parameter will dictate whether all connections for this STOMP instance are or are not encrypted>> <<obsoleted|2.16>>",
+					"description": "This parameter represents whether or not communications that utilize this <<object>> object instance are encrypted. <<deprecated|2.14|because the <<param|EnableEncryption>> parameter will dictate whether all connections for this STOMP instance are or are not encrypted>> <<obsoleted|2.16>> <<deleted|2.17>>",
 					"datatype": "boolean"
 				},
 				"EnableEncryption": {
@@ -97410,7 +108032,7 @@
 				"protocols": [
 					"usp"
 				],
-				"description": "<<list|each entry is an algorithm for calculating firgerprints that is supported by the Agent>>",
+				"description": "<<list|each entry is an algorithm for calculating fingerprints that is supported by the Agent>>",
 				"list": {
 					"datatype": "string",
 					"enumerations": [
@@ -97633,6 +108255,34 @@
 								"max": 256
 							}
 						]
+					},
+					"CheckSumAlgorithm": {
+						"type": "string",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"usp"
+						],
+						"description": "The hash algorithm that was used to generate the checksum for the transferred file.",
+						"datatype": "string",
+						"enumerations": [
+							"SHA-1",
+							"SHA-224",
+							"SHA-256",
+							"SHA-384",
+							"SHA-512",
+							"Unknown"
+						]
+					},
+					"CheckSum": {
+						"type": "hexBinary",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"usp"
+						],
+						"description": "The hash value that was used for the transferred file. This hash value was generated using transferred file content and the <<param|CheckSumAlgorithm>>. If the argument is <<empty>>, not present, or the <<param|CheckSumAlgorithm>> is <<enum|Unknown|CheckSumAlgorithm>>, then the Controller can assume that the checksum is not applicable or was not generated for this transfer.",
+						"datatype": "hexBinary"
 					}
 				}
 			},
@@ -97777,7 +108427,7 @@
 					"protocols": [
 						"usp"
 					],
-					"description": "The Message Transport Protocol (MTP) to be used for communications by a USP Endpoint.",
+					"description": "The Message Transfer Protocol (MTP) to be used for communications by a USP Endpoint.",
 					"datatype": "string"
 				},
 				"EnableMDNS": {
@@ -97787,7 +108437,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.AdvertisedInterfaces>> 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 restriced 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"
 				},
@@ -97797,7 +108447,7 @@
 					"protocols": [
 						"usp"
 					],
-					"description": "If the USP Endpoint uses the CoAP Message Transport Protocol (MTP), then this object contains CoAP specific configuration parameters. <<deprecated|2.15|because the CoAP MTP was deprecated in USP 1.2>>",
+					"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>>",
 					"access": false,
 					"array": false,
 					"Interfaces": {
@@ -97846,7 +108496,7 @@
 						"protocols": [
 							"usp"
 						],
-						"description": "This parameter represents whether or not communications that utilize this <<object>> object instance are encrypted. <<deprecated|2.14|because the <<param|EnableEncryption>> parameter will dictate whether all connections to this CoAP server instance are or are not encrypted>> <<obsoleted|2.16>>",
+						"description": "This parameter represents whether or not communications that utilize this <<object>> object instance are encrypted. <<deprecated|2.14|because the <<param|EnableEncryption>> parameter will dictate whether all connections to this CoAP server instance are or are not encrypted>> <<obsoleted|2.16>> <<deleted|2.17>>",
 						"datatype": "boolean"
 					},
 					"EnableEncryption": {
@@ -97867,7 +108517,7 @@
 					"protocols": [
 						"usp"
 					],
-					"description": "If the USP Endpoint uses the STOMP Message Transport Protocol (MTP), then this object contains STOMP Client specific configuration parameters related to how the Agent communicates with the STOMP Server.",
+					"description": "If the USP Endpoint uses the STOMP Message Transfer Protocol (MTP), then this object contains STOMP Client specific configuration parameters related to how the Agent communicates with the STOMP Server.",
 					"access": false,
 					"array": false,
 					"Reference": {
@@ -97907,7 +108557,7 @@
 					"protocols": [
 						"usp"
 					],
-					"description": "If the USP Endpoint uses the WebSocket Message Transport Protocol (MTP) as a WebSocket server, then this object contains WebSocket specific configuration parameters.",
+					"description": "If the USP Endpoint uses the WebSocket Message Transfer Protocol (MTP) as a WebSocket server, then this object contains WebSocket specific configuration parameters.",
 					"access": false,
 					"array": false,
 					"Interfaces": {
@@ -97930,7 +108580,7 @@
 							"usp"
 						],
 						"description": "The port number used by the WebSocket Server to receive USP messages.",
-						"default": "5683",
+						"default": "8443",
 						"datatype": "unsignedInt",
 						"range": [
 							{
@@ -97984,7 +108634,7 @@
 					"protocols": [
 						"usp"
 					],
-					"description": "If the USP Endpoint uses the MQTT Message Transport Protocol (MTP), then this object contains MQTT Client specific configuration parameters related to how the Agent communicates with the MQTT broker.",
+					"description": "If the USP Endpoint uses the MQTT Message Transfer Protocol (MTP), then this object contains MQTT Client specific configuration parameters related to how the Agent communicates with the MQTT broker.",
 					"access": false,
 					"array": false,
 					"Reference": {
@@ -98050,7 +108700,7 @@
 					"protocols": [
 						"usp"
 					],
-					"description": "If the USP Endpoint uses the Unix Domain Socket (UDS) Message Transfer Protocol (MTP), then this object contains UDS Client specific configuration parameters related to how the Agent communicates with the UDS Server.",
+					"description": "If the USP Endpoint uses the Unix Domain Socket (UDS) Message Transfer Protocol (MTP), then this object contains UDS specific configuration parameters related to how this Agent communicates with a Controller on another USP Endpoint. An example of how to set up this MTP can be found in <<bibref|TR-369| Section Example Data Models for a USP Broker and USP Services>>.",
 					"access": false,
 					"array": false,
 					"UnixDomainSocketRef": {
@@ -98568,6 +109218,29 @@
 					"description": "<<numentries>>",
 					"datatype": "unsignedInt"
 				},
+				"OnBoardingComplete": {
+					"type": "boolean",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"usp"
+					],
+					"description": "Signifies whether the onboarding is completed for this Controller. When set to <<false>>, the Controller hasnt completed its onboarding procedure and the agent MUST send it an OnBoardRequest USP Notification when the Controllers <<param|Enable>> parameter is <<true>>. This OnBoardRequest MUST be retried until the Controller confirms it has received the request as required by <<bibref|TR-369|R-NOT.5>> and <<bibref|TR-369|R-NOT.6>>. The value of this parameter SHOULD be set to <<true>> by the Controller when it is done with its onboarding procedure or it can be set by the Agent itself when it knows the onboarding has been completed. While the value of this parameter is <<false>> it will also restart the OnBoardRequest procedure according to the <<param|OnBoardingRestartTime>> parameter.",
+					"default": "false",
+					"datatype": "boolean"
+				},
+				"OnBoardingRestartTime": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"usp"
+					],
+					"description": "This parameter is used to configure a linear retry mechanism for the OnBoardRequest. It represents the time in <<units>> before the OnBoardRequest is retried. The OnBoardRequest notification is a USP notification that requires a NotifyResponse message like any other notification that needs to be retried. OnBoardRequest notifications must follow the default retry mechanism as required by <<bibref|TR-369|R-NOT.6>> until the Controller has confirmed the notification with a NotifyResponse message. However, the onboarding procedure typically requires several actions from the Controller before it can be considered as complete and things can go wrong during this procedure. The value of this parameter can be set to configure how long the Agent should wait before it sends another OnBoardRequest. This timer kicks in as soon as the Agent receives the NotifyResponse message for the previous OnBoardRequest. The timer is cancelled when the <<param|OnBoardingComplete>> parameter is set to <<true>>. When the value of this parameter is set to 0, the OnBoardRequest is not retried after the notification retry mechanism has been completed.",
+					"default": "0",
+					"datatype": "unsignedInt",
+					"unit": "seconds"
+				},
 				"Device.LocalAgent.Controller.{i}.MTP.{i}.": {
 					"type": "object",
 					"version": "2.12",
@@ -98614,7 +109287,7 @@
 						"protocols": [
 							"usp"
 						],
-						"description": "The Message Transport Protocol (MTP) to be used for communications by a USP Endpoint.",
+						"description": "The Message Transfer Protocol (MTP) to be used for communications by a USP Endpoint.",
 						"datatype": "string"
 					},
 					"Order": {
@@ -98638,7 +109311,7 @@
 						"protocols": [
 							"usp"
 						],
-						"description": "If the USP Endpoint uses the CoAP Message Transport Protocol (MTP), then this object contains CoAP specific configuration parameters. <<deprecated|2.15|because the CoAP MTP was deprecated in USP 1.2>>",
+						"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>>",
 						"access": false,
 						"array": false,
 						"Host": {
@@ -98700,7 +109373,7 @@
 						"protocols": [
 							"usp"
 						],
-						"description": "If the USP Endpoint uses the STOMP Message Transport Protocol (MTP), then this object contains STOMP Client specific configuration parameters related to how this Controller communicates with the STOMP Server.",
+						"description": "If the USP Endpoint uses the STOMP Message Transfer Protocol (MTP), then this object contains STOMP Client specific configuration parameters related to how this Controller communicates with the STOMP Server.",
 						"access": false,
 						"array": false,
 						"Reference": {
@@ -98740,7 +109413,7 @@
 						"protocols": [
 							"usp"
 						],
-						"description": "If the USP Endpoint uses the WebSocket Message Transport Protocol (MTP) as a WebSocket client, then this object contains WebSocket specific configuration parameters.",
+						"description": "If the USP Endpoint uses the WebSocket Message Transfer Protocol (MTP) as a WebSocket client, then this object contains WebSocket specific configuration parameters.",
 						"access": false,
 						"array": false,
 						"Host": {
@@ -98791,7 +109464,7 @@
 							"protocols": [
 								"usp"
 							],
-							"description": "This parameter represents whether or not communications that utilize this <<object>> object instance are encrypted. <<deprecated|2.14|because the <<param|EnableEncryption>> parameter will dictate whether this <<object>> is or is not encrypted>> <<obsoleted|2.16>>",
+							"description": "This parameter represents whether or not communications that utilize this <<object>> object instance are encrypted. <<deprecated|2.14|because the <<param|EnableEncryption>> parameter will dictate whether this <<object>> is or is not encrypted>> <<obsoleted|2.16>> <<deleted|2.17>>",
 							"datatype": "boolean"
 						},
 						"EnableEncryption": {
@@ -98890,7 +109563,7 @@
 						"protocols": [
 							"usp"
 						],
-						"description": "If the USP Endpoint uses the MQTT Message Transport Protocol (MTP), then this object contains MQTT Client specific configuration parameters related to how this Controller communicates with the MQTT broker.",
+						"description": "If the USP Endpoint uses the MQTT Message Transfer Protocol (MTP), then this object contains MQTT Client specific configuration parameters related to how this Controller communicates with the MQTT broker.",
 						"access": false,
 						"array": false,
 						"Reference": {
@@ -98967,7 +109640,7 @@
 						"protocols": [
 							"usp"
 						],
-						"description": "If the USP Endpoint uses the Unix Domain Socket (UDS) Message Transport Protocol (MTP), then this object contains UDS Client specific configuration parameters related to how the Controller communicates with the UDS Server.",
+						"description": "If the USP Endpoint uses the Unix Domain Socket (UDS) Message Transfer Protocol (MTP), then this object contains UDS specific configuration parameters related to how this Agent communicates with a Controller on another USP Endpoint. An example of how to set up this MTP can be found in <<bibref|TR-369| Section Example Data Models for a USP Broker and USP Services>>.",
 						"access": false,
 						"array": false,
 						"UnixDomainSocketRef": {
@@ -99088,7 +109761,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>>>>",
+						"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>>",
 						"default": "false",
 						"datatype": "boolean"
 					},
diff --git a/libbbfdm/dmtree/tr181/device.c b/libbbfdm/dmtree/tr181/device.c
index f12791e6..6b48232c 100644
--- a/libbbfdm/dmtree/tr181/device.c
+++ b/libbbfdm/dmtree/tr181/device.c
@@ -57,7 +57,7 @@ static int get_Device_InterfaceStackNumberOfEntries(char *refparam, struct dmctx
 
 static int get_Device_RootDataModelVersion(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
 {
-	*value = "2.16";
+	*value = "2.17";
 	return 0;
 }
 
diff --git a/test/tools/tr-181-2-16-0-cwmp-full.xml b/test/tools/tr-181-2-17-0-cwmp-full.xml
similarity index 90%
rename from test/tools/tr-181-2-16-0-cwmp-full.xml
rename to test/tools/tr-181-2-17-0-cwmp-full.xml
index e69fe87d..ba1d5a35 100644
--- a/test/tools/tr-181-2-16-0-cwmp-full.xml
+++ b/test/tools/tr-181-2-17-0-cwmp-full.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  TR-069 Device:2 Root Data Model definition [CWMP]
+  Device:2 Root Data Model definition [CWMP]
 
-  Copyright (c) 2010-2022, Broadband Forum
+  Copyright (c) 2010-2023, Broadband Forum
 
   The undersigned members have elected to grant the copyright to
   their contributed material used in this software:
@@ -59,8 +59,8 @@
         https://www.broadband-forum.org/cwmp/cwmp-datamodel-1-10.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-16-0-cwmp"
-    file="tr-181-2-16-0-cwmp.xml">
+    spec="urn:broadband-forum-org:tr-181-2-17-0-cwmp"
+    file="tr-181-2-17-0-cwmp.xml">
 
   <dataType name="_AliasCommon">
     <description>
@@ -245,6 +245,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="URI">
     <description>
       Uniform Resource Identifier. See {{bibref|RFC3986}}.
@@ -793,6 +814,229 @@
     </string>
   </dataType>
 
+  <dataType name="MocaChannelMask">
+    <description>
+      Represents one or more MoCA channel RF center frequencies using a
+      hexadecimal encoded 64-bit mask.
+
+      Bit 63 (the leftmost bit of the leftmost character) is the most
+      significant bit (highest frequency), and bit 0 (the rightmost bit of the
+      rightmost character) is the least significant bit (lowest frequency). Not
+      all bits are valid MoCA channels.
+
+      Each bit represents 25 MHz of spectrum, but the mapping from bits to
+      frequencies varies with the MoCA version:
+
+      * MoCA 1.0 and MoCA 1.1: bits 63 through 32 are not used, bit 31
+        represents 1575 MHz and bit 0 represents 800 MHz
+
+      * MoCA 2.0 and MoCA 2.5: bit 63 represents 1975 MHz and bit 0 represents
+        400 MHz
+
+      For example, a MoCA 1.0 or MoCA 1.1 interface would use
+      0x000000001FFFC000 to represent 1150 MHz through 1500 MHz.
+
+      Note that the MoCA version is indicated by the {{param|HighestVersion}}
+      parameter.
+    </description>
+    <hexBinary>
+      <size minLength="8" maxLength="8"/>
+    </hexBinary>
+  </dataType>
+
+  <dataType name="MocaNodeID">
+    <description>
+      Represents a MoCA Node ID.
+
+      * MoCA 1.0 network can have a maximum of 8 MoCA Nodes, so Node ID is 0 to
+        7.
+
+      * MoCA 1.1, MoCA 2.0, or MoCA 2.5 network can have a maximum of 16 MoCA
+        Nodes, so Node ID is 0 to 15.
+    </description>
+    <unsignedInt>
+      <range minInclusive="0" maxInclusive="15"/>
+    </unsignedInt>
+  </dataType>
+
+  <dataType name="MocaPhyRate">
+    <description>
+      Represents the transmit PHY rate in Mbps.
+    </description>
+    <unsignedInt>
+      <range minInclusive="0" maxInclusive="2048"/>
+    </unsignedInt>
+  </dataType>
+
+  <dataType name="MocaMacRate">
+    <description>
+      Represents the MAC throughput in Kbps.
+    </description>
+    <unsignedInt/>
+  </dataType>
+
+  <dataType name="MocaDB">
+    <description>
+      Represents one decibel or 1 dB.
+    </description>
+    <unsignedInt/>
+  </dataType>
+
+  <dataType name="MocaDBm">
+    <description>
+      Represents a measure of power in mW expressed in decibels, and calculated
+      as follows:
+
+       power = 10*log10( Vrms^2 / R * 1000 )
+
+       where Vrms is the root-mean-square Voltage of the received waveform and
+       R is 75 ohms.
+    </description>
+    <int/>
+  </dataType>
+
+  <dataType name="MocaScMod">
+    <description>
+      Represents the subcarrier modulation.
+
+      Binary string array (array of two hexadecimal characters) with 1 byte for
+      each subcarrier. The value of each byte represents the subcarrier
+      modulation for the corresponding subcarrier.
+
+      See {{bibref|MoCAv2.0|section 14.3.6.3}} and {{bibref|MOCA20-MIB|Appendix
+      A}} for the encoding of this parameter.
+    </description>
+    <hexBinary/>
+  </dataType>
+
+  <dataType name="MocaBand">
+    <description>
+      Represents the MoCA Bands and sub-bands the device is configured to
+      operate in or that the device supports. {{enum}}
+
+      See {{bibref|MoCAv2.0|section 15}}.
+    </description>
+    <list/>
+    <string>
+      <enumeration value="reserved" access="readOnly" code="0"/>
+      <enumeration value="bandFCBL" code="1"/>
+      <enumeration value="bandFSAT" code="2"/>
+      <enumeration value="bandE" code="3"/>
+      <enumeration value="bandExD" code="4"/>
+      <enumeration value="bandDH" code="5"/>
+      <enumeration value="bandDL" code="6"/>
+      <enumeration value="noBand" code="7"/>
+    </string>
+  </dataType>
+
+  <dataType name="MocaPowerState">
+    <description>
+      Represents the Power State defined by the MoCA2.0 specification.
+
+      {{enum}}
+
+      See {{bibref|MoCAv2.0|section 12}}.
+    </description>
+    <string>
+      <enumeration value="m0Active" code="0">
+        <description>Power State M0: Active.</description>
+      </enumeration>
+      <enumeration value="m1LowPowerIdle" code="1">
+        <description>Power State M1: Low Power Idle.</description>
+      </enumeration>
+      <enumeration value="m2Standby" code="2">
+        <description>Power State M2: Standby.</description>
+      </enumeration>
+      <enumeration value="m3Sleep" code="3">
+        <description>Power State M3: Sleep.</description>
+      </enumeration>
+    </string>
+  </dataType>
+
+  <dataType name="MocaFlowIngrClassRule">
+    <description>
+      Represents the MoCA 2.0 PQOS Ingress Classification Rule.
+    </description>
+    <string>
+      <enumeration value="ruleDAVLANtag4or5" code="0"/>
+      <enumeration value="ruleDAonly" code="4"/>
+      <enumeration value="ruleDAandDSCPnoVLAN" code="5"/>
+      <enumeration value="ruleDAandVLANignoreDSCP" code="6"/>
+      <enumeration value="ruleDAandVLANorDSCP" code="7"/>
+    </string>
+  </dataType>
+
+  <dataType name="MocaChannelIndex">
+    <description>
+      Represents the MoCA 2.0 primary or secondary channel, or MoCA 2.5 first,
+      second, third, fourth, or fifth channel.
+    </description>
+    <string>
+      <enumeration value="primary" code="1"/>
+      <enumeration value="secondary" code="2"/>
+      <enumeration value="m25first" code="3"/>
+      <enumeration value="m25second" code="4"/>
+      <enumeration value="m25third" code="5"/>
+      <enumeration value="m25fourth" code="6"/>
+      <enumeration value="m25fifth" code="7"/>
+    </string>
+  </dataType>
+
+  <dataType name="MocaPrivacy">
+    <description>
+      Represents a type of MoCA Privacy.
+    </description>
+    <string>
+      <enumeration value="mocaReserved5" code="0"/>
+      <enumeration value="mocaReserved4" code="1"/>
+      <enumeration value="mocaReserved3" code="2"/>
+      <enumeration value="mocaReserved2" code="3"/>
+      <enumeration value="mocaReserved1" code="4"/>
+      <enumeration value="moca2EnhancedPrivacy" code="5"/>
+      <enumeration value="moca20Privacy" code="6"/>
+      <enumeration value="moca1Privacy" code="7"/>
+    </string>
+  </dataType>
+
+  <dataType name="RowStatus">
+    <description>
+      Cut-down version of SNMP RowStatus that supports only its "status"
+      values, not its "control" values.
+    </description>
+    <string>
+      <enumeration value="active" code="1">
+        <description>
+          The row is available for use by the managed device.
+        </description>
+      </enumeration>
+      <enumeration value="notInService" code="2">
+        <description>
+          The row exists in the Agent, but is unavailable for use by the
+          managed device (see NOTE below); "notInService" has no implication
+          regarding the internal consistency of the row, availability of
+          resources, or consistency with the current state of the managed
+          device.
+        </description>
+      </enumeration>
+      <enumeration value="notReady" code="3">
+        <description>
+          The row exists in the Agent, but is missing information necessary in
+          order to be available for use by the managed device, i.e., one or
+          more required parameter in the row have not been populated.
+        </description>
+      </enumeration>
+      <enumeration value="createAndGo" code="4">
+        <description>Not used.</description>
+      </enumeration>
+      <enumeration value="createAndWait" code="5">
+        <description>Not used.</description>
+      </enumeration>
+      <enumeration value="destroy" code="6">
+        <description>Not used.</description>
+      </enumeration>
+    </string>
+  </dataType>
+
   <dataType name="PSMBreakPointIndexAndLevel">
     <description>
       # The PSM breakpoint sub-carrier index in the range [0:4095], and
@@ -1105,6 +1349,15 @@
         https://standards.ieee.org/standard/802_11ax-2021.html
       </hyperlink>
     </reference>
+    <reference id="802.11be">
+      <name>IEEE Std 802.11be</name>
+      <title>
+        Enhancements for Exteremely High Throughput (EHT) WLAN - Draft
+      </title>
+      <organization>IEEE</organization>
+      <date>March 2019</date>
+      <hyperlink>https://standards.ieee.org/ieee/802.11be/7516/</hyperlink>
+    </reference>
     <reference id="802.11b-1999">
       <name>IEEE Std 802.11b-1999</name>
       <title>Higher Speed Physical Layer Extension in the 2.4 GHz band</title>
@@ -1256,6 +1509,30 @@
       <date>May 2021</date>
       <hyperlink>https://www.itu.int/rec/T-REC-G.989.3-202105-I/en</hyperlink>
     </reference>
+    <reference id="G.992.3">
+      <name>G.992.3</name>
+      <title>Asymmetric digital subscriber line transceivers 2 (ADSL2)</title>
+      <organization>ITU-T</organization>
+      <hyperlink>https://www.itu.int/rec/T-REC-G.992.3</hyperlink>
+    </reference>
+    <reference id="G.992.4">
+      <name>G.992.4</name>
+      <title>
+        Splitterless asymmetric digital subscriber line transceivers 2
+        (splitterless ADSL2)
+      </title>
+      <organization>ITU-T</organization>
+      <hyperlink>https://www.itu.int/rec/T-REC-G.992.4</hyperlink>
+    </reference>
+    <reference id="G.992.5">
+      <name>G.992.5</name>
+      <title>
+        Asymmetric Digital Subscriber Line (ADSL) transceivers - Extended
+        bandwidth ADSL2 (ADSL2plus)
+      </title>
+      <organization>ITU-T</organization>
+      <hyperlink>https://www.itu.int/rec/T-REC-G.992.5</hyperlink>
+    </reference>
     <reference id="G.993.1">
       <name>G.993.1</name>
       <title>Very high speed digital subscriber line transceivers</title>
@@ -1270,6 +1547,14 @@
       <organization>ITU-T</organization>
       <hyperlink>https://www.itu.int/rec/T-REC-G.993.2</hyperlink>
     </reference>
+    <reference id="G.994.1">
+      <name>G.994.1</name>
+      <title>
+        Handshake procedures for digital subscriber line (DSL) transceivers
+      </title>
+      <organization>ITU-T</organization>
+      <hyperlink>https://www.itu.int/rec/T-REC-G.994.1</hyperlink>
+    </reference>
     <reference id="G.996.2">
       <name>G.996.2</name>
       <title>
@@ -2159,6 +2444,29 @@
       <date>May 2008</date>
       <hyperlink>https://www.rfc-editor.org/rfc/rfc5280</hyperlink>
     </reference>
+    <reference id="RFC5424">
+      <name>RFC 5424</name>
+      <title>The Syslog Protocol</title>
+      <organization>IETF</organization>
+      <date>May 2009</date>
+      <hyperlink>https://www.rfc-editor.org/rfc/rfc5424</hyperlink>
+    </reference>
+    <reference id="RFC5425">
+      <name>RFC 5425</name>
+      <title>
+        Transport Layer Security (TLS) Transport Mapping for Syslog
+      </title>
+      <organization>IETF</organization>
+      <date>May 2009</date>
+      <hyperlink>https://www.rfc-editor.org/rfc/rfc5425</hyperlink>
+    </reference>
+    <reference id="RFC5426">
+      <name>RFC 5426</name>
+      <title>Transmission of Syslog Messages over UDP</title>
+      <organization>IETF</organization>
+      <date>May 2009</date>
+      <hyperlink>https://www.rfc-editor.org/rfc/rfc5425</hyperlink>
+    </reference>
     <reference id="RFC5491">
       <name>RFC 5491</name>
       <title>
@@ -2257,6 +2565,14 @@
       <date>December 2011</date>
       <hyperlink>https://www.rfc-editor.org/rfc/rfc6455</hyperlink>
     </reference>
+    <reference id="RFC6587">
+      <name>RFC 6587</name>
+      <title>Transmission of Syslog Messages over TCP</title>
+      <organization>IETF</organization>
+      <category>RFC</category>
+      <date>April 2012</date>
+      <hyperlink>https://www.rfc-editor.org/rfc/rfc6587</hyperlink>
+    </reference>
     <reference id="RFC6762">
       <name>RFC 6762</name>
       <title>Multicast DNS</title>
@@ -2433,6 +2749,22 @@
       <date>November 2015</date>
       <hyperlink>https://www.rfc-editor.org/rfc/rfc7693</hyperlink>
     </reference>
+    <reference id="RFC8089">
+      <name>RFC 8089</name>
+      <title>The "file" URI Scheme</title>
+      <organization>IETF</organization>
+      <category>RFC</category>
+      <date>February 2017</date>
+      <hyperlink>https://www.rfc-editor.org/rfc/rfc8089</hyperlink>
+    </reference>
+    <reference id="RFC8106">
+      <name>RFC 8106</name>
+      <title>IPv6 Router Advertisement Options for DNS Configuration</title>
+      <organization>IETF</organization>
+      <category>RFC</category>
+      <date>March 2017</date>
+      <hyperlink>https://www.rfc-editor.org/rfc/rfc8106</hyperlink>
+    </reference>
     <reference id="RFC8141">
       <name>RFC 8141</name>
       <title>Uniform Resource Names (URNs)</title>
@@ -2527,6 +2859,16 @@
       <date>July 2022</date>
       <hyperlink>https://www.rfc-editor.org/rfc/rfc9249</hyperlink>
     </reference>
+    <reference id="YANGSYSLOG">
+      <name>draft-ietf-netmod-syslog-model</name>
+      <title>A YANG Data Model for Syslog Configuration</title>
+      <organization>IETF</organization>
+      <category>Internet Draft</category>
+      <date>April 2023</date>
+      <hyperlink>
+        https://datatracker.ietf.org/doc/draft-ietf-netmod-syslog-model
+      </hyperlink>
+    </reference>
     <reference id="TR-064">
       <name>TR-064 Corrigendum 1</name>
       <title>LAN-Side DSL CPE Configuration Specification</title>
@@ -2635,9 +2977,9 @@
       </title>
       <organization>Broadband Forum</organization>
       <category>Technical Report</category>
-      <date>December 2021</date>
+      <date>December 2023</date>
       <hyperlink>
-        https://www.broadband-forum.org/download/TR-471_Issue-2.pdf
+        https://www.broadband-forum.org/download/TR-471_Issue-4.pdf
       </hyperlink>
     </reference>
     <reference id="AMB">
@@ -3001,6 +3343,37 @@
       <date>October 2007</date>
       <hyperlink>https://csa-iot.org/all-solutions/zigbee</hyperlink>
     </reference>
+    <reference id="MoCAv2.0">
+      <name>MoCA v2.0</name>
+      <title>MoCA MAC/PHY Specification v2.0</title>
+      <organization>MoCA Alliance</organization>
+      <date>2017</date>
+      <hyperlink>https://www.mocalliance.org</hyperlink>
+    </reference>
+    <reference id="MoCAv2.5">
+      <name>MoCA v2.5</name>
+      <title>MoCA MAC/PHY Specification v2.5</title>
+      <organization>MoCA Alliance</organization>
+      <date>2017</date>
+      <hyperlink>https://www.mocalliance.org</hyperlink>
+    </reference>
+    <reference id="MOCA20-MIB">
+      <name>MOCA20-MIB</name>
+      <title>Remote Management of MoCA Interfaces using SNMP MIB v2.0</title>
+      <organization>MoCA Alliance</organization>
+      <date>2020</date>
+      <hyperlink>https://www.mocalliance.org</hyperlink>
+    </reference>
+    <reference id="MOCA25-MIB">
+      <name>MOCA25-MIB</name>
+      <title>
+        Remote Management of MoCA Interfaces using SNMP MIB v2.5 (Approved
+        draft)
+      </title>
+      <organization>MoCA Alliance</organization>
+      <date>2018</date>
+      <hyperlink>https://www.mocalliance.org</hyperlink>
+    </reference>
   </bibliography>
 
   <template id="IP-DIAGNOSTICS-PARENT"/>
@@ -3110,7 +3483,7 @@
     configuration file.
   </template>
 
-  <model name="Device:2.16">
+  <model name="Device:2.17">
 
     <object name="Device." access="readOnly" minEntries="1" maxEntries="1"
         version="2.0">
@@ -3195,9 +3568,10 @@
           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.{{np}}Any change would indicate
-          that it's a new device and would therefore require a BOOTSTRAP
-          Inform.
+          including across firmware updates.
+
+          Any change would indicate that it's a new device and would therefore
+          require a BOOTSTRAP Inform.
         </description>
         <syntax>
           <string>
@@ -3460,6 +3834,15 @@
         </syntax>
       </parameter>
 
+      <parameter name="LogRotateNumberOfEntries" access="readOnly">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
       <parameter name="VendorLogFileNumberOfEntries" access="readOnly">
         <description>
           {{numentries}}
@@ -4745,7 +5128,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -5525,7 +5908,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -5660,7 +6043,7 @@
         <parameter ref="Name"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -5827,10 +6210,12 @@
 
       <parameter name="ProcessNumberOfEntries" access="readOnly">
         <description>
-          {{numentries}}{{np}}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}}.
+          {{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}}.
         </description>
         <syntax>
           <unsignedInt/>
@@ -5950,7 +6335,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -6277,7 +6662,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -6320,6 +6705,195 @@
       </parameter>
     </object>
 
+    <object name="Device.DeviceInfo.LogRotate.{i}." access="readWrite"
+        enableParameter="Enable" numEntriesParameter="LogRotateNumberOfEntries"
+        minEntries="0" maxEntries="unbounded" version="2.17">
+      <description>
+        This Object details the available rotation settings for vendor log file
+        rotation.
+
+        Based on {{bibref|YANGSYSLOG|A YANG Data Model for Syslog
+        Configuration}}.
+      </description>
+      <uniqueKey functional="false">
+        <parameter ref="Alias"/>
+      </uniqueKey>
+      <uniqueKey functional="true">
+        <parameter ref="Name"/>
+      </uniqueKey>
+
+      <parameter name="Alias" access="writeOnceReadOnly">
+        <description>
+          {{datatype|expand}}
+        </description>
+        <syntax>
+          <dataType ref="Alias"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Enable" access="readWrite">
+        <description>
+          Enables or disables the log rotation functionality for this item.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Name" access="readWrite">
+        <description>
+          Specifies the full path and filename of the log file that must be
+          rotated. Which MUST use the uri scheme file {{bibref|RFC8089|The file
+          URI Scheme}}.
+        </description>
+        <syntax>
+          <string/>
+        </syntax>
+      </parameter>
+
+      <parameter name="NumberOfFiles" access="readWrite">
+        <description>
+          Specifies the maximum number of log files retained. When during log
+          rotation the maximum number of log files is reached, the oldest log
+          file will be deleted.
+
+          Specify ''1'' for implementations that only support one log file.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range minInclusive="1"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="MaxFileSize" access="readWrite">
+        <description>
+          Specifies the maximum log file size in {{units}}. Log events that
+          arrive after the maximum file size is reached will cause the current
+          log file to be closed and a new log file to be opened.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="KiB"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="RollOver" access="readWrite">
+        <description>
+          Specifies the length of time, in {{units}}, that log events should be
+          written to a specific log file. Log events that arrive after the
+          rollover period cause the current log file to be closed and a new log
+          file to be opened.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="minutes"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="Retention" access="readWrite">
+        <description>
+          Specifies the length of time, in {{units}}, that completed/closed log
+          event files should be stored in the file system before they are
+          removed.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="minutes"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="Compression" access="readWrite">
+        <description>
+          Specifies the post-rotation compression method that must be applied
+          exclusively on the initial log file in a rotation sequence.
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="None"/>
+            <enumeration value="GZIP"/>
+            <enumeration value="BZIP2"/>
+            <enumeration value="LZO"/>
+            <enumeration value="XZ"/>
+            <enumeration value="ZSTD"/>
+          </string>
+          <default type="object" value="None"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="LogFileNumberOfEntries" access="readOnly">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object name="Device.DeviceInfo.LogRotate.{i}.LogFile.{i}."
+        access="readOnly" numEntriesParameter="LogFileNumberOfEntries"
+        minEntries="0" maxEntries="unbounded" version="2.17">
+      <description>
+        Each table entry represents a Log File.
+
+        This table of log files is informational only and does not allow the
+        Controller to operate on these files in any way.
+      </description>
+      <uniqueKey functional="false">
+        <parameter ref="Alias"/>
+      </uniqueKey>
+      <uniqueKey functional="true">
+        <parameter ref="Name"/>
+      </uniqueKey>
+
+      <parameter name="Alias" access="writeOnceReadOnly">
+        <description>
+          {{datatype|expand}}
+        </description>
+        <syntax>
+          <dataType ref="Alias"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Name" access="readOnly">
+        <description>
+          Name of the rotated log file stored within the same directory that
+          {{param|#.Name}} is specified. Which MUST use the uri scheme file
+          {{bibref|RFC8089|The file URI Scheme}}.
+        </description>
+        <syntax>
+          <string>
+            <size maxLength="64"/>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="Size" access="readOnly">
+        <description>
+          The size of the log file in {{units}}. If the device doesn't know the
+          file size then {{param}} will be 0.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="bytes"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="LastChange" access="readOnly" activeNotify="canDeny">
+        <description>
+          Last modification date of the file specified by {{param|Name}}.
+        </description>
+        <syntax>
+          <dateTime/>
+        </syntax>
+      </parameter>
+    </object>
+
     <object name="Device.DeviceInfo.VendorLogFile.{i}." access="readOnly"
         numEntriesParameter="VendorLogFileNumberOfEntries" minEntries="0"
         maxEntries="unbounded" version="2.1">
@@ -6336,7 +6910,7 @@
         <parameter ref="Name"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -6518,7 +7092,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -6568,7 +7142,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -6698,8 +7272,8 @@
             </enumeration>
             <enumeration value="ActivationFailed">
               <description>
-                The Agent has attempted to active this Firmware Image instance,
-                but ultimately failed while being activated.
+                The Agent has attempted to activate this Firmware Image
+                instance, but ultimately the activation failed.
               </description>
             </enumeration>
           </string>
@@ -6725,6 +7299,337 @@
       </parameter>
     </object>
 
+    <object name="Device.DeviceInfo.KernelFaults." access="readOnly"
+        version="2.17">
+      <description>
+        A fault in the context of the Kernel refers to a situation where the
+        kernel encounters a critical error or a bug that it cannot recover
+        from. When this happens, the kernel generates a "fault message" or
+        "kernel panic", which provides information about the error, the state
+        of the system at the time of the error, and a stack trace of function
+        calls leading up to the error.
+      </description>
+
+      <parameter name="StoragePath" access="readOnly">
+        <description>
+          Path where the Kernel faults logs must be stored.
+        </description>
+        <syntax>
+          <string/>
+        </syntax>
+      </parameter>
+
+      <parameter name="LastUpgradeCount" access="readOnly">
+        <description>
+          Total number of Kernel faults which occured since last firmware
+          upgrade.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="PreviousBootCount" access="readOnly">
+        <description>
+          The number of Kernel faults which occurred during the previous boot
+          cycle.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="MinFreeSpace" access="readWrite">
+        <description>
+          Minimum free space in {{units}} on the device that must be free
+          before attempting to create a {{object|KernelFault}} instance. This
+          setting does not affect the counting of Kernel faults.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="KiB"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="MaxKernelFaultEntries" access="readWrite">
+        <description>
+          The maximum number of entries available in the {{object|KernelFault}}
+          table. Defines the maximum number of {{object|KernelFault}} instances
+          that can be stored on the device.
+
+          If this limit is hit, No new {{object|KernelFault}} instances will be
+          created until sufficient Kernel fault instances are removed. Set this
+          parameter to 0 to completely disable the creation of
+          {{object|KernelFault}} instances.
+
+          Reducing the {{param}} will cause for the implementation to delete
+          the oldest {{object|KernelFault}} instances.
+
+          This setting does not affect the counting of Kernel faults.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="KernelFaultNumberOfEntries" access="readOnly">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object name="Device.DeviceInfo.KernelFaults.KernelFault.{i}."
+        access="readOnly" numEntriesParameter="KernelFaultNumberOfEntries"
+        minEntries="0" maxEntries="unbounded" dmr:noUniqueKeys="true"
+        version="2.17">
+      <description>
+        Each table entry represents a Kernel fault that is stored on the
+        device.
+      </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="FaultLocation" access="readOnly">
+        <description>
+          Specifies the location of where to create and keep the logs. Can
+          either be a relative path or file within the {{param|#.StoragePath}}
+          location.
+        </description>
+        <syntax>
+          <string/>
+        </syntax>
+      </parameter>
+
+      <parameter name="LastInstruction" access="readOnly">
+        <description>
+          The last instruction executed when the Kernel fault was triggered.
+        </description>
+        <syntax>
+          <string/>
+        </syntax>
+      </parameter>
+
+      <parameter name="TimeStamp" access="readOnly">
+        <description>
+          The time when the Kernel fault was registered.
+        </description>
+        <syntax>
+          <dateTime/>
+        </syntax>
+      </parameter>
+
+      <parameter name="FirmwareVersion" access="readOnly">
+        <description>
+          The firmeware version that triggered the Kernel fault.
+        </description>
+        <syntax>
+          <string/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ProcessName" access="readOnly">
+        <description>
+          The name of the process that was active while the kernel fault
+          occurred.
+        </description>
+        <syntax>
+          <string/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Reason" access="readOnly">
+        <description>
+          The reason why the kernel fault occurred.
+        </description>
+        <syntax>
+          <string/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object name="Device.DeviceInfo.ProcessFaults." access="readOnly"
+        version="2.17">
+      <description>
+        Monitoring process faults and configuring the operating system to
+        generate crash dumps and core files is essential for diagnosing and
+        troubleshooting issues with applications and processes.
+      </description>
+
+      <parameter name="StoragePath" access="readOnly">
+        <description>
+          Path where the process fault logs must be stored.
+        </description>
+        <syntax>
+          <string/>
+        </syntax>
+      </parameter>
+
+      <parameter name="LastUpgradeCount" access="readOnly">
+        <description>
+          Total number of process faults which occured since last firmware
+          upgrade.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="PreviousBootCount" access="readOnly">
+        <description>
+          The number of process faults which occurred during the previous boot
+          cycle.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="MinFreeSpace" access="readWrite">
+        <description>
+          Minimum free space in {{units}} on the device that must be free
+          before attempting to create a {{object|ProcessFault}} instance. This
+          setting does not affect the counting of process faults.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="KiB"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="MaxProcessFaultEntries" access="readWrite">
+        <description>
+          The maximum number of entries available in the
+          {{object|ProcessFault}} table. Defines the maximum number of
+          {{object|ProcessFault}} instances that can be stored on the device.
+
+          If this limit is hit, No new {{object|ProcessFault}} instances will
+          be created until sufficient process fault instances are removed. Set
+          this parameter to 0 to completely disable the creation of
+          {{object|ProcessFault}} instances.
+
+          Reducing the {{param}} will cause for the implementation to delete
+          the oldest {{object|ProcessFault}} instances.
+
+          This setting does not affect the counting of process faults.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ProcessFaultNumberOfEntries" access="readOnly">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object name="Device.DeviceInfo.ProcessFaults.ProcessFault.{i}."
+        access="readOnly" numEntriesParameter="ProcessFaultNumberOfEntries"
+        minEntries="0" maxEntries="unbounded" dmr:noUniqueKeys="true"
+        version="2.17">
+      <description>
+        Each table entry represents a process fault that is stored on the
+        device.
+      </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="ProcessID" access="readOnly">
+        <description>
+          Process ID of the process that crashed.
+        </description>
+        <syntax>
+          <string/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ProcessName" access="readOnly">
+        <description>
+          Process Name of the process that crashed.
+        </description>
+        <syntax>
+          <string/>
+        </syntax>
+      </parameter>
+
+      <parameter name="FaultLocation" access="readOnly">
+        <description>
+          Specifies the location of where to create and keep the process fault
+          logs. Can either be a relative path or file within the
+          {{param|#.StoragePath}} location.
+        </description>
+        <syntax>
+          <string/>
+        </syntax>
+      </parameter>
+
+      <parameter name="TimeStamp" access="readOnly">
+        <description>
+          The time when the process fault occured.
+        </description>
+        <syntax>
+          <dateTime/>
+        </syntax>
+      </parameter>
+
+      <parameter name="FirmwareVersion" access="readOnly">
+        <description>
+          The firmware version that triggered the the process fault.
+        </description>
+        <syntax>
+          <string/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Arguments" access="readOnly">
+        <description>
+          The command arguments that were used to start to the process.
+        </description>
+        <syntax>
+          <string/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Reason" access="readOnly">
+        <description>
+          The reason why the process fault occurred.
+        </description>
+        <syntax>
+          <string/>
+        </syntax>
+      </parameter>
+    </object>
+
     <object name="Device.DeviceInfo.SupportedDataModel.{i}." access="readOnly"
         numEntriesParameter="SupportedDataModelNumberOfEntries" minEntries="0"
         maxEntries="unbounded" version="2.0">
@@ -6753,7 +7658,7 @@
         <parameter ref="UUID"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -7154,7 +8059,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -7495,7 +8400,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -7949,7 +8854,9 @@
       <parameter name="AutoUpdateServer" access="readWrite">
         <description>
           The server the CPE can check to see if an update is available for
-          direct download to it.{{np}}This MUST NOT be used by the CPE if the
+          direct download to it.
+
+          This MUST NOT be used by the CPE if the
           {{param|#.ManagementServer.UpgradesManaged}} parameter is {{true}}.
         </description>
         <syntax>
@@ -7962,9 +8869,10 @@
       <parameter name="UserUpdateServer" access="readWrite">
         <description>
           The server where a user can check via a web browser if an update is
-          available for download to a PC.{{np}}This MUST NOT be used by the CPE
-          if the {{param|#.ManagementServer.UpgradesManaged}} parameter is
-          {{true}}.
+          available for download to a PC.
+
+          This MUST NOT be used by the CPE if the
+          {{param|#.ManagementServer.UpgradesManaged}} parameter is {{true}}.
         </description>
         <syntax>
           <string>
@@ -8060,7 +8968,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -8071,22 +8979,14 @@
 
       <parameter name="Order" access="readWrite">
         <description>
-          Position of the {{object}} entry in the order of precedence. A value
-          of ''1'' indicates the first entry considered (highest precedence).
+          {{datatype|expand}}
+
           For each incoming connection, the highest ordered entry that matches
           the Host: HTTP header and path prefix is applied. All lower {{param}}
-          entries are ignored. When this value is set, if the value matches
-          that of an existing entry, the {{param}} value for the existing entry
-          and all lower {{param}} entries is 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.
+          entries are ignored.
         </description>
         <syntax>
-          <unsignedInt>
-            <range minInclusive="1"/>
-          </unsignedInt>
+          <dataType ref="Order"/>
         </syntax>
       </parameter>
 
@@ -8192,9 +9092,9 @@
           The IP or Logical Interface associated with the {{object}} entry.
           Example:
 
-          * ''Device.IP.Interface.1''.
+          * ''Device.IP.Interface.1''
 
-          * ''Device.Logical.Interface.1''.
+          * ''Device.Logical.Interface.1''
 
           {{template|INTERFACE-ROUTING}}
         </description>
@@ -8219,7 +9119,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Protocol" access="readOnly">
+      <parameter name="Protocol" access="readWrite">
         <description>
           Protocol being used.
         </description>
@@ -8316,10 +9216,13 @@
     </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.
+
+        Note: This parameter was demoted to readOnly in the Device:2.17
+        version.
       </description>
       <uniqueKey functional="false">
         <parameter ref="SessionID"/>
@@ -8336,10 +9239,13 @@
         </syntax>
       </parameter>
 
-      <parameter name="User" access="readWrite">
+      <parameter name="User" access="readOnly">
         <description>
           The user to whom the session belongs. When the user is unknown
           {{empty}} string SHOULD be used.
+
+          Note: This parameter was demoted to readOnly in the Device:2.17
+          version.
         </description>
         <syntax>
           <string>
@@ -8715,7 +9621,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -8902,7 +9808,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -9916,6 +10822,35 @@
         </syntax>
       </parameter>
 
+      <parameter name="XTURVersion" access="readOnly">
+        <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,
+          encoded in this order and separated by a space character, i.e.,
+          '(xTU-R firmware version) (xTU-R model)'.
+        </description>
+        <syntax>
+          <string>
+            <size maxLength="16"/>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="XTURSerial" access="readOnly">
+        <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
+          the equipment firmware version. All shall be encoded in this order
+          and separated by space characters, i.e., '(equipment serial number)
+          (equipment model) (equipment firmware version)'.
+        </description>
+        <syntax>
+          <string>
+            <size maxLength="32"/>
+          </string>
+        </syntax>
+      </parameter>
+
       <parameter name="XTURVendor" access="readOnly">
         <description>
           xTU-R vendor identifier as defined in G.994.1 and T1.413. In the case
@@ -9936,6 +10871,26 @@
         </syntax>
       </parameter>
 
+      <parameter name="XTURVendorSpecific" access="readOnly">
+        <description>
+          xTU-R vendor-specific information as defined in {{bibref|G.994.1}}.
+          This corresponds to the two-octet vendor-specific information, which
+          MUST be represented as four hexadecimal digits.
+
+          Note: This parameter is OPTIONAL at the G and S/T interfaces in
+          G.997.1 Amendment 1. If the parameter is implemented but no value is
+          available, it MUST have the value "0000".
+
+          Note: In {{bibref|G.997.1}}, this parameter is called "xTU-R G.994.1
+          Vendor ID". See ITU-T Recommendation {{bibref|G.997.1}}.
+        </description>
+        <syntax>
+          <hexBinary>
+            <size minLength="2" maxLength="2"/>
+          </hexBinary>
+        </syntax>
+      </parameter>
+
       <parameter name="XTURCountry" access="readOnly">
         <description>
           T.35 country code of the xTU-R vendor as defined in G.994.1, where
@@ -9956,6 +10911,50 @@
         </syntax>
       </parameter>
 
+      <parameter name="XTURSystemVendor" access="readOnly">
+        <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
+          be represented as eight hexadecimal digits as defined in
+          {{bibref|G.994.1}} as Vendor ID.
+        </description>
+        <syntax>
+          <hexBinary>
+            <size minLength="4" maxLength="4"/>
+          </hexBinary>
+        </syntax>
+      </parameter>
+
+      <parameter name="XTURSystemVendorSpecific" access="readOnly">
+        <description>
+          xTU-R system vendor-specific information as defined in
+          {{bibref|G.997.1|Section 7.4.4}}. This corresponds to the two-octet
+          vendor-specific information, which MUST be represented as four
+          hexadecimal digits as defined in {{bibref|G.994.1}} as Vendor ID.
+
+          Note: If the parameter is implemented but no value is available, it
+          MUST have the value "0000".
+        </description>
+        <syntax>
+          <hexBinary>
+            <size minLength="2" maxLength="2"/>
+          </hexBinary>
+        </syntax>
+      </parameter>
+
+      <parameter name="XTURSystemCountry" access="readOnly">
+        <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
+          in {{bibref|G.997.1}} MUST be represented as four hexadecimal digits.
+        </description>
+        <syntax>
+          <hexBinary>
+            <size minLength="2" maxLength="2"/>
+          </hexBinary>
+        </syntax>
+      </parameter>
+
       <parameter name="XTURANSIStd" access="readOnly">
         <description>
           xTU-R T1.413 Revision Number as defined in T1.413 Issue 2.
@@ -9980,6 +10979,33 @@
         </syntax>
       </parameter>
 
+      <parameter name="XTUCVersion" access="readOnly">
+        <description>
+          The xTU-C version number is the version number as inserted by the
+          xTU-C in the overhead messages ({{bibref|G.992.3}},
+          {{bibref|G.992.4}}, {{bibref|G.992.5}} and {{bibref|G.993.2}}). It is
+          for version control and is vendor specific information. It consists
+          of up to 16 binary octets.
+        </description>
+        <syntax>
+          <hexBinary>
+            <size minLength="16" maxLength="16"/>
+          </hexBinary>
+        </syntax>
+      </parameter>
+
+      <parameter name="XTUCSerial" access="readOnly">
+        <description>
+          xTU-C serial number as defined in {{bibref|G.997.1|Section 7.4.7}}.
+          This corresponds to the equipment serial number.
+        </description>
+        <syntax>
+          <string>
+            <size maxLength="32"/>
+          </string>
+        </syntax>
+      </parameter>
+
       <parameter name="XTUCVendor" access="readOnly">
         <description>
           xTU-C vendor identifier as defined in G.994.1 and T1.413. In the case
@@ -9997,6 +11023,20 @@
         </syntax>
       </parameter>
 
+      <parameter name="XTUCVendorSpecific" access="readOnly">
+        <description>
+          xTU-C vendor-specific information as defined in
+          {{bibref|G.997.1|Section 7.4.3}}. This corresponds to the two-octet
+          vendor-specific information, which MUST be represented as four
+          hexadecimal digits as defined in G.994.1 as Vendor ID.
+        </description>
+        <syntax>
+          <hexBinary>
+            <size minLength="2" maxLength="2"/>
+          </hexBinary>
+        </syntax>
+      </parameter>
+
       <parameter name="XTUCCountry" access="readOnly">
         <description>
           T.35 country code of the xTU-C vendor as defined in G.994.1, where
@@ -10014,6 +11054,50 @@
         </syntax>
       </parameter>
 
+      <parameter name="XTUCSystemVendor" access="readOnly">
+        <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
+          be represented as eight hexadecimal digits as defined in
+          {{bibref|G.994.1}} as Vendor ID..
+        </description>
+        <syntax>
+          <hexBinary>
+            <size minLength="4" maxLength="4"/>
+          </hexBinary>
+        </syntax>
+      </parameter>
+
+      <parameter name="XTUCSystemVendorSpecific" access="readOnly">
+        <description>
+          xTU-C system vendor-specific information as defined in
+          {{bibref|G.997.1|Section 7.4.4}}. This corresponds to the two-octet
+          vendor-specific information, which MUST be represented as four
+          hexadecimal digits as defined in {{bibref|G.994.1}} as Vendor ID..
+
+          Note: If the parameter is implemented but no value is available, it
+          MUST have the value "0000".
+        </description>
+        <syntax>
+          <hexBinary>
+            <size minLength="2" maxLength="2"/>
+          </hexBinary>
+        </syntax>
+      </parameter>
+
+      <parameter name="XTUCSystemCountry" access="readOnly">
+        <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
+          in G.997.1 MUST be represented as four hexadecimal digits.
+        </description>
+        <syntax>
+          <hexBinary>
+            <size minLength="2" maxLength="2"/>
+          </hexBinary>
+        </syntax>
+      </parameter>
+
       <parameter name="XTUCANSIStd" access="readOnly">
         <description>
           xTU-C T1.413 Revision Number as defined in T1.413 Issue 2.
@@ -11004,7 +12088,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -12044,7 +13128,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -12318,7 +13402,7 @@
         <parameter ref="Channel"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -14576,7 +15660,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -16375,7 +17459,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -16466,7 +17550,7 @@
       </parameter>
 
       <parameter name="LowerOpticalThreshold" access="readOnly"
-          status="deprecated">
+          status="obsoleted">
         <description>
           Optical level that is used to declare the downstream low received
           optical power alarm.
@@ -16482,6 +17566,8 @@
 
           {{deprecated|2.15|because it is not intended for the device to raise
           an optical power alarm.}}
+
+          {{obsoleted|2.17}}
         </description>
         <syntax>
           <dataType ref="Dbm1000">
@@ -16491,7 +17577,7 @@
       </parameter>
 
       <parameter name="UpperOpticalThreshold" access="readOnly"
-          status="deprecated">
+          status="obsoleted">
         <description>
           Optical level that is used to declare the downstream high received
           optical power alarm.
@@ -16507,6 +17593,8 @@
 
           {{deprecated|2.15|because it is not intended for the device to raise
           an optical power alarm.}}
+
+          {{obsoleted|2.17}}
         </description>
         <syntax>
           <dataType ref="Dbm1000">
@@ -16535,7 +17623,7 @@
       </parameter>
 
       <parameter name="LowerTransmitPowerThreshold" access="readOnly"
-          status="deprecated">
+          status="obsoleted">
         <description>
           Minimum mean optical launch power that is used to declare the low
           transmit optical power alarm.
@@ -16551,6 +17639,8 @@
 
           {{deprecated|2.15|because it is not intended for the device to raise
           an optical power alarm.}}
+
+          {{obsoleted|2.17}}
         </description>
         <syntax>
           <dataType ref="Dbm1000">
@@ -16560,7 +17650,7 @@
       </parameter>
 
       <parameter name="UpperTransmitPowerThreshold" access="readOnly"
-          status="deprecated">
+          status="obsoleted">
         <description>
           Maximum mean optical launch power that is used to declare the high
           transmit optical power alarm.
@@ -16576,6 +17666,8 @@
 
           {{deprecated|2.15|because it is not intended for the device to raise
           an optical power alarm.}}
+
+          {{obsoleted|2.17}}
         </description>
         <syntax>
           <dataType ref="Dbm1000">
@@ -16817,7 +17909,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -17432,7 +18524,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -17601,7 +18693,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -18332,7 +19424,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -18701,7 +19793,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -19019,7 +20111,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -19399,7 +20491,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -19772,7 +20864,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -20743,7 +21835,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -21079,8 +22171,7 @@
         {{bibref|TR-181i2|Section 4.2}}). This table models physical Ethernet
         ports, but in terms of the interface stack it only models the PHY and
         Connection Access Method of the Ethernet interface MAC. A
-        {{object|#.Interface}} is also required to model a full Ethernet
-        device.
+        {{object|#.Link}} is also required to model a full Ethernet device.
       </description>
       <uniqueKey functional="false">
         <parameter ref="Alias"/>
@@ -21140,7 +22231,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -21312,6 +22403,37 @@
           <boolean/>
         </syntax>
       </parameter>
+
+      <parameter name="EEEStatus" access="readOnly">
+        <description>
+          Indicates the active state of Energy Efficient Ethernet
+          {{bibref|802.3-2012_section6|Section 78}}.
+
+          The {{enum|Disabled}} value indicates that {{param|EEEEnable}} is
+          disabled.
+
+          The {{enum|Active}} value indicates that {{param|EEEEnable}} is
+          enabled and that EEE support has been negotiated with the link
+          partner. In this state EEE will be used.
+
+          The {{enum|Inactive}} value indicates that {{param|EEEEnable}} is
+          disabled, or that EEE support has not been negotiated with the link
+          partner, either because the link parter is not EEE capable, or its
+          support for EEE is disabled.
+
+          The {{enum|Unsupported}} value indicates that this physical interface
+          does not support EEE. In which case {{param|EEECapability}} will be
+          {{false}}.
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="Disabled"/>
+            <enumeration value="Active"/>
+            <enumeration value="Inactive"/>
+            <enumeration value="Unsupported"/>
+          </string>
+        </syntax>
+      </parameter>
     </object>
 
     <object name="Device.Ethernet.Interface.{i}.Stats." access="readOnly"
@@ -21575,7 +22697,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -21924,7 +23046,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -22294,7 +23416,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -22739,7 +23861,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -23082,7 +24204,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -23393,7 +24515,7 @@
         <parameter ref="Name"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -23530,7 +24652,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -24061,7 +25183,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -24642,7 +25764,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -25728,7 +26850,62 @@
         <parameter ref="Name"/>
       </uniqueKey>
 
-      <parameter name="Enable" access="readWrite">
+      <parameter name="AccessControlNumberOfEntries" access="readOnly">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="RlapmNumberOfEntries" access="readOnly">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="SapmNumberOfEntries" access="readOnly">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="MeshNumberOfEntries" access="readOnly">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="BridgeNumberOfEntries" access="readOnly">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="MeshScModNumberOfEntries" access="readOnly">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Enable" access="readWrite"
+          id="mocaIfEnable/1.3.6.1.4.1.31621.1.2.1.1.1.1">
         <description>
           Enables or disables the interface.
 
@@ -25736,10 +26913,12 @@
         </description>
         <syntax>
           <boolean/>
+          <default type="factory" value="true"/>
         </syntax>
       </parameter>
 
-      <parameter name="Status" access="readOnly">
+      <parameter name="Status" access="readOnly"
+          id="mocaIfStatus/1.3.6.1.4.1.31621.1.2.1.7.1.1">
         <description>
           The current operational state of the interface (see
           {{bibref|TR-181i2|Section 4.2.2}}). {{enum}}
@@ -25779,7 +26958,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -25788,7 +26967,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="Name" access="readOnly">
+      <parameter name="Name" access="readOnly"
+          id="mocaIfName/1.3.6.1.4.1.31621.1.2.1.7.1.8">
         <description>
           The textual name of the interface as assigned by the CPE.
         </description>
@@ -25799,7 +26979,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="LastChange" access="readOnly" activeNotify="canDeny">
+      <parameter name="LastChange" access="readOnly" activeNotify="canDeny"
+          id="mocaIfStatus/1.3.6.1.4.1.31621.1.2.1.7.1.1">
         <description>
           The accumulated time in {{units}} since the interface entered its
           current operational state.
@@ -25850,7 +27031,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="MACAddress" access="readOnly">
+      <parameter name="MACAddress" access="readOnly"
+          id="mocaIfMacAddress/1.3.6.1.4.1.31621.1.2.1.7.1.6">
         <description>
           The MAC Address of the interface.
 
@@ -25864,7 +27046,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="FirmwareVersion" access="readOnly">
+      <parameter name="FirmwareVersion" access="readOnly"
+          id="mocaIfSoftwareVersion/1.3.6.1.4.1.31621.1.2.1.7.1.3">
         <description>
           This interface's firmware version.
 
@@ -25881,6 +27064,9 @@
       <parameter name="MaxBitRate" access="readOnly">
         <description>
           The maximum MoCA PHY bit rate (expressed in {{units}}).
+
+          This parameter MUST NOT be implemented for MoCA 2.0 because it
+          doesn't map to a MIB object.
         </description>
         <syntax>
           <unsignedInt>
@@ -25889,33 +27075,31 @@
         </syntax>
       </parameter>
 
-      <parameter name="MaxIngressBW" access="readOnly">
+      <parameter name="MaxIngressBW" access="readOnly"
+          id="mocaIfMaxIngressNodeThroughput/1.3.6.1.4.1.31621.1.2.1.7.1.18">
         <description>
           The maximum bandwidth of this interface for flows onto the MoCA
-          network in {{units}}.
+          network.
 
           This parameter is based on ''mocaIfMaxIngressNodeBw'' from
           {{bibref|MOCA11-MIB}}.
         </description>
         <syntax>
-          <unsignedInt>
-            <units value="Mbps"/>
-          </unsignedInt>
+          <dataType ref="MocaMacRate"/>
         </syntax>
       </parameter>
 
-      <parameter name="MaxEgressBW" access="readOnly">
+      <parameter name="MaxEgressBW" access="readOnly"
+          id="mocaIfMaxEgressNodeThroughput/1.3.6.1.4.1.31621.1.2.1.7.1.19">
         <description>
           The maximum bandwidth of this interface for flows from the MoCA
-          network in {{units}}.
+          network.
 
           This parameter is based on ''mocaIfMaxEgressNodeBw'' from
           {{bibref|MOCA11-MIB}}.
         </description>
         <syntax>
-          <unsignedInt>
-            <units value="Mbps"/>
-          </unsignedInt>
+          <dataType ref="MocaMacRate"/>
         </syntax>
       </parameter>
 
@@ -25939,7 +27123,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="CurrentVersion" access="readOnly">
+      <parameter name="CurrentVersion" access="readOnly"
+          id="mocaIfNetworkVersion/1.3.6.1.4.1.31621.1.2.1.7.1.5">
         <description>
           Identifies the MoCA version that the MoCA network is currently
           running.
@@ -25960,7 +27145,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="NetworkCoordinator" access="readOnly">
+      <parameter name="NetworkCoordinator" access="readOnly"
+          id="mocaIfNC/1.3.6.1.4.1.31621.1.2.1.7.1.10">
         <description>
           The Node ID of the current Network Coordinator (NC) for the MoCA
           network.
@@ -25968,11 +27154,12 @@
           This parameter is based on ''mocaIfNC'' from {{bibref|MOCA11-MIB}}.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="MocaNodeID"/>
         </syntax>
       </parameter>
 
-      <parameter name="NodeID" access="readOnly">
+      <parameter name="NodeID" access="readOnly"
+          id="mocaIfNodeID/1.3.6.1.4.1.31621.1.2.1.7.1.7">
         <description>
           The Node ID of this interface.
 
@@ -25980,7 +27167,7 @@
           {{bibref|MOCA11-MIB}}.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="MocaNodeID"/>
         </syntax>
       </parameter>
 
@@ -25990,13 +27177,36 @@
           {{param}} is {{true}} then the interface supports 16 nodes (the
           maximum for a MoCA 1.1 network). If {{param}} is false then the
           interface supports 8 nodes (the maximum for a MoCA 1.0 network).
+
+          This parameter MUST NOT be implemented for MoCA 2.0 because it
+          doesn't map to a MIB object.
         </description>
         <syntax>
           <boolean/>
         </syntax>
       </parameter>
 
-      <parameter name="PreferredNC" access="readWrite">
+      <parameter name="NumNodes" access="readOnly"
+          id="mocaIfNumNodes/1.3.6.1.4.1.31621.1.2.1.7.1.9">
+        <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
+          MoCA Node communicates to in the MoCA network.
+
+          This value may be smaller than the number of MoCA Nodes reported by
+          the NC Node.
+
+          See {{bibref|MoCAv1.1|Section 3.6.3.2}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range minInclusive="0" maxInclusive="16"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="PreferredNC" access="readWrite"
+          id="mocaIfPreferredNC/1.3.6.1.4.1.31621.1.2.1.1.1.9">
         <description>
           Whether this interface is a preferred Network Coordinator (NC).
 
@@ -26005,10 +27215,12 @@
         </description>
         <syntax>
           <boolean/>
+          <default type="factory" value="false"/>
         </syntax>
       </parameter>
 
-      <parameter name="BackupNC" access="readOnly">
+      <parameter name="BackupNC" access="readOnly"
+          id="mocaIfBackupNC/1.3.6.1.4.1.31621.1.2.1.7.1.11">
         <description>
           The Node ID of the backup Network Coordinator node.
 
@@ -26016,93 +27228,215 @@
           {{bibref|MOCA11-MIB}}.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="MocaNodeID"/>
         </syntax>
       </parameter>
 
-      <parameter name="PrivacyEnabledSetting" access="readWrite">
+      <parameter name="PrivacyEnabledSetting" access="readWrite"
+          id="mocaIfPrivacyEnable/1.3.6.1.4.1.31621.1.2.1.1.1.7">
         <description>
           The configured privacy mode. This indicates whether link-layer
           security is enabled ({{true}}) or disabled ({{false}}) for network
           admission.
-
-          The configured privacy setting MAY NOT match the current operational
-          state ({{param|PrivacyEnabled}}), since this setting is only applied
-          during network formation or admission.
         </description>
         <syntax>
           <boolean/>
+          <default type="factory" value="false"/>
         </syntax>
       </parameter>
 
-      <parameter name="PrivacyEnabled" access="readOnly">
+      <parameter name="PrivacyEnabled" access="readOnly" status="deprecated"
+          id="mocaIfPrivacyEnable/1.3.6.1.4.1.31621.1.2.1.1.1.7">
         <description>
           Indicates whether link-layer security is enabled or disabled.
 
           This parameter is based on ''mocaIfPrivacyEnable'' from
           {{bibref|MOCA11-MIB}}.
+
+          {{deprecated|2.17|because it and {{param|PrivacyEnabledSetting}} are
+          associated with the same underlying MIB object and it is therefore
+          unnecessary. If implemented, it MUST return the same value as
+          {{param|PrivacyEnabledSetting}}}}
         </description>
         <syntax>
           <boolean/>
         </syntax>
       </parameter>
 
-      <parameter name="FreqCapabilityMask" access="readOnly">
+      <parameter name="AccessControlEnable" access="readWrite"
+          id="mocaIfAccessEnable/1.3.6.1.4.1.31621.1.2.1.1.1.10">
         <description>
-          Hexadecimal encoded 64-bit mask of supported frequencies. This is the
-          bit map of the spectrum that the interface supports, and each bit
-          represents 25 MHz of spectrum. The least significant bit of the
-          rightmost character corresponds to 800MHz, which is the lowest
-          frequency.
+          Enable MAC address access control on the MoCA interface if this value
+          is {{true}}. Disable MAC address access control on the MoCA interface
+          if this value is {{false}}.
 
-          For example, an interface that supports 1150 MHz through 1500 MHz
-          would have a value of 0x000000001FFFC000.
-
-          This parameter is based on ''mocaIfCapabilityMask'' from
-          {{bibref|MOCA11-MIB}}.
+          Access control applies to subsequent MoCA Node admission.
         </description>
         <syntax>
-          <hexBinary>
-            <size minLength="8" maxLength="8"/>
-          </hexBinary>
+          <boolean/>
+          <default type="factory" value="false"/>
         </syntax>
       </parameter>
 
-      <parameter name="FreqCurrentMaskSetting" access="readWrite">
+      <parameter name="PhyThreshold" access="readWrite"
+          id="mocaIfPhyThreshold/1.3.6.1.4.1.31621.1.2.1.1.1.11"
+          dmr:previousParameter="PacketAggregationCapability">
         <description>
-          The configured hexadecimal encoded 64-bit mask of enabled frequencies
-          for network admission.
+          The minimum PHY rate.
 
-          The configured frequencies MAY NOT match the current operational
+          If transmit PHY rate between all pairs of MoCA Nodes are greater than
+          or equal to this value, and subsequently the transmit PHY rate of one
+          pair of MoCA Nodes is less than this value, send
+          {{param|BelowPhyThresholdTrap}} if {{param|PhyThresholdTrapEnable}}
+          is {{true}}.
+
+          If transmit PHY rate between one or more pairs of MoCA Nodes are less
+          than this value, and subsequently the transmit PHY rate between all
+          pairs of MoCA Nodes are greater than or equal to this value, send
+          {{param|AbovePhyThresholdTrap}} if {{param|PhyThresholdTrapEnable}}
+          is {{true}}.
+
+          See {{bibref|MoCAv2.0|Section 3, Unusable Link definition}}.
+        </description>
+        <syntax>
+          <dataType ref="MocaPhyRate"/>
+          <default type="factory" value="123"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="PhyThresholdTrapEnable" access="readWrite"
+          id="mocaIfPhyThresholdEnable/1.3.6.1.4.1.31621.1.2.1.1.1.12">
+        <description>
+          If transmit PHY rate between all pairs of MoCA Nodes are greater than
+          or equal to {{param|PhyThreshold}}, and subsequently the transmit PHY
+          rate of one pair of MoCA Node is less than {{param|PhyThreshold}},
+          send {{param|BelowPhyThresholdTrap}} if this value is {{true}}, do
+          not send {{param|BelowPhyThresholdTrap}} if this value is {{false}}.
+
+          If transmit PHY rate between one or more pairs of MoCA Nodes are less
+          than {{param|PhyThreshold}}, and subsequently the transmit PHY rate
+          between all pairs of MoCA Nodes are greater than or equal to
+          {{param|PhyThreshold}}, send {{param|AbovePhyThresholdTrap}} if this
+          value is {{true}}, do not send {{param|AbovePhyThresholdTrap}} if
+          this value is {{false}}.
+
+          Only one MoCA Node in the MoCA network should set {{param}} to
+          {{true}}.
+
+          Only one MoCA Node in the MoCA network should set {{param}} to
+          {{true}}.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="factory" value="false"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="StatusChangeEnable" access="readWrite"
+          id="mocaIfStatusChangeEnable/1.3.6.1.4.1.31621.1.2.1.1.1.13">
+        <description>
+          If {{param}} is {{true}} and {{param|Status}} changes, then the trap
+          {{param|StatusChangeTrap}} is sent.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="factory" value="false"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="NumNodesChangeEnable" access="readWrite"
+          id="mocaIfNumNodesChangeEnable/1.3.6.1.4.1.31621.1.2.1.1.1.14">
+        <description>
+          If {{param}} is {{true}} and {{param|NumNodes}} changes, then the
+          trap {{param|NumNodesChangeTrap}} is sent.
+
+          Only one MoCA Node in the MoCA network should set {{param}} to
+          {{true}}.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="factory" value="false"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="TpcTargetRateNper" access="readWrite"
+          id="mocaIfTpcTargetRateNper/1.3.6.1.4.1.31621.1.2.1.1.1.15">
+        <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
+          transmitting and receiving MoCA Nodes when TPC is enabled and PERMODE
+          = NPER.
+        </description>
+        <syntax>
+          <dataType ref="MocaPhyRate"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Band" access="readWrite"
+          id="mocaIfBand/1.3.6.1.4.1.31621.1.2.1.1.1.16">
+        <description>
+          Configure the band or sub-band for the MoCA Node to operate in (BND
+          Managed Parameter). See {{bibref|MoCAv2.0|section 15}}.
+        </description>
+        <syntax>
+          <dataType ref="MocaBand"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="LastOperFreqUpdateEnable" access="readWrite"
+          id="mocaIfLofUpdateEnable/1.3.6.1.4.1.31621.1.2.1.1.1.17">
+        <description>
+          Controls whether the LOF is updated when joining a network
+          (LOF_UPDATE_EN Managed Parameter). See {{bibref|MoCAv2.0|section
+          8.1.1, and Table 17-1}}.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="FreqCapabilityMask" access="readOnly"
+          id="mocaIfChannelSupport/1.3.6.1.4.1.31621.1.2.1.7.1.22">
+        <description>
+          The frequencies that the interface supports. {{datatype|expand}}
+        </description>
+        <syntax>
+          <dataType ref="MocaChannelMask"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="FreqCurrentMaskSetting" access="readWrite"
+          id="mocaIfChannelMask/1.3.6.1.4.1.31621.1.2.1.1.1.2">
+        <description>
+          The enabled frequencies that the interface supports for network
+          admission.
+
+          {{datatype|expand}}
+
+          The configured frequencies might not match the current operational
           state ({{param|FreqCurrentMask}}), since this setting is only applied
           during network formation or admission.
         </description>
         <syntax>
-          <hexBinary>
-            <size minLength="8" maxLength="8"/>
-          </hexBinary>
+          <dataType ref="MocaChannelMask"/>
         </syntax>
       </parameter>
 
-      <parameter name="FreqCurrentMask" access="readOnly">
+      <parameter name="FreqCurrentMask" access="readOnly"
+          id="mocaIfChannelSupport/1.3.6.1.4.1.31621.1.2.1.7.1.22">
         <description>
-          Hexadecimal encoded 64-bit mask of used frequencies. This is the bit
-          map of the spectrum that can be used and is a subset of the
-          {{param|FreqCapabilityMask}}. Each bit represents 25 MHz of spectrum.
-          The least significant bit of the rightmost character corresponds to
-          800MHz, which is the lowest frequency.
+          The frequencies that can be used. This is a subset of the
+          {{param|FreqCapabilityMask}} frequencies.
 
-          This parameter is based on ''mocaIfChannelMask'' from
-          {{bibref|MOCA11-MIB}}.
+          {{datatype|expand}}
         </description>
         <syntax>
-          <hexBinary>
-            <size minLength="8" maxLength="8"/>
-          </hexBinary>
+          <dataType ref="MocaChannelMask"/>
         </syntax>
       </parameter>
 
-      <parameter name="CurrentOperFreq" access="readOnly">
+      <parameter name="CurrentOperFreq" access="readOnly"
+          id="mocaIfRFChannel/1.3.6.1.4.1.31621.1.2.1.7.1.12">
         <description>
           Current Operational Frequency. The RF frequency in Hz to which the
           MoCA interface is currently tuned. This parameter is only valid when
@@ -26116,19 +27450,39 @@
         </syntax>
       </parameter>
 
-      <parameter name="LastOperFreq" access="readOnly">
+      <parameter name="LastOperFreq" access="readWrite"
+          id="mocaIfLof/1.3.6.1.4.1.31621.1.2.1.1.1.18">
         <description>
           Last Operational Frequency. The RF frequency in Hz to which the MoCA
           interface was tuned when last in the {{enum|Up|Status}} state.
 
           This parameter is based on ''mocaIfLOF'' from {{bibref|MOCA11-MIB}}.
+
+          (LOF Managed Parameter)
+
+          This parameter is writable only for MoCA 2.0.
         </description>
         <syntax>
           <unsignedInt/>
         </syntax>
       </parameter>
 
-      <parameter name="KeyPassphrase" access="readWrite">
+      <parameter name="TpcEnable" access="readWrite"
+          id="mocaIfTpcEnable/1.3.6.1.4.1.31621.1.2.1.1.1.3">
+        <description>
+          Enable automatic power control if this value is {{true}}. Use a fixed
+          transmit power level if this value is {{false}}.
+
+          (TPC_EN Managed Parameter)
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="factory" value="true"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="KeyPassphrase" access="readWrite"
+          id="mocaIfPassword/1.3.6.1.4.1.31621.1.2.1.1.1.8">
         <description>
           MoCA Password. The value consists of numeric characters (0-9).
           {{pattern}}
@@ -26144,25 +27498,802 @@
         </syntax>
       </parameter>
 
-      <parameter name="TxPowerLimit" access="readWrite">
+      <parameter name="PerMode" access="readWrite"
+          id="mocaIfPerMode/1.3.6.1.4.1.31621.1.2.1.1.1.20">
         <description>
-          Transmit Power attenuation in dB relative to the maximum transmit
-          power.
+          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
+          indicates VLPER. By default PER mode is set to 1 in band E, while it
+          is set to 0 for all other bands (PER_MODE Managed Parameter).
 
-          The MoCA interface SHOULD have {{param|Enable}} set to {{false}} for
-          any change in this configuration. If the parameter is modified when
-          {{param|Enable}} is {{true}} then this change might take several
-          minutes to complete.
-
-          This parameter is based on ''mocaIfTxPowerLimit'' from
-          {{bibref|MOCA11-MIB}}.
+          See {{bibref|MoCAv2.0|section 8.2 and Table 17-2}}.
         </description>
         <syntax>
           <unsignedInt/>
         </syntax>
       </parameter>
 
-      <parameter name="PowerCntlPhyTarget" access="readWrite">
+      <parameter name="TurboModeEnable" access="readWrite"
+          id="mocaIfTurboModeEnable/1.3.6.1.4.1.31621.1.2.1.1.1.21">
+        <description>
+          Controls whether the MoCA Node operates in point-to-point Turbo Mode
+          or not.
+
+          When set to {{true}} the turbo mode is enabled; when set to {{false}}
+          the turbo mode is disabled (TURBO_MODE_EN Managed Parameter).
+
+          See {{bibref|MoCAv2.0|section 10 and Table 17-1}}.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="factory" value="false"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="PolicingEnable" access="readWrite"
+          id="mocaIfPolicingEnable/1.3.6.1.4.1.31621.1.2.1.1.1.22">
+        <description>
+          Controls whether policing of PQoS Flows is enabled or disabled. When
+          {{false}} the policy is disabled, and when {{true}} the policy is
+          enabled (POLICING_EN Managed Parameter).
+
+          See {{bibref|MoCAv2.0|section 8.8 and Table 17-1}}.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="factory" value="false"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="TlpMin" access="readWrite"
+          id="mocaIfTlpMin/1.3.6.1.4.1.31621.1.2.1.1.1.23">
+        <description>
+          The minimum time (in milliseconds) a MoCA Node is required to stay in
+          the Listening Phase of the Network Search (TLP_MIN Managed
+          Parameter).
+
+          See {{bibref|MoCAv2.0|Table 17-2}}.
+        </description>
+        <syntax>
+          <unsignedInt/>
+          <default type="factory" value="0"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="TlpMax" access="readWrite"
+          id="mocaIfTlpMax/1.3.6.1.4.1.31621.1.2.1.1.1.24">
+        <description>
+          The maximum time (in milliseconds) a MoCA Node is required to stay in
+          the Listening Phase of the Network Search (TLP_MAX Managed
+          Parameter).
+
+          Default value of {{param}} depends on the band configuration as
+          follows:
+
+          * 20 seconds for band E
+
+          * 35 seconds for band F
+
+          * 95 seconds for Band ExD
+
+          * 10 seconds for Band D-Low
+
+          * 55 seconds for Band D-High
+
+          See {{bibref|MoCAv2.0|section 8.1}}.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="RlapmEnable" access="readWrite"
+          id="mocaIfRlapmEnable/1.3.6.1.4.1.31621.1.2.1.1.1.25">
+        <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
+          MoCA Node needs to ignore it.
+
+          RLAPM function is enabled when set to {{true}}. RLAPM function is
+          disabled when set to {{false}}.
+
+          The RLAPM function allows a Node to add a specific global PHY margin
+          (RLAPM) to all the subcarriers' bitloadings at each estimated
+          aggregate receive power level. This RLAPM value is obtained from the
+          RLAPM table {{object|Device.MoCA.Interface.{i}.Rlapm.{i}.}}.
+
+          See {{bibref|MoCAv2.0|section 7.15 and Table 17-1}}.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="RlapmProfileSelect" access="readWrite"
+          id="mocaIfRlapmProfileSelect/1.3.6.1.4.1.31621.1.2.1.1.1.26">
+        <description>
+          Controls which RLAPM (Receive Level Added PHY Margin) profile is
+          Active.
+
+          See {{bibref|MoCAv2.0|section 7.15.2 and Table 17-1}}.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="SapmEnable" access="readWrite"
+          id="mocaIfSapmEnable/1.3.6.1.4.1.31621.1.2.1.1.1.27">
+        <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
+          Node needs to ignore it.
+
+          SAPM function is enabled when set to {{true}}. SAPM function is
+          disabled when set to {{false}}.
+
+          The SAPM function allows a Node to add a prespecified PHY margin to
+          each subcarrier’s bitloading (SAPM value) whenever the aggregate
+          received power levels (ARPLs) are below a pre-specified threshold.
+          This SAPM value is obtained from the SAPM table
+          {{object|Device.MoCA.Interface.{i}.Sapm.{i}.}}.
+
+          See {{bibref|MoCAv2.0|section 7.15 and Table 17-1}}.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="SapmProfileSelect" access="readWrite"
+          id="mocaIfSapmProfileSelect/1.3.6.1.4.1.31621.1.2.1.1.1.28">
+        <description>
+          Controls which SAPM (Subcarrier Added PHY Margin) profile is Active.
+
+          See {{bibref|MoCAv2.0|section 7.15.1 and Table 17-1}}.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="PowerStateRequest" access="readWrite"
+          id="mocaIfPowerStateRequest/1.3.6.1.4.1.31621.1.2.1.1.1.29">
+        <description>
+          Carries a request to the MoCA Node to transition into a specified
+          Power State (POWER_STATE_REQ Managed Parameter).
+
+          See {{bibref|MoCAv2.0|section 12}}.
+        </description>
+        <syntax>
+          <dataType ref="MocaPowerState"/>
+          <default type="factory" value="m0Active"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="SeqNumMr" access="readWrite"
+          id="mocaIfSeqNumMr/1.3.6.1.4.1.31621.1.2.1.1.1.30">
+        <description>
+          Sequence Number used by the MR Transaction (SEQ_NUM_MR Managed
+          Parameter).
+
+          See {{bibref|MoCAv2.0|section 7.15 and Table 17-1}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range minInclusive="0" maxInclusive="65535"/>
+          </unsignedInt>
+          <default type="factory" value="0"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="PowerStateTrapEnable" access="readWrite"
+          id="mocaIfPowerStateTrapEnable/1.3.6.1.4.1.31621.1.2.1.1.1.31">
+        <description>
+          Used for power state message trap.
+
+          * When set to {{true}} it allows the MoCA Node to report a trap on
+            each Power State transition.
+
+          * When set to {{false}} no trap report is generated when the MoCA
+            Node Power State changes.
+
+          See {{bibref|MoCAv2.0|section 12}}.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="factory" value="false"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="LmoTrapEnable" access="readWrite"
+          id="mocaIfLmoTrapEnable/1.3.6.1.4.1.31621.1.2.1.1.1.32">
+        <description>
+          Used for LMO (Link Maintenance Operation) message trap.
+
+          * When set to {{true}} it allows the MoCA Node to report a trap on
+            transitioning to LMO.
+
+          * When set to {{false}} no trap report the MoCA Node is not
+            transitioning to LMO.
+
+          See {{bibref|MoCAv2.0|section 12}}.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="factory" value="false"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="PrimaryOffset" access="readWrite"
+          id="mocaIfPrimaryOffset/1.3.6.1.4.1.31621.1.2.1.1.1.33">
+        <description>
+          The offset in {{units}} of the primary channel relative to the beacon
+          channel (PRIMARY_OFFSET Managed Parameter).
+        </description>
+        <syntax>
+          <int>
+            <range minInclusive="-25" maxInclusive="25" step="25"/>
+            <units value="MHz"/>
+          </int>
+        </syntax>
+      </parameter>
+
+      <parameter name="SecondaryOffset" access="readWrite"
+          id="mocaIfSecondaryOffset/1.3.6.1.4.1.31621.1.2.1.1.1.34">
+        <description>
+          The offset in {{units}} of the secondary channel relative to the
+          beacon channel (SECONDARY_OFFSET Managed Parameter).
+
+          A value of 0 indicates that there is no secondary channel.
+        </description>
+        <syntax>
+          <int>
+            <range minInclusive="-125" maxInclusive="125" step="125"/>
+            <units value="MHz"/>
+          </int>
+        </syntax>
+      </parameter>
+
+      <parameter name="BeaconPowerDistributed" access="readWrite"
+          id="moca25IfBeaconPowerDistributed/1.3.6.1.4.1.31621.1.3.1.1.1.1">
+        <description>
+          The networkwide (see {{param|BeaconPowerMePie}}) value of Beacon
+          transmit power in {{units}} sent by the NC (Network Coordinator) in
+          Beacon Power PIEs (Power Information Elements).
+
+          A value of 255 indicates that no networkwide PIE is sent.
+
+          See {{bibref|MoCAv2.5|section 7.1.5 and Table 17-1}}.
+        </description>
+        <syntax>
+          <int>
+            <range minInclusive="-10" maxInclusive="7"/>
+            <range minInclusive="255" maxInclusive="255"/>
+            <units value="dBm"/>
+          </int>
+        </syntax>
+      </parameter>
+
+      <parameter name="BeaconPowerLocal" access="readWrite"
+          id="moca25IfBeaconPowerLocal/1.3.6.1.4.1.31621.1.3.1.1.1.2">
+        <description>
+          The value of Beacon transmit power in {{units}} used by the Node when
+          it transmits beacons.
+        </description>
+        <syntax>
+          <int>
+            <range minInclusive="-10" maxInclusive="7"/>
+            <units value="dBm"/>
+          </int>
+        </syntax>
+      </parameter>
+
+      <parameter name="BeaconPowerMePie" access="readWrite"
+          id="moca25IfBeaconPowerMePie/1.3.6.1.4.1.31621.1.3.1.1.1.3">
+        <description>
+          The Beacon Power PIE (Power Information Element) that the ME
+          (Management Entity) wants the NC (Network Coordinator) to send to
+          configure the Beacon Transmit Power of the different nodes. See
+          {{bibref|MoCAv2.5|section 7.1.5}}.
+
+          This parameter specifies if the Beacon transmit power is intended to
+          set the Beacon Power Local (individual type) or the Beacon Power
+          Distributed (networkwide type) of the selected nodes.
+
+          It is encoded as specified in {{bibref|MOCA25-MIB|section 4.11}}.
+        </description>
+        <syntax>
+          <hexBinary>
+            <size minLength="4" maxLength="4"/>
+          </hexBinary>
+        </syntax>
+      </parameter>
+
+      <parameter name="BeaconPowerMePieSend" access="readWrite"
+          id="moca25IfBeaconPowerMePieSend/1.3.6.1.4.1.31621.1.3.1.1.1.4">
+        <description>
+          When this parameter is written, instructs the Node (in case of
+          Network Coordinator) to send a set of Beacon Power PIEs (Power
+          Information Element) with the Beacon Power PIE fields set as
+          specified in {{param|BeaconPowerMePie}}.
+
+          See {{bibref|MoCAv2.5|section 7.1.5}}.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="BeaconPowerNetConfig" access="readWrite"
+          id="moca25IfBeaconPowerNetConfig/1.3.6.1.4.1.31621.1.3.1.1.1.5">
+        <description>
+          Controls whether the Node is allowed to configure its Beacon power
+          (both Beacon Power Distributed and Beacon Power Local) according to
+          the Beacon Power PIE (Power Information Element) sent by the NC
+          (Network Coordinator).
+
+          * When set to true the Node is allowed to configure its Beacon power.
+
+          * When set to false the Node is not allowed to configure its Beacon
+            power.
+
+          See {{bibref|MoCAv2.5|section 7.1.5 and Table 17-1}}.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="EnhancedPassword" access="readWrite"
+          id="moca25IfEnhancedPassword/1.3.6.1.4.1.31621.1.3.1.1.1.6">
+        <description>
+          The MoCA Enhanced Password using an ASCII printable character.
+
+          This value must be 12 to 64 ASCII printable characters with decimal
+          codes in the range 33 to 126 inclusive. Access is only allowed when
+          used with SNMPv3 protocol, but not allowed when used with SNMPv1 or
+          SNMPv2c protocol.
+
+          If this value changes, this node will drop from the network if
+          {{param|PrivacyEnabledSetting}} is {{true}}. If this managed object
+          is changed, it may not be possible to change this object again via
+          the SNMP protocol. The mechanism to change this object again is out
+          of the scope of this MIB definition draft.
+
+          See {{bibref|MoCAv2.5|section 11.3.1}}.
+        </description>
+        <syntax hidden="true">
+          <string>
+            <size minLength="12" maxLength="64"/>
+            <size minLength="0" maxLength="0"/>
+          </string>
+          <default type="factory" value=""/>
+        </syntax>
+      </parameter>
+
+      <parameter name="FirstOffset" access="readWrite"
+          id="moca25IfFirstOffset/1.3.6.1.4.1.31621.1.3.1.1.1.7">
+        <description>
+          The offset of the First Channel's center frequency below the center
+          frequency of the Primary Channel. Valid values are -4 to 0.
+
+          See {{bibref|MoCAv2.5|Table 17-1}}.
+        </description>
+        <syntax>
+          <int>
+            <range minInclusive="-4" maxInclusive="0"/>
+          </int>
+        </syntax>
+      </parameter>
+
+      <parameter name="HandoffToLowerVersionEnable" access="readWrite"
+          id="moca25IfHandoffToLowerVersionEnable/1.3.6.1.4.1.31621.1.3.1.1.1.8">
+        <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
+          {{false}}.
+
+          See {{bibref|MoCAv2.5|section 8.11.1 and Table 17-1}}.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="factory" value="false"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="MgntEntityNetIePayloadRespTimeout" access="readWrite"
+          id="moca25IfMgntEntityNetIePayloadRespTimeout/1.3.6.1.4.1.31621.1.3.1.1.1.9">
+        <description>
+          The number of Discovery Request transmission opportunities a NN has
+          to wait for a response to a Management Entity Response Network IE
+          before continuing its network search.
+
+          See {{bibref|MoCAv2.5|section 8.3.3.2 and Table 17-1}}.
+        </description>
+        <syntax>
+          <unsignedInt/>
+          <default type="factory" value="1000"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="MgntEntityNetIePayloadTx" access="readWrite"
+          id="moca25IfMgntEntityNetIePayloadTx/1.3.6.1.4.1.31621.1.3.1.1.1.10">
+        <description>
+          The payload of the Management Entity Request Network IE (when the
+          Node is trying to join the network), or of the Management Entity
+          Response Network IE (when the Node is the NC).
+
+          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) }
+        </description>
+        <syntax>
+          <hexBinary>
+            <size minLength="2" maxLength="62"/>
+          </hexBinary>
+        </syntax>
+      </parameter>
+
+      <parameter name="MpsPrivacyDown" access="readWrite"
+          id="moca25IfMpsPrivacyDown/1.3.6.1.4.1.31621.1.3.1.1.1.11">
+        <description>
+          Controls whether the Node, during its MPS (MoCA Protected Setup)
+          session, is allowed to accept privacy setting of Privacy Disabled
+          from another Node when its own setting is Privacy Enabled. This
+          parameter is valid only when {{param|MpsPrivacyReceive}} is set to
+          {{true}}.
+
+          See {{bibref|MoCAv2.5|section 8.3.1 and Table 17-1}}.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="factory" value="false"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="MpsPrivacyReceive" access="readWrite"
+          id="moca25IfMpsPrivacyReceive/1.3.6.1.4.1.31621.1.3.1.1.1.12">
+        <description>
+          Controls whether the Node, during its MPS (MoCA Protected Setup)
+          session, is allowed to accept privacy settings (Privacy Enabled /
+          Disabled and Network Password and/or Enhanced Network Password) from
+          another Node.
+
+          See {{bibref|MoCAv2.5|section 8.3.1 and Table 17-1}}.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="factory" value="true"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="MpsReset" access="readWrite"
+          id="moca25IfMpsReset/1.3.6.1.4.1.31621.1.3.1.1.1.13">
+        <description>
+          Resets the MPS (MoCA Protected Setup) state of the Node
+          {{param|MpsState}} to un-Paired and reinitializes MPS local variables
+          and relevant parameters when this parameter is written.
+
+          See {{bibref|MoCAv2.5|Section 8.3.1 and Table 17-1}}.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="MpsTriggered" access="readWrite"
+          id="moca25IfMpsTriggered/1.3.6.1.4.1.31621.1.3.1.1.1.14">
+        <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
+          written.
+
+          See {{bibref|MoCAv2.5|Section 8.3.1 and Table 17-1}}.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="MpsUnpairedTime" access="readWrite"
+          id="moca25IfMpsUnpairedTime/1.3.6.1.4.1.31621.1.3.1.1.1.15">
+        <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
+          joins a network without using MPS (MoCA Protected Setup).
+
+          See {{bibref|MoCAv2.5|Section 8.3.1 and Table 17-1}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+          <default type="factory" value="300"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="MpsWalkTime" access="readWrite"
+          id="moca25IfMpsWalkTime/1.3.6.1.4.1.31621.1.3.1.1.1.16">
+        <description>
+          The allowed time interval in {{units}} to trigger MPS (MoCA Protected
+          Setup) on two Nodes.
+
+          See {{bibref|MoCAv2.5|Section 8.3.1 and Table 17-1}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range minInclusive="12" maxInclusive="1200"/>
+            <units value="seconds"/>
+          </unsignedInt>
+          <default type="factory" value="120"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="NetworkJoin" access="readWrite"
+          id="moca25IfNetworkJoin/1.3.6.1.4.1.31621.1.3.1.1.1.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
+          is {{true}} and No if this value is {{false}}.
+
+          See {{bibref|MoCAv2.5|Section 8.3.3 and Table 17-1}}.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="NetworkNameAdmissionRule" access="readWrite"
+          id="moca25IfNetworkNameAdmissionRule/1.3.6.1.4.1.31621.1.3.1.1.1.18">
+        <description>
+          Controls which Admission rule to follow.
+
+          See {{bibref|MoCAv2.5|Section 8.3.3 and Table 17-1}}.
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="none">
+              <description>Join no network.</description>
+            </enumeration>
+            <enumeration value="all">
+              <description>Join any network.</description>
+            </enumeration>
+            <enumeration value="name">
+              <description>
+                Join only the network with a network name that matches
+                {{param|NetworkNameNcNn}}.
+              </description>
+            </enumeration>
+            <enumeration value="osp">
+              <description>
+                Wait for management entity instructions after exchanging OSP
+                messages.
+              </description>
+            </enumeration>
+          </string>
+          <default type="factory" value="none"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="NetworkNameNcNn" access="readWrite"
+          id="moca25IfNetworkNameNcNn/1.3.6.1.4.1.31621.1.3.1.1.1.19">
+        <description>
+          The Network Name the Node is to use for any MoCA network it creates.
+
+          When {{param|NetworkNameAdmissionRule}} is set to
+          {{enum|name|NetworkNameAdmissionRule}}, this object also indicates to
+          the Node the name of the network to join.
+
+          See {{bibref|MoCAv2.5|Section 8.3.3 and Table 17-1}}.
+        </description>
+        <syntax>
+          <string/>
+        </syntax>
+      </parameter>
+
+      <parameter name="NumChannels" access="readWrite"
+          id="moca25IfNumChannels/1.3.6.1.4.1.31621.1.3.1.1.1.20">
+        <description>
+          The maximum number of 100MHz channels the Node uses when the Node
+          forms the network.
+
+          See {{bibref|MoCAv2.5|Table 17-1}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range minInclusive="1" maxInclusive="5"/>
+          </unsignedInt>
+          <default type="factory" value="5"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Per25Mode" access="readWrite"
+          id="moca25IfPer25Mode/1.3.6.1.4.1.31621.1.3.1.1.1.21">
+        <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
+          NPER and 1 indicates VLPER.
+
+          See {{bibref|MoCAv2.5|Table 17-1}}.
+        </description>
+        <syntax>
+          <unsignedInt/>
+          <default type="factory" value="0"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="PrivacySupported" access="readWrite"
+          id="moca25IfPrivacySupported/1.3.6.1.4.1.31621.1.3.1.1.1.22">
+        <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}}.
+        </description>
+        <syntax>
+          <list/>
+          <dataType ref="MocaPrivacy"/>
+          <default type="factory"
+              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">
+        <description>
+          The EtherType value of MSDUs that are allowed to transmit/receive
+          to/from a Non-Secured Admitted Node.
+
+          See {{bibref|MoCAv2.5|Section 11.7 and Table 17-1}}.
+        </description>
+        <syntax>
+          <hexBinary>
+            <size minLength="2" maxLength="2"/>
+          </hexBinary>
+          <default type="factory" value="888E"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="TrafficPermissionLink" access="readWrite"
+          id="moca25IfTrafficPermissionLink/1.3.6.1.4.1.31621.1.3.1.1.1.24">
+        <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
+          with the given Node ID in an Authorized Link PIE that the ME of the
+          Authorization Server wants to distribute if the Node is the
+          Authorization Server; otherwise, the value of SOURCE_NODE_BITMASK in
+          the last received Authorized Link PIE.
+
+          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];
+           };
+        </description>
+        <syntax>
+          <hexBinary/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ConnectedNodesChangeTrapEn" access="readWrite"
+          id="moca25IfConnectedNodesChangeTrapEn/1.3.6.1.4.1.31621.1.3.1.1.1.25">
+        <description>
+          Used to enable {{param|ConnectedNodesChangeTrap}}.
+
+          * When set to {{true}} it allows the MoCA Node to report a trap on
+            the change of {{param|NumNodes}}.
+
+          * When set to {{false}} no trap report is generated when
+            {{param|NumNodes}} changes.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="factory" value="false"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="MgntEntityNetwIePayloadRecTrapEn" access="readWrite"
+          id="moca25IfMgntEntityNetwIePayloadRecTrapEn/1.3.6.1.4.1.31621.1.3.1.1.1.26">
+        <description>
+          Used to enable {{param|MgntEntityNetwIePayloadRecTrap}}.
+
+          * When set to {{true}} it allows the MoCA Node to report a trap on
+            reception of a Management Entity Request/Response Network IE.
+
+          * When set to {{false}} no trap report is generated when a Management
+            Entity Request/Response Network IE is received.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="factory" value="false"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="MpsTrapEn" access="readWrite"
+          id="moca25IfMpsTrapEn/1.3.6.1.4.1.31621.1.3.1.1.1.27">
+        <description>
+          Used to enable the MPS-related traps: {{param|MpsInitScanRecTrap}},
+          {{param|MpsPairFailTrap}}, and {{param|MpsPrivacyChangedTrap}}.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="factory" value="false"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="NcPrivSupportedRecTrapEn" access="readWrite"
+          id="moca25IfNcPrivSupportedRecTrapEn/1.3.6.1.4.1.31621.1.3.1.1.1.28">
+        <description>
+          Used to enable {{param|NcPrivacySupportedRecTrap}}.
+
+          * When set to {{true}} it allows the MoCA Node to report a trap on
+            reception of a new NC_PRIVACY_SUPPORTED value.
+
+          * When set to {{false}} no trap report is generated when a new
+            NC_PRIVACY_SUPPORTED value is received.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="factory" value="false"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="NetworkNameRecTrapEn" access="readWrite"
+          id="moca25IfNetworkNameRecTrapEn/1.3.6.1.4.1.31621.1.3.1.1.1.29">
+        <description>
+          Used to enable {{param|NetworkNameRecTrap}}.
+
+          * When set to {{true}} it allows the MoCA Node to report a trap on
+            reception of a Network Name.
+
+          * When set to {{false}} no trap report is generated when a Network
+            Name is received.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="factory" value="false"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="NodeDropTrapEn" access="readWrite"
+          id="moca25IfNodeDropTrapEn/1.3.6.1.4.1.31621.1.3.1.1.1.30">
+        <description>
+          Used to enable {{param|NodeDropAdmFailureTrap}},
+          {{param|NodeDropNcTrap}}, {{param|NodeDropMpsTriggeredTrap}}, and
+          {{param|NodeDropNcChgTrap}}.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="factory" value="false"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="TxPowerLimit" access="readWrite"
+          id="mocaIfTxPowerLimit/1.3.6.1.4.1.31621.1.2.1.1.1.4">
+        <description>
+          The value in dB by which to reduce the transmit power of the node
+          from its maximum transmit power. The transmit power SHALL only be
+          changed when {{param|Status}} is not {{enum|Up|Status}}, which means
+          the interface is not part of a MoCA network. If changed, the
+          parameter may not take effect until the MoCA interface is restarted.
+
+          This parameter is based on ''mocaIfTxPowerLimit'' from
+          {{bibref|MOCA11-MIB}}.
+        </description>
+        <syntax>
+          <dataType ref="MocaDB"/>
+          <default type="factory" value="0"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="PowerCntlPhyTarget" access="readWrite"
+          id="mocaIfPowerControlTargetRate/1.3.6.1.4.1.31621.1.2.1.1.1.6">
         <description>
           Target PHY rate in Mbps for the power control algorithm.
 
@@ -26175,92 +28306,94 @@
           {{bibref|MOCA11-MIB}}.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="MocaPhyRate"/>
+          <default type="factory" value="630"/>
         </syntax>
       </parameter>
 
-      <parameter name="BeaconPowerLimit" access="readWrite">
+      <parameter name="BeaconPowerLimit" access="readWrite"
+          status="deprecated"
+          id="mocaIfBeaconPowerBackoff/1.3.6.1.4.1.31621.1.2.1.1.1.5">
         <description>
-          Beacon Transmit Power attenuation in {{units}} relative to the
-          maximum transmit power.
-
-          The MoCA interface SHOULD have {{param|Enable}} set to {{false}} for
-          any change in this configuration. If the parameter is modified when
-          {{param|Enable}} is {{true}} then this change might take several
-          minutes to complete.
+          The value in dB by which to reduce the setting of the transmit power
+          of the Beacon from the maximum transmit power (BEACON_PWR_BACKOFF
+          Managed Parameter). The beacon transmit power SHALL only be changed
+          when {{param|Status}} is not {{enum|Up|Status}}, which means the
+          interface is not part of a MoCA network. If changed, the parameter
+          may not take effect until the MoCA interface is restarted.
 
           This parameter is based on ''mocaIfBeaconPowerLimit'' from
           {{bibref|MOCA11-MIB}}.
+
+          Note that this parameter maps to different MIB objects for MoCA
+          1.0/1.1 and MoCA 2.0.
+
+          {{deprecated|2.17|for MoCA 2.5}}
         </description>
         <syntax>
-          <unsignedInt>
-            <units value="dB"/>
-          </unsignedInt>
+          <dataType ref="MocaDB"/>
+          <default type="factory" value="0"/>
         </syntax>
       </parameter>
 
-      <parameter name="NetworkTabooMask" access="readOnly">
+      <parameter name="NetworkTabooMask" access="readOnly"
+          id="mocaIfTabooChannelMask/1.3.6.1.4.1.31621.1.2.1.7.1.13">
         <description>
-          Hexadecimal encoded 64-bit mask of MoCA taboo channels identified for
-          the home network. This is the bit map of the spectrum that the
-          interface supports, and each bit represents 25 MHz of spectrum. The
-          least significant bit of the rightmost character corresponds to
-          800MHz, which is the lowest frequency.
+          The MoCA taboo channels identified for the home network.
 
-          This parameter is based on ''mocaIfTabooChannelMask'' from
-          {{bibref|MOCA11-MIB}}.
+          {{datatype|expand}}
         </description>
         <syntax>
-          <hexBinary>
-            <size minLength="8" maxLength="8"/>
-          </hexBinary>
+          <dataType ref="MocaChannelMask"/>
         </syntax>
       </parameter>
 
-      <parameter name="NodeTabooMask" access="readOnly">
+      <parameter name="NodeTabooMask" access="readOnly"
+          id="mocaIfNodeTabooChannelMask/1.3.6.1.4.1.31621.1.2.1.7.1.14">
         <description>
-          Hexadecimal encoded 64-bit mask of supported frequencies. This is the
-          bit map of the spectrum that the interface supports, and each bit
-          represents 25 MHz of spectrum. The least significant bit of the
-          rightmost character corresponds to 800MHz, which is the lowest
-          frequency.
+          The MoCA taboo channels identified for this device.
 
-          This parameter is based on ''mocaIfNodeTabooChannelMask'' from
-          {{bibref|MOCA11-MIB}}.
+          {{datatype|expand}}
         </description>
         <syntax>
-          <hexBinary>
-            <size minLength="8" maxLength="8"/>
-          </hexBinary>
+          <dataType ref="MocaChannelMask"/>
         </syntax>
       </parameter>
 
-      <parameter name="TxBcastRate" access="readOnly">
+      <parameter name="SupportedBands" access="readOnly"
+          id="mocaIfSupportedBands/1.3.6.1.4.1.31621.1.2.1.7.1.15">
         <description>
-          The broadcast PHY transmit rate in {{units}} for this interface.
+          Lists all the supported bands and sub-bands by this device.
+        </description>
+        <syntax>
+          <dataType ref="MocaBand"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="TxBcastRate" access="readOnly"
+          id="mocaIfTxGcdRate/1.3.6.1.4.1.31621.1.2.1.7.1.20">
+        <description>
+          The broadcast PHY transmit rate for this interface.
 
           This parameter is based on ''mocaIfTxGcdRate'' from
           {{bibref|MOCA11-MIB}}.
         </description>
         <syntax>
-          <unsignedInt>
-            <units value="Mbps"/>
-          </unsignedInt>
+          <dataType ref="MocaPhyRate"/>
         </syntax>
       </parameter>
 
-      <parameter name="TxBcastPowerReduction" access="readOnly">
+      <parameter name="TxBcastPowerReduction" access="readOnly"
+          id="mocaIfTxGcdPowerReduction/1.3.6.1.4.1.31621.1.2.1.7.1.16">
         <description>
-          Transmit Power attenuation in {{units}} relative to the maximum
-          transmit power for broadcast transmissions.
+          Transmit Power attenuation relative to the maximum transmit power for
+          broadcast transmissions.
 
           This parameter is based on ''mocaIfTxGcdPowerReduction'' from
           {{bibref|MOCA11-MIB}}.
         </description>
         <syntax>
-          <unsignedInt>
-            <units value="dB"/>
-          </unsignedInt>
+          <dataType ref="MocaDB"/>
         </syntax>
       </parameter>
 
@@ -26270,13 +28403,17 @@
 
           This parameter is based on ''mocaIfQAM256Capable'' from
           {{bibref|MOCA11-MIB}}.
+
+          This parameter MUST NOT be implemented for MoCA 2.0 because it
+          doesn't map to a MIB object.
         </description>
         <syntax>
           <boolean/>
         </syntax>
       </parameter>
 
-      <parameter name="PacketAggregationCapability" access="readOnly">
+      <parameter name="PacketAggregationCapability" access="readOnly"
+          id="mocaIfPduNumber/1.3.6.1.4.1.31621.1.2.1.7.1.17">
         <description>
           The packet aggregation capability supported by the interface.
           Standard values are 0 (no support), 6 (6 {{units}}) or 10 (10
@@ -26284,10 +28421,14 @@
 
           This parameter is based on ''mocaIfPacketsAggrCapability'' from
           {{bibref|MOCA11-MIB}}.
+
+          Note that this parameter maps to different MIB objects for MoCA
+          1.0/1.1 and MoCA 2.0. [XXX1: Need to modify the syntax to
+          'unsignedInt' because MoCA 2.0 requires a minimum of 20 packets and
+          MoCA 2.5 requires a minimum of 80 packets.]
         </description>
         <syntax>
           <unsignedInt>
-            <range minInclusive="0" maxInclusive="10"/>
             <units value="packets"/>
           </unsignedInt>
         </syntax>
@@ -26301,6 +28442,1282 @@
           <unsignedInt/>
         </syntax>
       </parameter>
+
+      <parameter name="PasswordHash" access="readOnly"
+          id="mocaIfPasswordHash/1.3.6.1.4.1.31621.1.2.1.7.1.21">
+        <description>
+          The 16 LSBs of a SHA1 performed on a 0-extended password
+          ({{param|KeyPassphrase}}) concatenated with the SALT string
+          "MocaPasswordHash". This parameter allows to remotely validate the
+          MoCA password configuration without exposing its value. This value
+          must be 4 hexadecimal digits long.
+        </description>
+        <syntax>
+          <hexBinary>
+            <size minLength="2" maxLength="2"/>
+          </hexBinary>
+        </syntax>
+      </parameter>
+
+      <parameter name="AggregationSize" access="readOnly"
+          id="mocaIfAggregationSize/1.3.6.1.4.1.31621.1.2.1.7.1.23">
+        <description>
+          The maximum number of bytes in one aggregate which can be received by
+          the MoCA Node.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="AeNumber" access="readOnly"
+          id="mocaIfAeNumber/1.3.6.1.4.1.31621.1.2.1.7.1.24">
+        <description>
+          Maximum number of allocation elements, excluding the TAUs and the
+          Dummy DAUs, in one MAP the MoCA Node can process.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="SupportedIngressPqosFlows" access="readOnly"
+          id="mocaIfSupportedIngressPqosFlows/1.3.6.1.4.1.31621.1.2.1.7.1.25">
+        <description>
+          Maximum number of Ingress PQoS Flows supported by the MoCA Node.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="SupportedEgressPqosFlows" access="readOnly"
+          id="mocaIfSupportedEgressPqosFlows/1.3.6.1.4.1.31621.1.2.1.7.1.26">
+        <description>
+          Maximum number of Egress PQoS Flows supported by the MoCA Node.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="PowerStateCap" access="readOnly"
+          id="mocaIfPowerStateCap/1.3.6.1.4.1.31621.1.2.1.7.1.27">
+        <description>
+          The Power State capabilities of the MoCA Node (e.g., which Power
+          States it can transition to) (POWER_STATE_CAP Managed Parameter).
+          This value can change over time (e.g. when a MoCA 1 Node joins the
+          network).
+        </description>
+        <syntax>
+          <dataType ref="MocaPowerState"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="AvbSupport" access="readOnly"
+          id="mocaIfAvbSupport/1.3.6.1.4.1.31621.1.2.1.7.1.28">
+        <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
+          supported if this value is {{false}}.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ResetCount" access="readOnly"
+          id="mocaIfResetCount/1.3.6.1.4.1.31621.1.2.1.7.1.29">
+        <description>
+          Count of MoCA resets since the interface was enabled for this MoCA
+          Node.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="LinkDownCount" access="readOnly"
+          id="mocaIfLinkDownCount/1.3.6.1.4.1.31621.1.2.1.7.1.30">
+        <description>
+          The number of times that this MoCA Node has lost link with the MoCA
+          network since the interface was enabled.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="LmoNodeID" access="readOnly"
+          id="mocaIfLmoNodeID/1.3.6.1.4.1.31621.1.2.1.7.1.31">
+        <description>
+          The ID of the MoCA Node currently undergoing LMO (Link Maintenance
+          Operation), i.e. the LMO node.
+        </description>
+        <syntax>
+          <dataType ref="MocaNodeID"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="NetworkState" access="readOnly"
+          id="mocaIfNetworkState/1.3.6.1.4.1.31621.1.2.1.7.1.32">
+        <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>
+        <syntax>
+          <string>
+            <enumeration value="beginNodeAdmissionState">
+              <description>{{bibref|MoCAv2.0|Section 8.3.3}}</description>
+            </enumeration>
+            <enumeration value="newNodeTypeOneProbeTxState">
+              <description>{{bibref|MoCAv2.0|Section 8.3.4}}</description>
+            </enumeration>
+            <enumeration value="newNodeTypeOneProbeRxState">
+              <description>{{bibref|MoCAv2.0|Section 8.3.5}}</description>
+            </enumeration>
+            <enumeration value="newGcdDistributionState">
+              <description>{{bibref|MoCAv2.0|Section 8.3.6}}</description>
+            </enumeration>
+            <enumeration value="beginPhyProfileState">
+              <description>{{bibref|MoCAv2.0|Section 8.3.7}}</description>
+            </enumeration>
+            <enumeration value="steadyState">
+              <description>
+                {{bibref|MoCAv2.0|Section 8.3.8}} {{bibref|MoCAv2.0|Section
+                8.9.2.2.3}}
+              </description>
+            </enumeration>
+            <enumeration value="typeThreeProbeState">
+              <description>{{bibref|MoCAv2.0|Section 8.9.1.2}}</description>
+            </enumeration>
+            <enumeration value="lmoTypeOneProbeState">
+              <description>{{bibref|MoCAv2.0|Section 8.9.1.3}}</description>
+            </enumeration>
+            <enumeration value="lmoNodeGcdDistributionState">
+              <description>{{bibref|MoCAv2.0|Section 8.9.1.5}}</description>
+            </enumeration>
+            <enumeration value="beginLmoPhyProfileState">
+              <description>{{bibref|MoCAv2.0|Section 8.9.1.6}}</description>
+            </enumeration>
+            <enumeration value="lmoGcdTypeOneProbeLinkState">
+              <description>{{bibref|MoCAv2.0|Section 8.9.1.4}}</description>
+            </enumeration>
+            <enumeration value="alternateChannelQuietLineState">
+              <description>{{bibref|MoCAv2.0|Section 8.9.2.5}}</description>
+            </enumeration>
+            <enumeration value="alternateChannelEvmProbeState">
+              <description>{{bibref|MoCAv2.0|Section 8.9.2.5}}</description>
+            </enumeration>
+            <enumeration value="unsolicitedProbeReportState">
+              <description>{{bibref|MoCAv2.0|Section 8.9.2.2.1}}</description>
+            </enumeration>
+            <enumeration value="beginUnsolicitedPhyProfileState">
+              <description>{{bibref|MoCAv2.0|Section 8.9.2.2.2}}</description>
+            </enumeration>
+            <enumeration value="rxDeterminedProbeState">
+              <description>{{bibref|MoCAv2.0|Section 8.9.2.1}}</description>
+            </enumeration>
+            <enumeration value="calibrationState">
+              <description>{{bibref|MoCAv2.0|Section 8.14.1}}</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">
+        <description>
+          The offset in MHz of the primary channel relative to the beacon
+          channel. The allowed values are -25, 0, and +25.
+        </description>
+        <syntax>
+          <int/>
+        </syntax>
+      </parameter>
+
+      <parameter name="SecondaryChannelOffset" access="readOnly"
+          id="mocaIfSecondaryChannelOffset/1.3.6.1.4.1.31621.1.2.1.7.1.34">
+        <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
+          that there is no secondary channel.
+        </description>
+        <syntax>
+          <int/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ResetReason" access="readOnly"
+          id="mocaIfResetReason/1.3.6.1.4.1.31621.1.2.1.7.1.35">
+        <description>
+          Describes the reason for a MoCA link reset or failure to join a
+          network.
+        </description>
+        <syntax>
+          <string>
+            <size minLength="0" maxLength="80"/>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="NcVersion" access="readOnly"
+          id="mocaIfNcVersion/1.3.6.1.4.1.31621.1.2.1.7.1.36">
+        <description>
+          Indicates the MoCA version of the NC.
+
+          This element MUST be in the form of dot-delimited integers, where
+          each successive integer represents a more minor category of
+          variation. For example, 1.0, where the components mean major.minor
+          revision number. Possible patterns:
+
+          * ''\d+(\.\d+)*''
+        </description>
+        <syntax>
+          <string>
+            <size minLength="0" maxLength="64"/>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="LinkState" access="readOnly"
+          id="mocaIfLinkState/1.3.6.1.4.1.31621.1.2.1.7.1.37">
+        <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 };
+        </description>
+        <syntax>
+          <hexBinary>
+            <size minLength="3" maxLength="3"/>
+          </hexBinary>
+        </syntax>
+      </parameter>
+
+      <parameter name="ConnectedNodesInfo" access="readOnly"
+          id="moca25IfConnectedNodesInfo/1.3.6.1.4.1.31621.1.3.1.2.1.1">
+        <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]; };
+        </description>
+        <syntax>
+          <hexBinary>
+            <size minLength="12" maxLength="156"/>
+          </hexBinary>
+        </syntax>
+      </parameter>
+
+      <parameter name="MgntEntityNetIePayloadRx" access="readOnly"
+          id="moca25IfMgntEntityNetIePayloadRx/1.3.6.1.4.1.31621.1.3.1.2.1.2">
+        <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) };
+        </description>
+        <syntax>
+          <hexBinary>
+            <size minLength="2" maxLength="62"/>
+          </hexBinary>
+        </syntax>
+      </parameter>
+
+      <parameter name="Moca25PhyCapable" access="readOnly"
+          id="moca25IfMoca25PhyCapable/1.3.6.1.4.1.31621.1.3.1.2.1.3">
+        <description>
+          Indicate the MoCA Node supports MoCA 2.5 PHY if the value is
+          {{true}}.
+
+          Indicate the MoCA Node does not support MoCA 2.5 PHY if this value is
+          {{false}}.
+
+          See {{bibref|MoCAv2.5|section 8.3.4.1.1}}.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="MpsInitScanPayload" access="readOnly"
+          id="moca25IfMpsInitScanPayload/1.3.6.1.4.1.31621.1.3.1.2.1.4">
+        <description>
+          Reports the channel number, NC's (Network Coordinators) MoCA version,
+          Network MPS (MoCA Protected Setup) trigger, and Network MPS
+          parameters (if any) and Network Name of the latest MoCA network found
+          during Initial MPS Scanning. See {{bibref|MoCAv2.5|section
+          8.3.1.1.1}}.
+
+          It is encoded as specified in {{bibref|MOCA25-MIB|section 4.6}}.
+        </description>
+        <syntax>
+          <hexBinary>
+            <size minLength="4" maxLength="4"/>
+          </hexBinary>
+        </syntax>
+      </parameter>
+
+      <parameter name="MpsState" access="readOnly"
+          id="moca25IfMpsState/1.3.6.1.4.1.31621.1.3.1.2.1.5">
+        <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}}.
+
+          See {{bibref|MoCAv2.5|section 8.3.1}}.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="NetworkNamePayload" access="readOnly"
+          id="moca25IfNetworkNamePayload/1.3.6.1.4.1.31621.1.3.1.2.1.6">
+        <description>
+          The payload of the latest received Network Name from the NC.
+
+          See {{bibref|MoCAv2.5|section 8.3.3.2}}.
+        </description>
+        <syntax>
+          <hexBinary>
+            <size minLength="0" maxLength="32"/>
+          </hexBinary>
+        </syntax>
+      </parameter>
+
+      <parameter name="PrivacyNc" access="readOnly"
+          id="moca25IfPrivacyNc/1.3.6.1.4.1.31621.1.3.1.2.1.7">
+        <description>
+          The latest NC_PRIVACY_SUPPORTED value received from the NC. Before
+          any NC_PRIVACY_SUPPORTED is received, reflects the value of
+          {{param|PrivacySupported}}.
+
+          See {{bibref|MoCAv2.5|Table 17-1}}.
+        </description>
+        <syntax>
+          <list/>
+          <dataType ref="MocaPrivacy"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="PowerStateResp" access="readOnly"
+          id="moca25IfPowerStateResp/1.3.6.1.4.1.31621.1.3.1.2.1.8">
+        <description>
+          Carries the response of the MoCA Node to a request (through
+          POWER_STATEREQ) to transition into a desired Power State: yes if the
+          value if {{true}} and no if the value is {{false}}.
+
+          See {{bibref|MoCAv2.5|section 12}}.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="PowerStateStatus" access="readOnly"
+          id="moca25IfPowerStateStatus/1.3.6.1.4.1.31621.1.3.1.2.1.9">
+        <description>
+          Reports the current Power State of the Node (POWER_STATE_STATUS
+          Managed Parameter).
+        </description>
+        <syntax>
+          <dataType ref="MocaPowerState"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ConnectedNodesDropReason" access="readOnly"
+          id="moca25IfConnectedNodesDropReason/1.3.6.1.4.1.31621.1.3.1.2.1.10">
+        <description>
+          Reports the GUID(s) of the dropped EN(s) and the reason of node drop
+          for up to 15 nodes.
+
+          This object is valid only when the Node is the NC.
+
+          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]; };
+        </description>
+        <syntax>
+          <hexBinary/>
+        </syntax>
+      </parameter>
+
+      <parameter name="BelowPhyThresholdTrap" access="readOnly"
+          id="mocaTrapBelowPhyThreshold/1.3.6.1.4.1.31621.1.2.0.1">
+        <description>
+          If transmit PHY rate between all pairs of MoCA Nodes are greater than
+          or equal to {{param|PhyThreshold}}, and subsequently the transmit PHY
+          rate of one pair of MoCA Nodes drops below {{param|PhyThreshold}},
+          send this notification if {{param|PhyThresholdTrapEnable}} is
+          {{true}}.
+
+          This parameter is a counter that is incremented whenever the event
+          occurs.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="AbovePhyThresholdTrap" access="readOnly"
+          id="mocaTrapAbovePhyThreshold/1.3.6.1.4.1.31621.1.2.0.2">
+        <description>
+          If transmit PHY rate between one or more pairs of MoCA Nodes are less
+          than {{param|PhyThreshold}}, and subsequently the transmit PHY rate
+          between all pairs of MoCA Nodes goes above or is equal to
+          {{param|PhyThreshold}}, send this notification if
+          {{param|PhyThresholdTrapEnable}} is {{true}}.
+
+          This parameter is a counter that is incremented whenever the event
+          occurs.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="StatusChangeTrap" access="readOnly"
+          id="mocaTrapIfStatusChange/1.3.6.1.4.1.31621.1.2.0.3">
+        <description>
+          This trap is sent when {{param|StatusChangeEnable}} is {{true}} and
+          {{param|Status}} changes value.
+
+          This parameter is a counter that is incremented whenever the event
+          occurs.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="NumNodesChangeTrap" access="readOnly"
+          id="mocaTrapIfNumNodesChange/1.3.6.1.4.1.31621.1.2.0.4">
+        <description>
+          This trap is sent when {{param|NumNodesChangeEnable}} is {{true}} and
+          {{param|NumNodes}} changes value.
+
+          This parameter is a counter that is incremented whenever the event
+          occurs.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="MrRstSuccessTrap" access="readOnly"
+          id="mocaTrapMrRstSuccess/1.3.6.1.4.1.31621.1.2.0.5">
+        <description>
+          An MR Entry Node reports that the network got reset successfully
+          (MRRST_SUCCESS Event).
+
+          This parameter is a counter that is incremented whenever the event
+          occurs.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="MrRstFailTrap" access="readOnly"
+          id="mocaTrapMrRstFail/1.3.6.1.4.1.31621.1.2.0.6">
+        <description>
+          An MR Entry Node reports that the network reset did not complete
+          successfully (MRRST_FAIL Event).
+
+          This parameter is a counter that is incremented whenever the event
+          occurs.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="MrNetworkSuccessTrap" access="readOnly"
+          id="mocaTrapMrNetworkSuccess/1.3.6.1.4.1.31621.1.2.0.7">
+        <description>
+          An MR Entry Node reports that the network got reformed successfully
+          following the MR transaction (MRNETWORK_SUCCESS Event).
+
+          This parameter is a counter that is incremented whenever the event
+          occurs.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="MrNetworkFailTrap" access="readOnly"
+          id="mocaTrapMrNetworkFail/1.3.6.1.4.1.31621.1.2.0.8">
+        <description>
+          An MR Entry Node reports that the MR transaction failed, and the
+          network did not get reformed (MRNETWORK_FAIL Event).
+
+          This parameter is a counter that is incremented whenever the event
+          occurs.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="PowerStateBcstRecTrap" access="readOnly"
+          id="mocaTrapPowerStateBcstRec/1.3.6.1.4.1.31621.1.2.0.9">
+        <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
+          the data interface (POWER_STATEBCST_REC Event).
+
+          This parameter is a counter that is incremented whenever the event
+          occurs.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="PowerStateM0NcTrap" access="readOnly"
+          id="mocaTrapPowerStateM0Nc/1.3.6.1.4.1.31621.1.2.0.10">
+        <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.
+
+          This parameter is a counter that is incremented whenever the event
+          occurs (POWER_STATEM0_NC Event).
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="PowerStateNc1xTrap" access="readOnly"
+          id="mocaTrapPowerStateNc1x/1.3.6.1.4.1.31621.1.2.0.11">
+        <description>
+          When the MoCA Node is in Power State M1/M2/M3, indicates that MoCA 1
+          Node is the NC (POWER_STATENC_1X Event).
+
+          This parameter is a counter that is incremented whenever the event
+          occurs.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="PowerStateNetVerTrap" access="readOnly"
+          id="mocaTrapPowerStateNetVer/1.3.6.1.4.1.31621.1.2.0.12">
+        <description>
+          When the MoCA Node is in Power State M2 or M3, indicates that the
+          network MoCA version is changed (POWER_STATENET_VER Event).
+
+          This parameter is a counter that is incremented whenever the event
+          occurs.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="PowerStateRespTrap" access="readOnly"
+          id="mocaTrapPowerStateResp/1.3.6.1.4.1.31621.1.2.0.13">
+        <description>
+          Carries the response of the MoCA Node to a request (through
+          POWER_STATEREQ) to transition into a desired Power State
+          (POWER_STATERESP Event).
+
+          This parameter is a counter that is incremented whenever the event
+          occurs.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="PowerStateUcstPenTrap" access="readOnly"
+          id="mocaTrapPowerStateUcstPen/1.3.6.1.4.1.31621.1.2.0.14">
+        <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
+          Event).
+
+          This parameter is a counter that is incremented whenever the event
+          occurs.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="PowerStateTrnsReqTrap" access="readOnly"
+          id="mocaTrapPowerStateTrnsReq/1.3.6.1.4.1.31621.1.2.0.15">
+        <description>
+          When a MoCA Node is in Power State M1 or M2, requests to transition
+          to Power State M0 (POWER_STATETRNS_REQ Event).
+
+          This parameter is a counter that is incremented whenever the event
+          occurs.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="PowerStateWupUrTrap" access="readOnly"
+          id="mocaTrapPowerStateWupUr/1.3.6.1.4.1.31621.1.2.0.16">
+        <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).
+
+          This parameter is a counter that is incremented whenever the event
+          occurs.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="LmoStatusTrap" access="readOnly"
+          id="mocaTrapLmoStatus/1.3.6.1.4.1.31621.1.2.0.17">
+        <description>
+          When {{param|LmoTrapEnable}} is enabled, reports that the MoCA Node
+          is starting LMO (Link Maintenance Operation).
+
+          This parameter is a counter that is incremented whenever the event
+          occurs.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="LinkFailureTrap" access="readOnly"
+          id="mocaTrapLinkFailure/1.3.6.1.4.1.31621.1.2.0.18">
+        <description>
+          Indicates a link failure. If the failure was an Admission or LMO
+          failure, {{param|LinkState}} indicates when the link was dropped
+          within the sequence.
+
+          This parameter is a counter that is incremented whenever the event
+          occurs.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ConnectedNodesChangeTrap" access="readOnly"
+          id="moca25TrapConnectedNodesChange/1.3.6.1.4.1.31621.1.3.0.1">
+        <description>
+          This trap is sent when {{param|ConnectedNodesChangeTrapEn}} is
+          {{true}} and {{param|ConnectedNodesInfo}} changes value.
+
+          This parameter is a counter that is incremented whenever the event
+          occurs.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="MgntEntityNetwIePayloadRecTrap" access="readOnly"
+          id="moca25TrapMgntEntityNetwIePayloadRec/1.3.6.1.4.1.31621.1.3.0.2">
+        <description>
+          This trap is sent when {{param|MgntEntityNetwIePayloadRecTrapEn}} is
+          {{true}} and {{param|MgntEntityNetIePayloadRx}} changes value.
+
+          This parameter is a counter that is incremented whenever the event
+          occurs.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="MpsInitScanRecTrap" access="readOnly"
+          id="moca25TrapMpsInitScanRec/1.3.6.1.4.1.31621.1.3.0.3">
+        <description>
+          This trap is sent when {{param|MpsTrapEn}} is {{true}} and
+          {{param|MpsInitScanPayload}} changes value.
+
+          This parameter is a counter that is incremented whenever the event
+          occurs.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="MpsPairFailTrap" access="readOnly"
+          id="moca25TrapMpsPairFail/1.3.6.1.4.1.31621.1.3.0.4">
+        <description>
+          This trap is sent when {{param|MpsTrapEn}} is {{true}}, indicates a
+          MPS pairing failure.
+
+          This parameter is a counter that is incremented whenever the event
+          occurs.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="MpsPrivacyChangedTrap" access="readOnly"
+          id="moca25TrapMpsPrivacyChanged/1.3.6.1.4.1.31621.1.3.0.5">
+        <description>
+          This trap is sent when {{param|MpsTrapEn}} is {{true}}, indicates
+          that the Node's privacy settings (PRIVACYEN and/or PSWD) have been
+          changed by MPS.
+
+          This parameter is a counter that is incremented whenever the event
+          occurs.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="NcPrivacySupportedRecTrap" access="readOnly"
+          id="moca25TrapNcPrivacySupportedRec/1.3.6.1.4.1.31621.1.3.0.6">
+        <description>
+          This trap is sent when {{param|NcPrivSupportedRecTrapEn}} is {{true}}
+          and {{param|PrivacyNc}} changes value.
+
+          This parameter is a counter that is incremented whenever the event
+          occurs.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="NetworkNameRecTrap" access="readOnly"
+          id="moca25TrapNetworkNameRec/1.3.6.1.4.1.31621.1.3.0.7">
+        <description>
+          This trap is sent when {{param|NetworkNameRecTrapEn}} is {{true}} and
+          {{param|NetworkNamePayload}} changes value.
+
+          This parameter is a counter that is incremented whenever the event
+          occurs.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="NodeDropAdmFailureTrap" access="readOnly"
+          id="moca25TrapNodeDropAdmFailure/1.3.6.1.4.1.31621.1.3.0.8">
+        <description>
+          This trap is sent when {{param|NodeDropTrapEn}} is {{true}},
+          indicates that the Node drops from the network due to admission
+          failure.
+
+          This parameter is a counter that is incremented whenever the event
+          occurs.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="NodeDropNcTrap" access="readOnly"
+          id="moca25TrapTrapNodeDropNc/1.3.6.1.4.1.31621.1.3.0.9">
+        <description>
+          This trap is sent when {{param|NodeDropTrapEn}} is {{true}},
+          indicates that the Node is dropped by the NC as indicated in the
+          NODE_BITMASK and LOW_POWER_NODE_BITMASK.
+
+          This parameter is a counter that is incremented whenever the event
+          occurs.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="NodeDropMpsTriggeredTrap" access="readOnly"
+          id="moca25TrapNodeDropMpsTriggered/1.3.6.1.4.1.31621.1.3.0.10">
+        <description>
+          This trap is sent when {{param|NodeDropTrapEn}} is {{true}},
+          indicates that MPS is locally triggered when the Node is un-Paired.
+
+          This parameter is a counter that is incremented whenever the event
+          occurs.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="NodeDropNcChgTrap" access="readOnly"
+          id="moca25TrapNodeDropNcChg/1.3.6.1.4.1.31621.1.3.0.11">
+        <description>
+          This trap is sent when {{param|NodeDropTrapEn}} is {{true}}},
+          indicates that there is a NC change when the Node is Non-Secured
+          Admitted Node.
+
+          This parameter is a counter that is incremented whenever the event
+          occurs.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object name="Device.MoCA.Interface.{i}.AccessControl.{i}."
+        access="readWrite" minEntries="0" maxEntries="unbounded"
+        numEntriesParameter="AccessControlNumberOfEntries"
+        enableParameter="Enable"
+        id="mocaIfAccessTable/1.3.6.1.4.1.31621.1.2.1.2" version="2.17">
+      <description>
+        MoCA interface MAC access control table. This table contains a list of
+        MAC addresses that are allowed to connect to the MoCA network. In
+        addition to being in this access control list, a MoCA Node must have
+        the proper {{param|#.FreqCurrentMask}},
+        {{param|#.PrivacyEnabledSetting}}, and {{param|#.KeyPassphrase}} before
+        the MoCA Node can form or join a MoCA network.
+      </description>
+      <uniqueKey functional="true">
+        <parameter ref="MACAddress"/>
+      </uniqueKey>
+
+      <parameter name="Enable" access="readWrite">
+        <description>
+          Enables or disables this MAC address to be allowed to connect to the
+          MoCA network.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="object" value="true"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="MACAddress" access="readWrite"
+          id="mocaIfAccessMacAddress/1.3.6.1.4.1.31621.1.2.1.2.1.2">
+        <description>
+          If {{param|#.AccessControlEnable}} is set to {{true}}, MoCA Node with
+          this MAC address is allowed to join the MoCA network. It is not
+          guaranteed that the MoCA Node with this MAC address can form or join
+          a network.
+        </description>
+        <syntax>
+          <dataType ref="MACAddress"/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object name="Device.MoCA.Interface.{i}.Rlapm.{i}." access="readWrite"
+        minEntries="0" maxEntries="unbounded"
+        numEntriesParameter="RlapmNumberOfEntries" enableParameter="Enable"
+        id="mocaIfRlapmTable/1.3.6.1.4.1.31621.1.2.1.3" version="2.17">
+      <description>
+        Interface RLAPM Table supporting the configuration of RLAPM (Receive
+        Level Added PHY Margin) function parameters for the selected profile.
+
+        The pairs [{{param|GlobalAggrRxPwrLevel}} (GARPLi ),
+        {{param|PhyMargin}} (RLAPMi)] are used to determine the subcarriers'
+        bitloadings according {{bibref|MoCAv2.0|section 7.15.2 and Table
+        17-1}}.
+      </description>
+      <uniqueKey functional="true">
+        <parameter ref="Profile"/>
+        <parameter ref="Frequency"/>
+        <parameter ref="GlobalAggrRxPwrLevel"/>
+      </uniqueKey>
+
+      <parameter name="Enable" access="readWrite">
+        <description>
+          Enables or disables this Rlamp entry.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="object" value="true"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Profile" access="readWrite"
+          id="mocaIfRlapmProfile/1.3.6.1.4.1.31621.1.2.1.3.1.1">
+        <description>
+          Profile index used for the RLAPM (Receive Level Added PHY Margin)
+          table.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Frequency" access="readWrite"
+          id="mocaIfRlapmFrequency/1.3.6.1.4.1.31621.1.2.1.3.1.2">
+        <description>
+          Frequency (band) index used for the RLAPM (Receive Level Added PHY
+          Margin) table.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="GlobalAggrRxPwrLevel" access="readWrite"
+          id="mocaIfRlapmGarpl/1.3.6.1.4.1.31621.1.2.1.3.1.3">
+        <description>
+          Global Aggregated Receive Power Level (GARPL).
+
+          The parameter contains the "Ni" value, where GARPLi = -Ni dBm.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range minInclusive="0" maxInclusive="65"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="PhyMargin" access="readWrite"
+          id="mocaIfRlapmPhyMargin/1.3.6.1.4.1.31621.1.2.1.3.1.4">
+        <description>
+          Receive Level Added Phy Margin (RLAPM).
+
+          The parameter contains the "Ni" value, where RLAPMi = 0.5*Ni dB.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range minInclusive="0" maxInclusive="60"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="Status" access="readOnly"
+          id="mocaIfRlapmStatus/1.3.6.1.4.1.31621.1.2.1.3.1.5">
+        <description>
+          Reflects the status of a row in this table.
+        </description>
+        <syntax>
+          <dataType ref="RowStatus"/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object name="Device.MoCA.Interface.{i}.Sapm.{i}." access="readWrite"
+        minEntries="0" maxEntries="unbounded"
+        numEntriesParameter="SapmNumberOfEntries" enableParameter="Enable"
+        id="mocaIfSapmTable/1.3.6.1.4.1.31621.1.2.1.4" version="2.17">
+      <description>
+        Interface SAPM Table supporting the configuration of SAPM (Subcarrier
+        Added PHY Margin) function parameters for the selected profile.
+
+        When the aggregate received power level (ARPL) is below the
+        pre-specified threshold {{param|AggrRxPwrLevelThreshold}}, for each
+        subcarrier, its corresponding value on the list {{param|PhyMargin}}
+        will be considered to determine the subcarriers' bitloading according
+        {{bibref|MoCAv2.0|section 7.15.2 and Table 17-1}}.
+      </description>
+      <uniqueKey functional="true">
+        <parameter ref="Profile"/>
+        <parameter ref="Frequency"/>
+      </uniqueKey>
+
+      <parameter name="Enable" access="readWrite">
+        <description>
+          Enables or disables this Sapm entry.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="object" value="true"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Profile" access="readWrite"
+          id="mocaIfSapmProfile/1.3.6.1.4.1.31621.1.2.1.4.1.1">
+        <description>
+          Profile index used for the SAPM (Subcarrier Added PHY Margin) table.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Frequency" access="readWrite"
+          id="mocaIfSapmFrequency/1.3.6.1.4.1.31621.1.2.1.4.1.2">
+        <description>
+          Frequency (band) index used for the SAPM (Subcarrier Added PHY
+          Margin) table.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="AggrRxPwrLevelThreshold" access="readWrite"
+          id="mocaIfSapmARPLTHLD/1.3.6.1.4.1.31621.1.2.1.4.1.3">
+        <description>
+          Aggregate Received Power Level Threshold (ARPL_THLD).
+
+          The parameter contains the "N" value, where ARPL_THLD = -N dBm.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range minInclusive="0" maxInclusive="65"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="PhyMargin" access="readWrite"
+          id="mocaIfSapmPhyMargin/1.3.6.1.4.1.31621.1.2.1.4.1.4">
+        <description>
+          Subcarrier Added PHY Margin (SAPM).
+
+          List of SAPM values representing the PHY margin the Node is required
+          to add to the bitloading of each of the available subcarriers when
+          the received power level is below ARPL_THLD
+          ({{param|AggrRxPwrLevelThreshold}}).
+
+          Each value contains the "Ni" value for a OFDM subcarrier "i", where
+          SAPMi = 0.5*Ni dB.
+        </description>
+        <syntax>
+          <list/>
+          <unsignedInt>
+            <range minInclusive="0" maxInclusive="120"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="Status" access="readOnly"
+          id="mocaIfSapmStatus/1.3.6.1.4.1.31621.1.2.1.4.1.5">
+        <description>
+          Reflects the status of a row in this table.
+        </description>
+        <syntax>
+          <dataType ref="RowStatus"/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object name="Device.MoCA.Interface.{i}.Aca." access="readOnly"
+        version="2.17" minEntries="1" maxEntries="1"
+        id="mocaIfAcaTable/1.3.6.1.4.1.31621.1.2.1.5"
+        dmr:previousObject="Device.MoCA.Interface.{i}.Sapm.{i}.">
+      <description>
+        This diagnostic test corresponds to the MoCA ACA (Alternate Channel
+        Assessment) operation. When this test is
+        {{enum|Requested|DiagnosticsState}} the managed MoCA Node will initiate
+        a MoCA On Demand LMO (Link Maintenance Operation).
+      </description>
+
+      <parameter name="DiagnosticsState" access="readWrite"
+          id="mocaIfAcaInitiate/1.3.6.1.4.1.31621.1.2.1.5.1.5                                                                 mocaIfAcaStatus/1.3.6.1.4.1.31621.1.2.1.5.1.6       mocaIfAcaStatusCompletedTrap/1.3.6.1.4.1.31621.1.2.1.5.1.9">
+        <description>
+          {{datatype|expand}}
+        </description>
+        <syntax>
+          <dataType ref="DiagnosticsState">
+            <enumeration value="None" access="readOnly"/>
+            <enumeration value="Requested">
+              <description>
+                ACA operation requested and in progress.
+              </description>
+            </enumeration>
+            <enumeration value="Canceled" optional="true"/>
+            <enumeration value="Complete" access="readOnly">
+              <description>ACA operation completed successfully.</description>
+            </enumeration>
+            <enumeration value="Error" access="readOnly">
+              <description>ACA operation failed (''fail'').</description>
+            </enumeration>
+            <enumeration value="Error_BadChannel" access="readOnly">
+              <description>
+                ACA operation failed because of bad channel
+                (''failBADCHANNEL'').
+              </description>
+            </enumeration>
+            <enumeration value="Error_NoEvmProbe" access="readOnly">
+              <description>
+                ACA operation failed because there was no Evm probe detected
+                (''failNOEVMPROBE'').
+              </description>
+            </enumeration>
+          </dataType>
+        </syntax>
+      </parameter>
+
+      <parameter name="NodeID" access="readWrite"
+          id="mocaIfAcaNodeID/1.3.6.1.4.1.31621.1.2.1.5.1.1">
+        <description>
+          The Node ID of the MoCA Node to transmit the EVM Probe when the
+          parameter {{param|Type}} = {{enum|evm|Type}}.
+        </description>
+        <syntax>
+          <dataType ref="MocaNodeID"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Type" access="readWrite"
+          id="mocaIfAcaType/1.3.6.1.4.1.31621.1.2.1.5.1.2">
+        <description>
+          The ACA (Alternate Channel Assessment) type is either {{enum|evm}} or
+          {{enum|quiet}}.
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="quiet"/>
+            <enumeration value="evm"/>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="Channel" access="readWrite"
+          id="mocaIfAcaChannel/1.3.6.1.4.1.31621.1.2.1.5.1.3">
+        <description>
+          The channel number under assessment, starting from 0 in increments of
+          25 MHz.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ReportNodeMask" access="readWrite"
+          id="mocaIfAcaReportNodeMask/1.3.6.1.4.1.31621.1.2.1.5.1.4">
+        <description>
+          Specifies the MoCA Nodes that are requested to be part of the channel
+          assessment: Setting bits corresponding to Node IDs of these MoCA
+          Nodes to 1.
+
+          See {{bibref|MoCAv2.0|Section 6.2.1}}
+        </description>
+        <syntax>
+          <hexBinary>
+            <size minLength="2" maxLength="2"/>
+          </hexBinary>
+        </syntax>
+      </parameter>
+
+      <parameter name="TotalRxPower" access="readOnly"
+          id="mocaIfAcaTotalRxPower/1.3.6.1.4.1.31621.1.2.1.5.1.7">
+        <description>
+          dBm (-128 to +127 dBm).
+        </description>
+        <syntax>
+          <dataType ref="MocaDBm"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="PowerProfile" access="readOnly"
+          id="mocaIfAcaPowerProfile/1.3.6.1.4.1.31621.1.2.1.5.1.8">
+        <description>
+          Binary string array with 1 byte (represented as two hexadecimal
+          digits) for each subcarrier. See {{bibref|MOCA11-MIB|Appendix A}} for
+          the encoding of this object.
+        </description>
+        <syntax>
+          <hexBinary/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object name="Device.MoCA.Interface.{i}.Reset." access="readOnly"
+        minEntries="1" maxEntries="1"
+        id="mocaIfMrTable/1.3.6.1.4.1.31621.1.2.1.6" version="2.17">
+      <description>
+        Used by the managed MoCA Node to initiate MoCA Reset Transaction.
+      </description>
+
+      <parameter name="NodeMask" access="readWrite"
+          id="mocaIfMrNodeMask/1.3.6.1.4.1.31621.1.2.1.6.1.1">
+        <description>
+          The MoCA Nodes that must respond to the MR transaction L2ME request
+          sent by the NC except for the MR Entry Node (LSB corresponds to Node
+          ID 0x0).
+
+          See {{bibref|MoCAv2.0|Section 6.2.1}}
+        </description>
+        <syntax>
+          <hexBinary>
+            <size minLength="2" maxLength="2"/>
+          </hexBinary>
+        </syntax>
+      </parameter>
+
+      <parameter name="StartTime" access="readWrite"
+          id="mocaIfMrStartTime/1.3.6.1.4.1.31621.1.2.1.6.1.2">
+        <description>
+          Time in seconds after this parameter is written that a MoCA Node must
+          initiate a MoCA Reset (MR).
+
+          See {{bibref|MoCAv2.0|Section 7.15}}.
+        </description>
+        <syntax command="true">
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="StatusTrapEnable" access="readWrite"
+          id="mocaIfMrStatusTrapEnable/1.3.6.1.4.1.31621.1.2.1.6.1.3">
+        <description>
+          Used to enable {{param|#.MrRstSuccessTrap}} and
+          {{param|#.MrRstFailTrap}} that the network reset was completed
+          successfully or failed for MR transaction status trap.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="NetworkTrapEnable" access="readWrite"
+          id="mocaIfMrNetworkTrapEnable/1.3.6.1.4.1.31621.1.2.1.6.1.4">
+        <description>
+          Used to enable {{param|#.MrNetworkSuccessTrap}} and
+          {{param|#.MrNetworkFailTrap}} that the network was reformed or not
+          reformed successfully following the MR transaction.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
     </object>
 
     <object name="Device.MoCA.Interface.{i}.Stats." access="readOnly"
@@ -26319,42 +29736,58 @@
         4.2.2}}.
       </description>
 
-      <parameter name="BytesSent" access="readOnly" activeNotify="canDeny">
+      <parameter name="BytesSent" access="readOnly" activeNotify="canDeny"
+          id="mocaIfTxBytes/1.3.6.1.4.1.31621.1.2.1.8.1.8">
         <description>
           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">
+      <parameter name="BytesReceived" access="readOnly" activeNotify="canDeny"
+          id="mocaIfRxBytes/1.3.6.1.4.1.31621.1.2.1.8.1.9">
         <description>
           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">
+      <parameter name="PacketsSent" access="readOnly" activeNotify="canDeny"
+          id="mocaIfTxPackets/1.3.6.1.4.1.31621.1.2.1.8.1.1">
         <description>
           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">
+          activeNotify="canDeny"
+          id="mocaIfRxPackets/1.3.6.1.4.1.31621.1.2.1.8.1.3">
         <description>
           The total number of packets received on the interface.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="RxCorrectedErrors" access="readOnly"
+          activeNotify="canDeny"
+          id="mocaIfRxCorrectedErrors/1.3.6.1.4.1.31621.1.2.1.8.1.4">
+        <description>
+          The number of received Ethernet packets that have errors and are
+          corrected by this MoCA interface.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
@@ -26362,9 +29795,12 @@
         <description>
           The total number of outbound packets that could not be transmitted
           because of errors.
+
+          This parameter MUST NOT be implemented for MoCA 2.0 because it
+          doesn't map to a MIB object.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="StatsCounter32"/>
         </syntax>
       </parameter>
 
@@ -26373,33 +29809,38 @@
         <description>
           The total number of inbound packets that contained errors preventing
           them from being delivered to a higher-layer protocol.
+
+          This parameter MUST NOT be implemented for MoCA 2.0 because it
+          doesn't map to a MIB object.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="StatsCounter32"/>
         </syntax>
       </parameter>
 
       <parameter name="UnicastPacketsSent" access="readOnly"
-          activeNotify="canDeny">
+          activeNotify="canDeny"
+          id="mocaIfTxUnicast/1.3.6.1.4.1.31621.1.2.1.8.1.10">
         <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/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
       <parameter name="UnicastPacketsReceived" access="readOnly"
-          activeNotify="canDeny">
+          activeNotify="canDeny"
+          id="mocaIfRxUnicast/1.3.6.1.4.1.31621.1.2.1.8.1.11">
         <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>
 
@@ -26417,7 +29858,8 @@
       </parameter>
 
       <parameter name="DiscardPacketsReceived" access="readOnly"
-          activeNotify="canDeny">
+          activeNotify="canDeny"
+          id="mocaIfRxDrops/1.3.6.1.4.1.31621.1.2.1.8.1.5">
         <description>
           The total number of inbound packets which were chosen to be discarded
           even though no errors had been detected to prevent their being
@@ -26425,55 +29867,59 @@
           to free up buffer space.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="StatsCounter32"/>
         </syntax>
       </parameter>
 
       <parameter name="MulticastPacketsSent" access="readOnly"
-          activeNotify="canDeny">
+          activeNotify="canDeny"
+          id="mocaIfTxMulticast/1.3.6.1.4.1.31621.1.2.1.8.1.12">
         <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="MulticastPacketsReceived" access="readOnly"
-          activeNotify="canDeny">
+          activeNotify="canDeny"
+          id="mocaIfRxMulticast/1.3.6.1.4.1.31621.1.2.1.8.1.13">
         <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>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
       <parameter name="BroadcastPacketsSent" access="readOnly"
-          activeNotify="canDeny">
+          activeNotify="canDeny"
+          id="mocaIfTxBroadcast/1.3.6.1.4.1.31621.1.2.1.8.1.14">
         <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">
+          activeNotify="canDeny"
+          id="mocaIfRxBroadcast/1.3.6.1.4.1.31621.1.2.1.8.1.15">
         <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>
 
@@ -26482,9 +29928,12 @@
         <description>
           The total number of packets received via the interface which were
           discarded because of an unknown or unsupported protocol.
+
+          This parameter MUST NOT be implemented for MoCA 2.0 because it
+          doesn't map to a MIB object.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="StatsCounter32"/>
         </syntax>
       </parameter>
     </object>
@@ -26496,7 +29945,8 @@
         interface {{bibref|MoCAv1.1}}.
       </description>
 
-      <parameter name="EgressNumFlows" access="readOnly">
+      <parameter name="EgressNumFlows" access="readOnly"
+          id="mocaIfEgressNodeNumFlows/1.3.6.1.4.1.31621.1.2.1.8.1.6">
         <description>
           The number of QoS flows that this interface has from the MoCA
           network.
@@ -26509,7 +29959,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="IngressNumFlows" access="readOnly">
+      <parameter name="IngressNumFlows" access="readOnly"
+          id="mocaIfIngressNodeNumFlows/1.3.6.1.4.1.31621.1.2.1.8.1.7">
         <description>
           The number of QoS flows that this interface has onto the MoCA
           network.
@@ -26544,19 +29995,25 @@
         <parameter ref="FlowID"/>
       </uniqueKey>
 
-      <parameter name="FlowID" access="readOnly">
+      <parameter name="FlowID" access="readOnly"
+          id="mocaIfFlowID/1.3.6.1.4.1.31621.1.2.1.9.1.2">
         <description>
           The flow ID used to identify a flow in the network.
 
           This parameter is based on ''mocaIfFlowID'' from
           {{bibref|MOCA11-MIB}}.
+
+          Note that the data type has changed from ''unsignedInt'' to
+          ''MACAddress''. This is because the original data type was an error
+          and could not have been implemented as specified.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="MACAddress"/>
         </syntax>
       </parameter>
 
-      <parameter name="PacketDA" access="readOnly">
+      <parameter name="PacketDA" access="readOnly"
+          id="mocaIfPacketDA/1.3.6.1.4.1.31621.1.2.1.9.1.3">
         <description>
           The Destination Address (DA) for the packets in this flow.
 
@@ -26568,7 +30025,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="MaxRate" access="readOnly">
+      <parameter name="MaxRate" access="readOnly"
+          id="mocaIfPeakDataRate/1.3.6.1.4.1.31621.1.2.1.9.1.4">
         <description>
           Maximum required rate in {{units}}.
 
@@ -26582,7 +30040,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="MaxBurstSize" access="readOnly">
+      <parameter name="MaxBurstSize" access="readOnly"
+          id="mocaIfBurstSize/1.3.6.1.4.1.31621.1.2.1.9.1.5">
         <description>
           Maximum burst size.
 
@@ -26594,7 +30053,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="LeaseTime" access="readOnly">
+      <parameter name="LeaseTime" access="readOnly"
+          id="mocaIfLeaseTime/1.3.6.1.4.1.31621.1.2.1.9.1.6">
         <description>
           Flow lease time (expressed in {{units}}).
 
@@ -26610,7 +30070,21 @@
         </syntax>
       </parameter>
 
-      <parameter name="LeaseTimeLeft" access="readOnly" activeNotify="canDeny">
+      <parameter name="Tag" access="readOnly"
+          id="mocaIfFlowTag/1.3.6.1.4.1.31621.1.2.1.9.1.7">
+        <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
+          FLOW_TAG carries application specific content of this PQoS flow. See
+          {{bibref|MoCAv2.0|Section 6.3.13.1}}.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="LeaseTimeLeft" access="readOnly" activeNotify="canDeny"
+          id="mocaIfLeaseTimeLeft/1.3.6.1.4.1.31621.1.2.1.9.1.8">
         <description>
           Flow lease time remaining (expressed in {{units}}).
 
@@ -26627,13 +30101,126 @@
         </syntax>
       </parameter>
 
-      <parameter name="FlowPackets" access="readOnly" activeNotify="canDeny">
+      <parameter name="FlowPackets" access="readOnly" activeNotify="canDeny"
+          id="mocaIfTxPacketsFlow/1.3.6.1.4.1.31621.1.2.1.9.1.9">
         <description>
           The number of packets transmitted for this flow.
 
           This parameter is based on ''mocaIfTxPacketsFlow'' from
           {{bibref|MOCA11-MIB}}.
         </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="IngressGuid" access="readOnly"
+          id="mocaIfFlowStatsIngressGuid/1.3.6.1.4.1.31621.1.2.1.9.1.10">
+        <description>
+          The MAC address of the MoCA Node specified by the INGRESS_NODE_ID
+          parameter of the flow.
+
+          See {{bibref|MoCAv2.0|Section 6.3.13.1}}.
+        </description>
+        <syntax>
+          <dataType ref="MACAddress"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="EgressGuid" access="readOnly"
+          id="mocaIfFlowStatsEgressGuid/1.3.6.1.4.1.31621.1.2.1.9.1.11">
+        <description>
+          The MAC address of the MoCA Node specified by the EGRESS_NODE_ID
+          parameter of the flow.
+
+          See {{bibref|MoCAv2.0|section 6.3.13.1}}.
+        </description>
+        <syntax>
+          <dataType ref="MACAddress"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="MaximumLatency" access="readOnly"
+          id="mocaIfFlowStatsMaximumLatency/1.3.6.1.4.1.31621.1.2.1.9.1.12">
+        <description>
+          The MAXIMUM_LATENCY parameter of the flow in units of milliseconds. A
+          value of 0 indicates no value available.
+
+          See {{bibref|MoCAv2.0|section 6.3.13.1}}.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ShortTermAvgRatio" access="readOnly"
+          id="mocaIfFlowStatsShortTermAvgRatio/1.3.6.1.4.1.31621.1.2.1.9.1.13">
+        <description>
+          The SHORT_TERM_AVERAGE_RATIO parameter of the flow.
+
+          See {{bibref|MoCAv2.0|section 6.3.13.1}}.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="FlowPer" access="readOnly"
+          id="mocaIfFlowStatsFlowPer/1.3.6.1.4.1.31621.1.2.1.9.1.15">
+        <description>
+          The FLOW_PER parameter of this flow, where a value of 0 indicates
+          NPER and 1 indicates VLPER.
+
+          See {{bibref|MoCAv2.0|section 6.3.13.1}}.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="IngressClassify" access="readOnly"
+          id="mocaIfFlowStatsIngressClassify/1.3.6.1.4.1.31621.1.2.1.9.1.16">
+        <description>
+          The INGRESS_CLASSIFICATION_RULE parameter of the flow.
+
+          See {{bibref|MoCAv2.0|section 6.3.13.1}}.
+        </description>
+        <syntax>
+          <dataType ref="MocaFlowIngrClassRule"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="VlanTag" access="readOnly"
+          id="mocaIfFlowStatsVlanTag/1.3.6.1.4.1.31621.1.2.1.9.1.17">
+        <description>
+          The VLAN_TAG parameter of the flow.
+
+          See {{bibref|MoCAv2.0|section 6.3.13.1}}.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="DscpMoca" access="readOnly"
+          id="mocaIfFlowStatsDscpMoca/1.3.6.1.4.1.31621.1.2.1.9.1.18">
+        <description>
+          The DSCP_MOCA parameter of the flow.
+
+          See {{bibref|MoCAv2.0|section 6.3.13.1}}.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Dfid" access="readOnly"
+          id="mocaIfFlowStatsDfid/1.3.6.1.4.1.31621.1.2.1.9.1.19">
+        <description>
+          The destination flow ID of the flow assigned by the Ingress Node.
+
+          See {{bibref|MoCAv2.0|section 7.8.1.2}}.
+        </description>
         <syntax>
           <unsignedInt/>
         </syntax>
@@ -26642,16 +30229,22 @@
 
     <object name="Device.MoCA.Interface.{i}.AssociatedDevice.{i}."
         access="readOnly" numEntriesParameter="AssociatedDeviceNumberOfEntries"
-        minEntries="0" maxEntries="unbounded" version="2.0">
+        minEntries="0" maxEntries="unbounded" version="2.0"
+        id="mocaNodeTable/1.3.6.1.4.1.31621.1.2.1.11 mocaLinkStatsTable/1.3.6.1.4.1.31621.1.2.1.10">
       <description>
         This table contains information about other MoCA devices currently
         associated with this MoCA interface.
+
+        Entries in this table cannot be created or deleted by the network
+        management system. All entries are created or deleted by the device
+        software.
       </description>
       <uniqueKey functional="true">
         <parameter ref="MACAddress"/>
       </uniqueKey>
 
-      <parameter name="MACAddress" access="readOnly">
+      <parameter name="MACAddress" access="readOnly"
+          id="mocaNodeMacAddress/1.3.6.1.4.1.31621.1.2.1.11.1.3">
         <description>
           The MAC address of the associated device's MoCA interface.
         </description>
@@ -26660,7 +30253,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="NodeID" access="readOnly">
+      <parameter name="NodeID" access="readOnly"
+          id="mocaNodeIndex/1.3.6.1.4.1.31621.1.2.1.11.1.1">
         <description>
           The Node ID of this remote device.
 
@@ -26668,11 +30262,12 @@
           {{bibref|MOCA11-MIB}}.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="MocaNodeID"/>
         </syntax>
       </parameter>
 
-      <parameter name="PreferredNC" access="readOnly">
+      <parameter name="PreferredNC" access="readOnly"
+          id="mocaNodePreferredNC/1.3.6.1.4.1.31621.1.2.1.11.1.8">
         <description>
           Whether this remote device is a preferred Network Coordinator (NC).
 
@@ -26681,10 +30276,12 @@
         </description>
         <syntax>
           <boolean/>
+          <default type="factory" value="false"/>
         </syntax>
       </parameter>
 
-      <parameter name="HighestVersion" access="readOnly">
+      <parameter name="HighestVersion" access="readOnly"
+          id="mocaNodeMocaVersion/1.3.6.1.4.1.31621.1.2.1.11.1.2">
         <description>
           Identifies the highest MoCA version that this remote device supports.
 
@@ -26710,6 +30307,9 @@
 
           This parameter is based on ''mocaMeshTxRate'' from
           {{bibref|MOCA11-MIB}}.
+
+          This parameter MUST NOT be implemented for MoCA 2.0 because it
+          doesn't map to a MIB object.
         </description>
         <syntax>
           <unsignedInt>
@@ -26721,6 +30321,9 @@
       <parameter name="PHYRxRate" access="readOnly">
         <description>
           The PHY receive rate (in {{units}}) from this remote device.
+
+          This parameter MUST NOT be implemented for MoCA 2.0 because it
+          doesn't map to a MIB object.
         </description>
         <syntax>
           <unsignedInt>
@@ -26729,28 +30332,37 @@
         </syntax>
       </parameter>
 
-      <parameter name="TxPowerControlReduction" access="readOnly">
+      <parameter name="TxPowerControlReduction" access="readOnly"
+          status="deprecated"
+          id="mocaNodeTxPowerReduction/1.3.6.1.4.1.31621.1.2.1.11.1.6">
         <description>
-          The reduction in transmitter level (in {{units}}) due to power
-          control.
+          The reduction in transmitter level due to power control.
 
           This parameter is based on ''mocaNodeTxPowerReduction'' from
           {{bibref|MOCA11-MIB}}.
+
+          {{deprecated|2.17|since it is replaced by
+          {{param|Device.MoCA.Interface.{i}.Mesh.{i}.PowerReduction}}. See
+          {{bibref|MOCA20-MIB}}}}
         </description>
         <syntax>
-          <unsignedInt>
-            <units value="dB"/>
-          </unsignedInt>
+          <dataType ref="MocaDB"/>
         </syntax>
       </parameter>
 
-      <parameter name="RxPowerLevel" access="readOnly" activeNotify="canDeny">
+      <parameter name="RxPowerLevel" access="readOnly" activeNotify="canDeny"
+          status="deprecated"
+          id="mocaNodeRxPower/1.3.6.1.4.1.31621.1.2.1.11.1.7">
         <description>
           The power level (in {{units}}) received at the MoCA interface from
           this remote device.
 
           This parameter is based on ''mocaNodeRxPower'' from
           {{bibref|MOCA11-MIB}}.
+
+          {{deprecated|2.17|since it is replaced by
+          {{param|Device.MoCA.Interface.{i}.Mesh.{i}.Power}}. See
+          {{bibref|MOCA20-MIB}}}}
         </description>
         <syntax>
           <unsignedInt>
@@ -26759,48 +30371,58 @@
         </syntax>
       </parameter>
 
-      <parameter name="TxBcastRate" access="readOnly">
+      <parameter name="TxBcastRate" access="readOnly"
+          id="mocaNodeTxGcdRate/1.3.6.1.4.1.31621.1.2.1.11.1.4">
         <description>
-          The broadcast PHY transmit rate (in {{units}}) from this remote
-          device.
+          The broadcast PHY transmit rate from this remote device.
 
           This parameter is based on ''mocaNodeTxGcdRate'' from
           {{bibref|MOCA11-MIB}}.
         </description>
         <syntax>
-          <unsignedInt>
-            <units value="Mbps"/>
-          </unsignedInt>
+          <dataType ref="MocaPhyRate"/>
         </syntax>
       </parameter>
 
       <parameter name="RxBcastPowerLevel" access="readOnly"
-          activeNotify="canDeny">
+          activeNotify="canDeny"
+          id="mocaNodeRxGcdPower/1.3.6.1.4.1.31621.1.2.1.11.1.5">
         <description>
-          The power level (in {{units}}) received at the MoCA interface from
-          this remote device.
+          The power level received at the MoCA interface from this remote
+          device.
 
           This parameter is based on ''mocaNodeRxGcdPower'' from
           {{bibref|MOCA11-MIB}}.
         </description>
         <syntax>
-          <unsignedInt>
-            <units value="dBm"/>
-          </unsignedInt>
+          <dataType ref="MocaDBm"/>
         </syntax>
       </parameter>
 
-      <parameter name="TxPackets" access="readOnly" activeNotify="canDeny">
+      <parameter name="TxPackets" access="readOnly" activeNotify="canDeny"
+          id="mocaLinkTxPackets/1.3.6.1.4.1.31621.1.2.1.10.1.2">
         <description>
           The number of packets transmitted to this remote device (Note:
           Includes Broadcast, Multicast and Unicast packets).
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
-      <parameter name="RxPackets" access="readOnly" activeNotify="canDeny">
+      <parameter name="TxDrops" access="readOnly"
+          id="mocaLinkTxDrops/1.3.6.1.4.1.31621.1.2.1.10.1.3">
+        <description>
+          The number of Unicast EPDUs received at the ECL, destined to the
+          associated MoCA Node, and not transmitted by this MoCA interface.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="RxPackets" access="readOnly" activeNotify="canDeny"
+          id="mocaNodeRxPackets/1.3.6.1.4.1.31621.1.2.1.11.1.11">
         <description>
           The number of packets received from this remote device (Note:
           Includes Broadcast, Multicast and Unicast packets).
@@ -26809,11 +30431,24 @@
           {{bibref|MOCA11-MIB}}.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
-      <parameter name="RxErroredAndMissedPackets" access="readOnly">
+      <parameter name="RxCorrected" access="readOnly"
+          id="mocaNodeRxCorrected/1.3.6.1.4.1.31621.1.2.1.11.1.12">
+        <description>
+          The number of Ethernet packets received by this MoCA interface that
+          have errors and are corrected from the MoCA Node identified by
+          {{param|MACAddress}}.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter64"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="RxErroredAndMissedPackets" access="readOnly"
+          id="mocaNodeRxDrops/1.3.6.1.4.1.31621.1.2.1.11.1.13">
         <description>
           The number of errored and missed packets received from this remote
           device.
@@ -26822,7 +30457,20 @@
           {{bibref|MOCA11-MIB}}.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="BondingCapable" access="readOnly"
+          id="mocaNodeBondingCapable/1.3.6.1.4.1.31621.1.2.1.11.1.9">
+        <description>
+          The MoCA Node identified by {{param|MACAddress}} supports Bonding if
+          the value is {{true}}. The MoCA Node identified by
+          {{param|MACAddress}} does not support Bonding if this value is
+          {{false}}.
+        </description>
+        <syntax>
+          <boolean/>
         </syntax>
       </parameter>
 
@@ -26832,13 +30480,17 @@
 
           This parameter is based on ''mocaNodeQAM256Capable'' from
           {{bibref|MOCA11-MIB}}.
+
+          This parameter MUST NOT be implemented for MoCA 2.0 because it
+          doesn't map to a MIB object.
         </description>
         <syntax>
           <boolean/>
         </syntax>
       </parameter>
 
-      <parameter name="PacketAggregationCapability" access="readOnly">
+      <parameter name="PacketAggregationCapability" access="readOnly"
+          id="mocaNodePduNumber/1.3.6.1.4.1.31621.1.2.1.11.1.10">
         <description>
           The packet aggregation capability supported by the remote device.
           Standard values are 0 (no support), 6 (6 {{units}}) or 10 (10
@@ -26846,27 +30498,34 @@
 
           This parameter is based on ''mocaNodePacketsAggrCapability'' from
           {{bibref|MOCA11-MIB}}.
+
+          Note that this parameter maps to different MIB objects for MoCA
+          1.0/1.1 and MoCA 2.0. [XXX2: Need to modify the syntax to
+          'unsignedInt' because MoCA 2.0 requires a minimum of 20 packets and
+          MoCA 2.5 requires a minimum of 80 packets.]
         </description>
         <syntax>
           <unsignedInt>
-            <range minInclusive="0" maxInclusive="10"/>
             <units value="packets"/>
           </unsignedInt>
         </syntax>
       </parameter>
 
-      <parameter name="RxSNR" access="readOnly">
+      <parameter name="RxSNR" access="readOnly" status="deprecated"
+          id="mocaNodeSNR/1.3.6.1.4.1.31621.1.2.1.11.1.14">
         <description>
-          The signal to noise level (in {{units}}) received at this interface
-          from this remote device.
+          The signal to noise level received at this interface from this remote
+          device.
 
           This parameter is based on ''mocaNodeSNR'' from
           {{bibref|MOCA11-MIB}}.
+
+          {{deprecated|2.17|since it is replaced by
+          {{param|Device.MoCA.Interface.{i}.Mesh.{i}.RxSNR}}. See
+          {{bibref|MOCA20-MIB}}}}
         </description>
         <syntax>
-          <unsignedInt>
-            <units value="dBm"/>
-          </unsignedInt>
+          <dataType ref="MocaDB"/>
         </syntax>
       </parameter>
 
@@ -26884,6 +30543,677 @@
           <boolean/>
         </syntax>
       </parameter>
+
+      <parameter name="SupportedIngressPqosFlows" access="readOnly"
+          id="mocaNodeSupportedIngressPqosFlows/1.3.6.1.4.1.31621.1.2.1.11.1.15">
+        <description>
+          The number of Ingress PQoS Flows supported by this MoCA interface
+          from the MoCA Node identified by {{param|MACAddress}}.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="SupportedEgressPqosFlows" access="readOnly"
+          id="mocaNodeSupportedEgressPqosFlows/1.3.6.1.4.1.31621.1.2.1.11.1.16">
+        <description>
+          The number of Egress PQoS Flows supported by this MoCA interface from
+          the MoCA Node identified by {{param|MACAddress}}.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="AggregationSize" access="readOnly"
+          id="mocaNodeAggregationSize/1.3.6.1.4.1.31621.1.2.1.11.1.17">
+        <description>
+          The maximum number of bytes that can be aggregated in a MoCA frame
+          that this MoCA Node supports.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="AeNumber" access="readOnly"
+          id="mocaNodeAeNumber/1.3.6.1.4.1.31621.1.2.1.11.1.18">
+        <description>
+          The maximum number of allocation elements, excluding the TAUs and the
+          Dummy DAUs, in one MAP that this MoCA Node supports.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="PowerState" access="readOnly"
+          id="mocaNodePowerState/1.3.6.1.4.1.31621.1.2.1.11.1.19">
+        <description>
+          Power State of the MoCA Node identified by the {{param|MACAddress}}.
+        </description>
+        <syntax>
+          <dataType ref="MocaPowerState"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="PowerStateCapability" access="readOnly"
+          id="mocaNodePowerStateCapability/1.3.6.1.4.1.31621.1.2.1.11.1.20">
+        <description>
+          Power State capability of the MoCA Node identified by the
+          {{param|MACAddress}}.
+        </description>
+        <syntax>
+          <dataType ref="MocaPowerState"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="PDelay" access="readOnly"
+          id="mocaNodePDelay/1.3.6.1.4.1.31621.1.2.1.11.1.21">
+        <description>
+          Propagation delay measured in units of 10ns between the local MoCA
+          Node and the MoCA Node identified by the {{param|MACAddress}}.
+        </description>
+        <syntax>
+          <int/>
+        </syntax>
+      </parameter>
+
+      <parameter name="EnhancedPrivacyCapable" access="readOnly"
+          id="moca25NodeEnhancedPrivacyCapable/1.3.6.1.4.1.31621.1.3.1.3.1.2">
+        <description>
+          Indicates the MoCA Node identified by {{param|MACAddress}} supports
+          MoCA 2 Enhanced Privacy if the value is {{true}}. Indicates the MoCA
+          Node identified by {{param|MACAddress}} does not support MoCA 2
+          Enhanced Privacy if this value is {{false}}.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="LinkType" access="readOnly"
+          id="moca25NodeLinkType/1.3.6.1.4.1.31621.1.3.1.3.1.3">
+        <description>
+          Indicates the type of link used for unicast data transmissions
+          between the managed MoCA Node and the MoCA Node identified by
+          {{param|MACAddress}}.
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="moca1PHY">
+              <description>MoCA 1 PHY.</description>
+            </enumeration>
+            <enumeration value="primary">
+              <description>Primary.</description>
+            </enumeration>
+            <enumeration value="bonded">
+              <description>Bonded.</description>
+            </enumeration>
+            <enumeration value="m25300MHz">
+              <description>300 MHz MoCA 2.5 PHY.</description>
+            </enumeration>
+            <enumeration value="m25400MHz">
+              <description>400 MHz MoCA 2.5 PHY.</description>
+            </enumeration>
+            <enumeration value="m25500MHz">
+              <description>500 MHz MoCA 2.5 PHY.</description>
+            </enumeration>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="Moca25PhyCapable" access="readOnly"
+          id="moca25NodeMoca25PhyCapable/1.3.6.1.4.1.31621.1.3.1.3.1.4">
+        <description>
+          Indicates the MoCA Node identified by {{param|MACAddress}} supports
+          MoCA 2.5 PHY if the value is {{true}}. Indicates the MoCA Node
+          identified by {{param|MACAddress}} does not support MoCA 2.5 PHY if
+          this value is {{false}}.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="RxPwrList" access="readOnly"
+          id="moca25NodeRxPwrList/1.3.6.1.4.1.31621.1.3.1.3.1.5">
+        <description>
+          Per channel list of Receive power levels in dBm from the MoCA Node
+          identified by {{param|MACAddress}} to the managed MoCA Node.
+
+          The power measurement should cover the preamble and/or at least a
+          symbol time. The averaging method employed for this measurement is
+          implementation specific and not specified. It is recommended but not
+          required to utilize the LMO (Link Maintenance Operation) EVM probes
+          for this measurement.
+
+          The field numValues is a function of {{param|LinkType}}:
+
+          * MoCA 1 PHY - 1
+
+          * Primary - 1
+
+          * Bonded - 2
+
+          * 300 MHz MoCA 2.5 PHY - 3
+
+          * 400 MHz MoCA 2.5 PHY - 4
+
+          * 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]; };
+        </description>
+        <syntax>
+          <string>
+            <size minLength="2" maxLength="6"/>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="RxSNRList" access="readOnly"
+          id="moca25NodeRxSNRList/1.3.6.1.4.1.31621.1.3.1.3.1.6">
+        <description>
+          Per channel list of Average Receive Signal to Noise Ratio (SNR)
+          across all available subcarriers based on the EVM probe from the MoCA
+          Node identified by {{param|MACAddress}} to the managed MoCA Node.
+
+          The field numValues is a function of {{param|LinkType}}:
+
+          * MoCA 1 PHY - 1
+
+          * Primary - 1
+
+          * Bonded - 2
+
+          * 300 MHz MoCA 2.5 PHY - 3
+
+          * 400 MHz MoCA 2.5 PHY - 4
+
+          * 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]; };
+        </description>
+        <syntax>
+          <string>
+            <size minLength="2" maxLength="6"/>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="TxPwrList" access="readOnly"
+          id="moca25NodeTxPwrList/1.3.6.1.4.1.31621.1.3.1.3.1.7">
+        <description>
+          Per channel list of Transmit power levels in dBm from the managed
+          MoCA Node to the MoCA Node identified by {{param|MACAddress}}. The
+          transmit power should be max power for the channel less the Transmit
+          Power Control.
+
+          The field numValues is a function of {{param|LinkType}}:
+
+          * MoCA 1 PHY - 1
+
+          * Primary - 1
+
+          * Bonded - 2
+
+          * 300 MHz MoCA 2.5 PHY - 3
+
+          * 400 MHz MoCA 2.5 PHY - 4
+
+          * 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]; };
+        </description>
+        <syntax>
+          <string>
+            <size minLength="2" maxLength="6"/>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="TxPwrReductionList" access="readOnly"
+          id="moca25NodeTxPwrReductionList/1.3.6.1.4.1.31621.1.3.1.3.1.8">
+        <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
+          identified by {{param|MACAddress}}.
+
+          {{param}} is identical to the TPC back-off utilized for transmission
+          from the TPC backoff parameter TX_POWER_ADJUSTMENT_100MHZ.
+
+          The field numValues is a function of {{param|LinkType}}:
+
+          * MoCA 1 PHY - 1
+
+          * Primary - 1
+
+          * Bonded - 2
+
+          * 300 MHz MoCA 2.5 PHY - 3
+
+          * 400 MHz MoCA 2.5 PHY - 4
+
+          * 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]; };
+        </description>
+        <syntax>
+          <string>
+            <size minLength="2" maxLength="6"/>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="EgressNodeNumFlows" access="readOnly"
+          id="mocaLinkEgressNodeNumFlows/1.3.6.1.4.1.31621.1.2.1.10.1.4">
+        <description>
+          The number of PQoS flows in which this MoCA interface is an Egress
+          Node for these PQoS flows.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="IngressNodeNumFlows" access="readOnly"
+          id="mocaLinkIngressNodeNumFlows/1.3.6.1.4.1.31621.1.2.1.10.1.5">
+        <description>
+          The number of PQoS flows in which this MoCA interface is an Ingress
+          Node for these PQoS flows.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object name="Device.MoCA.Interface.{i}.Mesh.{i}." access="readOnly"
+        minEntries="0" maxEntries="unbounded"
+        numEntriesParameter="MeshNumberOfEntries"
+        id="mocaMeshTable/1.3.6.1.4.1.31621.1.2.1.12" version="2.17">
+      <description>
+        MoCA mesh PHY rate table. This table contains the unicast transmit PHY
+        rate between all pairs of MoCA Nodes in the MoCA network.
+
+        Since {{param|TxRate}} is the transmit PHY rate from
+        {{param|TxNodeIndex}} to {{param|RxNodeIndex}}, this table does not
+        contain any entries with {{param|TxNodeIndex}} equals
+        {{param|RxNodeIndex}}. In addition, a MoCA network can have less than
+        16 Nodes, hence some values of {{param|TxNodeIndex}} and
+        {{param|RxNodeIndex}} in the range of 0 to 15 may not exist.
+
+        Entries in this table cannot be created or deleted by the network
+        management system. All entries are created or deleted by the device
+        software.
+      </description>
+      <uniqueKey functional="true">
+        <parameter ref="TxNodeIndex"/>
+        <parameter ref="RxNodeIndex"/>
+      </uniqueKey>
+
+      <parameter name="TxNodeIndex" access="readOnly"
+          id="mocaMeshTableTxNodeIndex/1.3.6.1.4.1.31621.1.2.1.12.1.1">
+        <description>
+          The Node ID of the transmit MoCA Node is used as one of the index to
+          order the mesh PHY rate table.
+        </description>
+        <syntax>
+          <dataType ref="MocaNodeID"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="RxNodeIndex" access="readOnly"
+          id="mocaMeshTableRxNodeIndex/1.3.6.1.4.1.31621.1.2.1.12.1.2">
+        <description>
+          The Node ID of the receive MoCA Node is used as one of the index to
+          order the mesh PHY rate table.
+        </description>
+        <syntax>
+          <dataType ref="MocaNodeID"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="TxRate" access="readOnly"
+          id="mocaMeshTxRate/1.3.6.1.4.1.31621.1.2.1.12.1.3">
+        <description>
+          The transmit MoCA 1 PHY rate in Mbps from the MoCA Node identified by
+          {{param|TxNodeIndex}} to the MoCA Node identified by
+          {{param|RxNodeIndex}}.
+        </description>
+        <syntax>
+          <dataType ref="MocaPhyRate"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="TxRateNper" access="readOnly"
+          id="mocaMeshTxRateNper/1.3.6.1.4.1.31621.1.2.1.12.1.4">
+        <description>
+          The transmit normal packet error PHY Rate from the MoCA Node
+          identified by {{param|TxNodeIndex}} to the MoCA Node identified by
+          {{param|RxNodeIndex}}.
+        </description>
+        <syntax>
+          <dataType ref="MocaPhyRate"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="TxRateVlper" access="readOnly"
+          id="mocaMeshTxRateVlper/1.3.6.1.4.1.31621.1.2.1.12.1.5">
+        <description>
+          The transmit very low packet error PHY Rate from the MoCA Node
+          identified by {{param|TxNodeIndex}} to the MoCA Node identified by
+          {{param|RxNodeIndex}}.
+        </description>
+        <syntax>
+          <dataType ref="MocaPhyRate"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="LinkType" access="readOnly"
+          id="mocaMeshLinkType/1.3.6.1.4.1.31621.1.2.1.12.1.6">
+        <description>
+          The type of link which exists from the MoCA Node identified by
+          {{param|TxNodeIndex}} to the MoCA Node identified by
+          {{param|RxNodeIndex}}. {{enum}}
+
+          This parameter is only used for MoCA 2.0.
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="moca1PHY" code="0"/>
+            <enumeration value="primary" code="1"/>
+            <enumeration value="bonded" code="2"/>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="Power" access="readOnly"
+          id="mocaMeshPower/1.3.6.1.4.1.31621.1.2.1.12.1.7">
+        <description>
+          Per channel list of Transmit or Receive power levels in dBm. If the
+          MoCA Node identified by {{param|TxNodeIndex}} is equal to
+          {{param|#.NodeID}}, then indicates the unicast transmit power in dBm
+          from the MoCA Node identified by {{param|TxNodeIndex}} to the MoCA
+          Node identified by {{param|RxNodeIndex}}, else indicates the unicast
+          receive power in dBm from the MoCA Node identified by
+          {{param|TxNodeIndex}} at the MoCA Node identified by
+          {{param|RxNodeIndex}}.
+
+          For transmit power, the power should be max power for the channel
+          less the Transmit Power Control. For received power, the power
+          measurement should cover the preamble and/or at least a symbol time.
+          The averaging method employed for this measurement is implementation
+          specific and not specified. It is recommended but not required to
+          utilize the LMO (Link Maintenance Operation) EVM probes for this
+          measurement.
+
+          The field ''numValues'' is a function of {{param|LinkType}}:
+
+          * {{enum|moca1PHY|LinkType}} - 1
+
+          * {{enum|primary|LinkType}} - 1
+
+          * {{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]; };
+
+          This parameter is only used for MoCA 2.0.
+        </description>
+        <syntax>
+          <hexBinary>
+            <size minLength="2" maxLength="3"/>
+          </hexBinary>
+        </syntax>
+      </parameter>
+
+      <parameter name="PowerReduction" access="readOnly"
+          id="mocaMeshPowerReduction/1.3.6.1.4.1.31621.1.2.1.12.1.8">
+        <description>
+          Per channel list of The Transmit Power Control (TPC) back-off in dB.
+          If the MoCA Node identified by {{param|TxNodeIndex}} is equal to
+          {{param|#.NodeID}}, then indicates the TPC in dB utilized to back-off
+          transmission to the MoCA Node identified by {{param|RxNodeIndex}}.
+          Otherwise indicates the TPC in dB that the MoCA Node identified by
+          {{param|TxNodeIndex}} utilized to back-off its transmission.
+
+          {{param}} is identical to the TPC back-off utilized for transmission
+          and determined from the TPC backoff parameters TPC_BACKOFF_MAJOR and
+          TPC_BACKOFF_MINOR as follows: {{param}} = TPC_BACKOFF_MAJOR * 3
+          +TPC_BACKOFF_MINOR.
+
+          The field ''numValues'' is a function of {{param|LinkType}}:
+
+          * {{enum|moca1PHY|LinkType}} - 1
+
+          * {{enum|primary|LinkType}} - 1
+
+          * {{enum|bonded|LinkType}} - 2
+
+           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>
+        <syntax>
+          <hexBinary>
+            <size minLength="2" maxLength="3"/>
+          </hexBinary>
+        </syntax>
+      </parameter>
+
+      <parameter name="RxSNR" access="readOnly"
+          id="mocaMeshRxSNR/1.3.6.1.4.1.31621.1.2.1.12.1.9">
+        <description>
+          Per channel list of average received Signal to Noise Ratio (SNR) in
+          dB. If the MoCA Node identified by {{param|RxNodeIndex}} is not equal
+          to {{param|#.NodeID}} or the MoCA Node identified by
+          {{param|TxNodeIndex}} is equal to {{param|#.NodeID}}, then this
+          parameter is not present. Otherwise indicates the average received
+          SNR across all the available carriers based on the EVM probe from the
+          MoCA Node identified by {{param|TxNodeIndex}}.
+
+          The field ''numValues'' is a function of {{param|LinkType}}:
+
+          * {{enum|moca1PHY|LinkType}} - 1
+
+          * {{enum|primary|LinkType}} - 1
+
+          * {{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]; };
+
+          This parameter is only used for MoCA 2.0.
+        </description>
+        <syntax>
+          <hexBinary>
+            <size minLength="2" maxLength="3"/>
+          </hexBinary>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object name="Device.MoCA.Interface.{i}.Bridge.{i}." access="readOnly"
+        minEntries="0" maxEntries="unbounded"
+        numEntriesParameter="BridgeNumberOfEntries"
+        id="mocaBridgeTable/1.3.6.1.4.1.31621.1.2.1.13" version="2.17">
+      <description>
+        MoCA bridge Ethernet MAC address table. This table contains an entry
+        for every MoCA Node in the MoCA network.
+
+        Entries in this table cannot be created or deleted by the network
+        management system. All entries are created or deleted by the device
+        software.
+      </description>
+      <uniqueKey functional="true">
+        <parameter ref="NodeIndex"/>
+      </uniqueKey>
+
+      <parameter name="NodeIndex" access="readOnly"
+          id="mocaBridgeNodeIndex/1.3.6.1.4.1.31621.1.2.1.13.1.1">
+        <description>
+          The Node ID is used as an index to order the MAC entries in the MoCA
+          bridge table.
+        </description>
+        <syntax>
+          <dataType ref="MocaNodeID"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="MACAddresses" access="readOnly"
+          id="mocaBridgeMacAddress/1.3.6.1.4.1.31621.1.2.1.13.1.3">
+        <description>
+          The Ethernet MAC addresses identified by the Node ID.
+        </description>
+        <syntax>
+          <list/>
+          <dataType ref="MACAddress"/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object name="Device.MoCA.Interface.{i}.MeshScMod.{i}." access="readOnly"
+        minEntries="0" maxEntries="unbounded"
+        numEntriesParameter="MeshScModNumberOfEntries"
+        id="mocaMeshScModTable/1.3.6.1.4.1.31621.1.2.1.14" version="2.17">
+      <description>
+        MoCA mesh Subcarrier Modulation table. This table contains the Unicast
+        transmit subcarrier modulation between all pairs of MoCA Nodes in the
+        MoCA network.
+
+        Since {{param|Mod}} is the subcarrier modulation from
+        {{param|TxNodeIndex}} to {{param|RxNodeIndex}}, this table does not
+        contain any entries with {{param|TxNodeIndex}} equals
+        {{param|RxNodeIndex}}. In addition, a MoCA network can have less than
+        16 MoCA Nodes, hence some values of {{param|TxNodeIndex}} and
+        {{param|RxNodeIndex}} in the range of 0 to 15 may not exist. The
+        {{param|ChannelIndex}} index is used to differentiate between the
+        primary and secondary channels in a bonded channel network. The primary
+        channel index is always present, the secondary channel index may not
+        always be present.
+
+        Entries in this table cannot be created or deleted by the network
+        management system. All entries are created or deleted by the device
+        software.
+      </description>
+      <uniqueKey functional="true">
+        <parameter ref="TxNodeIndex"/>
+        <parameter ref="RxNodeIndex"/>
+        <parameter ref="ChannelIndex"/>
+      </uniqueKey>
+
+      <parameter name="TxNodeIndex" access="readOnly"
+          id="mocaMeshTxNodeIndex/1.3.6.1.4.1.31621.1.2.1.14.1.1">
+        <description>
+          The Node ID of the transmit MoCA Node is used as one of the index to
+          order the mesh PHY rate table.
+        </description>
+        <syntax>
+          <dataType ref="MocaNodeID"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="RxNodeIndex" access="readOnly"
+          id="mocaMeshRxNodeIndex/1.3.6.1.4.1.31621.1.2.1.14.1.2">
+        <description>
+          The Node ID of the receive MoCA Node is used as one of the index to
+          order the mesh subcarrier modulation.
+        </description>
+        <syntax>
+          <dataType ref="MocaNodeID"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ChannelIndex" access="readOnly"
+          id="mocaMeshChannelIndex/1.3.6.1.4.1.31621.1.2.1.14.1.3">
+        <description>
+          {{enum|primary}} or {{enum|secondary}} channel for MoCA 2.0 Node
+          associated with {{param|Nper}} and {{param|Vlper}}. For MoCA 1 Node,
+          the same as the {{enum|primary}} channel associated with
+          {{param|Mod}}. In a bonded MoCA 2.0 network, the {{enum|primary}} and
+          {{enum|secondary}} channels each have their own subcarrier modulation
+          data.
+
+          {{enum|m25first}}, {{enum|m25second}}, {{enum|m25third}},
+          {{enum|m25fourth}} or {{enum|m25fifth}} channel for MoCA 2.5 Node
+          associated with {{param|ModM25}}.
+        </description>
+        <syntax>
+          <dataType ref="MocaChannelIndex"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Mod" access="readOnly"
+          id="mocaMeshScMod/1.3.6.1.4.1.31621.1.2.1.14.1.4">
+        <description>
+          1 Byte Hex array values with no delimiters where each byte indicates
+          the subcarrier modulation of one subcarrier from the MoCA Node
+          identified by {{param|TxNodeIndex}} to the MoCA Node identified by
+          {{param|RxNodeIndex}} for the MoCA 1 Unicast transmission PHY
+          profile.
+        </description>
+        <syntax>
+          <dataType ref="MocaScMod"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Nper" access="readOnly"
+          id="mocaMeshScModNper/1.3.6.1.4.1.31621.1.2.1.14.1.5">
+        <description>
+          1 Byte Hex array values with no delimiters where each byte indicates
+          the unicast NPER subcarrier modulation of one subcarrier from the
+          MoCA Node identified by {{param|TxNodeIndex}} to the MoCA Node
+          identified by {{param|RxNodeIndex}} for the associated
+          {{param|ChannelIndex}}.
+        </description>
+        <syntax>
+          <dataType ref="MocaScMod"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Vlper" access="readOnly"
+          id="mocaMeshScModVlper/1.3.6.1.4.1.31621.1.2.1.14.1.6">
+        <description>
+          1 Byte Hex array values with no delimiters where each byte indicates
+          the unicast VLPER subcarrier modulation of one subcarrier from the
+          MoCA Node identified by {{param|TxNodeIndex}} to the MoCA Node
+          identified by {{param|RxNodeIndex}} for the associated
+          {{param|ChannelIndex}}.
+        </description>
+        <syntax>
+          <dataType ref="MocaScMod"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ModM25" access="readOnly"
+          id="mocaMeshScModM25/1.3.6.1.4.1.31621.1.3.1.4.1.4">
+        <description>
+          1 Byte Hex array values with no delimiters where each byte indicates
+          the MoCA 2.5 unicast subcarrier modulation for all subcarriers from
+          the MoCA Node identified by {{param|TxNodeIndex}} to the MoCA Node
+          identified by {{param|RxNodeIndex}} for the associated
+          {{param|ChannelIndex}}.
+
+          For MoCA 2.5 First Channel, Second Channel, Third Channel, Fourth
+          Channel and Fifth Channel, the total number of subcarriers is 512.
+        </description>
+        <syntax>
+          <dataType ref="MocaScMod"/>
+        </syntax>
+      </parameter>
     </object>
 
     <object name="Device.Ghn." access="readOnly" minEntries="1" maxEntries="1"
@@ -26972,7 +31302,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -28801,7 +33131,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -29419,7 +33749,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -30016,7 +34346,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -30082,7 +34412,7 @@
         <parameter ref="MACAddress"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -30319,7 +34649,7 @@
     </object>
 
     <object name="Device.WiFi.MultiAP." access="readOnly" minEntries="1"
-        maxEntries="1" status="deprecated" version="2.13">
+        maxEntries="1" status="obsoleted" version="2.13">
       <description>
         This object describes a Wi-Fi network containing 1 or more Access Point
         devices.
@@ -30336,15 +34666,19 @@
 
         {{deprecated|2.15|because it has moved to
         {{object|##.WiFi.DataElements.Network}} MultiAP objects}}
+
+        {{obsoleted|2.17}}
       </description>
 
       <parameter name="APDeviceNumberOfEntries" access="readOnly"
-          status="deprecated">
+          status="obsoleted">
         <description>
           {{numentries}}
 
-          {{deprecated|2.15| because the {{object|APDevice.{i}}}}} is being
-          deprecated.
+          {{deprecated|2.15| because the {{object|APDevice.{i}}} is being
+          deprecated}}
+
+          {{obsoleted|2.17}}
         </description>
         <syntax>
           <unsignedInt/>
@@ -30353,7 +34687,7 @@
     </object>
 
     <object name="Device.WiFi.MultiAP.SteeringSummaryStats." access="readOnly"
-        minEntries="1" maxEntries="1" status="deprecated" version="2.13">
+        minEntries="1" maxEntries="1" status="obsoleted" version="2.13">
       <description>
         The summary of statistics related to Multi-AP Steering for the Wi-Fi
         network.
@@ -30362,6 +34696,8 @@
 
         {{deprecated|2.15|because it has moved to
         {{object|##.DataElements.Network.MultiAPSteeringSummaryStats}}}}
+
+        {{obsoleted|2.17}}
       </description>
 
       <parameter name="NoCandidateAPFailures" access="readOnly">
@@ -30444,7 +34780,7 @@
 
     <object name="Device.WiFi.MultiAP.APDevice.{i}." access="readOnly"
         numEntriesParameter="APDeviceNumberOfEntries" minEntries="0"
-        maxEntries="unbounded" status="deprecated" version="2.13">
+        maxEntries="unbounded" status="obsoleted" version="2.13">
       <description>
         Each instance of this object represents an individual Access Point
         device in the Wi-Fi network.
@@ -30455,32 +34791,38 @@
         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.
+        {{param|##.DataElements.Network.Device.{i}.ID}}. All the rest are
+        deprecated as noted}}
+
+        {{obsoleted|2.17}}
       </description>
       <uniqueKey functional="true">
         <parameter ref="MACAddress"/>
       </uniqueKey>
 
-      <parameter name="MACAddress" access="readOnly" status="deprecated">
+      <parameter name="MACAddress" access="readOnly" status="obsoleted">
         <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>
         <syntax>
           <dataType ref="MACAddress"/>
         </syntax>
       </parameter>
 
-      <parameter name="Manufacturer" access="readOnly" status="deprecated">
+      <parameter name="Manufacturer" access="readOnly" status="obsoleted">
         <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>
         <syntax>
           <string/>
@@ -30506,7 +34848,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ProductClass" access="readOnly" status="deprecated">
+      <parameter name="ProductClass" access="readOnly" status="obsoleted">
         <description>
           Identifier of the class of product for which the serial number
           applies. That is, for a given manufacturer, this parameter is used to
@@ -30518,6 +34860,8 @@
 
           {{deprecated|2.15|because this information will be part of Data
           Elements R2}}
+
+          {{obsoleted|2.17}}
         </description>
         <syntax>
           <string>
@@ -30526,7 +34870,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SerialNumber" access="readOnly" status="deprecated">
+      <parameter name="SerialNumber" access="readOnly" status="obsoleted">
         <description>
           Identifier of the particular Access Point device that is unique for
           the indicated class of product and manufacturer.
@@ -30536,6 +34880,8 @@
 
           {{deprecated|2.15|because this information will be part of Data
           Elements R2}}
+
+          {{obsoleted|2.17}}
         </description>
         <syntax>
           <string>
@@ -30544,7 +34890,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SoftwareVersion" access="readOnly" status="deprecated">
+      <parameter name="SoftwareVersion" access="readOnly" status="obsoleted">
         <description>
           A string identifying the software version currently installed in the
           Access Point device (i.e. version of the overall firmware).
@@ -30556,6 +34902,8 @@
 
           {{deprecated|2.15|because this information will be part of Data
           Elements R2}}
+
+          {{obsoleted|2.17}}
         </description>
         <syntax>
           <string>
@@ -30693,12 +35041,14 @@
         </syntax>
       </parameter>
 
-      <parameter name="DFSEnable" access="readWrite" status="deprecated">
+      <parameter name="DFSEnable" access="readWrite" status="obsoleted">
         <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>
         <syntax>
           <boolean/>
@@ -30706,12 +35056,14 @@
       </parameter>
 
       <parameter name="RadioNumberOfEntries" access="readOnly"
-          status="deprecated">
+          status="obsoleted">
         <description>
           {{numentries}}
 
-          {{deprecated|2.15| because the {{object|Radio.{i}}}}} is being
-          deprecated
+          {{deprecated|2.15| because the {{object|Radio.{i}}} is being
+          deprecated}}
+
+          {{obsoleted|2.17}}
         </description>
         <syntax>
           <unsignedInt/>
@@ -30721,8 +35073,7 @@
 
     <object name="Device.WiFi.MultiAP.APDevice.{i}.Radio.{i}."
         access="readOnly" numEntriesParameter="RadioNumberOfEntries"
-        minEntries="0" maxEntries="unbounded" status="deprecated"
-        version="2.13">
+        minEntries="0" maxEntries="unbounded" status="obsoleted" version="2.13">
       <description>
         This object represents all of the individual Radios contained within
         the identified Access Point device known to the controller.
@@ -30734,20 +35085,24 @@
         {{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.
+        {{param|###.DataElements.Network.Device.{i}.Radio.{i}.CurrentOperatingClassProfile.{i}.TxPower}}.
+        The remaining parameters deprecated as noted}}
+
+        {{obsoleted|2.17}}
       </description>
       <uniqueKey functional="true">
         <parameter ref="MACAddress"/>
       </uniqueKey>
 
-      <parameter name="MACAddress" access="readOnly" status="deprecated">
+      <parameter name="MACAddress" access="readOnly" status="obsoleted">
         <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>
         <syntax>
           <dataType ref="MACAddress"/>
@@ -30755,13 +35110,15 @@
       </parameter>
 
       <parameter name="OperatingFrequencyBand" access="readOnly"
-          status="deprecated">
+          status="obsoleted">
         <description>
           Indicates the frequency band at which the radio is operating.
           {{enum}}
 
           {{deprecated|2.15|because it is replaced with
           {{param|###.DataElements.Network.Device.{i}.Radio.{i}.CurrentOperatingClassProfile.{i}.Class}}}}
+
+          {{obsoleted|2.17}}
         </description>
         <syntax>
           <string>
@@ -30773,7 +35130,7 @@
       </parameter>
 
       <parameter name="OperatingStandards" access="readOnly"
-          status="deprecated">
+          status="obsoleted">
         <description>
           {{list}} List items indicate which IEEE 802.11 standard this
           {{object}} instance is configured for. {{enum}}
@@ -30797,6 +35154,8 @@
 
           {{deprecated|2.15|because this information cannot be obtained by
           EasyMesh}}
+
+          {{obsoleted|2.17}}
         </description>
         <syntax>
           <list/>
@@ -30823,7 +35182,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Channel" access="readWrite" status="deprecated">
+      <parameter name="Channel" access="readWrite" status="obsoleted">
         <description>
           The current radio channel used by the connection.
 
@@ -30845,6 +35204,8 @@
 
           {{deprecated|2.15|because it is replaced with
           {{param|###.DataElements.Network.Device.{i}.Radio.{i}.CurrentOperatingClassProfile.{i}.Channel}}}}
+
+          {{obsoleted|2.17}}
         </description>
         <syntax>
           <unsignedInt>
@@ -30853,7 +35214,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ExtensionChannel" access="readOnly" status="deprecated">
+      <parameter name="ExtensionChannel" access="readOnly" status="obsoleted">
         <description>
           The secondary extension channel position, applicable when operating
           in wide channel mode (i.e. when
@@ -30867,6 +35228,8 @@
 
           {{deprecated|2.15|because this information is not available via
           EasyMesh}}
+
+          {{obsoleted|2.17}}
         </description>
         <syntax>
           <string>
@@ -30877,7 +35240,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="PossibleChannels" access="readOnly" status="deprecated">
+      <parameter name="PossibleChannels" access="readOnly" status="obsoleted">
         <description>
           {{list}} List items represent possible radio channels for the
           wireless standard (a, b, g, n, ac, ax) and the regulatory domain.
@@ -30887,6 +35250,8 @@
           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>
         <syntax>
           <list>
@@ -30897,11 +35262,13 @@
       </parameter>
 
       <parameter name="CurrentOperatingChannelBandwidth" access="readOnly"
-          status="deprecated">
+          status="obsoleted">
         <description>
           The channel bandwidth currently in use. {{enum}}
 
           {{deprecated|2.15|because it is not available via EasyMesh}}
+
+          {{obsoleted|2.17}}
         </description>
         <syntax>
           <string>
@@ -30913,7 +35280,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="MCS" access="readOnly" status="deprecated">
+      <parameter name="MCS" access="readOnly" status="obsoleted">
         <description>
           The Modulation Coding Scheme index (applicable to 802.11n and
           802.11ac specifications only). Values from 0 to 15 MUST be supported
@@ -30922,6 +35289,8 @@
 
           {{deprecated|2.15|because this information is not available in
           EasyMesh}}
+
+          {{obsoleted|2.17}}
         </description>
         <syntax>
           <int>
@@ -30931,13 +35300,15 @@
         </syntax>
       </parameter>
 
-      <parameter name="TransmitPower" access="readOnly" status="deprecated">
+      <parameter name="TransmitPower" access="readOnly" status="obsoleted">
         <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>
         <syntax>
           <int>
@@ -30948,7 +35319,7 @@
       </parameter>
 
       <parameter name="TransmitPowerLimit" access="readWrite"
-          status="deprecated">
+          status="obsoleted">
         <description>
           Indicates the maximum Effective Isotropic Radiated Power (EIRP) per
           20 MHz bandwidth representing the nominal transmit power limit for
@@ -30956,6 +35327,8 @@
           mW. {{bibref|EasyMesh|Clause 17.2.15}}
 
           {{deprecated|2.15|because it is not available in EasyMesh}}
+
+          {{obsoleted|2.17}}
         </description>
         <syntax>
           <int>
@@ -30965,13 +35338,14 @@
         </syntax>
       </parameter>
 
-      <parameter name="APNumberOfEntries" access="readOnly"
-          status="deprecated">
+      <parameter name="APNumberOfEntries" access="readOnly" status="obsoleted">
         <description>
           {{numentries}}
 
-          {{deprecated|2.15| because the {{object|AP.{i}.}}}} is being
-          deprecated.
+          {{deprecated|2.15| because the {{object|AP.{i}.}} is being
+          deprecated}}
+
+          {{obsoleted|2.17}}
         </description>
         <syntax>
           <unsignedInt/>
@@ -30981,15 +35355,16 @@
 
     <object name="Device.WiFi.MultiAP.APDevice.{i}.Radio.{i}.AP.{i}."
         access="readOnly" numEntriesParameter="APNumberOfEntries"
-        minEntries="0" maxEntries="unbounded" status="deprecated"
-        version="2.13">
+        minEntries="0" maxEntries="unbounded" status="obsoleted" version="2.13">
       <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
+        except {{param|SSID}} and {{param|BSSID}} which are duplicated in
         {{object|####.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.}}}}
+
+        {{obsoleted|2.17}}
       </description>
       <uniqueKey functional="true">
         <parameter ref="BSSID"/>
@@ -31048,12 +35423,14 @@
       </parameter>
 
       <parameter name="AssociatedDeviceNumberOfEntries" access="readOnly"
-          status="deprecated">
+          status="obsoleted">
         <description>
           {{numentries}}
 
-          {{deprecated|2.15| because the {{object|AssociatedDevice.{i}.}}}} is
-          being deprecated.
+          {{deprecated|2.15| because the {{object|AssociatedDevice.{i}.}} is
+          being deprecated}}
+
+          {{obsoleted|2.17}}
         </description>
         <syntax>
           <unsignedInt/>
@@ -31064,8 +35441,7 @@
     <object
         name="Device.WiFi.MultiAP.APDevice.{i}.Radio.{i}.AP.{i}.AssociatedDevice.{i}."
         access="readOnly" numEntriesParameter="AssociatedDeviceNumberOfEntries"
-        minEntries="0" maxEntries="unbounded" status="deprecated"
-        version="2.13">
+        minEntries="0" maxEntries="unbounded" status="obsoleted" version="2.13">
       <description>
         Object describing a single Associated Device (STA).
 
@@ -31074,7 +35450,9 @@
         {{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.
+        except {{param|OperatingStandard}} which was deprecated as noted}}
+
+        {{obsoleted|2.17}}
       </description>
       <uniqueKey functional="true">
         <parameter ref="MACAddress"/>
@@ -31089,14 +35467,15 @@
         </syntax>
       </parameter>
 
-      <parameter name="OperatingStandard" access="readOnly"
-          status="deprecated">
+      <parameter name="OperatingStandard" access="readOnly" status="obsoleted">
         <description>
           The operating standard that this associated device is connected with.
           {{enum}}
 
           {{deprecated|2.15|because this information cannot be obtained by
           EasyMesh}}
+
+          {{obsoleted|2.17}}
         </description>
         <syntax>
           <string>
@@ -31122,7 +35501,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Active" access="readOnly" status="deprecated">
+      <parameter name="Active" access="readOnly" status="obsoleted">
         <description>
           Whether or not this associated device is currently present on the
           Wi-Fi Access Point device.
@@ -31134,6 +35513,8 @@
 
           {{deprecated|2.15|because this information cannot be obtained by
           EasyMesh}}
+
+          {{obsoleted|2.17}}
         </description>
         <syntax>
           <boolean/>
@@ -31205,13 +35586,15 @@
       </parameter>
 
       <parameter name="SteeringHistoryNumberOfEntries" access="readOnly"
-          status="deprecated">
+          status="obsoleted">
         <description>
           {{numentries}}
 
           {{deprecated|2.15| because the
-          {{object|#####.MultiAP.APDevice.{i}.Radio.{i}.AP.{i}.AssociatedDevice.{i}.SteeringHistory.{i}.}}}}
-          is being deprecated.
+          {{object|#####.MultiAP.APDevice.{i}.Radio.{i}.AP.{i}.AssociatedDevice.{i}.SteeringHistory.{i}.}}
+          is being deprecated}}
+
+          {{obsoleted|2.17}}
         </description>
         <syntax>
           <unsignedInt/>
@@ -31221,13 +35604,15 @@
 
     <object
         name="Device.WiFi.MultiAP.APDevice.{i}.Radio.{i}.AP.{i}.AssociatedDevice.{i}.Stats."
-        access="readOnly" minEntries="1" maxEntries="1" status="deprecated"
+        access="readOnly" minEntries="1" maxEntries="1" status="obsoleted"
         version="2.13">
       <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>
 
       <parameter name="BytesSent" access="readOnly">
@@ -31301,7 +35686,7 @@
 
     <object
         name="Device.WiFi.MultiAP.APDevice.{i}.Radio.{i}.AP.{i}.AssociatedDevice.{i}.SteeringSummaryStats."
-        access="readOnly" minEntries="1" maxEntries="1" status="deprecated"
+        access="readOnly" minEntries="1" maxEntries="1" status="obsoleted"
         version="2.13">
       <description>
         The summary of statistics related to Multi-AP Steering for an
@@ -31311,6 +35696,8 @@
 
         {{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>
 
       <parameter name="NoCandidateAPFailures" access="readOnly">
@@ -31409,8 +35796,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="deprecated"
-        version="2.13">
+        minEntries="0" maxEntries="unbounded" status="obsoleted" version="2.13">
       <description>
         The history of Multi-AP Steering for an individual STA on the Wi-Fi
         network.
@@ -31419,6 +35805,8 @@
 
         {{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>
       <uniqueKey functional="true">
         <parameter ref="Time"/>
@@ -31574,6 +35962,18 @@
         </syntax>
       </parameter>
 
+      <parameter name="ColocatedAgentID" access="readOnly">
+        <description>
+          AL MAC address of the EasyMesh Agent that is co-located in the same
+          device with the Wi-Fi EasyMesh Controller.
+
+          Set to null if there is no such collocated agent.
+        </description>
+        <syntax>
+          <dataType ref="MACAddress"/>
+        </syntax>
+      </parameter>
+
       <parameter name="SSIDNumberOfEntries" access="readOnly">
         <description>
           {{numentries}}
@@ -31582,6 +35982,15 @@
           <unsignedInt/>
         </syntax>
       </parameter>
+
+      <parameter name="STABlockNumberOfEntries" access="readOnly">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
     </object>
 
     <object name="Device.WiFi.DataElements.Network.SSID.{i}."
@@ -31591,6 +36000,9 @@
         This object specifies SSIDs for fronthaul use across all agents in this
         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}}}.
       </description>
       <uniqueKey functional="false">
         <parameter ref="SSID"/>
@@ -31653,6 +36065,247 @@
           </string>
         </syntax>
       </parameter>
+
+      <parameter name="Enable" access="readOnly">
+        <description>
+          Enable or disable of this {{param|SSID}}. Disable stops the use of
+          this {{param|SSID}}, but the object is retained.
+
+          : {{true}}: this {{param|SSID}} is enabled.
+
+          : {{false}}: this {{param|SSID}} is disabled.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="AKMsAllowed" access="readOnly">
+        <description>
+          {{list}} List items indicate Authentication and Key Management (AKM)
+          suites/security modes allowed on this BSS. {{enum}}
+        </description>
+        <syntax>
+          <list/>
+          <string>
+            <enumeration value="psk">
+              <description>
+                "psk" indicates one or more of the PSK and FT-PSK AKMs defined
+                in {{bibref|802.11-2020|Table 9-151}} typically at least
+                "00-0F-AC:2" for interoperability.
+              </description>
+            </enumeration>
+            <enumeration value="dpp">
+              <description>
+                "dpp" indicates one or more of the DPP and FT-DPP AKMs defined
+                in {{bibref|EasyConnect|Section 8.4}}, typically at least
+                "50-6F-9A:2" for interoperability.
+              </description>
+            </enumeration>
+            <enumeration value="sae">
+              <description>
+                "sae" indicates one or more of the SAE and FT-SAE AKMs defined
+                in {{bibref|802.11-2020|Table 9-151}} typically at least
+                "00-0F-AC:8" for interoperability.
+              </description>
+            </enumeration>
+            <enumeration value="psk+sae"/>
+            <enumeration value="dpp+sae"/>
+            <enumeration value="dpp+psk+sae"/>
+            <enumeration value="SuiteSelector">
+              <description>
+                "SuiteSelector" indicates an AKM suite selector, the value of
+                which is indicated in {{param|SuiteSelector}}.
+              </description>
+            </enumeration>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="SuiteSelector" access="readOnly">
+        <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.
+          506F9A02 {{bibref|802.11-2020|Table 9-151}}.
+
+          This parameter applies if {{param|AKMsAllowed}} includes value
+          "SuiteSelector".
+        </description>
+        <syntax>
+          <hexBinary>
+            <size minLength="4" maxLength="4"/>
+          </hexBinary>
+        </syntax>
+      </parameter>
+
+      <parameter name="AdvertisementEnabled" access="readOnly">
+        <description>
+          Indicates if the SSID is advertised in beacons, or not.
+
+          : {{true}}: this {{param|SSID}} is to be advertised in beacons.
+
+          : {{false}}: this {{param|SSID}} is not to be advertised in beacons.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="MFPConfig" access="readOnly">
+        <description>
+          Management Frame Protection (MFP) configuration. {{enum}}
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="Disabled"/>
+            <enumeration value="Optional"/>
+            <enumeration value="Required"/>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="MobilityDomain" access="readOnly">
+        <description>
+          The IEEE 802.11 mobility domain {{bibref|802.11-2020|Section
+          9.4.2.46}}.
+        </description>
+        <syntax>
+          <dataType ref="MACAddress"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="HaulType" access="readOnly">
+        <description>
+          Indicates the use of this {{param|SSID}}. {{enum}}
+        </description>
+        <syntax>
+          <list/>
+          <string>
+            <enumeration value="Fronthaul"/>
+            <enumeration value="Backhaul"/>
+          </string>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object name="Device.WiFi.DataElements.Network.STABlock.{i}."
+        access="readWrite" numEntriesParameter="STABlockNumberOfEntries"
+        minEntries="0" maxEntries="unbounded" version="2.17">
+      <description>
+        This object indicates stations (STAs) for which client association is
+        blocked.
+
+        optionally the BSSID(s) the STA is blocked from associating to. In
+        multi-AP cases, this should be implemented by Wi-Fi EasyMesh
+        {{bibref|EasyMesh}} client association control.
+
+        Stations that are already associated shall be disassociated if
+        {{object|#.STABlock.{i}.Schedule.{i}.}} indicates so.
+      </description>
+      <uniqueKey functional="false">
+        <parameter ref="BlockedSTA"/>
+      </uniqueKey>
+
+      <parameter name="BlockedSTA" access="readWrite">
+        <description>
+          MAC addresses of the STA that is blocked.
+        </description>
+        <syntax>
+          <dataType ref="MACAddress"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="BSSID" access="readWrite">
+        <description>
+          {{list}} Indicates BSS from which the {{param|BlockedSTA}} is blocked
+          from association and cannot associate to. A null list indicates that
+          all SSIDs are blocked.
+        </description>
+        <syntax>
+          <list/>
+          <dataType ref="MACAddress"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ScheduleNumberOfEntries" access="readOnly">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object name="Device.WiFi.DataElements.Network.STABlock.{i}.Schedule.{i}."
+        access="readWrite" numEntriesParameter="ScheduleNumberOfEntries"
+        minEntries="0" maxEntries="unbounded" version="2.17">
+      <description>
+        Each instance of this object provides a schedule where client
+        association is blocked for {{param|#.BlockedSTA}}
+        {{bibref|EasyMesh|Section 11.6}}.
+      </description>
+      <uniqueKey functional="false">
+        <parameter ref="Alias"/>
+      </uniqueKey>
+
+      <parameter name="Alias" access="writeOnceReadOnly">
+        <description>
+          {{datatype|expand}}
+        </description>
+        <syntax>
+          <dataType ref="Alias"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Day" access="readWrite">
+        <description>
+          {{list|the days for which the STA is blocked}} {{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 STA block 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 STA is blocked. If
+          {{param|StartTime}} is defined, the STA is blocked for the {{param}}
+          period starting from {{param|StartTime}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range minInclusive="1"/>
+            <units value="seconds"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
     </object>
 
     <object
@@ -31747,8 +36400,8 @@
         access="readOnly" numEntriesParameter="DeviceNumberOfEntries"
         minEntries="0" maxEntries="unbounded" version="2.13">
       <description>
-        Each instance of this object represents an individual Access Point
-        device in the Wi-Fi network.
+        Each instance of this object represents an individual EasyMesh Agent or
+        single-AP device in the Wi-Fi network.
       </description>
       <uniqueKey functional="true">
         <parameter ref="ID"/>
@@ -31818,7 +36471,23 @@
 
           : 0: Do not report AP Metrics periodically;
 
-          : 1 – 255: AP Metrics reporting interval in {{units}}.
+          : 1 - 255: AP Metrics reporting interval in {{units}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+            <range maxInclusive="255"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="AssociatedSTAReportingInterval" access="readWrite">
+        <description>
+          Associated STA Reporting Interval.
+
+          0: Do not report associated STA Metrics periodically;
+
+          1 - 255: Associated STA Metrics reporting interval in {{units}}.
         </description>
         <syntax>
           <unsignedInt>
@@ -31906,7 +36575,7 @@
           A hexadecimal string of 64 Priority Code Point (PCP) values (one
           octet per value) corresponding to the Differentiated Services Code
           Point (DSCP) markings 0x00 to 0x3F, ordered by increasing DSCP value.
-          Each octet is in the range 0x00 – 0x07. This is used to select a PCP
+          Each octet is in the range 0x00 - 0x07. This is used to select a PCP
           value if a Service Prioritization Rule specifies Rule Output: 0x08
         </description>
         <syntax>
@@ -32110,6 +36779,180 @@
         </syntax>
       </parameter>
 
+      <parameter name="ControllerOperationMode" access="readOnly">
+        <description>
+          This parameter represents the status of Wi-Fi EasyMesh controller
+          functionality. {{enum}}
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="NotSupported">
+              <description>
+                Wi-Fi EasyMesh controller is not supported.
+              </description>
+            </enumeration>
+            <enumeration value="SupportedNotEnabled">
+              <description>
+                Wi-Fi EasyMesh controller is supported but not enabled.
+              </description>
+            </enumeration>
+            <enumeration value="Running">
+              <description>Wi-Fi EasyMesh controller is running.</description>
+            </enumeration>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="BackhaulMACAddress" access="readOnly">
+        <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
+          BSSID or AP MLD address of the backhaul BSS.
+        </description>
+        <syntax>
+          <dataType ref="MACAddress"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="BackhaulALID" access="readOnly">
+        <description>
+          The IEEE 1905 {{bibref|IEEE1905.1a}} Abstraction-Layer ID (ALID) of
+          the EasyMesh Agent on the network that is providing the backhaul for
+          this EasyMesh Agent.
+        </description>
+        <syntax>
+          <dataType ref="MACAddress"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="BackhaulDownMACAddress" access="readOnly">
+        <description>
+          {{list}} Each MAC address is that of a downstream EasyMesh agent's
+          backhaul link.
+        </description>
+        <syntax>
+          <list/>
+          <dataType ref="MACAddress"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="BackhaulMediaType" access="readOnly">
+        <description>
+          Media type of the backhaul link of this EasyMesh Agent.
+
+          This value can be derived from the neighbor's topology response
+          message 1905 device information type TLV Media Type field defined in
+          {{bibref|IEEE1905.1a|Table 6-12}}. {{enum}}
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="IEEE 802.3u">
+              <description>IEEE 802.3u Fast Ethernet</description>
+            </enumeration>
+            <enumeration value="IEEE 802.3ab">
+              <description>IEEE 802.3ab Gigabit Ethernet</description>
+            </enumeration>
+            <enumeration value="IEEE 802.11b">
+              <description>IEEE 802.11b (2.4GHz)</description>
+            </enumeration>
+            <enumeration value="IEEE 802.11g">
+              <description>IEEE 802.11g (2.4GHz)</description>
+            </enumeration>
+            <enumeration value="IEEE 802.11a">
+              <description>IEEE 802.11a (5GHz)</description>
+            </enumeration>
+            <enumeration value="IEEE 802.11n 2.4">
+              <description>IEEE 802.11n (2.4GHz)</description>
+            </enumeration>
+            <enumeration value="IEEE 802.11n 5.0">
+              <description>IEEE 802.11n (5GHz)</description>
+            </enumeration>
+            <enumeration value="IEEE 802.11ac">
+              <description>IEEE 802.11ac (5GHz)</description>
+            </enumeration>
+            <enumeration value="IEEE 802.11ad">
+              <description>IEEE 802.11ad (60GHz)</description>
+            </enumeration>
+            <enumeration value="IEEE 802.11af">
+              <description>IEEE 802.11af</description>
+            </enumeration>
+            <enumeration value="IEEE 802.11ax">
+              <description>IEEE 802.11ax</description>
+            </enumeration>
+            <enumeration value="IEEE 802.11be">
+              <description>IEEE 802.11be</description>
+            </enumeration>
+            <enumeration value="IEEE 1901 Wavelet">
+              <description>IEEE 1901 Wavelet</description>
+            </enumeration>
+            <enumeration value="IEEE 1901 FFT">
+              <description>IEEE 1901 FFT</description>
+            </enumeration>
+            <enumeration value="MoCAv1.1">
+              <description>MoCAv1.1</description>
+            </enumeration>
+            <enumeration value="Generic PHY"/>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="BackhaulPHYRate" access="readOnly">
+        <description>
+          The Physical Layer (PHY) rate in {{units}} on the backhaul link of
+          this EasyMesh agent.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="Mb/s"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="TrafficSeparationCapability" access="readOnly">
+        <description>
+          Indicator of EasyMesh Agent capability to support EasyMesh
+          {{bibref|EasyMesh}} 802.1Q C-TAG Traffic Separation.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="EasyConnectCapability" access="readOnly">
+        <description>
+          Indicator of the device capability to support Wi-Fi Easy Connect
+          onboarding.
+
+          Indicated in the DPP Onboarding field of the EasyMesh Profile-2 AP
+          Capability TLV {{bibref|EasyMesh}}.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="TestCapabilities" access="readOnly">
+        <description>
+          Indicates EasyMesh agent support for running a throughput or latency
+          test.
+
+          0 indicates that the EasyMesh Agent or single-AP does not support any
+          throughput test and does not support a latency test.
+
+          1 indicates that the EasyMesh Agent or single-AP supports a
+          throughput test but does not support a latency test.
+
+          2 indicates that the EasyMesh Agent or single-AP supports a latency
+          test but does not support a throughput test.
+
+          3 indicates that the EasyMesh Agent or single-AP supports a
+          throughput test and a latency test.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
       <parameter name="RadioNumberOfEntries" access="readOnly">
         <description>
           {{numentries}}
@@ -32182,6 +37025,81 @@
           <unsignedInt/>
         </syntax>
       </parameter>
+
+      <parameter name="MaxNumMLDs" access="readOnly">
+        <description>
+          The maximum number of MLDs that the EasyMesh Agent can support.
+          {{bibref|EasyMesh}} source: Wi-Fi 7 Agent Capabilities TLV.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="APMLDMaxLinks" access="readOnly">
+        <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
+          of affiliated APs minus 1. The value of 15 is reserved.
+          {{bibref|EasyMesh}} source: Wi-Fi 7 Agent Capabilities TLV.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range minInclusive="0" maxInclusive="15"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="bSTAMLDMaxLinks" access="readOnly">
+        <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
+          number of affiliated bSTAs minus 1. The value of 15 is reserved.
+          {{bibref|EasyMesh}} source: Wi-Fi 7 Agent Capabilities TLV.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range minInclusive="0" maxInclusive="15"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="TIDLinkMapCapability" access="readOnly">
+        <description>
+          Indicates the EasyMesh Agent support for TID to Link mapping.
+          {{bibref|EasyMesh}} source: Wi-Fi 7 Agent Capabilities TLV. {{enum}}
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="0">
+              <description>
+                The EasyMesh Agent does not support TID-to-link mapping.
+              </description>
+            </enumeration>
+            <enumeration value="1">
+              <description>
+                The EasyMesh Agent supports the mapping of each TID to the same
+                or different link set.
+              </description>
+            </enumeration>
+            <enumeration value="2">
+              <description>
+                The EasyMesh Agent only supports the mapping of all TIDs to the
+                same link set.
+              </description>
+            </enumeration>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="APMLDNumberOfEntries" access="readOnly">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
     </object>
 
     <object
@@ -32484,7 +37402,7 @@
 
       <parameter name="Precedence" access="readOnly">
         <description>
-          Rule Precedence – higher number means higher priority.
+          Rule Precedence - higher number means higher priority.
         </description>
         <syntax>
           <unsignedInt>
@@ -32747,14 +37665,14 @@
           One of:
 
           : MAC address: if the entry corresponds to channel usage by a single
-            client STA associated to an AP of the Agent;
+            client STA associated to the BSS of the Agent;
 
           : BSSID: if the entry corresponds to channel usage by multiple or
-            unspecified client STAs associated to an AP of the Agent;
+            unspecified client STAs associated to the BSS of the Agent;
 
           : BSS Color: (first 42-bits are zero) if the channel usage is caused
             by a source external to the BSSs operated by the Agent and the
-            BSSID can’t be decoded (since frame sent at high MCS) but the BSS
+            BSSID cannot be decoded (since frame sent at high MCS) but the BSS
             Color in the PHY headers could still be identified;
 
           : Zero: if the channel usage is caused by a source external to the
@@ -32934,8 +37852,8 @@
         {{param|BackhaulMACAddress}}) of the uplinked Backhaul Device -
         {{param|MACAddress}} of this Access Point Device
 
-          {{param|BackhaulDeviceID}} / {{param|BackhaulMACAddress}} &lt;--
-          {{param|LinkType}} --- &lt; {{param|MACAddress}}
+            {{param|BackhaulDeviceID}} / {{param|BackhaulMACAddress}} &lt;--
+            {{param|LinkType}} --- &lt; {{param|MACAddress}}
 
         {{empty}} is reserved for the {{object}} instance that represents the
         Multi-AP Controller.
@@ -33416,7 +38334,7 @@
 
           : 0: Do not report STA Metrics based on RCPI threshold.
 
-          : 1 – 220: RCPI threshold (encoded per {{bibref|802.11-2020|Table
+          : 1 - 220: RCPI threshold (encoded per {{bibref|802.11-2020|Table
             9-176}}).
         </description>
         <syntax>
@@ -33585,6 +38503,27 @@
         </syntax>
       </parameter>
 
+      <parameter name="AggregateScanDuration" access="readOnly">
+        <description>
+          Total time spent performing the scan of this channel in {{units}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="milliseconds"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="ScanType" access="readOnly">
+        <description>
+          Indicates whether the scan was performed passively (false) or with
+          active probing (true).
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
       <parameter name="OpClassScanNumberOfEntries" access="readOnly">
         <description>
           {{numentries}}
@@ -33694,6 +38633,47 @@
         </syntax>
       </parameter>
 
+      <parameter name="ScanStatus" access="readOnly">
+        <description>
+          Status code to indicate whether a scan has been performed and if not
+          the reason for failure {{enum}}
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="0">
+              <description>Success</description>
+            </enumeration>
+            <enumeration value="1">
+              <description>
+                Scan not supported on this opclass and channel
+              </description>
+            </enumeration>
+            <enumeration value="2">
+              <description>
+                Request too soon after last scan
+              </description>
+            </enumeration>
+            <enumeration value="3">
+              <description>Radio too busy to perform scan</description>
+            </enumeration>
+            <enumeration value="4">
+              <description>Scan not completed</description>
+            </enumeration>
+            <enumeration value="5">
+              <description>Scan aborted</description>
+            </enumeration>
+            <enumeration value="6">
+              <description>
+                Fresh scan not supported, radio only supports on boot scans
+              </description>
+            </enumeration>
+            <enumeration value="7">
+              <description>reserved</description>
+            </enumeration>
+          </string>
+        </syntax>
+      </parameter>
+
       <parameter name="NeighborBSSNumberOfEntries" access="readOnly">
         <description>
           {{numentries}}
@@ -33739,10 +38719,6 @@
           Response frames of the neighboring BSS as received by the radio
           measured in {{units}}. (RSSI is encoded per
           {{bibref|802.11-2020|Table 9-176}}). Reserved: 221 - 255.
-
-          NOTE: The underlying WFA specification is in the process of being
-          reviewed for possible clarification. Please refer to that
-          specification for more details.
         </description>
         <syntax>
           <unsignedInt>
@@ -33785,6 +38761,62 @@
           <unsignedInt/>
         </syntax>
       </parameter>
+
+      <parameter name="MLDMACAddress" access="readOnly">
+        <description>
+          The Multi-Link Device (MLD) MAC address of the Multi-Link Operation
+          (MLO) capable access point this neighboring BSS is affiliated to.
+          Null if the neighboring BSS is not an affiliated AP.
+        </description>
+        <syntax>
+          <dataType ref="MACAddress"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ReportingBSSID" access="readOnly">
+        <description>
+          The BSSID of the reporting BSSID if different from {{param|BSSID}}.
+          This will be set if the NeigborBSS was discovered through, for
+          example, a Reduced Neighbor Report. EasyMesh {{bibref|EasyMesh}}
+          source: Channel Scan Result TLV.
+        </description>
+        <syntax>
+          <dataType ref="MACAddress"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="MultiBSSID" access="readOnly">
+        <description>
+          Indicates if the neighboring BSS is part of a MultiBSSID set and may
+          be a non-transmitted BSSID.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="BSSLoadElementPresent" access="readOnly">
+        <description>
+          Set to true if the neighbour BSS Beacon/Probe Responses include a
+          BSSLoad Element as defined in {{bibref|802.11-2020|Section
+          9.4.2.28}}.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="BSSColor" access="readOnly">
+        <description>
+          Set to the BSS Color from the BSS Color Information field in the
+          BSS's HE Operation element.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range maxInclusive="63"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
     </object>
 
     <object
@@ -33815,8 +38847,8 @@
 
       <parameter name="OnBootOnly" access="readOnly">
         <description>
-          “On boot only” flag, Indicates whether the specified radio is capable
-          only of “On boot” scans.
+          On boot only flag, Indicates whether the specified radio is capable
+          only of On boot scans.
         </description>
         <syntax>
           <boolean/>
@@ -34047,13 +39079,15 @@
         </syntax>
       </parameter>
 
-      <parameter name="HECapabilities" access="readOnly" status="deprecated">
+      <parameter name="HECapabilities" access="readOnly" status="obsoleted">
         <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}}.}}
+          and {{object|WiFi6bSTARole}}}}
+
+          {{obsoleted|2.17}}
         </description>
         <syntax>
           <base64>
@@ -34062,6 +39096,62 @@
         </syntax>
       </parameter>
 
+      <parameter name="MSCSCapability" access="readOnly">
+        <description>
+          This parameter indicates support for Mirrored Stream Classification
+          Service (MSCS) and EasyMesh configuration of MSCS
+          {{bibref|EasyMesh|AP Radio Advanced Capabilities TLV}}.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="SCSCapability" access="readOnly">
+        <description>
+          This parameter indicates support for Stream Classification Service
+          (SCS) and EasyMesh {{bibref|EasyMesh}} configuration of SCS
+          {{bibref|EasyMesh|AP Radio Advanced Capabilities TLV}}.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="QoSMapCapability" access="readOnly">
+        <description>
+          This parameter indicates support for QoS Map {{bibref|EasyMesh|AP
+          Radio Advanced Capabilities TLV}}.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="DSCPPolicyCapability" access="readOnly">
+        <description>
+          This parameter indicates support for DSCP Mapping Table TLV based
+          DSCP-to-UP mapping and EasyMesh distribution of QoS Map elements to
+          associated STAs {{bibref|EasyMesh|AP Radio Advanced Capabilities
+          TLV}}.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="SCSTrafficDescriptionCapability" access="readOnly">
+        <description>
+          This parameter indicates support for QoS Management Stream
+          Classification Service (SCS) Traffic Description and EasyMesh
+          configuration of and/or extensions to SCS using traffic descriptions
+          {{bibref|EasyMesh|AP Radio Advanced Capabilities TLV}}.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
       <parameter name="CapableOperatingClassProfileNumberOfEntries"
           access="readOnly">
         <description>
@@ -34197,10 +39287,20 @@
         </syntax>
       </parameter>
 
+      <parameter name="DLOFDMA" access="readOnly">
+        <description>
+          Indicates support for Downlink (DL) Orthogonal Frequency Division
+          Multiplexing (OFDMA).
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
       <parameter name="MaxDLMUMIMO" access="readOnly">
         <description>
-          Max number of users supported per DL MU-MIMO Transmitter (TX) in an
-          AP role.
+          Max number of users supported per DL MU-MIMO Transmitter (TX) in the
+          BSS role.
         </description>
         <syntax>
           <unsignedInt>
@@ -34211,7 +39311,7 @@
 
       <parameter name="MaxULMUMIMO" access="readOnly">
         <description>
-          Max number of users supported per UL MU-MIMO Receiver (RX) in an AP
+          Max number of users supported per UL MU-MIMO Receiver (RX) in the BSS
           role.
         </description>
         <syntax>
@@ -34223,7 +39323,7 @@
 
       <parameter name="MaxDLOFDMA" access="readOnly">
         <description>
-          Max number of users supported per Downlink (DL) OFDMA TX in an AP
+          Max number of users supported per Downlink (DL) OFDMA TX in the BSS
           role.
         </description>
         <syntax>
@@ -34235,7 +39335,7 @@
 
       <parameter name="MaxULOFDMA" access="readOnly">
         <description>
-          Max number of users supported per UL OFDMA RX in an AP role.
+          Max number of users supported per UL OFDMA RX in the BSS role.
         </description>
         <syntax>
           <unsignedInt>
@@ -34425,10 +39525,20 @@
         </syntax>
       </parameter>
 
+      <parameter name="DLOFDMA" access="readOnly">
+        <description>
+          Indicates support for Downlink (DL) Orthogonal Frequency Division
+          Multiplexing (OFDMA).
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
       <parameter name="MaxDLMUMIMO" access="readOnly">
         <description>
-          Max number of users supported per DL MU-MIMO Transmitter (TX) in an
-          AP role.
+          Max number of users supported per DL MU-MIMO Transmitter (TX) in the
+          BSS role.
         </description>
         <syntax>
           <unsignedInt>
@@ -34439,7 +39549,7 @@
 
       <parameter name="MaxULMUMIMO" access="readOnly">
         <description>
-          Max number of users supported per UL MU-MIMO Receiver (RX) in an AP
+          Max number of users supported per UL MU-MIMO Receiver (RX) in the BSS
           role.
         </description>
         <syntax>
@@ -34451,7 +39561,7 @@
 
       <parameter name="MaxDLOFDMA" access="readOnly">
         <description>
-          Max number of users supported per Downlink (DL) OFDMA TX in an AP
+          Max number of users supported per Downlink (DL) OFDMA TX in the BSS
           role.
         </description>
         <syntax>
@@ -34463,7 +39573,7 @@
 
       <parameter name="MaxULOFDMA" access="readOnly">
         <description>
-          Max number of users supported per UL OFDMA RX in an AP role.
+          Max number of users supported per UL OFDMA RX in the BSS role.
         </description>
         <syntax>
           <unsignedInt>
@@ -34546,6 +39656,518 @@
       </parameter>
     </object>
 
+    <object
+        name="Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi7APRole."
+        access="readOnly" minEntries="1" maxEntries="1" version="2.17">
+      <description>
+        This object describes the Wi-Fi 7 capabilities for the AP role
+        including Multi-Link Operation (MLO) capabilities. {{bibref|EasyMesh}}
+        Source: Wi-Fi 7 Agent Capabilities TLV.
+      </description>
+
+      <parameter name="EMLMRSupport" access="readOnly">
+        <description>
+          Indicates if the Enhanced Multi-Link Multi-Radio (EMLMR) operation is
+          supported.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="EMLSRSupport" access="readOnly">
+        <description>
+          Indicates if Enhanced Multi-Link Single-Radio (EMLSR) operation is
+          supported.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="STRSupport" access="readOnly">
+        <description>
+          Indicates if Simultaneous Transmit and Receive (STR) operation is
+          supported.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="NSTRSupport" access="readOnly">
+        <description>
+          Indicates if Non-Simultaneous Transmit and Receive (NSTR) operation
+          is supported.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="TIDLinkMapNegotiation" access="readOnly">
+        <description>
+          Indicates if Traffic Identifier (TID) to Link Mapping Negotiation is
+          supported.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="EMLMRFreqSeparationNumberOfEntries" access="readOnly">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="EMLSRFreqSeparationNumberOfEntries" access="readOnly">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="STRFreqSeparationNumberOfEntries" access="readOnly">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="NSTRFreqSeparationNumberOfEntries" access="readOnly">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object
+        name="Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi7APRole.EMLMRFreqSeparation.{i}."
+        access="readOnly"
+        numEntriesParameter="EMLMRFreqSeparationNumberOfEntries" minEntries="0"
+        maxEntries="unbounded" version="2.17">
+      <description>
+        This object describes the required frequency separation from the
+        specified radio {{param|RUID}} for MLO Enhanced Multi-Link Multi-Radio
+        (EMLMR) operation. {{bibref|EasyMesh}} Source: Wi-Fi 7 Agent
+        Capabilities TLV.
+      </description>
+      <uniqueKey functional="true">
+        <parameter ref="RUID"/>
+      </uniqueKey>
+
+      <parameter name="RUID" access="readOnly">
+        <description>
+          The Radio unique identifier (RUID) of another radio to which the
+          specified frequency separation gap applies.
+        </description>
+        <syntax>
+          <base64/>
+        </syntax>
+      </parameter>
+
+      <parameter name="FreqSeparation" access="readOnly">
+        <description>
+          Frequency separation to the specified radio for the particular MLO
+          operation mode. A value of 0 indicates that no frequency separation
+          information is provided. Set to a nonzero value to indicate the
+          required frequency gap is ({{param}} - 1) x {{units}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="80 MHz"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object
+        name="Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi7APRole.EMLSRFreqSeparation.{i}."
+        access="readOnly"
+        numEntriesParameter="EMLSRFreqSeparationNumberOfEntries" minEntries="0"
+        maxEntries="unbounded" version="2.17">
+      <description>
+        This object describes the required frequency separation from the
+        specified radio {{param|RUID}} for MLO Enhanced Multi-Link Single-Radio
+        (EMLSR) operation. {{bibref|EasyMesh}} Source: Wi-Fi 7 Agent
+        Capabilities TLV.
+      </description>
+      <uniqueKey functional="true">
+        <parameter ref="RUID"/>
+      </uniqueKey>
+
+      <parameter name="RUID" access="readOnly">
+        <description>
+          The Radio unique identifier (RUID) of another radio to which the
+          specified frequency separation gap applies.
+        </description>
+        <syntax>
+          <base64/>
+        </syntax>
+      </parameter>
+
+      <parameter name="FreqSeparation" access="readOnly">
+        <description>
+          Frequency separation to the specified radio for the particular MLO
+          operation mode. A value of 0 indicates that no frequency separation
+          information is provided. Set to a nonzero value to indicate the
+          required frequency gap is ({{param}} - 1) x {{units}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="80 MHz"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object
+        name="Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi7APRole.STRFreqSeparation.{i}."
+        access="readOnly"
+        numEntriesParameter="STRFreqSeparationNumberOfEntries" minEntries="0"
+        maxEntries="unbounded" version="2.17">
+      <description>
+        This object describes the required frequency separation from the
+        specified radio {{param|RUID}} for MLO Simultaneous Transmit and
+        Receive (STR) operation. {{bibref|EasyMesh}} Source: Wi-Fi 7 Agent
+        Capabilities TLV.
+      </description>
+      <uniqueKey functional="true">
+        <parameter ref="RUID"/>
+      </uniqueKey>
+
+      <parameter name="RUID" access="readOnly">
+        <description>
+          The Radio unique identifier (RUID) of another radio to which the
+          specified frequency separation gap applies.
+        </description>
+        <syntax>
+          <base64/>
+        </syntax>
+      </parameter>
+
+      <parameter name="FreqSeparation" access="readOnly">
+        <description>
+          Frequency separation to the specified radio for the particular MLO
+          operation mode. A value of 0 indicates that no frequency separation
+          information is provided. Set to a nonzero value to indicate the
+          required frequency gap is ({{param}} - 1) x {{units}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="80 MHz"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object
+        name="Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi7APRole.NSTRFreqSeparation.{i}."
+        access="readOnly"
+        numEntriesParameter="NSTRFreqSeparationNumberOfEntries" minEntries="0"
+        maxEntries="unbounded" version="2.17">
+      <description>
+        This object describes the required frequency separation from the
+        specified radio {{param|RUID}} for MLO Non-Simultaneous Transmit and
+        Receive (NSTR) operation. {{bibref|EasyMesh}} Source: Wi-Fi 7 Agent
+        Capabilities TLV.
+      </description>
+      <uniqueKey functional="true">
+        <parameter ref="RUID"/>
+      </uniqueKey>
+
+      <parameter name="RUID" access="readOnly">
+        <description>
+          The Radio unique identifier (RUID) of another radio to which the
+          specified frequency separation gap applies.
+        </description>
+        <syntax>
+          <base64/>
+        </syntax>
+      </parameter>
+
+      <parameter name="FreqSeparation" access="readOnly">
+        <description>
+          Frequency separation to the specified radio for the particular MLO
+          operation mode. A value of 0 indicates that no frequency separation
+          information is provided. Set to a nonzero value to indicate the
+          required frequency gap is ({{param}} - 1) x {{units}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="80 MHz"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object
+        name="Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi7bSTARole."
+        access="readOnly" minEntries="1" maxEntries="1" version="2.17">
+      <description>
+        This object describes the Wi-Fi 7 capabilities for the backhaul Station
+        (bSTA) role including Multi-Link Operation (MLO) capabilities.
+        {{bibref|EasyMesh}} Source: Wi-Fi 7 Agent Capabilities TLV.
+      </description>
+
+      <parameter name="EMLMRSupport" access="readOnly">
+        <description>
+          Indicates if the Enhanced Multi-Link Multi-Radio (EMLMR) operation is
+          supported.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="EMLSRSupport" access="readOnly">
+        <description>
+          Indicates if Enhanced Multi-Link Single-Radio (EMLSR) operation is
+          supported.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="STRSupport" access="readOnly">
+        <description>
+          Indicates if Simultaneous Transmit and Receive (STR) operation is
+          supported.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="NSTRSupport" access="readOnly">
+        <description>
+          Indicates if Non-Simultaneous Transmit and Receive (NSTR) operation
+          is supported.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="TIDLinkMapNegotiation" access="readOnly">
+        <description>
+          Indicates if Traffic Identifier (TID) to Link Mapping Negotiation is
+          supported.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="EMLMRFreqSeparationNumberOfEntries" access="readOnly">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="EMLSRFreqSeparationNumberOfEntries" access="readOnly">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="STRFreqSeparationNumberOfEntries" access="readOnly">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="NSTRFreqSeparationNumberOfEntries" access="readOnly">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object
+        name="Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi7bSTARole.EMLMRFreqSeparation.{i}."
+        access="readOnly"
+        numEntriesParameter="EMLMRFreqSeparationNumberOfEntries" minEntries="0"
+        maxEntries="unbounded" version="2.17">
+      <description>
+        This object describes the required frequency separation from the
+        specified radio {{param|RUID}} for MLO Enhanced Multi-Link Multi-Radio
+        (EMLMR) operation. {{bibref|EasyMesh}} Source: Wi-Fi 7 Agent
+        Capabilities TLV.
+      </description>
+      <uniqueKey functional="true">
+        <parameter ref="RUID"/>
+      </uniqueKey>
+
+      <parameter name="RUID" access="readOnly">
+        <description>
+          The Radio unique identifier (RUID) of another radio to which the
+          specified frequency separation gap applies.
+        </description>
+        <syntax>
+          <base64/>
+        </syntax>
+      </parameter>
+
+      <parameter name="FreqSeparation" access="readOnly">
+        <description>
+          Frequency separation to the specified radio for the particular MLO
+          operation mode. A value of 0 indicates that no frequency separation
+          information is provided. Set to a nonzero value to indicate the
+          required frequency gap is ({{param}} - 1) x {{units}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="80 MHz"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object
+        name="Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi7bSTARole.EMLSRFreqSeparation.{i}."
+        access="readOnly"
+        numEntriesParameter="EMLSRFreqSeparationNumberOfEntries" minEntries="0"
+        maxEntries="unbounded" version="2.17">
+      <description>
+        This object describes the required frequency separation from the
+        specified radio {{param|RUID}} for MLO Enhanced Multi-Link Single-Radio
+        (EMLSR) operation. {{bibref|EasyMesh}} Source: Wi-Fi 7 Agent
+        Capabilities TLV.
+      </description>
+      <uniqueKey functional="true">
+        <parameter ref="RUID"/>
+      </uniqueKey>
+
+      <parameter name="RUID" access="readOnly">
+        <description>
+          The Radio unique identifier (RUID) of another radio to which the
+          specified frequency separation gap applies.
+        </description>
+        <syntax>
+          <base64/>
+        </syntax>
+      </parameter>
+
+      <parameter name="FreqSeparation" access="readOnly">
+        <description>
+          Frequency separation to the specified radio for the particular MLO
+          operation mode. A value of 0 indicates that no frequency separation
+          information is provided. Set to a nonzero value to indicate the
+          required frequency gap is ({{param}} - 1) x {{units}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="80 MHz"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object
+        name="Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi7bSTARole.STRFreqSeparation.{i}."
+        access="readOnly"
+        numEntriesParameter="STRFreqSeparationNumberOfEntries" minEntries="0"
+        maxEntries="unbounded" version="2.17">
+      <description>
+        This object describes the required frequency separation from the
+        specified radio {{param|RUID}} for MLO Simultaneous Transmit and
+        Receive (STR) operation. {{bibref|EasyMesh}} Source: Wi-Fi 7 Agent
+        Capabilities TLV.
+      </description>
+      <uniqueKey functional="true">
+        <parameter ref="RUID"/>
+      </uniqueKey>
+
+      <parameter name="RUID" access="readOnly">
+        <description>
+          The Radio unique identifier (RUID) of another radio to which the
+          specified frequency separation gap applies.
+        </description>
+        <syntax>
+          <base64/>
+        </syntax>
+      </parameter>
+
+      <parameter name="FreqSeparation" access="readOnly">
+        <description>
+          Frequency separation to the specified radio for the particular MLO
+          operation mode. A value of 0 indicates that no frequency separation
+          information is provided. Set to a nonzero value to indicate the
+          required frequency gap is ({{param}} - 1) x {{units}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="80 MHz"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object
+        name="Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi7bSTARole.NSTRFreqSeparation.{i}."
+        access="readOnly"
+        numEntriesParameter="NSTRFreqSeparationNumberOfEntries" minEntries="0"
+        maxEntries="unbounded" version="2.17">
+      <description>
+        This object describes the required frequency separation from the
+        specified radio {{param|RUID}} for MLO Non-Simultaneous Transmit and
+        Receive (NSTR) operation. {{bibref|EasyMesh}} Source: Wi-Fi 7 Agent
+        Capabilities TLV.
+      </description>
+      <uniqueKey functional="true">
+        <parameter ref="RUID"/>
+      </uniqueKey>
+
+      <parameter name="RUID" access="readOnly">
+        <description>
+          The Radio unique identifier (RUID) of another radio to which the
+          specified frequency separation gap applies.
+        </description>
+        <syntax>
+          <base64/>
+        </syntax>
+      </parameter>
+
+      <parameter name="FreqSeparation" access="readOnly">
+        <description>
+          Frequency separation to the specified radio for the particular MLO
+          operation mode. A value of 0 indicates that no frequency separation
+          information is provided. Set to a nonzero value to indicate the
+          required frequency gap is ({{param}} - 1) x {{units}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="80 MHz"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+    </object>
+
     <object
         name="Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.AKMFrontHaul.{i}."
         access="readOnly" numEntriesParameter="AKMFrontHaulNumberOfEntries"
@@ -35372,15 +40994,30 @@
             <enumeration value="dpp+psk+sae"/>
             <enumeration value="SuiteSelector">
               <description>
-                AKM suite selector, each AKM suite selector (OUI and type) is
-                encoded as a 4-octet hex-encoded value without internal
-                delimiters, e.g. 506F9A02 {{bibref|802.11-2020|Table 9-151}}.
+                "SuiteSelector" indicates an AKM suite selector, the value of
+                which is indicated in {{param|FronthaulSuiteSelector}}.
               </description>
             </enumeration>
           </string>
         </syntax>
       </parameter>
 
+      <parameter name="FronthaulSuiteSelector" access="readWrite">
+        <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.
+          506F9A02 {{bibref|802.11-2020|Table 9-151}}.
+
+          This parameter applies if {{param|FronthaulAKMsAllowed}} includes
+          value "SuiteSelector".
+        </description>
+        <syntax>
+          <hexBinary>
+            <size minLength="4" maxLength="4"/>
+          </hexBinary>
+        </syntax>
+      </parameter>
+
       <parameter name="BackhaulAKMsAllowed" access="readWrite">
         <description>
           {{list}} List items indicate Authentication and Key Management (AKM)
@@ -35415,15 +41052,46 @@
             <enumeration value="dpp+psk+sae"/>
             <enumeration value="SuiteSelector">
               <description>
-                AKM suite selector, each AKM suite selector (OUI and type) is
-                encoded as a 4-octet hex-encoded value without internal
-                delimiters, e.g. 506F9A02 {{bibref|802.11-2020|Table 9-151}}.
+                "SuiteSelector" indicates an AKM suite selector, the value of
+                which is indicated in {{param|BackhaulSuiteSelector}}.
               </description>
             </enumeration>
           </string>
         </syntax>
       </parameter>
 
+      <parameter name="BackhaulSuiteSelector" access="readWrite">
+        <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.
+          506F9A02 {{bibref|802.11-2020|Table 9-151}}.
+
+          This parameter applies if {{param|BackhaulAKMsAllowed}} includes
+          value "SuiteSelector".
+        </description>
+        <syntax>
+          <hexBinary>
+            <size minLength="4" maxLength="4"/>
+          </hexBinary>
+        </syntax>
+      </parameter>
+
+      <parameter name="BasicDataTransmitRates" access="readOnly">
+        <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
+          join this BSS. The stations have to be able to receive and transmit
+          at each of the data rates listed in {{param}}. Most control packets
+          use a data rate in {{param}}.
+        </description>
+        <syntax>
+          <list/>
+          <unsignedInt>
+            <units value="kbps"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
       <parameter name="STANumberOfEntries" access="readOnly">
         <description>
           {{numentries}}
@@ -35454,6 +41122,15 @@
         <parameter ref="ClientMAC"/>
       </uniqueKey>
 
+      <parameter name="BSSID" access="readOnly">
+        <description>
+          The BSSID of BSS for which this descriptor applies.
+        </description>
+        <syntax>
+          <dataType ref="MACAddress"/>
+        </syntax>
+      </parameter>
+
       <parameter name="ClientMAC" access="readOnly">
         <description>
           MAC address of STA for which this descriptor applies.
@@ -35483,6 +41160,296 @@
       </parameter>
     </object>
 
+    <object
+        name="Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.MUConfig."
+        minEntries="1" maxEntries="1" version="2.17">
+      <description>
+        This object provides Multiuser (MU)-specific BSS configuration.
+      </description>
+
+      <parameter name="DLOFDMAEnable" access="readWrite">
+        <description>
+          Enable downlink (DL) Orthogonal Frequency-Division Multiple Access
+          (OFDMA).
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ULOFDMAEnable" access="readWrite">
+        <description>
+          Enable uplink (UL) OFDMA.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="DLMUMIMOEnable" access="readWrite">
+        <description>
+          Enable DL Multi-User Multi-Input Multi-Output (MU-MIMO).
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ULMUMIMOEnable" access="readWrite">
+        <description>
+          Enable UL MU-MIMO.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object
+        name="Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.MUStats."
+        minEntries="1" maxEntries="1" version="2.17">
+      <description>
+        This object provides packet statistics for a Multiuser (MU) BSS.
+      </description>
+
+      <parameter name="DLTotalPPDUCount" access="readOnly">
+        <description>
+          Total number of Physical-layer Protocol Data Units (PPDUs)
+          transmitted by the Wi-Fi Basic Service Set (BSS).
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="DLHEPPDUCount" access="readOnly">
+        <description>
+          Number of High-Efficiency (HE) PPDUs transmitted by the BSS.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="DLMUPPDUCount" access="readOnly">
+        <description>
+          Number of Multi-User (MU) PPDUs transmitted by the BSS.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="DLOFDMAPPDUCount" access="readOnly">
+        <description>
+          Number of Orthogonal Frequency-Division Multiple Access (OFDMA) PPDUs
+          transmitted by the BSS.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="DLMUMIMOPPDUCount" access="readOnly">
+        <description>
+          Number of Multi-Input Multi-Output (MU-MIMO) PPDUs transmitted by the
+          BSS.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="DLOFDMAMUMIMOPPDUCount" access="readOnly">
+        <description>
+          Number of PPDUs transmitted by the BSS with OFDMA and MU-MIMO.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ULTotalPPDUCount" access="readOnly">
+        <description>
+          Total number of PPDUs received by the BSS.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ULHEPPDUCount" access="readOnly">
+        <description>
+          Number of High-Efficiency (HE) PPDUs received by the BSS.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ULMUPPDUCount" access="readOnly">
+        <description>
+          Number of MU PPDUs received by the BSS.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ULOFDMAPPDUCount" access="readOnly">
+        <description>
+          Number of OFDMA PPDUs received by the BSS.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ULMUMIMOPPDUCount" access="readOnly">
+        <description>
+          Number of MU-MIMO PDDUs received by the BSS.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ULOFDMAMUMIMOPPDUCount" access="readOnly">
+        <description>
+          Number of PPDUs received by the BSS with OFDMA and MU-MIMO.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="DLRU26PPDUCount" access="readOnly">
+        <description>
+          Number of PPDUs sent on the downlink using Resource Unit (RU) RU26.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="DLRU52PPDUCount" access="readOnly">
+        <description>
+          Number of PPDUs sent on the downlink using RU52.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="DLRU106PPDUCount" access="readOnly">
+        <description>
+          Number of PPDUs sent on the downlink using RU106.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="DLRU242PPDUCount" access="readOnly">
+        <description>
+          Number of PPDUs sent on the downlink using RU242.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="DLRU484PPDUCount" access="readOnly">
+        <description>
+          Number of PPDUs sent on the downlink using RU484.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="DLRU996PPDUCount" access="readOnly">
+        <description>
+          Number of PPDUs sent on the downlink using RU996.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="DLRU1992PPDUCount" access="readOnly">
+        <description>
+          Number of PPDUs sent on the downlink using RU1992.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ULRU26PPDUCount" access="readOnly">
+        <description>
+          Number of PPDUs received on the uplink using RU26.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ULRU52PPDUCount" access="readOnly">
+        <description>
+          Number of PPDUs received on the uplink using RU52.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ULRU106PPDUCount" access="readOnly">
+        <description>
+          Number of PPDUs received on the uplink using RU106.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ULRU242PPDUCount" access="readOnly">
+        <description>
+          Number of PPDUs received on the uplink using RU242.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ULRU484PPDUCount" access="readOnly">
+        <description>
+          Number of PPDUs received on the uplink using RU484.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ULRU996PPDUCount" access="readOnly">
+        <description>
+          Number of PPDUs received on the uplink using RU996.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ULRU1992PPDUCount" access="readOnly">
+        <description>
+          Number of PPDUs received on the uplink using RU1992.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+    </object>
+
     <object
         name="Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.MultiAPSteering."
         access="readOnly" minEntries="1" maxEntries="1" version="2.15">
@@ -35506,8 +41473,9 @@
 
       <parameter name="BTMAttempts" access="readOnly">
         <description>
-          Number of times a BTM (BSS Transition Management; {{bibref|802.11k}})
-          steer was attempted for this Access Point.
+          Number of times a BTM (BSS Transition Management;
+          {{bibref|802.11-2020|sections 4.3.19.3 and 6.3.57}} steer was
+          attempted for this Access Point.
         </description>
         <syntax>
           <dataType ref="StatsCounter64"/>
@@ -35517,8 +41485,8 @@
       <parameter name="BTMQueryResponses" access="readOnly">
         <description>
           Number of asynchronous BTM (BSS Transition Management;
-          {{bibref|802.11k}}) Queries for which a BTM Request was issued by
-          this Access Point.
+          {{bibref|802.11-2020|sections 4.3.19.3 and 6.3.57}} Queries for which
+          a BTM Request was issued by this Access Point.
         </description>
         <syntax>
           <dataType ref="StatsCounter64"/>
@@ -35526,6 +41494,267 @@
       </parameter>
     </object>
 
+    <object
+        name="Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.ThroughputTestResult."
+        access="readOnly" minEntries="1" maxEntries="1" version="2.17">
+      <description>
+        Object containing the results of the most recent throughput (speed)
+        test from the BSS to a station (STA).
+      </description>
+
+      <parameter name="TimeStamp" access="readOnly">
+        <description>
+          Timestamp for the throughput test, indicating when the test
+          completed.
+        </description>
+        <syntax>
+          <dateTime/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ClientMAC" access="readOnly">
+        <description>
+          MAC address of the STA that the throughput test ran to.
+        </description>
+        <syntax>
+          <dataType ref="MACAddress"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="VID" access="readOnly">
+        <description>
+          The VLAN ID (VID) that the throughput test ran on.
+
+          A value of 0 indicates that no VLAN was specified.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range minInclusive="0" maxInclusive="4095"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="WMMUP" access="readOnly">
+        <description>
+          Wireless MultiMedia (WMM) User Priority (UP) {{bibref|WMM}} that the
+          throughput test was requested to run on.
+
+          A value of 8 indicates that no UP was specified.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range minInclusive="0" maxInclusive="8"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="TestDuration" access="readOnly">
+        <description>
+          Duration of the throughput test in {{units}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="milliseconds"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="TestLayer" access="readOnly">
+        <description>
+          The OSI layer that the throughput test ran on.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="TestAlgorithm" access="readOnly">
+        <description>
+          The test algorithm that the throughput test used.
+        </description>
+        <syntax>
+          <string/>
+        </syntax>
+      </parameter>
+
+      <parameter name="DownlinkSpeed" access="readOnly">
+        <description>
+          Downlink speed found by the throughput test in {{units}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="kbps"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="UplinkSpeed" access="readOnly">
+        <description>
+          Uplink speed found by the throughput test in {{units}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="kbps"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object
+        name="Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.LatencyTestResult."
+        access="readOnly" minEntries="1" maxEntries="1" version="2.17">
+      <description>
+        Object containing the results of the most recent latency test set from
+        the BSS to a station (STA). Each latency test set includes a number of
+        individual echo tests. Each echo test result provides a sample of
+        round-trip times and statistics on all the echo tests in this latency
+        test are reported in this object.
+      </description>
+
+      <parameter name="TimeStamp" access="readOnly">
+        <description>
+          Timestamp for the latency test, indicating when the last echo in the
+          latency test set was received or timed-out.
+        </description>
+        <syntax>
+          <dateTime/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ClientMAC" access="readOnly">
+        <description>
+          MAC address of the station (STA) or EasyMesh Agent that the latency
+          test ran to.
+        </description>
+        <syntax>
+          <dataType ref="MACAddress"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="VID" access="readOnly">
+        <description>
+          The VLAN ID (VID) that the latency test ran on.
+
+          A value of 0 indicates that no VLAN was specified.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range minInclusive="0" maxInclusive="4095"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="WMMUP" access="readOnly">
+        <description>
+          Wireless MultiMedia (WMM) User Priority (UP) {{bibref|WMM}} that the
+          latency test was requested to run on.
+
+          A value of 8 indicates that no UP was specified.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range minInclusive="0" maxInclusive="8"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="DataBlockSize" access="readOnly">
+        <description>
+          The size of each data block, in {{units}}, that was transmitted in
+          each echo test. The data block excludes the packet or frame header.
+
+          A value of 0 indicates that no DataBlockSize was specified.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="bytes"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="TestLayer" access="readOnly">
+        <description>
+          The OSI layer that the latency test ran on.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="TestAlgorithm" access="readOnly">
+        <description>
+          The test algorithm that the latency test used.
+        </description>
+        <syntax>
+          <string/>
+        </syntax>
+      </parameter>
+
+      <parameter name="SuccessCount" access="readOnly">
+        <description>
+          The number of successfully received echo responses.
+
+          This parameter is an output of the latency test.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="LostCount" access="readOnly">
+        <description>
+          The number of lost echoes in the latency test set.
+
+          This parameter is an output of the latency test.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="AverageResponseTime" access="readOnly">
+        <description>
+          The average round-trip time of the results of the latency test set in
+          {{units}}. This average is across successfully received echoes only.
+
+          This parameter is an output of the latency test.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="milliseconds"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="MinimumResponseTime" access="readOnly">
+        <description>
+          The minimum round-trip time of the results of the latency test set in
+          {{units}}. This minimum is across successfully received echoes only.
+
+          This parameter is an output of the latency test.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="milliseconds"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="MaximumResponseTime" access="readOnly">
+        <description>
+          The maximum round-trip time of the results of the latency test set in
+          {{units}}. This maximum is across successfully received echoes only.
+
+          This parameter is an output of the latency test.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="milliseconds"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+    </object>
+
     <object
         name="Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}."
         access="readOnly" numEntriesParameter="STANumberOfEntries"
@@ -35583,12 +41812,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.15|because it is superseded by
-          {{object|WiFi6Capabilities}}.}}
+          {{object|WiFi6Capabilities}}}}
+
+          {{obsoleted|2.17}}
         </description>
         <syntax>
           <base64>
@@ -35702,10 +41933,6 @@
           encoded per {{bibref|802.11-2020|Table 9-176}}, and described in
           {{bibref|EasyMesh|Section 10.3.1}}). Reserved: 221 - 255.
 
-          NOTE: The underlying WFA specification is in the process of being
-          reviewed for possible clarification. Please refer to that
-          specification for more details.
-
           If the instance of this {{object}} is the same as
           {{object|Device.WiFi.AccessPoint.{i}.AssociatedDevice.{i}}}, then
           this parameter is the same as
@@ -35912,6 +42139,48 @@
         </syntax>
       </parameter>
 
+      <parameter name="SleepMode" access="readOnly">
+        <description>
+          This parameter indicates the current operating sleep mode as recorded
+          by the BSS {{bibref|802.11-2020}}. {{enum}}
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="Not_Asleep"/>
+            <enumeration value="WNM_Sleep_Mode"/>
+            <enumeration value="TPU_Sleep"/>
+            <enumeration value="TDLS_Peer_Power_Save_Mode_(PSM)"/>
+            <enumeration value="AP_PS-Poll"/>
+            <enumeration value="TWT_Sleep"/>
+            <enumeration value="Light_Sleep"/>
+            <enumeration value="Deep_Sleep"/>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="SecurityAssociation" access="readOnly">
+        <description>
+          This parameter indicates the current operating security state as
+          defined in {{bibref|802.11-2020|Section 12.6.1.1}}. {{enum}}
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="PMKSA"/>
+            <enumeration value="PMK-R0"/>
+            <enumeration value="PMK-R1"/>
+            <enumeration value="Mesh_PMKSA"/>
+            <enumeration value="Mesh_TKSA"/>
+            <enumeration value="PTKSA"/>
+            <enumeration value="GTKSA"/>
+            <enumeration value="IGTKSA"/>
+            <enumeration value="Mesh_GTKSA"/>
+            <enumeration value="BIGTKSA"/>
+            <enumeration value="TPKSA"/>
+            <enumeration value="Other"/>
+          </string>
+        </syntax>
+      </parameter>
+
       <parameter name="TIDQueueSizesNumberOfEntries" access="readOnly">
         <description>
           {{numentries}}
@@ -36275,10 +42544,20 @@
         </syntax>
       </parameter>
 
+      <parameter name="DLOFDMA" access="readOnly">
+        <description>
+          Indicates support for Downlink (DL) Orthogonal Frequency Division
+          Multiplexing (OFDMA).
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
       <parameter name="MaxDLMUMIMO" access="readOnly">
         <description>
-          Max number of users supported per DL MU-MIMO Transmitter (TX) in an
-          AP role.
+          Max number of users supported per DL MU-MIMO Transmitter (TX) in the
+          BSS role.
         </description>
         <syntax>
           <unsignedInt>
@@ -36289,7 +42568,7 @@
 
       <parameter name="MaxULMUMIMO" access="readOnly">
         <description>
-          Max number of users supported per UL MU-MIMO Receiver (RX) in an AP
+          Max number of users supported per UL MU-MIMO Receiver (RX) in the BSS
           role.
         </description>
         <syntax>
@@ -36301,7 +42580,7 @@
 
       <parameter name="MaxDLOFDMA" access="readOnly">
         <description>
-          Max number of users supported per Downlink (DL) OFDMA TX in an AP
+          Max number of users supported per Downlink (DL) OFDMA TX in the BSS
           role.
         </description>
         <syntax>
@@ -36313,7 +42592,7 @@
 
       <parameter name="MaxULOFDMA" access="readOnly">
         <description>
-          Max number of users supported per UL OFDMA RX in an AP role.
+          Max number of users supported per UL OFDMA RX in the BSS role.
         </description>
         <syntax>
           <unsignedInt>
@@ -36460,8 +42739,9 @@
         access="readOnly" numEntriesParameter="UnassociatedSTANumberOfEntries"
         minEntries="0" maxEntries="unbounded" version="2.13">
       <description>
-        Each instance represents a Non-AP STA that has been discovered by the
-        Radio but is not associated to any of the BSS operating on the Radio.
+        Each instance represents a station (STA) that has been discovered by
+        the Radio but is not associated to any of the BSS operating on the
+        Radio.
       </description>
       <uniqueKey functional="true">
         <parameter ref="MACAddress"/>
@@ -36482,10 +42762,6 @@
           Non-AP STA - measured in {{units}}. RCPI is encoded per
           {{bibref|802.11-2020|Table 9-176}}, and described in
           {{bibref|EasyMesh|Section 10.3.2}}. Reserved: 221 - 255.
-
-          NOTE: The underlying WFA specification is in the process of being
-          reviewed for possible clarification. Please refer to that
-          specification for more details.
         </description>
         <syntax>
           <unsignedInt>
@@ -36494,6 +42770,1081 @@
           </unsignedInt>
         </syntax>
       </parameter>
+
+      <parameter name="OperatingClass" access="readOnly">
+        <description>
+          Operating class on which this unassociated STA was last detected, per
+          {{bibref|802.11-2020|Table E-4}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range maxInclusive="255"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="Channel" access="readOnly">
+        <description>
+          Channel on which this unassociated STA was last detected.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range maxInclusive="255"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object name="Device.WiFi.DataElements.Network.Device.{i}.WPS."
+        access="readOnly" minEntries="1" maxEntries="1" version="2.17">
+      <description>
+        This object contains Wi-Fi Protected Setup (WPS) Push Button
+        Configuration (PBC) configuration and status as specified in
+        {{bibref|WPSv1.0}} or {{bibref|WPS 2.0}}). In EasyMesh
+        {{bibref|EasyMesh}} this object applies to fronthaul only.
+      </description>
+
+      <parameter name="Enable" access="readWrite">
+        <description>
+          Enables or disables WPS functionality for this EasyMesh agent or
+          single AP.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Status" access="readOnly">
+        <description>
+          Indicates the current status of WPS. If the device goes to
+          {{enum|SetupLocked}} the WPS needs to be disabled and re-enabled to
+          come out of this state.
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="Disabled"/>
+            <enumeration value="Error"/>
+            <enumeration value="Unconfigured"/>
+            <enumeration value="Configured"/>
+            <enumeration value="SetupLocked"/>
+            <enumeration value="InProgress"/>
+          </string>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object name="Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}."
+        access="readOnly" numEntriesParameter="APMLDNumberOfEntries"
+        minEntries="0" maxEntries="unbounded" version="2.17">
+      <description>
+        Table of Multi-Link Operation (MLO) capable Access Points (APs) on this
+        EasyMesh Agent or Single AP device. {{bibref|EasyMesh}} source: Agent
+        AP MLD Configuration TLV.
+      </description>
+      <uniqueKey functional="true">
+        <parameter ref="MLDMACAddress"/>
+      </uniqueKey>
+
+      <parameter name="MLDMACAddress" access="readOnly">
+        <description>
+          The Multi-Link Device (MLD) MAC Address of the MLO Capable access
+          point (AP). {{bibref|EasyMesh}} Source: Agent AP MLD Configuration
+          TLV.
+        </description>
+        <syntax>
+          <dataType ref="MACAddress"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="TIDLinkMapNumberOfEntries" access="readOnly">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="AffiliatedAPNumberOfEntries" access="readOnly">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="STAMLDNumberOfEntries" access="readOnly">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object
+        name="Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.APMLDConfig."
+        access="readOnly" minEntries="1" maxEntries="1" version="2.17">
+      <description>
+        This object describes the Wi-Fi 7 Multi-Link Operation (MLO)
+        configuration of the Multi-Link Device (MLD) Access Point (AP),
+        {{bibref|EasyMesh}} source: Agent AP MLD Configuration TLV.
+      </description>
+
+      <parameter name="EMLMREnabled" access="readOnly">
+        <description>
+          Indicates if the Enhanced Multi-Link Multi-Radio (EMLMR) operation is
+          enabled.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="EMLSREnabled" access="readOnly">
+        <description>
+          Indicates if Enhanced Multi-Link Single-Radio (EMLSR) operation is
+          enabled.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="STREnabled" access="readOnly">
+        <description>
+          Indicates if Simultaneous Transmit and Receive (STR) operation is
+          enabled.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="NSTREnabled" access="readOnly">
+        <description>
+          Indicates if Non-Simultaneous Transmit and Receive (NSTR) operation
+          is enabled.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="TIDLinkMapNegotiation" access="readOnly">
+        <description>
+          Indicates if Traffic Identifier (TID) to Link Mapping Negotiation is
+          enabled. {{bibref|EasyMesh}} source: TID-to-Link Mapping Policy TLV.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object
+        name="Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.TIDLinkMap.{i}."
+        access="readOnly" numEntriesParameter="TIDLinkMapNumberOfEntries"
+        minEntries="0" maxEntries="unbounded" version="2.17">
+      <description>
+        Table of Traffic Identifier (TID) to Link Mappings of the Multi-Link
+        Operation (MLO) capable access point (AP). Each table entry describes
+        the mapping between a particular TID and direction and preferred link.
+        {{bibref|EasyMesh}} source: TID-to-Link Mapping Policy TLV.
+      </description>
+      <uniqueKey functional="true">
+        <parameter ref="TID"/>
+      </uniqueKey>
+
+      <parameter name="Direction" access="readOnly">
+        <description>
+          The direction of the traffic flow from the perspective of the APMLD.
+          {{enum}}
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="Up"/>
+            <enumeration value="Down"/>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="TID" access="readOnly">
+        <description>
+          The traffic identifier (TID) for this mapping.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range minInclusive="0" maxInclusive="255"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="BSSID" access="readOnly">
+        <description>
+          The BSSID of the preferred link (affiliated AP) to use for traffic
+          with matching direction and TID values.
+        </description>
+        <syntax>
+          <dataType ref="MACAddress"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="LinkID" access="readOnly">
+        <description>
+          The Link ID of the preferred link (affiliated AP) to use for traffic
+          with matching direction and TID values.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range minInclusive="0" maxInclusive="255"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object
+        name="Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.AffiliatedAP.{i}."
+        access="readOnly" numEntriesParameter="AffiliatedAPNumberOfEntries"
+        minEntries="0" maxEntries="unbounded" version="2.17">
+      <description>
+        The Access Points (APs) affiliated to the AP MLD. {{bibref|EasyMesh}}
+        Source: Agent AP MLD Configuration TLV.
+
+        Counters in this object include all traffic, MLD and non-MLD.
+      </description>
+      <uniqueKey functional="true">
+        <parameter ref="BSSID"/>
+      </uniqueKey>
+
+      <parameter name="BSSID" access="readOnly">
+        <description>
+          The BSSID of the affiliated AP. This should be set to one of the
+          values of {{param|##.Radio.{i}.BSS.{i}.BSSID}}. {{bibref|EasyMesh}}
+          source: Agent AP MLD Configuration TLV.
+        </description>
+        <syntax>
+          <dataType ref="MACAddress"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="LinkID" access="readOnly">
+        <description>
+          The Link ID assigned to this affiliated AP. {{bibref|EasyMesh}}
+          source: Agent AP MLD Configuration TLV.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range minInclusive="0" maxInclusive="255"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="RUID" access="readOnly">
+        <description>
+          The Radio unique identifier (RUID) of the Radio that this affiliated
+          AP is operating on. {{bibref|EasyMesh}} source: Agent AP MLD
+          Configuration TLV.
+        </description>
+        <syntax>
+          <base64/>
+        </syntax>
+      </parameter>
+
+      <parameter name="DisabledSubChannels" access="readOnly">
+        <description>
+          Disabled Subchannel Bitmap subfield from the EHT Operation element in
+          transmitted Management frames. Null value or not present for
+          stations. {{bibref|EasyMesh}} source: Static Puncturing Configuration
+          TLV.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range minInclusive="0" maxInclusive="65535"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="PacketsSent" access="readOnly">
+        <description>
+          The number of packets transmitted by the Affiliated AP. Note: this
+          counter counts only MLD traffic through this BSSID, not legacy
+          (non-MLD) traffic. {{bibref|EasyMesh}} source: Associated STA Traffic
+          Stats TLV.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="PacketsReceived" access="readOnly">
+        <description>
+          The total number of packets received from the affiliated STAs by this
+          Affiliated AP. {{bibref|EasyMesh}} source: Associated STA Traffic
+          Stats TLV.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="UnicastBytesSent" access="readOnly">
+        <description>
+          Total number of unicast bytes transmitted to MLD STAs associated with
+          the affiliated AP. {{bibref|EasyMesh}} source: Affiliated AP Metrics
+          TLV.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="UnicastBytesReceived" access="readOnly">
+        <description>
+          Total number of unicast bytes received from MLD STAs associated with
+          the affiliated AP. {{bibref|EasyMesh}} source: Affiliated AP Metrics
+          TLV.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ErrorsSent" access="readOnly">
+        <description>
+          The number of packets which could not be transmitted by the
+          Affiliated AP due to errors. This counter counts only MLD traffic
+          through this BSSID, not legacy (non-MLD) traffic. {{bibref|EasyMesh}}
+          source: Affiliated AP Metrics TLV.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="MulticastBytesSent" access="readOnly">
+        <description>
+          Total multicast bytes transmitted to MLD STAs associated with the
+          affiliated AP. {{bibref|EasyMesh}} source: Affiliated AP Metrics TLV.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="MulticastBytesReceived" access="readOnly">
+        <description>
+          Total multicast bytes received from MLD STAs associated with the
+          affiliated AP. {{bibref|EasyMesh}} source: Affiliated AP Metrics TLV.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="BroadcastBytesSent" access="readOnly">
+        <description>
+          Total broadcast bytes transmitted to MLD STAs associated with the
+          affiliated AP. {{bibref|EasyMesh}} source: Affiliated AP Metrics TLV.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="BroadcastBytesReceived" access="readOnly">
+        <description>
+          Total broadcast bytes received from MLD STAs associated with the
+          affiliated AP. {{bibref|EasyMesh}} source: Affiliated AP Metrics TLV.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="EstServiceParametersBE" access="readOnly">
+        <description>
+          Estimated Service Parameters information field for AC=BE, defined per
+          {{bibref|802.11-2020|Figure 9-637}} and referenced in
+          {{bibref|EasyMesh|Section 17.2.22}}.
+        </description>
+        <syntax>
+          <base64>
+            <size minLength="0" maxLength="3"/>
+          </base64>
+        </syntax>
+      </parameter>
+
+      <parameter name="EstServiceParametersBK" access="readOnly">
+        <description>
+          Estimated Service Parameters information field for AC=BK, defined per
+          {{bibref|802.11-2020|Figure 9-637}} and referenced in
+          {{bibref|EasyMesh|Section 17.2.22}}.
+        </description>
+        <syntax>
+          <base64>
+            <size minLength="0" maxLength="3"/>
+          </base64>
+        </syntax>
+      </parameter>
+
+      <parameter name="EstServiceParametersVI" access="readOnly">
+        <description>
+          Estimated Service Parameters information field for AC=VI, defined per
+          {{bibref|802.11-2020|Figure 9-637}} and referenced in
+          {{bibref|EasyMesh|Section 17.2.22}}.
+        </description>
+        <syntax>
+          <base64>
+            <size minLength="0" maxLength="3"/>
+          </base64>
+        </syntax>
+      </parameter>
+
+      <parameter name="EstServiceParametersVO" access="readOnly">
+        <description>
+          Estimated Service Parameters information field for AC=VO, defined per
+          {{bibref|802.11-2020|Figure 9-637}} and referenced in
+          {{bibref|EasyMesh|Section 17.2.22}}.
+        </description>
+        <syntax>
+          <base64>
+            <size minLength="0" maxLength="3"/>
+          </base64>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object
+        name="Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.STAMLD.{i}."
+        access="readOnly" numEntriesParameter="STAMLDNumberOfEntries"
+        minEntries="0" maxEntries="unbounded" version="2.17">
+      <description>
+        This object describes Multi-Link Operation (MLO) capable stations
+        (STAs), also known as client Multilink Devices (MLDs), associated to
+        this MLO capable Access Point. {{bibref|EasyMesh}} source: Associated
+        Clients TLV.
+      </description>
+      <uniqueKey functional="true">
+        <parameter ref="MLDMACAddress"/>
+      </uniqueKey>
+
+      <parameter name="MLDMACAddress" access="readOnly">
+        <description>
+          The Multi-Link Device (MLD) MAC Address of the client MLD STA.
+          {{bibref|EasyMesh}} source: Associated STA MLD Configuration Report
+          TLV.
+        </description>
+        <syntax>
+          <dataType ref="MACAddress"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Hostname" access="readOnly">
+        <description>
+          The Hostname for the client MLD STA.
+        </description>
+        <syntax>
+          <string/>
+        </syntax>
+      </parameter>
+
+      <parameter name="IPv4Address" access="readOnly">
+        <description>
+          The IPv4 address allocated to the MLD MAC Address of this device.
+        </description>
+        <syntax>
+          <dataType ref="IPv4Address"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="IPv6Address" access="readOnly">
+        <description>
+          The IPv6 address allocated to the MLD MAC Address of this device.
+        </description>
+        <syntax>
+          <dataType ref="IPv6Address"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="IsbSTA" access="readOnly">
+        <description>
+          Indicates if the client MLD STA is a backhaul MLD STA (bSTAMLD). This
+          is useful when the same AP MLD has both client MLD and bSTAMLDs
+          associated. {{bibref|EasyMesh}} source: Backhaul STA MLD
+          Configuration TLV.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="LastConnectTime" access="readOnly">
+        <description>
+          The time in {{units}} since this client MLD STA was associated.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="BytesSent" access="readOnly">
+        <description>
+          The total number of bytes transmitted to the client MLD STA.
+          {{bibref|EasyMesh}} source: Associated STA Traffic Stats TLV.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="BytesReceived" access="readOnly">
+        <description>
+          The total number of bytes received from the client MLD STA.
+          {{bibref|EasyMesh}} source: Associated STA Traffic Stats TLV.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <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.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="PacketsReceived" access="readOnly">
+        <description>
+          The total number of packets received from the client MLD STA.
+          {{bibref|EasyMesh}} source: Associated STA Traffic Stats TLV.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ErrorsSent" access="readOnly">
+        <description>
+          The number of packets which could not be transmitted to the client
+          MLD STA due to errors. {{bibref|EasyMesh}} source: Associated STA
+          Traffic Stats TLV.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ErrorsReceived" access="readOnly">
+        <description>
+          The number of packets which were received with error from the client
+          MLD STA. {{bibref|EasyMesh}} source: Associated STA Traffic Stats
+          TLV.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="RetransCount" access="readOnly">
+        <description>
+          The number of packets transmitted with the retry flag sent to the
+          client MLD STA. {{bibref|EasyMesh}} source: Associated STA Traffic
+          Stats TLV.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="STATIDLinkMapNumberOfEntries" access="readOnly">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="AffiliatedSTANumberOfEntries" access="readOnly">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object
+        name="Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.STAMLD.{i}.WiFi7Capabilities."
+        access="readOnly"
+        numEntriesParameter="WiFi7CapabilitiesNumberOfEntries" minEntries="1"
+        maxEntries="1" version="2.17">
+      <description>
+        This object describes the Wi-Fi 7 capabilities for this STAMLD
+        including Multi-Link Operation (MLO) capabilities. {{bibref|EasyMesh}}
+        Source: Wi-Fi 7 Agent Capabilities TLV.
+      </description>
+
+      <parameter name="EMLMRSupport" access="readOnly">
+        <description>
+          Indicates if the Enhanced Multi-Link Multi-Radio (EMLMR) operation is
+          supported by this STAMLD.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="EMLSRSupport" access="readOnly">
+        <description>
+          Indicates if Enhanced Multi-Link Single-Radio (EMLSR) operation is
+          supported by this STAMLD.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="STRSupport" access="readOnly">
+        <description>
+          Indicates if Simultaneous Transmit and Receive (STR) operation is
+          supported by this STAMLD.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="NSTRSupport" access="readOnly">
+        <description>
+          Indicates if Non-Simultaneous Transmit and Receive (NSTR) operation
+          is supported by this STAMLD.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="TIDLinkMapNegotiation" access="readOnly">
+        <description>
+          Indicates if Traffic Identifier (TID) to Link Mapping Negotiation is
+          supported by this STAMLD.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object
+        name="Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.STAMLD.{i}.STAMLDConfig."
+        access="readOnly" minEntries="1" maxEntries="1" version="2.17">
+      <description>
+        This object describes the Wi-Fi 7 Multi-Link Operation (MLO)
+        configuration of the Multi-Link Device (MLD) station (STA, also called
+        associated device). Note this may differ from the WiFi7 capabilities of
+        the device. {{bibref|EasyMesh}} source: Associated STA MLD
+        Configuration Report TLV.
+      </description>
+
+      <parameter name="EMLMREnabled" access="readOnly">
+        <description>
+          Indicates if the Enhanced Multi-Link Multi-Radio (EMLMR) operation is
+          enabled.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="EMLSREnabled" access="readOnly">
+        <description>
+          Indicates if Enhanced Multi-Link Single-Radio (EMLSR) operation is
+          enabled.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="STREnabled" access="readOnly">
+        <description>
+          Indicates if Simultaneous Transmit and Receive (STR) operation is
+          enabled.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="NSTREnabled" access="readOnly">
+        <description>
+          Indicates if Non-Simultaneous Transmit and Receive (NSTR) operation
+          is enabled.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="TIDLinkMapNegotiation" access="readOnly">
+        <description>
+          Indicates if Traffic Identifier (TID) to Link Mapping Negotiation is
+          enabled. {{bibref|EasyMesh}} source: TID-to-Link Mapping Policy TLV.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object
+        name="Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.STAMLD.{i}.STATIDLinkMap.{i}."
+        access="readOnly" numEntriesParameter="STATIDLinkMapNumberOfEntries"
+        minEntries="0" maxEntries="unbounded" version="2.17">
+      <description>
+        Table of Traffic Identifier (TID) to Link Mappings of the Multi-Link
+        Operation (MLO) capable station (STA). Each table entry describes the
+        mapping between a particular TID and direction and preferred link.
+        {{bibref|EasyMesh}} source: TID-to-Link Mapping Policy TLV.
+      </description>
+      <uniqueKey functional="true">
+        <parameter ref="TID"/>
+      </uniqueKey>
+
+      <parameter name="Direction" access="readOnly">
+        <description>
+          The direction of the traffic flow from the perspective of the APMLD.
+          {{enum}}
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="Up"/>
+            <enumeration value="Down"/>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="TID" access="readOnly">
+        <description>
+          The traffic identifier (TID) for this mapping.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range minInclusive="0" maxInclusive="255"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="BSSID" access="readOnly">
+        <description>
+          The BSSID of the preferred link (affiliated AP) to use for traffic
+          with matching direction and TID values.
+        </description>
+        <syntax>
+          <dataType ref="MACAddress"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="LinkID" access="readOnly">
+        <description>
+          The Link ID of the preferred link (affiliated AP) to use for traffic
+          with matching direction and TID values.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range minInclusive="0" maxInclusive="255"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object
+        name="Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.STAMLD.{i}.AffiliatedSTA.{i}."
+        access="readOnly" numEntriesParameter="AffiliatedSTANumberOfEntries"
+        minEntries="0" maxEntries="unbounded" version="2.17">
+      <description>
+        This object describes stations (STAs, also called associated devices)
+        that are affiliated to this Multi-Link Device (MLD) STA.
+        {{bibref|EasyMesh}} source: Associated STA MLD Configuration TLV.
+      </description>
+      <uniqueKey functional="true">
+        <parameter ref="MACAddress"/>
+      </uniqueKey>
+
+      <parameter name="MACAddress" access="readOnly">
+        <description>
+          The MAC address of the affiliated STA. {{bibref|EasyMesh}} source:
+          Associated STA MLD Configuration Report TLV.
+        </description>
+        <syntax>
+          <dataType ref="MACAddress"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="BSSID" access="readOnly">
+        <description>
+          The BSSID of the affiliated AP that the affiliated STA is associated
+          to. {{bibref|EasyMesh}} source: Associated STA MLD Configuration
+          Report TLV.
+        </description>
+        <syntax>
+          <dataType ref="MACAddress"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="BytesSent" access="readOnly">
+        <description>
+          The total number of bytes transmitted to the affiliated STA.
+          {{bibref|EasyMesh}} source: Associated STA Traffic Stats TLV.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="BytesReceived" access="readOnly">
+        <description>
+          The total number of bytes received from the affiliated STA.
+          {{bibref|EasyMesh}} source: Associated STA Traffic Stats TLV.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="PacketsSent" access="readOnly">
+        <description>
+           The total number of packets transmitted to the affiliated STA.
+           {{bibref|EasyMesh}} source: Associated STA Traffic Stats TLV.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="PacketsReceived" access="readOnly">
+        <description>
+          The total number of packets received from the affiliated STA.
+          {{bibref|EasyMesh}} source: Associated STA Traffic Stats TLV.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ErrorsSent" access="readOnly">
+        <description>
+          The number of packets which could not be transmitted to the
+          affiliated STA due to errors. {{bibref|EasyMesh}} source: Associated
+          STA Traffic Stats TLV.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="SignalStrength" access="readOnly">
+        <description>
+          An indicator of radio signal strength of the uplink from the
+          affiliated STA to the access point - measured in {{units}}. RCPI is
+          encoded per {{bibref|802.11-2020|Table 9-176}}, and described in
+          {{bibref|EasyMesh|Section 10.3.1}}). Reserved: 221 - 255.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range maxInclusive="255"/>
+            <units value="dBm"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="EstMACDataRateDownlink" access="readOnly">
+        <description>
+          Estimate of the MAC layer throughput in {{units}} achievable in the
+          downlink direction if 100% of channel airtime and BSS operating
+          bandwidth were available, as defined in {{bibref|EasyMesh|Section
+          10.3.1}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="Mbps"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="EstMACDataRateUplink" access="readOnly">
+        <description>
+          Estimate of the MAC layer throughput in {{units}} achievable in the
+          uplink direction if 100% of channel airtime and BSS operating
+          bandwidth were available, as defined in {{bibref|EasyMesh|Section
+          10.3.1}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="Mbps"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="LastDataDownlinkRate" access="readOnly">
+        <description>
+          The data transmit rate in {{units}} that was most recently used for
+          transmission of data from the access point to the affiliated STA.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="kbps"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="LastDataUplinkRate" access="readOnly">
+        <description>
+          The data transmit rate in {{units}} that was most recently used for
+          transmission of data from the affiliated STA to the access point.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="kbps"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="UtilizationReceive" access="readOnly">
+        <description>
+          The amount of time in {{units}} that the APMLD Radio has spent on the
+          channel receiving data from the affiliated STA.
+        </description>
+        <syntax>
+          <unsignedLong>
+            <units value="milliseconds"/>
+          </unsignedLong>
+        </syntax>
+      </parameter>
+
+      <parameter name="UtilizationTransmit" access="readOnly">
+        <description>
+          The amount of time in {{units}} that the APMLD Radio has spent on the
+          channel transmitting data to the affiliated STA.
+        </description>
+        <syntax>
+          <unsignedLong>
+            <units value="milliseconds"/>
+          </unsignedLong>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object name="Device.WiFi.DataElements.Network.Device.{i}.bSTAMLD."
+        access="readOnly" minEntries="1" maxEntries="1" version="2.17">
+      <description>
+        This object represents the Multi-Link Operation (MLO) capable backhaul
+        station (bSTA) operating on this EasyMesh Agent. Only one MLO capable
+        bSTA per EasyMesh Agent is allowed. {{bibref|EasyMesh}} source:
+        Backhaul STA MLD Configuration TLV.
+      </description>
+
+      <parameter name="MLDMACAddress" access="readOnly">
+        <description>
+          The Multi-Link Device (MLD) MAC Address of the MLO Capable bSTA.
+          {{bibref|EasyMesh}} Source: Backhaul STA MLD Configuration TLV.
+        </description>
+        <syntax>
+          <dataType ref="MACAddress"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="BSSID" access="readOnly">
+        <description>
+          The MLD MAC address of the upstream APMLD that this bSTAMLD is
+          associated to. {{bibref|EasyMesh}} source: Associated Clients TLV.
+        </description>
+        <syntax>
+          <dataType ref="MACAddress"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="AffiliatedbSTAList" access="readOnly">
+        <description>
+          {{list}} backhaul STA MAC addresses affiliated to this bSTAMLD.
+          {{bibref|EasyMesh}} source: Backhaul STA MLD Configuration TLV.
+        </description>
+        <syntax>
+          <list/>
+          <dataType ref="MACAddress"/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object
+        name="Device.WiFi.DataElements.Network.Device.{i}.bSTAMLD.bSTAMLDConfig."
+        access="readOnly" minEntries="1" maxEntries="1" version="2.17">
+      <description>
+        This object describes the Multi-Link Operation (MLO) configuration of a
+        Multi-Link Device (MLD) backhaul STA (bSTA). {{bibref|EasyMesh}}
+        source: Backhaul STA MLD Configuration TLV.
+      </description>
+
+      <parameter name="EMLMREnabled" access="readOnly">
+        <description>
+          Indicates if the Enhanced Multi-Link Multi-Radio (EMLMR) operation is
+          enabled.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="EMLSREnabled" access="readOnly">
+        <description>
+          Indicates if Enhanced Multi-Link Single-Radio (EMLSR) operation is
+          enabled.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="STREnabled" access="readOnly">
+        <description>
+          Indicates if Simultaneous Transmit and Receive (STR) operation is
+          enabled.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="NSTREnabled" access="readOnly">
+        <description>
+          Indicates if Non-Simultaneous Transmit and Receive (NSTR) operation
+          is enabled.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="TIDLinkMapNegotiation" access="readOnly">
+        <description>
+          Indicates if Traffic Identifier (TID) to Link Mapping Negotiation is
+          enabled. {{bibref|EasyMesh}} source: TID-to-Link Mapping Policy TLV.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
     </object>
 
     <object name="Device.WiFi.DataElements.AssociationEvent."
@@ -36503,9 +43854,13 @@
         BSS.
       </description>
 
-      <parameter name="AssociationEventDataNumberOfEntries" access="readOnly">
+      <parameter name="AssociationEventDataNumberOfEntries" access="readOnly"
+          status="deprecated">
         <description>
           {{numentries}}
+
+          {{deprecated|2.17|because a corresponding USP event is defined
+          instead}}
         </description>
         <syntax>
           <unsignedInt/>
@@ -36518,10 +43873,13 @@
         access="readOnly"
         numEntriesParameter="AssociationEventDataNumberOfEntries"
         minEntries="0" maxEntries="unbounded" dmr:noUniqueKeys="true"
-        version="2.13">
+        version="2.13" status="deprecated">
       <description>
         The events generated when an Associated Device (STA) associates to a
         BSS.
+
+        {{deprecated|2.17|because a corresponding USP event is defined
+        instead}}
       </description>
 
       <parameter name="TimeStamp" access="readOnly">
@@ -36615,9 +43973,13 @@
 
     <object
         name="Device.WiFi.DataElements.AssociationEvent.AssociationEventData.{i}.WiFi6Capabilities."
-        access="readOnly" minEntries="1" maxEntries="1" version="2.15">
+        access="readOnly" minEntries="1" maxEntries="1" version="2.15"
+        status="deprecated">
       <description>
         Describes the Wi-Fi 6 capabilities of the Associated Device (STA).
+
+        {{deprecated|2.17|because a corresponding USP event is defined
+        instead}}
       </description>
 
       <parameter name="HE160" access="readOnly">
@@ -36719,10 +44081,20 @@
         </syntax>
       </parameter>
 
+      <parameter name="DLOFDMA" access="readOnly">
+        <description>
+          Indicates support for Downlink (DL) Orthogonal Frequency Division
+          Multiplexing (OFDMA).
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
       <parameter name="MaxDLMUMIMO" access="readOnly">
         <description>
-          Max number of users supported per DL MU-MIMO Transmitter (TX) in an
-          AP role.
+          Max number of users supported per DL MU-MIMO Transmitter (TX) in the
+          BSS role.
         </description>
         <syntax>
           <unsignedInt>
@@ -36733,7 +44105,7 @@
 
       <parameter name="MaxULMUMIMO" access="readOnly">
         <description>
-          Max number of users supported per UL MU-MIMO Receiver (RX) in an AP
+          Max number of users supported per UL MU-MIMO Receiver (RX) in the BSS
           role.
         </description>
         <syntax>
@@ -36745,7 +44117,7 @@
 
       <parameter name="MaxDLOFDMA" access="readOnly">
         <description>
-          Max number of users supported per Downlink (DL) OFDMA TX in an AP
+          Max number of users supported per Downlink (DL) OFDMA TX in the BSS
           role.
         </description>
         <syntax>
@@ -36757,7 +44129,7 @@
 
       <parameter name="MaxULOFDMA" access="readOnly">
         <description>
-          Max number of users supported per UL OFDMA RX in an AP role.
+          Max number of users supported per UL OFDMA RX in the BSS role.
         </description>
         <syntax>
           <unsignedInt>
@@ -36848,9 +44220,12 @@
       </description>
 
       <parameter name="DisassociationEventDataNumberOfEntries"
-          access="readOnly">
+          access="readOnly" status="deprecated">
         <description>
           {{numentries}}
+
+          {{deprecated|2.17|because a corresponding USP event is defined
+          instead}}
         </description>
         <syntax>
           <unsignedInt/>
@@ -36863,15 +44238,18 @@
         access="readOnly"
         numEntriesParameter="DisassociationEventDataNumberOfEntries"
         minEntries="0" maxEntries="unbounded" dmr:noUniqueKeys="true"
-        version="2.13">
+        version="2.13" status="deprecated">
       <description>
         The events generated when an Associated Device (STA) disassociates from
         a BSS.
+
+        {{deprecated|2.17|because a corresponding USP event is defined
+        instead}}
       </description>
 
       <parameter name="BSSID" access="readOnly">
         <description>
-          The MAC Address of the logical BSS ( BSSID) which is reporting the
+          The MAC Address of the logical BSS (BSSID) which is reporting the
           Disassociation Event.
         </description>
         <syntax>
@@ -36984,6 +44362,143 @@
           <string/>
         </syntax>
       </parameter>
+
+      <parameter name="LastDataDownlinkRate" access="readOnly">
+        <description>
+          The data transmit rate in {{units}} that was most recently used for
+          transmission of data from the access point to the Associated Device
+          (STA).
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="kbps"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="LastDataUplinkRate" access="readOnly">
+        <description>
+          The data transmit rate in {{units}} that was most recently used for
+          transmission of data from the Associated Device (STA) to the access
+          point.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="kbps"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="UtilizationReceive" access="readOnly">
+        <description>
+          The amount of time in {{units}} that the Radio has spent on the
+          Channel receiving data from the Associated Device (STA).
+        </description>
+        <syntax>
+          <unsignedLong>
+            <units value="milliseconds"/>
+          </unsignedLong>
+        </syntax>
+      </parameter>
+
+      <parameter name="UtilizationTransmit" access="readOnly">
+        <description>
+          The amount of time in {{units}} that the Radio has spent on the
+          Channel transmitting data to the Associated Device (STA).
+        </description>
+        <syntax>
+          <unsignedLong>
+            <units value="milliseconds"/>
+          </unsignedLong>
+        </syntax>
+      </parameter>
+
+      <parameter name="EstMACDataRateDownlink" access="readOnly">
+        <description>
+          Estimate of the MAC layer throughput in {{units}} achievable in the
+          downlink direction to the Associated Device (STA) if 100% of channel
+          airtime and BSS operating bandwidth were available, as defined in
+          {{bibref|EasyMesh|Section 10.3.1}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="Mbps"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="EstMACDataRateUplink" access="readOnly">
+        <description>
+          Estimate of the MAC layer throughput in {{units}} achievable in the
+          uplink direction from the Associated Device (STA) if 100% of channel
+          airtime and BSS operating bandwidth were available, as defined in
+          {{bibref|EasyMesh|Section 10.3.1}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="Mbps"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="SignalStrength" access="readOnly">
+        <description>
+          An indicator of radio signal strength of the uplink from the
+          Associated Device (STA) to the access point - measured in {{units}}.
+          RCPI is encoded per {{bibref|802.11-2020|Table 9-176}}, and described
+          in {{bibref|EasyMesh|Section 10.3.1}}). Reserved: 221 - 255.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range maxInclusive="255"/>
+            <units value="dBm"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="LastConnectTime" access="readOnly">
+        <description>
+          The time in {{units}} since this Assocated Device (STA) was
+          associated.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="Noise" access="readOnly">
+        <description>
+          An indicator of the average radio noise plus interference power at
+          the access point measured for the primary operating channel to this
+          Associated Device (STA).
+
+          Encoded as defined for ANPI in {{bibref|802.11-2020|Section
+          11.10.9.4}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range maxInclusive="255"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="InitiatedBy" access="readOnly">
+        <description>
+          This parameter indicates the entity that initiated this
+          Disassociation Event. {{enum}}
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="STA"/>
+            <enumeration value="EasyMesh_Agent"/>
+            <enumeration value="EasyMesh_Controller"/>
+            <enumeration value="DE_Collector"/>
+            <enumeration value="Unknown"/>
+          </string>
+        </syntax>
+      </parameter>
     </object>
 
     <object name="Device.WiFi.DataElements.FailedConnectionEvent."
@@ -36994,9 +44509,12 @@
       </description>
 
       <parameter name="FailedConnectionEventDataNumberOfEntries"
-          access="readOnly">
+          access="readOnly" status="deprecated">
         <description>
           {{numentries}}
+
+          {{deprecated|2.17|because a corresponding USP event is defined
+          instead}}
         </description>
         <syntax>
           <unsignedInt/>
@@ -37009,14 +44527,28 @@
         access="readOnly"
         numEntriesParameter="FailedConnectionEventDataNumberOfEntries"
         minEntries="0" maxEntries="unbounded" version="2.15"
-        dmr:noUniqueKeys="true">
+        dmr:noUniqueKeys="true" status="deprecated">
       <description>
         This object describes the data provided with a failed connection event
+
+        {{deprecated|2.17|because a corresponding USP event is defined
+        instead}}
       </description>
 
+      <parameter name="BSSID" access="readOnly">
+        <description>
+          The MAC Address of the logical BSS (BSSID) which is reporting the
+          failed connection event.
+        </description>
+        <syntax>
+          <dataType ref="MACAddress"/>
+        </syntax>
+      </parameter>
+
       <parameter name="MACAddress" access="readOnly">
         <description>
-          STA MAC Address identifying the client that has attempted to connect.
+          MAC Address identifying the associated device (STA) that has
+          attempted to connect.
         </description>
         <syntax>
           <dataType ref="MACAddress"/>
@@ -37137,7 +44669,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -37272,15 +44804,15 @@
 
           If {{param|OperatingFrequencyBand}} is set to
           {{enum|2.4GHz|OperatingFrequencyBand}}, only values {{enum|b}},
-          {{enum|g}}, {{enum|n}}, {{enum|ax}} are allowed.
+          {{enum|g}}, {{enum|n}}, {{enum|ax}}, {{enum|be}} are allowed.
 
           If {{param|OperatingFrequencyBand}} is set to
           {{enum|5GHz|OperatingFrequencyBand}}, only values {{enum|a}},
-          {{enum|n}}, {{enum|ac}}, {{enum|ax}} are allowed.
+          {{enum|n}}, {{enum|ac}}, {{enum|ax}}, {{enum|be}} are allowed.
 
           If {{param|OperatingFrequencyBand}} is set to
-          {{enum|6GHz|OperatingFrequencyBand}}, only value {{enum|ax}} is
-          allowed.
+          {{enum|6GHz|OperatingFrequencyBand}}, only values {{enum|ax}},
+          {{enum|be}} are allowed.
         </description>
         <syntax>
           <list/>
@@ -37303,6 +44835,9 @@
             <enumeration value="ax">
               <description>{{bibref|802.11ax}}</description>
             </enumeration>
+            <enumeration value="be">
+              <description>{{bibref|802.11be}}</description>
+            </enumeration>
           </string>
         </syntax>
       </parameter>
@@ -37316,15 +44851,15 @@
 
           If {{param|OperatingFrequencyBand}} is set to
           {{enum|2.4GHz|OperatingFrequencyBand}}, only values {{enum|b}},
-          {{enum|g}}, {{enum|n}}, {{enum|ax}} are allowed.
+          {{enum|g}}, {{enum|n}}, {{enum|ax}}, {{enum|be}} are allowed.
 
           If {{param|OperatingFrequencyBand}} is set to
           {{enum|5GHz|OperatingFrequencyBand}}, only values {{enum|a}},
-          {{enum|n}}, {{enum|ac}}, {{enum|ax}} are allowed.
+          {{enum|n}}, {{enum|ac}}, {{enum|ax}}, {{enum|be}} are allowed.
 
           If {{param|OperatingFrequencyBand}} is set to
-          {{enum|6GHz|OperatingFrequencyBand}}, only value {{enum|ax}} is
-          allowed.
+          {{enum|6GHz|OperatingFrequencyBand}}, only values {{enum|ax}},
+          {{enum|be}} are 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
@@ -37342,7 +44877,7 @@
       <parameter name="PossibleChannels" access="readOnly">
         <description>
           {{list}} List items represent possible radio channels for the
-          wireless standard (a, b, g, n, ac, ax) and the regulatory domain.
+          wireless standard (a, b, g, n, ac, ax, be) and the regulatory domain.
 
           Ranges in the form "n-m" are permitted.
 
@@ -37566,13 +45101,23 @@
               <description>wide mode</description>
             </enumeration>
             <enumeration value="80MHz">
-              <description>802.11ac and 802.11ax only</description>
+              <description>802.11ac, 802.11ax and 802.11be only</description>
             </enumeration>
             <enumeration value="160MHz">
-              <description>802.11ac and 802.11ax only</description>
+              <description>802.11ac, 802.11ax and 802.11be only</description>
             </enumeration>
             <enumeration value="80+80MHz">
-              <description>802.11ac and 802.11ax only</description>
+              <description>802.11ac, 802.11ax and 802.11be only</description>
+            </enumeration>
+            <enumeration value="320MHz-1">
+              <description>
+                802.11be only - channel center frequency 31, 95, 159
+              </description>
+            </enumeration>
+            <enumeration value="320MHz-2">
+              <description>
+                802.11be only - channel center frequency 63, 127, 191
+              </description>
             </enumeration>
             <enumeration value="Auto"/>
           </string>
@@ -37582,7 +45127,7 @@
       <parameter name="OperatingChannelBandwidth" access="readWrite">
         <description>
           The preferred channel bandwidth to be used (applicable to 802.11n,
-          802.11ac, and 802.11ax specifications only).
+          802.11ac, 802.11ax and 802.11be specifications only).
         </description>
         <syntax>
           <string>
@@ -37602,6 +45147,8 @@
             <enumeration value="80MHz"/>
             <enumeration value="160MHz"/>
             <enumeration value="80+80MHz"/>
+            <enumeration value="320MHz-1"/>
+            <enumeration value="320MHz-2"/>
           </string>
         </syntax>
       </parameter>
@@ -37631,42 +45178,44 @@
           <string>
             <enumeration value="400nsec">
               <description>
-                applicable to 802.11n and 802.11ac specifications only
+                applicable to 802.11n, 802.11ac and 802.11be specifications
+                only
               </description>
             </enumeration>
             <enumeration value="800nsec">
               <description>
-                applicable to 802.11n and 802.11ac specifications only
+                applicable to 802.11n, 802.11ac and 802.11be specifications
+                only
               </description>
             </enumeration>
             <enumeration value="1xLTF_0.8us">
               <description>
-                applicable to 802.11ax specification only
+                applicable to 802.11ax and 802.11be specifications only
               </description>
             </enumeration>
             <enumeration value="1xLTF_1.6us">
               <description>
-                applicable to 802.11ax specification only
+                applicable to 802.11ax and 802.11be specifications only
               </description>
             </enumeration>
             <enumeration value="2xLTF_0.8us">
               <description>
-                applicable to 802.11ax specification only
+                applicable to 802.11ax and 802.11be specifications only
               </description>
             </enumeration>
             <enumeration value="2xLTF_1.6us">
               <description>
-                applicable to 802.11ax specification only
+                applicable to 802.11ax and 802.11be specifications only
               </description>
             </enumeration>
             <enumeration value="4xLTF_0.8us">
               <description>
-                applicable to 802.11ax specification only
+                applicable to 802.11ax and 802.11be specifications only
               </description>
             </enumeration>
             <enumeration value="4xLTF_3.2us">
               <description>
-                applicable to 802.11ax specification only
+                applicable to 802.11ax and 802.11be specifications only
               </description>
             </enumeration>
             <enumeration value="Auto"/>
@@ -37675,7 +45224,7 @@
       </parameter>
 
       <parameter name="CenterFrequencySegement0" access="readWrite"
-          status="obsoleted">
+          status="deleted">
         <description>
           When operating in {{enum|80+80MHz|CurrentOperatingChannelBandwidth}},
           this parameter determines the Center Frequency Segment 0 for the
@@ -37686,6 +45235,8 @@
           {{param|CenterFrequencySegment0}} instead}}
 
           {{obsoleted|2.16}}
+
+          {{deleted|2.17}}
         </description>
         <syntax>
           <unsignedInt/>
@@ -37693,7 +45244,7 @@
       </parameter>
 
       <parameter name="CenterFrequencySegement1" access="readWrite"
-          status="obsoleted">
+          status="deleted">
         <description>
           When operating in {{enum|80+80MHz|CurrentOperatingChannelBandwidth}},
           this parameter determines the Center Frequency Segment 1 for the
@@ -37704,6 +45255,8 @@
           {{param|CenterFrequencySegment1}} instead}}
 
           {{obsoleted|2.16}}
+
+          {{deleted|2.17}}
         </description>
         <syntax>
           <unsignedInt/>
@@ -37737,10 +45290,11 @@
       <parameter name="MCS" access="readWrite">
         <description>
           The Modulation Coding Scheme index (applicable to 802.11n, 802.11ac,
-          and 802.11ax specifications only). Values from 0 to 15 MUST be
-          supported for ({{bibref|802.11n-2009}}). Values from 0 to 9 MUST be
-          supported for {{bibref|802.11ac-2013}}. Values from 0 to 11 MUST be
-          supported for {{bibref|802.11ax}}. A value of -1 indicates automatic
+          802.11ax and 802.11be specifications only). Values from 0 to 15 MUST
+          be supported for ({{bibref|802.11n-2009}}). Values from 0 to 9 MUST
+          be supported for {{bibref|802.11ac-2013}}. Values from 0 to 11 MUST
+          be supported for {{bibref|802.11ax}}. Values from 0 to 15 MUST be
+          supported for {{bibref|802.11be}}. A value of -1 indicates automatic
           selection of the MCS index.
         </description>
         <syntax>
@@ -38262,12 +45816,13 @@
             <enumeration value="Canceled" optional="true"/>
             <enumeration value="Complete" access="readOnly"/>
             <enumeration value="Error" access="readOnly" optional="true"/>
-            <enumeration value="Completed" access="readOnly"
-                status="obsoleted">
+            <enumeration value="Completed" access="readOnly" status="deleted">
               <description>
                 {{deprecated|2.13|because it's a typo for {{enum|Complete}}}}
 
                 {{obsoleted|2.16}}
+
+                {{deleted|2.17}}
               </description>
             </enumeration>
           </dataType>
@@ -38443,15 +45998,15 @@
 
           If {{param|OperatingFrequencyBand}} is set to
           {{enum|2.4GHz|OperatingFrequencyBand}}, only values {{enum|b}},
-          {{enum|g}}, {{enum|n}}, {{enum|ax}} are allowed.
+          {{enum|g}}, {{enum|n}}, {{enum|ax}}, {{enum|be}} are allowed.
 
           If {{param|OperatingFrequencyBand}} is set to
           {{enum|5GHz|OperatingFrequencyBand}}, only values {{enum|a}},
-          {{enum|n}}, {{enum|ac}}, {{enum|ax}} are allowed.
+          {{enum|n}}, {{enum|ac}}, {{enum|ax}}, {{enum|be}} are allowed.
 
           If {{param|OperatingFrequencyBand}} is set to
-          {{enum|6GHz|OperatingFrequencyBand}}, only value {{enum|ax}} is
-          allowed.
+          {{enum|6GHz|OperatingFrequencyBand}}, only values {{enum|ax}},
+          {{enum|be}} are allowed.
         </description>
         <syntax>
           <list/>
@@ -38474,6 +46029,9 @@
             <enumeration value="ax">
               <description>{{bibref|802.11ax}}</description>
             </enumeration>
+            <enumeration value="be">
+              <description>{{bibref|802.11be}}</description>
+            </enumeration>
           </string>
         </syntax>
       </parameter>
@@ -38487,15 +46045,17 @@
 
           If {{param|OperatingFrequencyBand}} is set to
           {{enum|2.4GHz|##.Radio.{i}.SupportedFrequencyBands}}, only values
-          {{enum|b}}, {{enum|g}}, {{enum|n}}, {{enum|ax}} are allowed.
+          {{enum|b}}, {{enum|g}}, {{enum|n}}, {{enum|ax}}, {{enum|be}} are
+          allowed.
 
           If {{param|OperatingFrequencyBand}} is set to
           {{enum|5GHz|##.Radio.{i}.SupportedFrequencyBands}}, only values
-          {{enum|a}}, {{enum|n}}, {{enum|ac}}, {{enum|ax}} are allowed.
+          {{enum|a}}, {{enum|n}}, {{enum|ac}}, {{enum|ax}}, {{enum|be}} are
+          allowed.
 
           If {{param|OperatingFrequencyBand}} is set to
           {{enum|6GHz|##.Radio.{i}.SupportedFrequencyBands}}, only value
-          {{enum|ax}} is allowed.
+          {{enum|ax}}, {{enum|be}} are 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
@@ -38520,6 +46080,8 @@
             <enumeration value="40MHz"/>
             <enumeration value="80MHz"/>
             <enumeration value="160MHz"/>
+            <enumeration value="320MHz-1"/>
+            <enumeration value="320MHz-2"/>
             <enumeration value="Auto"/>
           </string>
         </syntax>
@@ -39012,7 +46574,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -39119,6 +46681,22 @@
         </syntax>
       </parameter>
 
+      <parameter name="MLDUnit" access="readWrite">
+        <description>
+          MLD-BSS unit number specifying BSS across multiple radios that form a
+          single Multi Link Device. Assigning the same MLD unit groups Basic
+          Service Sets (BSS) across radios. A (default) value of -1 indicates
+          that the interface is not part of any MLD.
+        </description>
+        <syntax>
+          <int>
+            <range minInclusive="-1" maxInclusive="-1"/>
+            <range minInclusive="0" maxInclusive="24"/>
+          </int>
+          <default type="object" value="-1"/>
+        </syntax>
+      </parameter>
+
       <parameter name="Upstream" access="readOnly">
         <description>
           Indicates whether the interface points towards the Internet
@@ -39568,7 +47146,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -40284,6 +47862,9 @@
             <enumeration value="ax">
               <description>{{bibref|802.11ax}}</description>
             </enumeration>
+            <enumeration value="be">
+              <description>{{bibref|802.11be}}</description>
+            </enumeration>
           </string>
         </syntax>
       </parameter>
@@ -40317,6 +47898,19 @@
         </syntax>
       </parameter>
 
+      <parameter name="MaxSupportedDataDownlinkRate" access="readOnly">
+        <description>
+          Maximum supported data rate on the downlink from the associated
+          device to the access point, measured in {{units}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range minInclusive="1000"/>
+            <units value="kbps"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
       <parameter name="LastDataUplinkRate" access="readOnly"
           activeNotify="canDeny">
         <description>
@@ -40336,6 +47930,19 @@
         </syntax>
       </parameter>
 
+      <parameter name="MaxSupportedDataUplinkRate" access="readOnly">
+        <description>
+          Maximum supported data rate on the uplink from the associated device
+          to the access point, measured in {{units}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range minInclusive="1000"/>
+            <units value="kbps"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
       <parameter name="AssociationTime" access="readOnly">
         <description>
           Date and time in UTC when the device was associated
@@ -40389,6 +47996,20 @@
         </syntax>
       </parameter>
 
+      <parameter name="SNR" access="readOnly">
+        <description>
+          An indicator of signal to noise ratio, in {{units}}, 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.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="dB"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
       <parameter name="Retransmissions" access="readOnly">
         <description>
           The number of {{units}} that had to be re-transmitted, from the last
@@ -40422,6 +48043,23 @@
           <boolean/>
         </syntax>
       </parameter>
+
+      <parameter name="MaxSupportedBandwidth" access="readOnly">
+        <description>
+          Specifies the maximum supported bandwidth for the associated device
+          to the access point.
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="20MHz"/>
+            <enumeration value="40MHz"/>
+            <enumeration value="80MHz"/>
+            <enumeration value="160MHz"/>
+            <enumeration value="320MHz"/>
+            <enumeration value="Unknown"/>
+          </string>
+        </syntax>
+      </parameter>
     </object>
 
     <object name="Device.WiFi.AccessPoint.{i}.AssociatedDevice.{i}.Stats."
@@ -40615,7 +48253,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -40624,13 +48262,14 @@
         </syntax>
       </parameter>
 
-      <parameter name="AIFSN" access="readWrite" status="deprecated">
+      <parameter name="AIFSN" access="readWrite" status="obsoleted">
         <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.}}
+          {{deprecated|2.15|because it is superseded by the WMM Specification}}
+
+          {{obsoleted|2.17}}
         </description>
         <syntax>
           <unsignedInt>
@@ -40639,14 +48278,15 @@
         </syntax>
       </parameter>
 
-      <parameter name="ECWMin" access="readWrite" status="deprecated">
+      <parameter name="ECWMin" access="readWrite" status="obsoleted">
         <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.}}
+          {{deprecated|2.15|because it is superseded by the WMM Specification}}
+
+          {{obsoleted|2.17}}
         </description>
         <syntax>
           <unsignedInt>
@@ -40656,14 +48296,15 @@
         </syntax>
       </parameter>
 
-      <parameter name="ECWMax" access="readWrite" status="deprecated">
+      <parameter name="ECWMax" access="readWrite" status="obsoleted">
         <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.}}
+          {{deprecated|2.15|because it is superseded by the WMM Specification}}
+
+          {{obsoleted|2.17}}
         </description>
         <syntax>
           <unsignedInt>
@@ -40673,14 +48314,15 @@
         </syntax>
       </parameter>
 
-      <parameter name="TxOpMax" access="readWrite" status="deprecated">
+      <parameter name="TxOpMax" access="readWrite" status="obsoleted">
         <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.}}
+          {{deprecated|2.15|because it is superseded by the WMM Specification}}
+
+          {{obsoleted|2.17}}
         </description>
         <syntax>
           <unsignedInt>
@@ -41054,7 +48696,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -41253,7 +48895,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -41567,7 +49209,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -41576,13 +49218,14 @@
         </syntax>
       </parameter>
 
-      <parameter name="AIFSN" access="readWrite" status="deprecated">
+      <parameter name="AIFSN" access="readWrite" status="obsoleted">
         <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.}}
+          {{deprecated|2.15|because it is superseded by the WMM Specification}}
+
+          {{obsoleted|2.17}}
         </description>
         <syntax>
           <unsignedInt>
@@ -41591,14 +49234,15 @@
         </syntax>
       </parameter>
 
-      <parameter name="ECWMin" access="readWrite" status="deprecated">
+      <parameter name="ECWMin" access="readWrite" status="obsoleted">
         <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.}}
+          {{deprecated|2.15|because it is superseded by the WMM Specification}}
+
+          {{obsoleted|2.17}}
         </description>
         <syntax>
           <unsignedInt>
@@ -41608,14 +49252,15 @@
         </syntax>
       </parameter>
 
-      <parameter name="ECWMax" access="readWrite" status="deprecated">
+      <parameter name="ECWMax" access="readWrite" status="obsoleted">
         <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.}}
+          {{deprecated|2.15|because it is superseded by the WMM Specification}}
+
+          {{obsoleted|2.17}}
         </description>
         <syntax>
           <unsignedInt>
@@ -41625,14 +49270,15 @@
         </syntax>
       </parameter>
 
-      <parameter name="TxOpMax" access="readWrite" status="deprecated">
+      <parameter name="TxOpMax" access="readWrite" status="obsoleted">
         <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.}}
+          {{deprecated|2.15|because it is superseded by the WMM Specification}}
+
+          {{obsoleted|2.17}}
         </description>
         <syntax>
           <unsignedInt>
@@ -41927,7 +49573,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -42330,7 +49976,7 @@
         <parameter ref="NetworkAddress"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -43078,7 +50724,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -43194,7 +50840,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -43255,7 +50901,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -43444,7 +51090,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -43652,7 +51298,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -43926,7 +51572,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -44588,7 +52234,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -44654,7 +52300,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -44741,7 +52387,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -44805,27 +52451,14 @@
 
       <parameter name="Order" access="readWrite">
         <description>
-          Position of the {{object}} entry in the order of precedence. A value
-          of ''1'' indicates the first entry considered (highest precedence).
+          {{datatype|expand}}
+
           For each ingress frame on the {{param|Interface}}, the highest
           ordered entry that matches the filter criteria is applied. All lower
           order entries are ignored.
-
-          When this value is modified, if the value matches that of an existing
-          entry, the {{param}} value for the existing entry and all lower
-          {{param}} entries is 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.
-
-          The value of {{param}} on creation of a {{object}} table entry MUST
-          be one greater than the largest current value (initially assigned the
-          lowest precedence).
         </description>
         <syntax>
-          <unsignedInt>
-            <range minInclusive="1"/>
-          </unsignedInt>
+          <dataType ref="Order"/>
         </syntax>
       </parameter>
 
@@ -45716,7 +53349,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -45894,7 +53527,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -46871,7 +54504,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -47118,7 +54751,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
 
@@ -47402,7 +55035,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -47634,7 +55267,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
 
@@ -47888,7 +55521,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
 
@@ -48837,12 +56470,13 @@
             <enumeration value="Requested"/>
             <enumeration value="Canceled" optional="true"/>
             <enumeration value="Complete" access="readOnly"/>
-            <enumeration value="Completed" access="readOnly"
-                status="obsoleted">
+            <enumeration value="Completed" access="readOnly" status="deleted">
               <description>
                 {{deprecated|2.13|because it's a typo for {{enum|Complete}}}}
 
                 {{obsoleted|2.16}}
+
+                {{deleted|2.17}}
               </description>
             </enumeration>
             <enumeration value="Error_CannotResolveHostName" access="readOnly"/>
@@ -49333,12 +56967,13 @@
             <enumeration value="Requested"/>
             <enumeration value="Canceled" optional="true"/>
             <enumeration value="Complete" access="readOnly"/>
-            <enumeration value="Completed" access="readOnly"
-                status="obsoleted">
+            <enumeration value="Completed" access="readOnly" status="deleted">
               <description>
                 {{deprecated|2.13|because it's a typo for {{enum|Complete}}}}
 
                 {{obsoleted|2.16}}
+
+                {{deleted|2.17}}
               </description>
             </enumeration>
             <enumeration value="Error_CannotResolveHostName" access="readOnly"/>
@@ -50543,12 +58178,13 @@
             <enumeration value="Requested"/>
             <enumeration value="Canceled" optional="true"/>
             <enumeration value="Complete" access="readOnly"/>
-            <enumeration value="Completed" access="readOnly"
-                status="obsoleted">
+            <enumeration value="Completed" access="readOnly" status="deleted">
               <description>
                 {{deprecated|2.13|because it's a typo for {{enum|Complete}}}}
 
                 {{obsoleted|2.16}}
+
+                {{deleted|2.17}}
               </description>
             </enumeration>
             <enumeration value="Error_CannotResolveHostName" access="readOnly"/>
@@ -50945,10 +58581,14 @@
         </syntax>
       </parameter>
 
-      <parameter name="Host" access="readWrite">
+      <parameter name="Host" access="readWrite" status="deprecated">
         <description>
           The Fully Qualified Domain Name (FQDN) or IP address of the Test
           Endpoint to perform the UDP Capacity tests with.
+
+          {{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>
           <string>
@@ -50957,9 +58597,33 @@
         </syntax>
       </parameter>
 
-      <parameter name="Port" access="readWrite" activeNotify="canDeny">
+      <parameter name="ServerList" access="readWrite">
+        <description>
+          A list of servers intended as testing partners for the client. The
+          client works through the server list attempting individual test flows
+          in a round-robin sequence. One flow is attempted to each server and
+          all flows are required for testing, unless the optional
+          {{param|FlowCount}} and {{param|MaximumFlows}} parameters are
+          specified. The list contains each server’s Fully Qualified Domain
+          Name or IP address and listening port in the format ''server:port''.
+        </description>
+        <syntax>
+          <list maxItems="100"/>
+          <string>
+            <size maxLength="256"/>
+            <size/>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="Port" access="readWrite" status="deprecated"
+          activeNotify="canDeny">
         <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}}
         </description>
         <syntax>
           <unsignedInt>
@@ -50978,11 +58642,16 @@
         </syntax>
       </parameter>
 
-      <parameter name="NumberOfConnections" access="readWrite">
+      <parameter name="NumberOfConnections" access="readWrite"
+          status="deprecated">
         <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
           {{param|{{template|IP-DIAGNOSTICS-PARENT}}IPLayerMaxConnections}}.
+
+          {{deprecated|2.17|because it is superseded by {{param|ServerList}}
+          with multi-flow and server capability and related parameters. Refer
+          to {{bibref|TR-471}} for details}}
         </description>
         <syntax>
           <unsignedInt>
@@ -50991,6 +58660,32 @@
         </syntax>
       </parameter>
 
+      <parameter name="FlowCount" access="readWrite">
+        <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}}
+          MUST NOT be set to a value greater than
+          {{param|{{template|IP-DIAGNOSTICS-PARENT}}IPLayerMaxConnections}}.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="MaximumFlows" access="readWrite">
+        <description>
+          Optional number of flows to attempt. MaximumFlows must be greater
+          than the size of ServerList or FlowCount.
+
+          The default SHOULD be 0 (a magic number that indicates the parameter
+          is not used). {{param}} MUST NOT be set to a value greater than
+          {{param|{{template|IP-DIAGNOSTICS-PARENT}}IPLayerMaxConnections}}.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
       <parameter name="EthernetPriority" access="readWrite">
         <description>
           Ethernet priority code for marking packets transmitted in the test
@@ -51318,8 +59013,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="TimeoutNoTraffic" access="readWrite"
-          status="deprecated">
+      <parameter name="TimeoutNoTraffic" access="readWrite" status="obsoleted">
         <description>
           Timeout value. Value specified in {{units}}. The default value SHOULD
           be 5 {{units}}.
@@ -51327,6 +59021,8 @@
           {{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>
         <syntax>
           <unsignedInt>
@@ -51932,6 +59628,17 @@
           </unsignedInt>
         </syntax>
       </parameter>
+
+      <parameter name="ActiveFlows" access="readOnly">
+        <description>
+          Number of flows set-up and used for a test.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range minInclusive="0"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
     </object>
 
     <object
@@ -52277,7 +59984,7 @@
         packets collected during a test if
         {{param|#.EnableIndividualPacketResults}} is set to true. When
         {{param|#.DiagnosticsState}} is set to
-        {{enum|Completed|#.DiagnosticsState}} it should contain
+        {{enum|Complete|#.DiagnosticsState}} it should contain
         {{param|#.NumberOfRepetitions}} objects. Instance numbers MUST start at
         1 and sequentially increment as new instances are created. The instance
         number should match the TestIterationNumber field of the request and
@@ -52419,12 +60126,13 @@
             <enumeration value="Requested"/>
             <enumeration value="Canceled" optional="true"/>
             <enumeration value="Complete" access="readOnly"/>
-            <enumeration value="Completed" access="readOnly"
-                status="obsoleted">
+            <enumeration value="Completed" access="readOnly" status="deleted">
               <description>
                 {{deprecated|2.13|because it's a typo for {{enum|Complete}}}}
 
                 {{obsoleted|2.16}}
+
+                {{deleted|2.17}}
               </description>
             </enumeration>
             <enumeration value="Error_CannotResolveHostName" access="readOnly"/>
@@ -53600,30 +61308,17 @@
 
       <parameter name="Order" access="readWrite">
         <description>
-          Position of the {{object}} entry in the order of precedence. A value
-          of ''1'' indicates the first entry considered (highest precedence).
+          {{datatype|expand}}
+
           For each packet, the highest ordered entry that matches the filter
           criteria is applied. All lower order entries are ignored.
-
-          When this value is modified, if the value matches that of an existing
-          entry, the {{param}} value for the existing entry and all lower
-          {{param}} entries is 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.
-
-          The value of {{param}} on creation of a {{object}} table entry MUST
-          be one greater than the largest current value (initially assigned the
-          lowest precedence).
         </description>
         <syntax>
-          <unsignedInt>
-            <range minInclusive="1"/>
-          </unsignedInt>
+          <dataType ref="Order"/>
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -53949,7 +61644,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -54347,7 +62042,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -54422,7 +62117,7 @@
         <parameter ref="TunneledInterface"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -54582,7 +62277,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -54950,7 +62645,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -55182,7 +62877,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -55473,7 +63168,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -55766,30 +63461,17 @@
 
       <parameter name="Order" access="readWrite">
         <description>
-          Position of the {{object}} entry in the order of precedence. A value
-          of ''1'' indicates the first entry considered (highest precedence).
+          {{datatype|expand}}
+
           For each packet, the highest ordered entry that matches the filter
           criteria is applied. All lower order entries are ignored.
-
-          When this value is modified, if the value matches that of an existing
-          entry, the {{param}} value for the existing entry and all lower
-          {{param}} entries is 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.
-
-          The value of {{param}} on creation of a {{object}} table entry MUST
-          be one greater than the largest current value (initially assigned the
-          lowest precedence).
         </description>
         <syntax>
-          <unsignedInt>
-            <range minInclusive="1"/>
-          </unsignedInt>
+          <dataType ref="Order"/>
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -55947,7 +63629,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -56303,7 +63985,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -56586,30 +64268,17 @@
 
       <parameter name="Order" access="readWrite">
         <description>
-          Position of the {{object}} entry in the order of precedence. A value
-          of ''1'' indicates the first entry considered (highest precedence).
+          {{datatype|expand}}
+
           For each packet, the highest ordered entry that matches the filter
           criteria is applied. All lower order entries are ignored.
-
-          When this value is modified, if the value matches that of an existing
-          entry, the {{param}} value for the existing entry and all lower
-          {{param}} entries is 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.
-
-          The value of {{param}} on creation of a {{object}} table entry MUST
-          be one greater than the largest current value (initially assigned the
-          lowest precedence).
         </description>
         <syntax>
-          <unsignedInt>
-            <range minInclusive="1"/>
-          </unsignedInt>
+          <dataType ref="Order"/>
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -56767,7 +64436,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -57095,7 +64764,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -57339,30 +65008,17 @@
 
       <parameter name="Order" access="readWrite">
         <description>
-          Position of the {{object}} entry in the order of precedence. A value
-          of ''1'' indicates the first entry considered (highest precedence).
+          {{datatype|expand}}
+
           For each packet, the highest ordered entry that matches the filter
           criteria is applied. All lower order entries are ignored.
-
-          When this value is modified, if the value matches that of an existing
-          entry, the {{param}} value for the existing entry and all lower
-          {{param}} entries is 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.
-
-          The value of {{param}} on creation of a {{object}} table entry MUST
-          be one greater than the largest current value (initially assigned the
-          lowest precedence).
         </description>
         <syntax>
-          <unsignedInt>
-            <range minInclusive="1"/>
-          </unsignedInt>
+          <dataType ref="Order"/>
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -57548,7 +65204,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -57672,7 +65328,7 @@
           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.16}}
+          {{obsoleted|2.14-2.17}}
         </description>
         <syntax>
           <unsignedInt>
@@ -57695,7 +65351,7 @@
           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.16}}
+          {{obsoleted|2.14-2.17}}
         </description>
         <syntax>
           <unsignedInt>
@@ -57722,7 +65378,7 @@
           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.16}}
+          {{obsoleted|2.14-2.17}}
         </description>
         <syntax>
           <unsignedInt>
@@ -57733,7 +65389,7 @@
       </parameter>
 
       <parameter name="IncludeSystemPorts" access="readWrite"
-          status="deprecated">
+          status="obsoleted">
         <description>
           Whether to include low-numbered (system) ports in the Port-sets.
           Normally ports in the range
@@ -57750,6 +65406,8 @@
           {{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>
         <syntax>
           <boolean/>
@@ -57813,7 +65471,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -58045,7 +65703,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -58393,8 +66051,9 @@
     <object name="Device.Routing." access="readOnly" minEntries="1"
         maxEntries="1" version="2.0">
       <description>
-        Routing object that contains the {{object|Router}} table and
-        {{object|RIP}} protocol object.
+        Routing object that contains the {{object|Router}} table, the received
+        router advertisement information {{object|RouteInformation}},
+        {{object|Babel}}, and {{object|RIP}} protocol objects.
       </description>
 
       <parameter name="RouterNumberOfEntries" access="readOnly">
@@ -58445,7 +66104,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -58555,7 +66214,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -58816,7 +66475,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -59097,7 +66756,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -59364,7 +67023,7 @@
         <parameter ref="Tag"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -59669,7 +67328,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -60232,7 +67891,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -60278,7 +67937,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -60411,7 +68070,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -60457,7 +68116,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -60591,7 +68250,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -60800,7 +68459,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -60822,6 +68481,76 @@
         </syntax>
       </parameter>
 
+      <parameter name="RDNSSMode" access="readWrite">
+        <description>
+          Describes which IPv6 address information MUST be specified in the
+          RDNSS option field specified in {{bibref|RFC8106|5.1. Recursive DNS
+          Server Option}}.
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="Static">
+              <description>
+                The DNS Servers as defined in the {{param|RDNSS}} parameter
+                should be used in the RA messages. A comma separated list of
+                IPv6 addresses must be supported.
+              </description>
+            </enumeration>
+            <enumeration value="LLA">
+              <description>
+                The link-local IPv6 address of the {{param|Interface}} is sent
+                in the RA messages.
+              </description>
+            </enumeration>
+            <enumeration value="GUA" optional="true">
+              <description>
+                The global unique IPv6 addresses of the {{param|Interface}} are
+                sent in the RA messages.
+              </description>
+            </enumeration>
+            <enumeration value="LLA_GUA" optional="true">
+              <description>
+                Both GUA and LLA of the {{param|Interface}} are sent in the RA
+                messages.
+              </description>
+            </enumeration>
+          </string>
+          <default type="object" value="Static"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="RDNSS" access="readWrite">
+        <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.
+        </description>
+        <syntax>
+          <list/>
+          <dataType ref="IPv6Address"/>
+          <default type="object" value=""/>
+        </syntax>
+      </parameter>
+
+      <parameter name="DNSSL" access="readWrite">
+        <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.
+        </description>
+        <syntax>
+          <list/>
+          <string/>
+          <default type="object" value=""/>
+        </syntax>
+      </parameter>
+
       <parameter name="ManualPrefixes" access="readWrite">
         <description>
           {{list}} {{reference}}
@@ -61070,6 +68799,58 @@
         </syntax>
       </parameter>
 
+      <parameter name="AdvRDNSSLifetime" access="readWrite">
+        <description>
+          The Lifetime field in RDNSS specifies the maximum duration, in
+          {{units}}, during which the provided RDNSS addresses can be used for
+          name resolution relative to the time the packet is received. By
+          default, the value of Lifetime is recommended to be at least 3 times
+          the MaxRtrAdvInterval. The MaxRtrAdvInterval is defined in
+          {{bibref|RFC4861}} and refers to the maximum interval between Router
+          Advertisement (RA) messages.
+
+          When the Lifetime value is set to all one bits (0xffffffff), it
+          indicates an infinite duration.
+
+          The Lifetime value of zero signifies that the RDNSS addresses must
+          not be used anymore, as specified in {{bibref|RFC8106|5.1. Recursive
+          DNS Server Option}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range maxInclusive="4294967295"/>
+            <units value="seconds"/>
+          </unsignedInt>
+          <default type="object" value="0"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="AdvDNSSLLifetime" access="readWrite">
+        <description>
+          The Lifetime field in DNSSL specifies the maximum duration, in
+          {{units}}, during which the provided DNSSL domain names can be used
+          for name resolution relative to the time the packet is received. By
+          default, the value of Lifetime is recommended to be at least 3 times
+          the MaxRtrAdvInterval. The MaxRtrAdvInterval is defined in
+          {{bibref|RFC4861}} and refers to the maximum interval between Router
+          Advertisement (RA) messages.
+
+          When the Lifetime value is set to all one bits (0xffffffff), it
+          indicates an infinite duration.
+
+          The Lifetime value of zero signifies that the DNSSL domain names must
+          not be used anymore, as specified in {{bibref|RFC8106|5.2. DNS Search
+          List Option}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+            <range maxInclusive="4294967295"/>
+          </unsignedInt>
+          <default type="object" value="0"/>
+        </syntax>
+      </parameter>
+
       <parameter name="OptionNumberOfEntries" access="readOnly">
         <description>
           {{numentries}}
@@ -61112,7 +68893,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -61224,7 +69005,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -61443,7 +69224,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -61950,31 +69731,18 @@
 
       <parameter name="Order" access="readWrite">
         <description>
-          Position of the {{object}} entry in the order of precedence. A value
-          of ''1'' indicates the first entry considered (highest precedence).
+          {{datatype|expand}}
+
           For each packet, the highest ordered entry that matches the
           classification criteria is applied. All lower order entries are
           ignored.
-
-          When this value is modified, if the value matches that of an existing
-          entry, the {{param}} value for the existing entry and all lower
-          {{param}} entries is 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.
-
-          The value of {{param}} on creation of a {{object}} table entry MUST
-          be one greater than the largest current value (initially assigned the
-          lowest precedence).
         </description>
         <syntax>
-          <unsignedInt>
-            <range minInclusive="1"/>
-          </unsignedInt>
+          <dataType ref="Order"/>
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -63428,7 +71196,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -63601,7 +71369,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -63798,7 +71566,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -64179,7 +71947,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -64538,7 +72306,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -64707,7 +72475,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -64827,7 +72595,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -65009,7 +72777,7 @@
         <parameter ref="PhysAddress"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite" status="deleted">
+      <parameter name="Alias" access="writeOnceReadOnly" status="deleted">
         <description>
           {{datatype|expand}}
 
@@ -65482,7 +73250,7 @@
         <parameter ref="PhysAddress"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -65491,6 +73259,35 @@
         </syntax>
       </parameter>
 
+      <parameter name="Origin" access="readOnly">
+        <description>
+          Indicates the owner of the {{object}} instance.
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="User">
+              <description>
+                Used for indicating that the access control rule was created by
+                the end-user. For example through the web user interface.
+              </description>
+            </enumeration>
+            <enumeration value="System">
+              <description>
+                Used for indicating that the access control rule was created by
+                the system itself.
+              </description>
+            </enumeration>
+            <enumeration value="Controller">
+              <description>
+                Used for indicating that the access control rule was created by
+                a Controller.
+              </description>
+            </enumeration>
+          </string>
+          <default type="object" value="Controller"/>
+        </syntax>
+      </parameter>
+
       <parameter name="PhysAddress" access="readWrite">
         <description>
           Unique physical identifier of the device. For many layer 2
@@ -65503,6 +73300,24 @@
         </syntax>
       </parameter>
 
+      <parameter name="PhysAddressMask" access="readWrite">
+        <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
+          host. Other possible values 'FF:FF:FF:00:00:00' to apply access
+          control to a specific OUI.
+
+          When {{empty}} is set, no mask will be applied and the
+          {{param|PhysAddress}} MUST be used as is.
+        </description>
+        <syntax>
+          <string>
+            <size maxLength="64"/>
+          </string>
+          <default type="object" value=""/>
+        </syntax>
+      </parameter>
+
       <parameter name="HostName" access="readWrite">
         <description>
           Any user defined name for the device.
@@ -65566,7 +73381,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -65667,6 +73482,199 @@
           </string>
         </syntax>
       </parameter>
+
+      <parameter name="ZoneNumberOfEntries" access="readOnly">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object name="Device.DNS.Zone.{i}." access="readWrite" minEntries="0"
+        numEntriesParameter="ZoneNumberOfEntries" maxEntries="unbounded"
+        version="2.17">
+      <description>
+        This object specifies Zone file configuration of the DNS server.
+      </description>
+      <uniqueKey functional="false">
+        <parameter ref="Alias"/>
+      </uniqueKey>
+
+      <parameter name="Alias" access="writeOnceReadOnly">
+        <description>
+          {{datatype|expand}}
+        </description>
+        <syntax>
+          <dataType ref="Alias"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Enable" access="readWrite">
+        <description>
+          Enables or disables the DNS zone.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Name" access="readWrite">
+        <description>
+          Domain name that is associated with the zone.
+        </description>
+        <syntax>
+          <string>
+            <size maxLength="128"/>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="Origin" access="readOnly">
+        <description>
+          The mechanism via which the Zone was created.
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="User">
+              <description>
+                Used for indicating that the entry was created by the end-user.
+                For example through the web user interface.
+              </description>
+            </enumeration>
+            <enumeration value="System">
+              <description>
+                Used for indicating that the entry was created by the system
+                itself.
+              </description>
+            </enumeration>
+            <enumeration value="Controller">
+              <description>
+                Used for indicating that the entry was created by a Controller.
+              </description>
+            </enumeration>
+          </string>
+          <default type="object" value="System"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Interface" access="readWrite">
+        <description>
+          Specifies the Layer 3 interface on which the zone should be
+          available. Example: ''Device.IP.Interface.1'' or
+          ''Device.Logical.Interface.1''.
+        </description>
+        <syntax>
+          <string>
+            <size maxLength="256"/>
+            <pathRef refType="strong" targetParent=".IP.Interface."
+                targetType="row"/>
+          </string>
+          <default type="object" value=""/>
+        </syntax>
+      </parameter>
+
+      <parameter name="HostNumberOfEntries" access="readOnly">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object name="Device.DNS.Zone.{i}.Host.{i}." access="readWrite"
+        minEntries="0" numEntriesParameter="HostNumberOfEntries"
+        maxEntries="unbounded" version="2.17">
+      <description>
+        This object specifies the resource records (RR) of the DNS zone.
+      </description>
+      <uniqueKey functional="false">
+        <parameter ref="Alias"/>
+      </uniqueKey>
+
+      <parameter name="Alias" access="writeOnceReadOnly">
+        <description>
+          {{datatype|expand}}
+        </description>
+        <syntax>
+          <dataType ref="Alias"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Enable" access="readWrite">
+        <description>
+          Enables or disables the entry in the zone file.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Name" access="readWrite">
+        <description>
+          List of hostnames that are associated with the {{object}}.
+        </description>
+        <syntax>
+          <list/>
+          <string>
+            <size maxLength="128"/>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="Origin" access="readWrite">
+        <description>
+          Indicates the owner of the {{object}} instance.
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="User">
+              <description>
+                Used for indicating that the entry was created by the end-user.
+                For example through the web user interface.
+              </description>
+            </enumeration>
+            <enumeration value="System">
+              <description>
+                Used for indicating that the entry was created by the system
+                itself.
+              </description>
+            </enumeration>
+            <enumeration value="Controller">
+              <description>
+                Used for indicating that the entry was created by a Controller.
+              </description>
+            </enumeration>
+          </string>
+          <default type="object" value="System"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Host" access="readWrite">
+        <description>
+          Host table entries associated with the device.
+        </description>
+        <syntax>
+          <string>
+            <size maxLength="256"/>
+            <pathRef refType="strong" targetParent=".Hosts.Host."
+                targetType="row"/>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="LastUpdate">
+        <description>
+          The date and time in UTC when the entry was last changed.
+        </description>
+        <syntax>
+          <dateTime/>
+        </syntax>
+      </parameter>
     </object>
 
     <object name="Device.DNS.Client." access="readOnly" minEntries="1"
@@ -65755,7 +73763,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -65864,6 +73872,16 @@
         </syntax>
       </parameter>
 
+      <parameter name="ConfigNumberOfEntries" access="readOnly"
+          dmr:customNumEntriesParameter="true">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
       <parameter name="ForwardNumberOfEntries" access="readOnly"
           dmr:customNumEntriesParameter="true">
         <description>
@@ -65875,6 +73893,105 @@
       </parameter>
     </object>
 
+    <object name="Device.DNS.Relay.Config.{i}." access="readWrite"
+        numEntriesParameter="ConfigNumberOfEntries" minEntries="0"
+        maxEntries="unbounded" version="2.17">
+      <description>
+        This object is used to specify the cache configuration for each
+        Forwarding relay.
+      </description>
+      <uniqueKey functional="false">
+        <parameter ref="Alias"/>
+      </uniqueKey>
+
+      <parameter name="Alias" access="writeOnceReadOnly">
+        <description>
+          {{datatype|expand}}
+        </description>
+        <syntax>
+          <dataType ref="Alias"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Forwarders" access="readWrite">
+        <description>
+          Specifies the list of the DNS forwarders to be used.
+        </description>
+        <syntax>
+          <list/>
+          <string>
+            <size maxLength="256"/>
+            <pathRef refType="strong" targetParent="#.Forwarding."
+                targetType="row"/>
+          </string>
+          <default type="object" value=""/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Interface" access="readWrite">
+        <description>
+          {{reference}} Specifies the IP interface over which the DNS query is
+          received. This is usually the LAN interface.
+
+          {{template|INTERFACE-ROUTING}}
+        </description>
+        <syntax>
+          <string>
+            <size maxLength="256"/>
+            <pathRef refType="strong" targetParent="###.IP.Interface."
+                targetType="row"/>
+          </string>
+          <default type="object" value=""/>
+        </syntax>
+      </parameter>
+
+      <parameter name="CacheSize" access="readOnly">
+        <description>
+          Specifies the size of cache in kilobytes.
+
+          When '0' is specified, no DNS results will be cached.
+        </description>
+        <syntax>
+          <unsignedInt/>
+          <default type="object" value="0"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="CacheMinTTL" access="readOnly">
+        <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>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+          <default type="object" value="0"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="CacheMaxTTL" access="readOnly">
+        <description>
+          Specifies the maximum TTL amount of time, in {{units}}, than 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>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+          <default type="object" value="86400"/>
+        </syntax>
+      </parameter>
+    </object>
+
     <object name="Device.DNS.Relay.Forwarding.{i}." access="readWrite"
         numEntriesParameter="ForwardNumberOfEntries" enableParameter="Enable"
         minEntries="0" maxEntries="unbounded" version="2.0">
@@ -65921,7 +74038,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -66256,6 +74373,15 @@
         </syntax>
       </parameter>
 
+      <parameter name="AdvertiseNumberOfEntries" access="readOnly">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
       <parameter name="ServiceNumberOfEntries" access="readOnly">
         <description>
           {{numentries}}
@@ -66265,13 +74391,16 @@
         </syntax>
       </parameter>
 
-      <parameter name="AdvertisedInterfaces" access="readWrite">
+      <parameter name="AdvertisedInterfaces" access="readWrite"
+          status="deprecated">
         <description>
           {{reference|the {{object|##.IP.Interface}} object instance from which
           DNS-SD services are advertised}}
 
           If this parameter is not supported by an implementation then DNS-SD
           services are advertised on all LAN interfaces.
+
+          {{deprecated|2.17|in favor of {{param|Advertise.{i}.Interface}}}}
         </description>
         <syntax>
           <list/>
@@ -66283,6 +74412,218 @@
       </parameter>
     </object>
 
+    <object name="Device.DNS.SD.Advertise.{i}." access="readWrite"
+        numEntriesParameter="AdvertiseNumberOfEntries" enableParameter="Enable"
+        minEntries="0" maxEntries="unbounded" version="2.17">
+      <description>
+        The {{object}} table contains DNS-SD services that MUST be advertised.
+        DNS.SD service information is provided in DNS RR SRV records
+        {{bibref|RFC2782}}. The Service Instance Name {{bibref|DNS-SD|Section
+        4.1 Structured Instance Names}} further specifies information about the
+        service name (RFC2782 Service field) and domain name (RFC2782 Name
+        field) in the form:
+
+        Service Instance Name = [InstanceName] . [Service] . [Domain]
+
+        [Service] = _[ApplicationProtocol] . _[TransportProtocol]
+
+        RFC2782 Service field will always be equal to [InstanceName]. [Service]
+
+        RFC2782 Name field will always be equal to [Domain]
+
+        For example, an SSH service might have:
+
+        *{{param|InstanceName}} = "Secure Shell (SSH))"
+
+        *{{param|ApplicationProtocol}} = "ssh"
+
+        *{{param|TransportProtocol}} = "TCP"
+
+        *{{param|Port}} = 22
+      </description>
+      <uniqueKey functional="true">
+        <parameter ref="Alias"/>
+      </uniqueKey>
+
+      <parameter name="Enable" access="readWrite">
+        <description>
+          Enables or disables the advertisement of the DNS-SD service.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Alias" access="writeOnceReadOnly">
+        <description>
+          {{datatype|expand}}
+        </description>
+        <syntax>
+          <dataType ref="Alias"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Status" access="readOnly">
+        <description>
+          The status of the advertised {{object}}.
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="Disabled">
+              <description>
+                Indicates that the DNS-SD service advertisement is disabled.
+              </description>
+            </enumeration>
+            <enumeration value="Enabled">
+              <description>
+                Indicates that the DNS-SD service advertisement is enabled.
+              </description>
+            </enumeration>
+            <enumeration value="Error_Misconfigured">
+              <description>
+                Indicates that a necessary configuration value is undefined or
+                invalid.
+              </description>
+            </enumeration>
+            <enumeration value="Error" optional="true">
+              <description>
+                MAY be used to define an error condition.
+              </description>
+            </enumeration>
+          </string>
+          <default type="object" value="Disabled"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Interface" access="readWrite">
+        <description>
+          {{reference}} The layer 3 interface on which the DNS-SD service MUST
+          be advertised. Example: ''Device.IP.Interface.1'' or
+          ''Device.Logical.Interface.1''.
+
+          {{template|INTERFACE-ROUTING}}
+        </description>
+        <syntax>
+          <string>
+            <size maxLength="256"/>
+            <pathRef refType="strong" targetParent=".IP.Interface."
+                targetType="row"/>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="InstanceName" access="readOnly">
+        <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>
+        <syntax>
+          <string>
+            <size maxLength="63"/>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="ApplicationProtocol" access="readOnly">
+        <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>
+        <syntax>
+          <string>
+            <size maxLength="15"/>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="TransportProtocol" access="readOnly">
+        <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>
+        <syntax>
+          <string>
+            <enumeration value="TCP"/>
+            <enumeration value="UDP"/>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="Domain" access="readOnly">
+        <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>
+        <syntax>
+          <string>
+            <size maxLength="256"/>
+          </string>
+          <default type="object" value="local"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Port" access="readOnly">
+        <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>
+        <syntax>
+          <unsignedInt>
+            <range maxInclusive="65535"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="TextRecordNumberOfEntries" access="readOnly">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object name="Device.DNS.SD.Advertise.{i}.TextRecord.{i}."
+        access="readOnly" numEntriesParameter="TextRecordNumberOfEntries"
+        minEntries="0" maxEntries="unbounded" dmr:noUniqueKeys="true"
+        version="2.17">
+      <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.
+      </description>
+
+      <parameter name="Key" access="readWrite">
+        <description>
+          The key that identifies the text record
+        </description>
+        <syntax>
+          <string>
+            <size maxLength="255"/>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="Value" access="readWrite">
+        <description>
+          The value of the text record.
+        </description>
+        <syntax>
+          <string>
+            <size maxLength="255"/>
+          </string>
+        </syntax>
+      </parameter>
+    </object>
+
     <object name="Device.DNS.SD.Service.{i}." access="readOnly"
         numEntriesParameter="ServiceNumberOfEntries" minEntries="0"
         maxEntries="unbounded" version="2.6">
@@ -66294,16 +74635,13 @@
         service name (RFC2782 Service field) and domain name (RFC2782 Name
         field) in the form:
 
-        Service Instance Name = &lt;InstanceName&gt; . &lt;Service&gt; .
-        &lt;Domain&gt;
+        Service Instance Name = [InstanceName] . [Service] . [Domain]
 
-        &lt;Service&gt; = _&lt;ApplicationProtocol&gt; .
-        _&lt;TransportProtocol&gt;
+        [Service] = _[ApplicationProtocol] . _[TransportProtocol]
 
-        RFC2782 Service field will always be equal to &lt;InstanceName&gt;.
-        &lt;Service&gt;
+        RFC2782 Service field will always be equal to [InstanceName]. [Service]
 
-        RFC2782 Name field will always be equal to &lt;Domain&gt;
+        RFC2782 Name field will always be equal to [Domain]
 
         For example, an SSH service might have:
 
@@ -66329,8 +74667,8 @@
       <parameter name="InstanceName" access="readOnly">
         <description>
           Human-readable instance name {{bibref|DNS-SD|Section 4.1.1 Instance
-          Names}} (i.e. The "&lt;{{param}}&gt;" portion of the '"Service
-          Instance Name'").
+          Names}} (i.e. The "[{{param}}]" portion of the '"Service Instance
+          Name'").
         </description>
         <syntax>
           <string>
@@ -66574,6 +74912,18 @@
         </syntax>
       </parameter>
 
+      <parameter name="MaxNumberOfPortMappings" access="readOnly">
+        <description>
+          The maximum number of port mappings that can exist at any given time.
+
+          If the value of this parameter is 0, then it means that the device
+          doesn't have a limit to the number of port mappings that can exist.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
       <parameter name="PortTriggerNumberOfEntries" access="readOnly">
         <description>
           {{numentries}}
@@ -66582,6 +74932,18 @@
           <unsignedInt/>
         </syntax>
       </parameter>
+
+      <parameter name="MaxNumberOfPortTriggers" access="readOnly">
+        <description>
+          The maximum number of port triggers that can exist at any given time.
+
+          If the value of this parameter is 0, then it means that the device
+          doesn't have a limit to the number of port mappings that can exist.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
     </object>
 
     <object name="Device.NAT.InterfaceSetting.{i}." access="readWrite"
@@ -66657,7 +75019,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -66804,7 +75166,42 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Origin" access="readOnly">
+        <description>
+          Indicates the Origin of the {{object}} instance.
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="User">
+              <description>
+                Used for indicating that the port mapping entry was created by
+                the end-user. For example through the web user interface.
+              </description>
+            </enumeration>
+            <enumeration value="System">
+              <description>
+                Used for indicating that the port mapping entry was created by
+                the system itself.
+              </description>
+            </enumeration>
+            <enumeration value="UPnP">
+              <description>
+                Used for indicating that the port mapping entry was created by
+                a device using UPnP-IGD.
+              </description>
+            </enumeration>
+            <enumeration value="Controller">
+              <description>
+                Used for indicating that the port mapping entry was created by
+                a Controller.
+              </description>
+            </enumeration>
+          </string>
+          <default type="object" value="Controller"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
 
@@ -67057,7 +75454,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -67116,7 +75513,7 @@
             <enumeration value="User">
               <description>
                 Used for indicating that the PortTrigger entry was created by
-                the end-user. For example through the web-ui.
+                the end-user. For example through the web user interface.
               </description>
             </enumeration>
             <enumeration value="System">
@@ -67254,7 +75651,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -67409,7 +75806,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -67657,7 +76054,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -67918,7 +76315,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -68164,7 +76561,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -68306,7 +76703,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -68551,7 +76948,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -68787,7 +77184,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -68847,26 +77244,16 @@
 
       <parameter name="Order" access="readWrite">
         <description>
-          Position of the option in the DHCP client request. A value of ''1''
-          indicates the first entry.
+          {{datatype|expand}}
 
-          When this value is modified, if the value matches that of an existing
-          entry, the {{param}} value for the existing entry and all lower
-          {{param}} entries is incremented to ensure uniqueness of this value.
-          A deletion causes {{param}} values to be compacted. When a value is
-          changed, incrementing occurs before compaction.
-
-          The value of {{param}} on creation of a {{object}} table entry MUST
-          be one greater than the largest current value.
+          This indicates the position of the option in the DHCP client request.
         </description>
         <syntax>
-          <unsignedInt>
-            <range minInclusive="1"/>
-          </unsignedInt>
+          <dataType ref="Order"/>
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -68986,7 +77373,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -68997,26 +77384,13 @@
 
       <parameter name="Order" access="readWrite">
         <description>
-          Position of the {{object}} entry in the order of precedence. A value
-          of ''1'' indicates the first entry considered (highest precedence).
+          {{datatype|expand}}
+
           For each DHCP request, the highest ordered entry that matches the
           association criteria is applied. All lower order entries are ignored.
-
-          When this value is modified, if the value matches that of an existing
-          entry, the {{param}} value for the existing entry and all lower
-          {{param}} entries is 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.
-
-          The value of {{param}} on creation of a {{object}} table entry MUST
-          be one greater than the largest current value (initially assigned the
-          lowest precedence).
         </description>
         <syntax>
-          <unsignedInt>
-            <range minInclusive="1"/>
-          </unsignedInt>
+          <dataType ref="Order"/>
         </syntax>
       </parameter>
 
@@ -69432,7 +77806,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -69489,7 +77863,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -69538,7 +77912,7 @@
         <parameter ref="Chaddr"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
 
@@ -69745,7 +78119,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -69756,26 +78130,13 @@
 
       <parameter name="Order" access="readWrite">
         <description>
-          Position of the {{object}} entry in the order of precedence. A value
-          of ''1'' indicates the first entry considered (highest precedence).
+          {{datatype|expand}}
+
           For each DHCP request, the highest ordered entry that matches the
           association criteria is applied. All lower order entries are ignored.
-
-          When this value is modified, if the value matches that of an existing
-          entry, the {{param}} value for the existing entry and all lower
-          {{param}} entries is 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.
-
-          The value of {{param}} on creation of a {{object}} table entry MUST
-          be one greater than the largest current value (initially assigned the
-          lowest precedence).
         </description>
         <syntax>
-          <unsignedInt>
-            <range minInclusive="1"/>
-          </unsignedInt>
+          <dataType ref="Order"/>
         </syntax>
       </parameter>
 
@@ -70045,7 +78406,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -70343,7 +78704,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -70512,7 +78873,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -70523,26 +78884,13 @@
 
       <parameter name="Order" access="readWrite">
         <description>
-          Position of the {{object}} entry in the order of precedence. A value
-          of ''1'' indicates the first entry considered (highest precedence).
+          {{datatype|expand}}
+
           For each DHCPv6 request, the highest ordered entry that matches the
           association criteria is applied. All lower order entries are ignored.
-
-          When this value is modified, if the value matches that of an existing
-          entry, the {{param}} value for the existing entry and all lower
-          {{param}} entries is 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.
-
-          The value of {{param}} on creation of a {{object}} table entry MUST
-          be one greater than the largest current value (initially assigned the
-          lowest precedence).
         </description>
         <syntax>
-          <unsignedInt>
-            <range minInclusive="1"/>
-          </unsignedInt>
+          <dataType ref="Order"/>
         </syntax>
       </parameter>
 
@@ -70907,7 +79255,7 @@
         <parameter ref="SourceAddress"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
 
@@ -71118,7 +79466,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -71252,7 +79600,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -71707,7 +80055,7 @@
         <parameter ref="UserID"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -71918,7 +80266,7 @@
         <parameter ref="GroupID"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -72007,7 +80355,7 @@
         <parameter ref="Name"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -72054,7 +80402,7 @@
         <parameter ref="RoleID"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -72137,7 +80485,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -73970,6 +82318,15 @@
           <unsignedInt/>
         </syntax>
       </parameter>
+
+      <parameter name="InterfaceSettingNumberOfEntries" access="readOnly">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
     </object>
 
     <object name="Device.Firewall.Level.{i}." access="readWrite"
@@ -73990,7 +82347,7 @@
         <parameter ref="Name"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -74023,23 +82380,14 @@
 
       <parameter name="Order" access="readWrite">
         <description>
-          Position of the {{object}} entry for user interface display; levels
-          can be presented according to an increasing or decreasing level of
-          security.
+          {{datatype|expand}}
 
-          When this value is modified, if the value matches that of an existing
-          entry, the {{param}} value for the existing entry and all
-          greater-valued {{param}} entries is incremented to ensure uniqueness
-          of this value. A deletion causes {{param}} values to be compacted.
-          When a value is changed, incrementing occurs before compaction.
-
-          The value of {{param}} on creation of a {{object}} table entry MUST
-          be one greater than the largest current value.
+          This indicates the order of the {{object}} entry in the user
+          interface display. Levels can be presented according to increasing or
+          decreasing level of security.
         </description>
         <syntax>
-          <unsignedInt>
-            <range minInclusive="1"/>
-          </unsignedInt>
+          <dataType ref="Order"/>
         </syntax>
       </parameter>
 
@@ -74149,7 +82497,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -74362,7 +82710,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -74510,30 +82858,17 @@
 
       <parameter name="Order" access="readWrite">
         <description>
-          Position of the {{object}} entry in the order of precedence. A value
-          of ''1'' indicates the first entry considered (highest precedence).
+          {{datatype|expand}}
+
           For each packet, the highest ordered entry that matches the rule
           criteria is applied. All lower order entries are ignored.
-
-          When this value is modified, if the value matches that of an existing
-          entry, the {{param}} value for the existing entry and all lower
-          {{param}} entries is 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.
-
-          The value of {{param}} on creation of a {{object}} table entry MUST
-          be one greater than the largest current value (initially assigned the
-          lowest precedence).
         </description>
         <syntax>
-          <unsignedInt>
-            <range minInclusive="1"/>
-          </unsignedInt>
+          <dataType ref="Order"/>
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -75165,7 +83500,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -75213,16 +83548,16 @@
         </syntax>
       </parameter>
 
-      <parameter name="Origin" access="readWrite">
+      <parameter name="Origin" access="readOnly">
         <description>
-          Indicates the owner of the {{object}} instance.
+          Indicates the Origin of the {{object}} instance.
         </description>
         <syntax>
           <string>
             <enumeration value="User">
               <description>
                 Used for indicating that the pinhole rule was created by the
-                end-user. For example through the web-ui.
+                end-user. For example through the web user interface.
               </description>
             </enumeration>
             <enumeration value="System">
@@ -75231,6 +83566,12 @@
                 system itself.
               </description>
             </enumeration>
+            <enumeration value="UPnP">
+              <description>
+                Used for indicating that the pinhole rule was created by a
+                device using UPnP-IGD.
+              </description>
+            </enumeration>
             <enumeration value="Controller">
               <description>
                 Used for indicating that the pinhole rule was created by a
@@ -75267,6 +83608,43 @@
         </syntax>
       </parameter>
 
+      <parameter name="LeaseDuration" access="readWrite">
+        <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
+          expires.
+
+          A value of 0 means the pin hole is static. Support for dynamic
+          (non-static) pin hole is OPTIONAL. That is, the only value for
+          {{param}} that MUST be supported is 0.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="RemainingLeaseTime" access="readOnly"
+          activeNotify="canDeny">
+        <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
+          lease. That is, for a dynamic pin hole, the value counts down toward
+          0. When a dynamic pin hole lease expires, the device MUST
+          automatically terminate that pin hole, and MUST automatically delete
+          the corresponding {{object}} table entry.
+
+          For a static pin hole, this parameter is irrelevant and should return
+          ''0''.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
       <parameter name="SourcePort" access="readWrite">
         <description>
           Source port number of the incoming connection. A value of ''-1''
@@ -75395,7 +83773,7 @@
         <parameter ref="SourcePrefix"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -75454,7 +83832,7 @@
             <enumeration value="User">
               <description>
                 Used for indicating that the DMZ rule was created by the
-                end-user. For example through the web-ui.
+                end-user. For example through the web user interface.
               </description>
             </enumeration>
             <enumeration value="System">
@@ -75499,6 +83877,42 @@
         </syntax>
       </parameter>
 
+      <parameter name="LeaseDuration" access="readWrite">
+        <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.
+
+          A value of 0 means the DMZ rule is static. Support for dynamic
+          (non-static) DMZ rules is OPTIONAL. That is, the only value for
+          {{param}} that MUST be supported is 0.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="RemainingLeaseTime" access="readOnly"
+          activeNotify="canDeny">
+        <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
+          lease. That is, for a dynamic DMZ rule, the value counts down toward
+          0. When a dynamic DMZ rule lease expires, the device MUST
+          automatically terminate that DMZ rule, and MUST automatically delete
+          the corresponding {{object}} table entry.
+
+          For a static DMZ rule, this parameter is irrelevant and should return
+          ''0''.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
       <parameter name="DestIP" access="readWrite">
         <description>
           The IPv4 address of a client in the DMZ network.
@@ -75548,7 +83962,7 @@
         <parameter ref="SourcePrefixes"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -75721,6 +84135,440 @@
       </parameter>
     </object>
 
+    <object name="Device.Firewall.InterfaceSetting.{i}." access="readWrite"
+        numEntriesParameter="InterfaceSettingNumberOfEntries"
+        enableParameter="Enable" minEntries="0" maxEntries="unbounded"
+        version="2.17">
+      <description>
+        Firewall settings for an associated IP Interface.
+
+        For enabled table entries, 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}}.
+
+        Note: The {{object}} includes a unique key that is a strong reference.
+        If a strongly referenced object is deleted, the device will set the
+        referencing parameter to {{empty}}. However, doing so under these
+        circumstances might cause the updated {{object}} row to then violate
+        the table's unique key constraint; if this occurs, the device MUST set
+        {{param|Status}} to {{enum|Error_Misconfigured|Status}} and disable the
+        offending {{object}} row.
+      </description>
+      <uniqueKey functional="false">
+        <parameter ref="Alias"/>
+      </uniqueKey>
+      <uniqueKey functional="true">
+        <parameter ref="Interface"/>
+      </uniqueKey>
+
+      <parameter name="Enable" access="readWrite">
+        <description>
+          Enables or disables the {{object}} entry, indicating if NAT is
+          enabled for the referenced IP Interface instance. On creation, an
+          {{object}} entry is disabled by default.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="object" value="false"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Status" access="readOnly">
+        <description>
+          The status of this entry. {{enum}}
+
+          The {{enum|Error_Misconfigured}} value indicates that a necessary
+          configuration value is undefined or invalid.
+
+          The {{enum|Error}} value MAY be used by the device to indicate a
+          locally defined error condition.
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="Disabled"/>
+            <enumeration value="Enabled"/>
+            <enumeration value="Error_Misconfigured"/>
+            <enumeration value="Error"/>
+          </string>
+          <default type="object" value="Disabled"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Alias" access="writeOnceReadOnly">
+        <description>
+          {{datatype|expand}}
+        </description>
+        <syntax>
+          <dataType ref="Alias"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Interface" access="readWrite">
+        <description>
+          {{reference}} The associated IP interface on which NAT is to be
+          enabled.
+        </description>
+        <syntax>
+          <string>
+            <size maxLength="256"/>
+            <pathRef refType="strong" targetParent="##.IP.Interface."
+                targetType="row"/>
+          </string>
+          <default type="object" value=""/>
+        </syntax>
+      </parameter>
+
+      <parameter name="IPv4SpoofingProtection" access="readWrite">
+        <description>
+          Enables or disables the IPv4 spoofing protection.
+
+          Spoofing protection prevents LAN devices from sending packets with a
+          wrong source IP address.
+
+          A number of DDoS attacks are known to modify the source IP address of
+          packets to initiate a DDoS attack. Spoofing protection checks if the
+          source IP address of packets initiated in the LAN belongs to the LAN
+          interface Address range, otherwise the packet will be dropped early
+          in the network stack.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="IPv6SpoofingProtection" access="readWrite">
+        <description>
+          Enables or disables the IPv6 spoofing protection.
+
+          Spoofing protection prevents LAN devices from sending packets with a
+          wrong source IP address.
+
+          A number of DDoS attacks are known to modify the source IP address of
+          packets to initiate a DDoS attack. Spoofing protection checks if the
+          source IP address of packets initiated in the LAN belongs to the LAN
+          interface Address range, otherwise the packet will be dropped early
+          in the network stack.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="IPv4AcceptICMPEchoRequest" access="readWrite">
+        <description>
+          When {{true}} the 'ICMPv4 echo request' packet must be answered with
+          an 'ICMPv4 echo reply'. When {{false}} the 'ICMPv4 echo request'
+          packet must be dropped.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="IPv6AcceptICMPEchoRequest" access="readWrite">
+        <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.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="StealthMode" access="readWrite">
+        <description>
+          Enables or disables the stealth mode. Stealth mode defines how the
+          firewall must treat "unwanted" packets.
+
+          Typically the feature is enabled for WAN facing interface(s). Stealth
+          mode is applicable for both IPv4 and IPv6, and UDP and TCP based
+          protocols.
+
+          If set to {{true}} all 'UDP/TCP' packets are dropped silently. This
+          prevents a possible attacker from knowing which ports are
+          opened/closed on a gateway.
+
+          When {{param}} is set to {{false}}, the firewall will reply with an
+          ICMP port unreachable.
+
+          If there are other firewall rules in effect, they will have priority
+          over this parameter. i.e: If an 'UDP' port is set to 'ACCEPT', and
+          the {{param}} is activated, then the port will be accepted and all
+          the other 'UDP' ports will be blocked.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object name="Device.Firewall.ConnectionTracking." access="readOnly"
+        version="2.17">
+      <description>
+        This Object contains the IP connection tracking related parameters.
+        Application Layer Gateway (ALG) are used to provide Network Address
+        Translation (NAT) support for various application-layer protocols.
+      </description>
+    </object>
+
+    <object name="Device.Firewall.ConnectionTracking.SIP." access="readOnly"
+        version="2.17">
+      <description>
+        SIP is an application-layer control protocol used to establish, modify,
+        and terminate multimedia sessions.
+      </description>
+
+      <parameter name="Enable" access="readWrite">
+        <description>
+          Enables or disables the connection tracking support for the SIP
+          protocol (SIP ALG).
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Ports" access="readWrite">
+        <description>
+          Port numbers of the SIP servers that need to be monitored.
+        </description>
+        <syntax>
+          <list/>
+          <int>
+            <range minInclusive="0" maxInclusive="65535"/>
+          </int>
+        </syntax>
+      </parameter>
+
+      <parameter name="DirectMedia" access="readWrite">
+        <description>
+          Allow media streams between signaling endpoints.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="implementation" value="true"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="DirectSignaling" access="readWrite">
+        <description>
+          Allow incoming calls from registrar.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="implementation" value="true"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ExternalMedia" access="readWrite">
+        <description>
+          Allow media streams that are not passing through this router.
+
+          When this feature is activated, the logic will maintain the SDP
+          payload as is when it identifies that the interface towards the
+          invited party is the same as the one towards the media endpoint.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="implementation" value="false"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="TimeOut" access="readWrite">
+        <description>
+          SIP time out session.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object name="Device.Firewall.ConnectionTracking.H323." access="readOnly"
+        version="2.17">
+      <description>
+        H.323 is a VoIP signalling protocol from ITU-T
+      </description>
+
+      <parameter name="Enable" access="readWrite">
+        <description>
+          Enables or disables the connection tracking support for the H323
+          protocol (H323 ALG).
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="RegistrationRequestTTL" access="readWrite">
+        <description>
+          When no TTL is specified in the registration request message the TTL
+          specified here will be used.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="GKRoutedOnly" access="readWrite">
+        <description>
+          Only accept calls from the gatekeeper.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="CallForwardFilter" access="readWrite">
+        <description>
+          Create call forwarding expectations only when both endpoints are on
+          different sides, as determined by routing information.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object name="Device.Firewall.ConnectionTracking.FTP." access="readOnly"
+        version="2.17">
+      <description>
+        Tracking FTP connections is difficult due to the requirement for
+        specialized helpers to handle them, along with the complexities of
+        masquerading and Network Address Translation. This involves supporting
+        FTP on Layer 3 with independent connection tracking.
+      </description>
+
+      <parameter name="Enable" access="readWrite">
+        <description>
+          Enables or disables the connection tracking support for the FTP
+          protocol (FTP ALG).
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Ports" access="readWrite">
+        <description>
+          Port numbers of the FTP servers that need to be monitored.
+        </description>
+        <syntax>
+          <list maxItems="8"/>
+          <int>
+            <range minInclusive="0" maxInclusive="65535"/>
+          </int>
+        </syntax>
+      </parameter>
+
+      <parameter name="Loose" access="readWrite">
+        <description>
+          The FTP protocol can enable a user to connect a FTP server to another
+          FTP server. This could lead to a hole in the DMZ and it is therefore
+          recommended to disable this feature.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object name="Device.Firewall.ConnectionTracking.PPTP." access="readOnly"
+        version="2.17">
+      <description>
+        PPTP Connection Tracking configuration object.
+      </description>
+
+      <parameter name="Enable" access="readWrite">
+        <description>
+          Enables or disables the connection tracking support for the PPTP
+          protocol (PPTP ALG).
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object name="Device.Firewall.ConnectionTracking.TFTP." access="readOnly"
+        version="2.17">
+      <description>
+        TFTP Connection Tracking configuration object.
+      </description>
+
+      <parameter name="Enable" access="readWrite">
+        <description>
+          Enables or disables the connection tracking support for the TFTP
+          protocol (TFTP ALG).
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Ports" access="readWrite">
+        <description>
+          Port numbers of the TFTP servers that need to be monitored.
+        </description>
+        <syntax>
+          <list maxItems="8"/>
+          <int>
+            <range minInclusive="0" maxInclusive="65535"/>
+          </int>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object name="Device.Firewall.ConnectionTracking.IRC." access="readOnly"
+        version="2.17">
+      <description>
+        IRC Connection Tracking configuration object.
+      </description>
+
+      <parameter name="Enable" access="readWrite">
+        <description>
+          Enables or disables the connection tracking support for the IRC
+          protocol (IRC ALG).
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Ports" access="readWrite">
+        <description>
+          Port numbers of the IRC servers that need to be monitored.
+        </description>
+        <syntax>
+          <list/>
+          <int>
+            <range minInclusive="0" maxInclusive="65535"/>
+          </int>
+        </syntax>
+      </parameter>
+
+      <parameter name="MAXDCCChannels" access="readWrite">
+        <description>
+          Maximum number of Direct Client-to-Client (DCC) channels allowed per
+          IRC session.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="DCCTimeout" access="readWrite">
+        <description>
+          Timeout duration for unestablished Direct Client-to-Client (DCC)
+          channels.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+    </object>
+
     <object name="Device.PeriodicStatistics." access="readOnly" minEntries="1"
         maxEntries="1" version="2.0">
       <description>
@@ -75784,7 +84632,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -75825,6 +84673,11 @@
           The sample interval in {{units}}. Each statistic is measured over
           this sample interval.
 
+          The CPE MAY also support an internal sampling rate (implementation
+          dependent) that is faster than the {{param}} and allows the CPE to
+          support the various options available in
+          {{param|Parameter.{i}.CalculationMode}}.
+
           The CPE MAY reject a request to set {{param}} to less than
           {{param|#.MinSampleInterval}}.
 
@@ -76110,7 +84963,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -76157,7 +85010,8 @@
             </enumeration>
             <enumeration value="Change">
               <description>
-                Sampled value is change in value since start of sample interval
+                Sampled value is change in value since start of each internal
+                sample interval.
               </description>
             </enumeration>
           </string>
@@ -76168,7 +85022,7 @@
       <parameter name="CalculationMode" access="readWrite">
         <description>
           Controls how this parameter's statistic is calculated from the
-          sampled value(s). {{enum}}
+          sampled value(s) of each internal sample interval. {{enum}}
 
           Parameters of non-numeric types can only support {{enum|Latest}}. The
           value of the {{param}} MUST be ignored for such parameters.
@@ -77282,7 +86136,8 @@
 
       <parameter name="SubjectAlt" access="readOnly">
         <description>
-          {{list}} Each item is a DNS Name.
+          {{list}} Each item specifies an identity that is bound to the
+          certificate's subject, and thus bound to the Public Key.
 
           The Subject Alternative Names extension field in an X.509
           certificate, see {{bibref|RFC5280}}.
@@ -77948,7 +86803,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -79297,7 +88152,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -80186,7 +89041,7 @@
         <parameter ref="Version"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -80337,12 +89192,12 @@
           When an Execution Environment is disabled, Deployment Units installed
           to that Execution Environment will be unaffected, but any Execution
           Units currently running on that Execution Environment will
-          automatically transition to
-          {{enum|Idle|#.ExecutionUnit.{i}.Status}}.{{np}}If a ChangeDUState is
-          attempted on a {{object|#.DeploymentUnit}} that is to be applied
-          against a disabled {{object}}, that ChangeDUState operation fails and
-          the associated DUStateChangeComplete RPC will contain a FaultStruct
-          for that operation.
+          automatically transition to {{enum|Idle|#.ExecutionUnit.{i}.Status}}.
+
+          If a ChangeDUState is attempted on a {{object|#.DeploymentUnit}} that
+          is to be applied against a disabled {{object}}, that ChangeDUState
+          operation fails and the associated DUStateChangeComplete RPC will
+          contain a FaultStruct for that operation.
 
           If a SetParameterValues is attempted against the
           {{param|#.ExecutionUnit.{i}.RequestedState}} for an
@@ -80407,7 +89262,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -80756,15 +89611,6 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite" dmr:previousParameter="">
-        <description>
-          {{datatype|expand}}
-        </description>
-        <syntax>
-          <dataType ref="Alias"/>
-        </syntax>
-      </parameter>
-
       <parameter name="Capacity" access="readOnly">
         <description>
           Storage capacity of the volume, in {{units}}.
@@ -80809,6 +89655,15 @@
         </syntax>
       </parameter>
 
+      <parameter name="Alias" access="writeOnceReadOnly">
+        <description>
+          {{datatype|expand}}
+        </description>
+        <syntax>
+          <dataType ref="Alias"/>
+        </syntax>
+      </parameter>
+
       <parameter name="ApplicationUUID" access="readOnly">
         <description>
           The {{param|##.DeploymentUnit.{i}.UUID}} of the
@@ -80882,7 +89737,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -81157,7 +90012,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -81459,8 +90314,10 @@
         <description>
           Represents the instances of multi-instanced objects that are directly
           controlled by, and have come into existence because of, this
-          {{object}}.{{np}}See {{bibref|TR-069|Appendix VI.3.2}} for more
-          description and some examples.
+          {{object}}.
+
+          See {{bibref|TR-069|Appendix VI.3.2}} for more description and some
+          examples.
 
           NOTE: All other objects and parameters (i.e. not multi-instanced
           objects) that this {{object}} has caused to come into existence can
@@ -81589,13 +90446,21 @@
           <unsignedInt/>
         </syntax>
       </parameter>
+
+      <parameter name="EnvVariableNumberOfEntries" access="readOnly">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
     </object>
 
     <object name="Device.SoftwareModules.ExecutionUnit.{i}.AutoRestart."
         access="readOnly" minEntries="1" maxEntries="1" version="2.16">
       <description>
-        Configures the parameters of the auto-restart algorithm for this
-        {{object|#}}.
+        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
@@ -81621,7 +90486,7 @@
 
       <parameter name="Enable" access="readWrite">
         <description>
-          Enable the auto-restart feature for this {{object|#}}.
+          Enable the auto-restart feature for this EU.
         </description>
         <syntax>
           <boolean/>
@@ -81677,10 +90542,10 @@
 
       <parameter name="ResetPeriod" access="readWrite">
         <description>
-          If the {{object|#}} runs for this number of {{units}} without
-          terminating abnormally the Agent MAY reset the {{param|RetryCount}}
-          to zero, thereby resetting the exponential backoff algorithm. A value
-          of zero disables this behavior.
+          If the EU runs for this number of {{units}} without terminating
+          abnormally the Agent MAY reset the {{param|RetryCount}} to zero,
+          thereby resetting the exponential backoff algorithm. A value of zero
+          disables this behavior.
         </description>
         <syntax>
           <unsignedInt>
@@ -81691,9 +90556,9 @@
 
       <parameter name="RetryCount" access="readWrite">
         <description>
-          The number of restart attempts which have been initiated so far.
-          Resetting this parameter to zero has the effect of re-initialising
-          the exponential back-off algorithm.
+          The number times the EU has terminated abnormally and a restart has
+          been attempted. Resetting this parameter to zero has the effect of
+          re-initialising the exponential back-off algorithm.
         </description>
         <syntax>
           <unsignedInt/>
@@ -81722,6 +90587,43 @@
       </parameter>
     </object>
 
+    <object name="Device.SoftwareModules.ExecutionUnit.{i}.NetworkConfig."
+        access="readOnly" version="2.17">
+      <description>
+        Parameters of the network configuration for this ExecutionUnit.
+
+        When no network configuration is provided, the EU will not have any
+        network access.
+      </description>
+
+      <parameter name="AccessInterfaceRefList" access="readOnly">
+        <description>
+          Represents the network interface through which the traffic from the
+          EU will be allowed.
+        </description>
+        <syntax>
+          <list/>
+          <string>
+            <pathRef refType="strong" targetParent=".Logical.Interface."
+                targetType="row"/>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="PortMappingRefList" access="readOnly">
+        <description>
+          Represents the list of Port mappings associated with this EU.
+        </description>
+        <syntax>
+          <list/>
+          <string>
+            <pathRef refType="strong" targetParent=".NAT.PortMapping."
+                targetType="row"/>
+          </string>
+        </syntax>
+      </parameter>
+    </object>
+
     <object name="Device.SoftwareModules.ExecutionUnit.{i}.HostObject.{i}."
         minEntries="0" maxEntries="unbounded" version="2.16" access="readOnly"
         numEntriesParameter="HostObjectNumberOfEntries">
@@ -81751,15 +90653,6 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite" dmr:previousParameter="">
-        <description>
-          {{datatype|expand}}
-        </description>
-        <syntax>
-          <dataType ref="Alias"/>
-        </syntax>
-      </parameter>
-
       <parameter name="Destination" access="readOnly">
         <description>
           The object identifier by which the object may be accessed by the
@@ -81784,6 +90677,63 @@
           </string>
         </syntax>
       </parameter>
+
+      <parameter name="Alias" access="writeOnceReadOnly">
+        <description>
+          {{datatype|expand}}
+        </description>
+        <syntax>
+          <dataType ref="Alias"/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object name="Device.SoftwareModules.ExecutionUnit.{i}.EnvVariable.{i}."
+        minEntries="0" maxEntries="unbounded" version="2.17" access="readOnly"
+        numEntriesParameter="EnvVariableNumberOfEntries">
+      <description>
+        This parameter describes the environment variables which are accessible
+        to the ExecutionUnit.
+      </description>
+      <uniqueKey functional="false">
+        <parameter ref="Alias"/>
+      </uniqueKey>
+      <uniqueKey functional="true">
+        <parameter ref="Key"/>
+      </uniqueKey>
+
+      <parameter name="Key" access="readOnly">
+        <description>
+          The Environment variable name that needs to be passed to the
+          Execution unit when the execution unit is activated.
+        </description>
+        <syntax>
+          <string>
+            <size maxLength="2048"/>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="Value" access="readOnly">
+        <description>
+          The Environment variable value associated with the name that needs to
+          be passed to the Execution unit it is activated.
+        </description>
+        <syntax>
+          <string>
+            <size maxLength="2048"/>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="Alias" access="writeOnceReadOnly">
+        <description>
+          {{datatype|expand}}
+        </description>
+        <syntax>
+          <dataType ref="Alias"/>
+        </syntax>
+      </parameter>
     </object>
 
     <object name="Device.SoftwareModules.ExecutionUnit.{i}.Extensions."
@@ -81793,12 +90743,14 @@
         to this Execution Unit, which allows multiple Execution Units to expose
         parameters without the concern of conflicting parameter names. These
         vendor extensions are related to displaying status and maintaining
-        configuration for this Execution Unit.{{np}}It is also possible for the
-        Execution Unit to expose status and configuration parameters within
-        Service objects or as embedded objects and parameters directly within
-        the root data model, in which case the combination of
-        {{param|#.References}} and {{param|#.SupportedDataModelList}} will be
-        used to determine their locations.
+        configuration for this Execution Unit.
+
+        It is also possible for the Execution Unit to expose status and
+        configuration parameters within Service objects or as embedded objects
+        and parameters directly within the root data model, in which case the
+        combination of {{param|#.References}} and
+        {{param|#.SupportedDataModelList}} will be used to determine their
+        locations.
 
         See {{bibref|TR-069|Appendix VI.3.2}} for more description and some
         examples.
@@ -81901,7 +90853,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -82230,7 +91182,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -83526,7 +92478,7 @@
 
       <parameter name="AssocWiFiNetworkDeviceRef" access="readOnly">
         <description>
-          {{reference||deprecated}}{{param}} is a reference to a MultiAP.Device
+          {{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
@@ -84529,7 +93481,7 @@
         <parameter ref="Name"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -84637,14 +93589,15 @@
         </syntax>
       </parameter>
 
-      <parameter name="EnableEncryption" access="readWrite"
-          status="deprecated">
+      <parameter name="EnableEncryption" access="readWrite" status="obsoleted">
         <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>
         <syntax>
           <boolean/>
@@ -85240,7 +94193,7 @@
         <parameter ref="Topic"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -85343,7 +94296,7 @@
         <parameter ref="Name"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -85597,7 +94550,7 @@
         <parameter ref="Name"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -85725,7 +94678,7 @@
         <parameter ref="Name"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -86099,7 +95052,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -86195,7 +95148,7 @@
         <parameter ref="Direction"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -86625,7 +95578,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -86835,7 +95788,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -86995,7 +95948,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -87146,7 +96099,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -87303,7 +96256,7 @@
         <parameter ref="MeasurementAgent"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -87530,7 +96483,7 @@
         <parameter ref="Identifier"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -87924,7 +96877,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -88037,8 +96990,8 @@
           <string>
             <enumeration value="Sequential">
               <description>
-                 Actions are executed in sequence as defined by the value of
-                 the {{param|Action.{i}.Order}} parameter.
+                Actions are executed in sequence as defined by the value of the
+                {{param|Action.{i}.Order}} parameter.
 
                 The first Scheduled Action of the DestinationOutput is provided
                 the input.
@@ -88174,7 +97127,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -88427,7 +97380,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -88499,7 +97452,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -88575,7 +97528,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -88634,7 +97587,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -88711,7 +97664,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -88816,7 +97769,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -88922,7 +97875,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -89447,7 +98400,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -89893,7 +98846,7 @@
         <parameter ref="Name"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -90107,7 +99060,7 @@
         <parameter ref="Precedence"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -90156,7 +99109,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -90217,7 +99170,7 @@
         <parameter ref="Precedence"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -90367,7 +99320,7 @@
         <parameter ref="SessionID"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -90698,7 +99651,7 @@
         <parameter ref="Identifier"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -90786,7 +99739,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -90863,7 +99816,7 @@
         <parameter ref="QFI"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -91011,7 +99964,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -91366,7 +100319,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -91882,7 +100835,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -92274,7 +101227,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -92617,6 +101570,92 @@
       </parameter>
     </object>
 
+    <object name="Device.XPON.ONU.{i}.ANI.{i}.TC.Authentication."
+        access="readOnly" version="2.17">
+      <description>
+        This object shows info related to authentication of the ONU to the OLT.
+      </description>
+
+      <parameter name="Password" access="readWrite">
+        <description>
+          All ITU based PON standards specify authentication by PLOAM password
+          or registration ID.
+
+          See:
+
+          * {{bibref|G.9807.1|Section C.15.2.1}}
+
+          * {{bibref|G.984.3|Section VI.2}}
+
+          * {{bibref|G.987.3|Section 15.2.1}}
+
+          * {{bibref|G.989.3|Section 15.2.1}}
+
+          All those standards mention that a method to enter the password is
+          beyond their scope. This parameter and the parameter
+          {{param|HexadecimalPassword}} standardize a method to enter the
+          password.
+
+          In case of G-PON as PON mode, the password can be up to 10 bytes
+          long. See {{bibref|G.984.3|Section 9.2.4.2}}. For the other PON
+          modes, the password can be up to 36 bytes long. See:
+
+          * {{bibref|G.9807.1|Section C.11.3.4.2}}
+
+          * {{bibref|G.987.3|Section 11.3.4.2}}
+
+          * {{bibref|G.989.3|Section 11.3.4.2}}
+
+          If {{param|HexadecimalPassword}} is {{false}}, the password is in
+          ASCII format. Then all 95 printable characters with decimal codes in
+          the range 32 to 126 inclusive are allowed. Each character corresponds
+          with 1 byte in the password.
+
+          If {{param|HexadecimalPassword}} is {{true}}, the password is in
+          hexadecimal format. Then only the characters 0 to 9, a to f, and A to
+          F are allowed. Each character corresponds with 1 nibble in the
+          password.
+
+          Depending on the value of {{param|HexadecimalPassword}} and the PON
+          mode, a different number of characters are applicable. If
+          {{param|HexadecimalPassword}} is {{false}}:
+
+          * In case of G-PON as PON mode, only the 1st 10 characters are
+            applicable.
+
+          * In case of another PON mode, only the 1st 36 characters are
+            applicable.
+
+          If {{param|HexadecimalPassword}} is {{true}}:
+
+          * In case of G-PON as PON mode, the 1st 20 characters are all
+            relevant. The other characters are not applicable.
+
+          * In case of another PON mode, all 72 characters are relevant.
+
+          This parameter is set to {{empty}} if no authentication via a
+          password is required.
+        </description>
+        <syntax secured="true">
+          <string>
+            <size maxLength="72"/>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="HexadecimalPassword" access="readWrite">
+        <description>
+          If {{false}}, {{param|Password}} is in ASCII format. If {{true}},
+          {{param|Password}} is in hexadecimal format.
+
+          See {{param|Password}} for more info.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+    </object>
+
     <object name="Device.XPON.ONU.{i}.ANI.{i}.TC.PM." access="readOnly"
         minEntries="1" maxEntries="1" version="2.16">
       <description>
@@ -93609,7 +102648,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -93770,7 +102809,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="AutoDisableDuration" access="readOnly">
+      <parameter name="AutoDisableDuration" access="readWrite">
         <description>
           The SSH server instance will be disabled when the the {{param}}
           elapses, and configuration must be done in {{units}}. At the end, the
@@ -93817,7 +102856,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -93869,7 +102908,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -93933,7 +102972,7 @@
         <parameter ref="Path"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -94007,10 +103046,11 @@
         </syntax>
       </parameter>
 
-      <parameter name="Protocol" access="readWrite">
+      <parameter name="Protocol" access="readOnly">
         <description>
-          The Message Transport Protocol (MTP) to be used for communications by
-          a USP Endpoint.
+          The Message Transfer Protocol (MTP) to be used for communications by
+          a USP Endpoint. Note: This parameter was demoted to readOnly in the
+          Device:2.17 version.
         </description>
         <syntax>
           <string>
@@ -94071,6 +103111,847 @@
       </parameter>
     </object>
 
+    <object name="Device.Syslog." access="readOnly" version="2.17">
+      <description>
+        This object contains global parameters relating to the syslog
+        implementations that is active in the Device. Based on
+        {{bibref|YANGSYSLOG|A YANG Data Model for Syslog Configuration}}.
+      </description>
+
+      <parameter name="Enable" access="readWrite">
+        <description>
+          Enables or disables the Syslog service.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Status" access="readOnly">
+        <description>
+          Indicates the syslog service operational state.
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="Disabled">
+              <description>
+                Indicates that the Syslog service is disabled.
+              </description>
+            </enumeration>
+            <enumeration value="Enabled">
+              <description>
+                Indicates that the Syslog service is enabled.
+              </description>
+            </enumeration>
+            <enumeration value="Error" optional="true">
+              <description>
+                Indicates that the Syslog service has encountered an error.
+              </description>
+            </enumeration>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="FilterNumberOfEntries" access="readOnly">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="SourceNumberOfEntries" access="readOnly">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="TemplateNumberOfEntries" access="readOnly">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ActionNumberOfEntries" access="readOnly">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object name="Device.Syslog.Filter.{i}." access="readWrite"
+        numEntriesParameter="FilterNumberOfEntries" minEntries="0"
+        maxEntries="unbounded" version="2.17">
+      <description>
+        This table defines the processing used to select log messages by
+        comparing syslog message with the provided rules.
+
+        A rule can consist either of {{param|FacilityLevel}} -
+        {{param|Severity}} and or {{param|PatternMatch}}.
+      </description>
+      <uniqueKey functional="false">
+        <parameter ref="Alias"/>
+      </uniqueKey>
+
+      <parameter name="Alias" access="writeOnceReadOnly">
+        <description>
+          {{datatype|expand}}
+        </description>
+        <syntax>
+          <dataType ref="Alias"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="FacilityLevel" access="readWrite">
+        <description>
+          Only the log messages with following Facility levels must be logged.
+        </description>
+        <syntax>
+          <list/>
+          <string>
+            <enumeration value="Kern">
+              <description>Kernel messages (0).</description>
+            </enumeration>
+            <enumeration value="User">
+              <description>User-level messages (1).</description>
+            </enumeration>
+            <enumeration value="Mail">
+              <description>Mail system messages (2).</description>
+            </enumeration>
+            <enumeration value="Daemon">
+              <description>System daemons messages (3).</description>
+            </enumeration>
+            <enumeration value="Auth">
+              <description>Security/authorization messages (4).</description>
+            </enumeration>
+            <enumeration value="Syslog">
+              <description>
+                Messages generated internally by syslogd (5).
+              </description>
+            </enumeration>
+            <enumeration value="LPR">
+              <description>Line printer subsystem messages (6).</description>
+            </enumeration>
+            <enumeration value="News">
+              <description>Network news subsystem (7).</description>
+            </enumeration>
+            <enumeration value="UUCP">
+              <description>UUCP subsystem messages (8).</description>
+            </enumeration>
+            <enumeration value="Cron">
+              <description>Clock daemon messages (9).</description>
+            </enumeration>
+            <enumeration value="AuthPriv">
+              <description>Security/authorization messages (10).</description>
+            </enumeration>
+            <enumeration value="FTP">
+              <description>FTP daemon messages (11).</description>
+            </enumeration>
+            <enumeration value="NTP">
+              <description>NTP subsystem messages (12).</description>
+            </enumeration>
+            <enumeration value="Audit">
+              <description>Log audit messages (13).</description>
+            </enumeration>
+            <enumeration value="Console">
+              <description>Log alert messages (14).</description>
+            </enumeration>
+            <enumeration value="Cron2">
+              <description>Second clock daemon messages (15).</description>
+            </enumeration>
+            <enumeration value="Local0">
+              <description>Local use 0 messages (16).</description>
+            </enumeration>
+            <enumeration value="Local1">
+              <description>Local use 1 messages (17).</description>
+            </enumeration>
+            <enumeration value="Local2">
+              <description>local use 2 messages (18).</description>
+            </enumeration>
+            <enumeration value="Local3">
+              <description>local use 3 messages (19).</description>
+            </enumeration>
+            <enumeration value="Local4">
+              <description>local use 4 messages (20).</description>
+            </enumeration>
+            <enumeration value="Local5">
+              <description>local use 5 messages (21).</description>
+            </enumeration>
+            <enumeration value="Local6">
+              <description>local use 6 messages (22).</description>
+            </enumeration>
+            <enumeration value="Local7">
+              <description>local use 7 messages (23).</description>
+            </enumeration>
+            <enumeration value="All">
+              <description>All facilities are selected.</description>
+            </enumeration>
+          </string>
+          <default type="object" value="All"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Severity" access="readWrite">
+        <description>
+          Specifies the Severity level filter rules.
+
+          Defines the processing used to select log messages by comparing
+          syslog message severity using the following processing rules: - if
+          'none', do not match. - if 'all', match. - else compare message
+          severity with the specified severity according to the default compare
+          rule (all messages of the specified severity and greater match).
+
+          This must be used inconjuction with {{param|SeverityCompare}} and
+          {{param|SeverityCompareAction}}.
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="Emergency">
+              <description>Indicates that the system is unusable.</description>
+            </enumeration>
+            <enumeration value="Alert">
+              <description>
+                Indicating that an action must be taken immediately.
+              </description>
+            </enumeration>
+            <enumeration value="Critical">
+              <description>Indicates a critical condition.</description>
+            </enumeration>
+            <enumeration value="Error">
+              <description>Indicates a errors condition.</description>
+            </enumeration>
+            <enumeration value="Warning">
+              <description>Indicates a warning condition.</description>
+            </enumeration>
+            <enumeration value="Notice">
+              <description>Indicates a informational message.</description>
+            </enumeration>
+            <enumeration value="Debug">
+              <description>Indicates a debug-level message.</description>
+            </enumeration>
+            <enumeration value="All">
+              <description>All severities are selected.</description>
+            </enumeration>
+            <enumeration value="None">
+              <description>No filtering will be applied.</description>
+            </enumeration>
+          </string>
+          <default type="object" value="All"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="SeverityCompare" access="readWrite">
+        <description>
+          Describes the comparison method that must be applied when a syslog
+          message is received. Not applicable when severity
+          {{enum|All|Severity}} and {{enum|None|Severity}} is configured.
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="Equal">
+              <description>
+                Specifies that the severity comparison operation will be
+                equals.
+              </description>
+            </enumeration>
+            <enumeration value="EqualOrHigher">
+              <description>
+                Specifies that the severity comparison operation will be equals
+                or higher."
+              </description>
+            </enumeration>
+          </string>
+          <default type="object" value="EqualOrHigher"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="SeverityCompareAction" access="readWrite">
+        <description>
+          Specifies the process of handling a syslog message based on specified
+          conditions. It defines the action that will be taken when the
+          criteria of both {{param|Severity}} and {{param|SeverityCompare}} are
+          met, determining the response to the syslog message.
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="Log">
+              <description>
+                When the selected comparison is true the syslog message will be
+                logged.
+              </description>
+            </enumeration>
+            <enumeration value="Block">
+              <description>
+                When the selected comparison is true the syslog message will
+                not be logged.
+              </description>
+            </enumeration>
+            <enumeration value="Stop">
+              <description>
+                When the select comparison is true the syslog message will not
+                be logged and no further processing will occur."
+              </description>
+            </enumeration>
+          </string>
+          <default type="object" value="Log"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="PatternMatch" access="readWrite">
+        <description>
+          Regular expression pattern designed to match a syslog message that
+          must be logged. The format is implementation specific.
+        </description>
+        <syntax>
+          <string/>
+          <default type="object" value=""/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object name="Device.Syslog.Source.{i}." access="readWrite"
+        numEntriesParameter="SourceNumberOfEntries" minEntries="0"
+        maxEntries="unbounded" version="2.17">
+      <description>
+        This table describes where and how the syslog service receives log
+        messages.
+      </description>
+      <uniqueKey functional="false">
+        <parameter ref="Alias"/>
+      </uniqueKey>
+
+      <parameter name="Alias" access="writeOnceReadOnly">
+        <description>
+          {{datatype|expand}}
+        </description>
+        <syntax>
+          <dataType ref="Alias"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="KernelMessages" access="readWrite">
+        <description>
+          This option enables the collection of kernel log messages that are
+          specific to the Device.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="object" value="true"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="SystemMessages" access="readWrite">
+        <description>
+          This option enables the collection of the system log messages that
+          are specific to the Device.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="object" value="true"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Severity" access="readWrite">
+        <description>
+          Specifies the default Severity. When an incoming message lacks a
+          valid syslog header, this parameter can be used to configure the
+          required Severity level.
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="Emergency">
+              <description>Indicates that the system is unusable.</description>
+            </enumeration>
+            <enumeration value="Alert">
+              <description>
+                Indicating that an action must be taken immediately.
+              </description>
+            </enumeration>
+            <enumeration value="Critical">
+              <description>Indicates a critical condition.</description>
+            </enumeration>
+            <enumeration value="Error">
+              <description>Indicates a errors condition.</description>
+            </enumeration>
+            <enumeration value="Warning">
+              <description>Indicates a warning condition.</description>
+            </enumeration>
+            <enumeration value="Notice">
+              <description>Indicates a informational message.</description>
+            </enumeration>
+            <enumeration value="Debug">
+              <description>Indicates a debug-level message.</description>
+            </enumeration>
+            <enumeration value="All">
+              <description>All severities are selected.</description>
+            </enumeration>
+            <enumeration value="None">
+              <description>No filtering will be applied.</description>
+            </enumeration>
+          </string>
+          <default type="object" value="All"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="FacilityLevel" access="readWrite">
+        <description>
+          Specifies the default Facility Level. When an incoming message lacks
+          a valid syslog header, this parameter can be used to configure the
+          required Facility level.
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="Kern">
+              <description>Kernel messages (0).</description>
+            </enumeration>
+            <enumeration value="User">
+              <description>User-level messages (1).</description>
+            </enumeration>
+            <enumeration value="Mail">
+              <description>Mail system messages (2).</description>
+            </enumeration>
+            <enumeration value="Daemon">
+              <description>System daemons messages (3).</description>
+            </enumeration>
+            <enumeration value="Auth">
+              <description>Security/authorization messages (4).</description>
+            </enumeration>
+            <enumeration value="Syslog">
+              <description>
+                Messages generated internally by syslogd (5).
+              </description>
+            </enumeration>
+            <enumeration value="LPR">
+              <description>Line printer subsystem messages (6).</description>
+            </enumeration>
+            <enumeration value="News">
+              <description>Network news subsystem (7).</description>
+            </enumeration>
+            <enumeration value="UUCP">
+              <description>UUCP subsystem messages (8).</description>
+            </enumeration>
+            <enumeration value="Cron">
+              <description>Clock daemon messages (9).</description>
+            </enumeration>
+            <enumeration value="AuthPriv">
+              <description>Security/authorization messages (10).</description>
+            </enumeration>
+            <enumeration value="FTP">
+              <description>FTP daemon messages (11).</description>
+            </enumeration>
+            <enumeration value="NTP">
+              <description>NTP subsystem messages (12).</description>
+            </enumeration>
+            <enumeration value="Audit">
+              <description>Log audit messages (13).</description>
+            </enumeration>
+            <enumeration value="Console">
+              <description>Log alert messages (14).</description>
+            </enumeration>
+            <enumeration value="Cron2">
+              <description>Second clock daemon messages (15).</description>
+            </enumeration>
+            <enumeration value="Local0">
+              <description>Local use 0 messages (16).</description>
+            </enumeration>
+            <enumeration value="Local1">
+              <description>Local use 1 messages (17).</description>
+            </enumeration>
+            <enumeration value="Local2">
+              <description>local use 2 messages (18).</description>
+            </enumeration>
+            <enumeration value="Local3">
+              <description>local use 3 messages (19).</description>
+            </enumeration>
+            <enumeration value="Local4">
+              <description>local use 4 messages (20).</description>
+            </enumeration>
+            <enumeration value="Local5">
+              <description>local use 5 messages (21).</description>
+            </enumeration>
+            <enumeration value="Local6">
+              <description>local use 6 messages (22).</description>
+            </enumeration>
+            <enumeration value="Local7">
+              <description>local use 7 messages (23).</description>
+            </enumeration>
+            <enumeration value="All">
+              <description>All facilities are selected.</description>
+            </enumeration>
+          </string>
+          <default type="object" value="All"/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object name="Device.Syslog.Source.{i}.Network." access="readOnly"
+        version="2.17">
+      <description>
+        This object describes the configuration parameters for receiving syslog
+        information on a network socket.
+      </description>
+
+      <parameter name="Enable" access="readWrite">
+        <description>
+          Enables or disables the functionality to receive syslog information
+          on a network socket.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Interface" access="readWrite">
+        <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>
+        <syntax>
+          <string>
+            <size maxLength="256"/>
+            <pathRef refType="strong" targetType="row"/>
+          </string>
+          <default type="object" value=""/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Port" access="readWrite">
+        <description>
+          Specifies the port number on which the syslog information will be
+          received.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range minInclusive="1" maxInclusive="65535"/>
+          </unsignedInt>
+          <default type="object" value="1099"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Protocol" access="readWrite">
+        <description>
+          The protocol to be used for receiving syslog information.
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="TCP">
+              <description>
+                {{bibref|RFC6587|Transmission of Syslog Messages over TCP}}.
+              </description>
+            </enumeration>
+            <enumeration value="UDP">
+              <description>
+                {{bibref|RFC5426|Transmission of Syslog Messages over UDP}}.
+              </description>
+            </enumeration>
+            <enumeration value="TLS">
+              <description>
+                {{bibref|RFC5425|Transport Layer Security (TLS) Transport
+                Mapping for Syslog}}.
+              </description>
+            </enumeration>
+          </string>
+          <default type="object" value="UDP"/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object name="Device.Syslog.Template.{i}." access="readWrite"
+        numEntriesParameter="TemplateNumberOfEntries" minEntries="0"
+        maxEntries="unbounded" version="2.17">
+      <description>
+        This table the describes the templates that can be referenced by
+        objects that can use the template syntax. With templates, you have the
+        flexibility to establish uniform message formats or even define
+        standard filenames for different objects.
+      </description>
+      <uniqueKey functional="false">
+        <parameter ref="Alias"/>
+      </uniqueKey>
+
+      <parameter name="Alias" access="writeOnceReadOnly">
+        <description>
+          {{datatype|expand}}
+        </description>
+        <syntax>
+          <dataType ref="Alias"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Expression" access="readWrite">
+        <description>
+          Describes the template syntax used for transforming the syslog
+          message. The format is implementation specific and can consist of
+          strings, macros, and template functions.
+        </description>
+        <syntax>
+          <string/>
+          <default type="object" value=""/>
+        </syntax>
+      </parameter>
+
+      <parameter name="EscapeMessage" access="readWrite">
+        <description>
+          Enabling this option will cause the following characters to be
+          escaped ', " and \. in the syslog message.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="object" value="false"/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object name="Device.Syslog.Action.{i}." access="readWrite"
+        numEntriesParameter="ActionNumberOfEntries" minEntries="0"
+        maxEntries="unbounded" version="2.17">
+      <description>
+        This object describes the log action parameters for syslog.
+      </description>
+      <uniqueKey functional="false">
+        <parameter ref="Alias"/>
+      </uniqueKey>
+
+      <parameter name="Alias" access="writeOnceReadOnly">
+        <description>
+          {{datatype|expand}}
+        </description>
+        <syntax>
+          <dataType ref="Alias"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="SourceRef" access="readWrite">
+        <description>
+          Mandatory parameter. Specifies one or multiple sources from where the
+          log messages originate.
+        </description>
+        <syntax>
+          <list/>
+          <string>
+            <size maxLength="256"/>
+            <pathRef refType="strong" targetParent="#.Source."
+                targetType="row"/>
+          </string>
+          <default type="object" value=""/>
+        </syntax>
+      </parameter>
+
+      <parameter name="FilterRef" access="readWrite">
+        <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.
+        </description>
+        <syntax>
+          <list/>
+          <string>
+            <size maxLength="256"/>
+            <pathRef refType="strong" targetParent="#.Filter."
+                targetType="row"/>
+          </string>
+          <default type="object" value=""/>
+        </syntax>
+      </parameter>
+
+      <parameter name="TemplateRef" access="readWrite">
+        <description>
+          The Template associated with the {{object}} entry.
+
+          When no Template is specified the log message will not be altered by
+          the template system.
+        </description>
+        <syntax>
+          <string>
+            <size maxLength="256"/>
+            <pathRef refType="strong" targetParent="#.Template."
+                targetType="row"/>
+          </string>
+          <default type="object" value=""/>
+        </syntax>
+      </parameter>
+
+      <parameter name="StructuredData" access="readWrite">
+        <description>
+          This feature represents the ability to log messages in
+          structured-data format. Reference {{bibref|RFC5424|The Syslog
+          Protocol}}.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="object" value="false"/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object name="Device.Syslog.Action.{i}.LogFile." access="readOnly"
+        version="2.17">
+      <description>
+        This object describes the configuration parameters for file logging. If
+        file-archive limits are not supplied, it is assumed that the local
+        implementation defined limits will be used.
+      </description>
+
+      <parameter name="Enable" access="readWrite">
+        <description>
+          Enables or disables the LogFile functionality.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="VendorLogFileRef" access="readOnly">
+        <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">
+        <description>
+          Destination path and filename of where to create and keep the
+          logfiles. Which MUST use the uri scheme file {{bibref|RFC8089|The
+          file URI Scheme}}.
+        </description>
+        <syntax>
+          <string/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object name="Device.Syslog.Action.{i}.LogRemote." access="readOnly"
+        version="2.17">
+      <description>
+        This object describes the configuration parameters for forwarding
+        syslog messages to remote relays or collectors.
+      </description>
+
+      <parameter name="Enable" access="readWrite">
+        <description>
+          Enables or disables the LogRemote functionality.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Address" access="readWrite">
+        <description>
+          Host name or IP address of the remote server.
+        </description>
+        <syntax>
+          <string/>
+          <default type="object" value=""/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Protocol" access="readOnly">
+        <description>
+          Protocol to be used to deliver the syslog messages to the remote
+          server.
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="TCP">
+              <description>
+                {{bibref|RFC6587|Transmission of Syslog Messages over TCP}}.
+              </description>
+            </enumeration>
+            <enumeration value="UDP">
+              <description>
+                {{bibref|RFC5426|Transmission of Syslog Messages over UDP}}.
+              </description>
+            </enumeration>
+            <enumeration value="TLS">
+              <description>
+                {{bibref|RFC5425|Transport Layer Security (TLS) Transport
+                Mapping for Syslog}}.
+              </description>
+            </enumeration>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="Port" access="readWrite">
+        <description>
+          Port number of the remote server.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range minInclusive="1" maxInclusive="65535"/>
+          </unsignedInt>
+          <default type="object" value="514"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Certificate" access="readWrite">
+        <description>
+          Certificate that must be used by the syslog service.
+        </description>
+        <syntax>
+          <string>
+            <pathRef refType="strong" targetParent=".Security.Certificate."
+                targetType="row"/>
+          </string>
+          <default type="object" value=""/>
+        </syntax>
+      </parameter>
+
+      <parameter name="PeerVerify" access="readWrite">
+        <description>
+          Ensures authentic and secure connections by validating entity
+          credentials such as certificates or tokens. Only applicable when
+          {{enum|TLS|Protocol}}
+
+          In order to validate a certificate, the entire certificate chain,
+          including the CA certificate, must be valid. If any certificate in
+          the chain is found to be invalid, the syslog service must reject the
+          connection.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="object" value="false"/>
+        </syntax>
+      </parameter>
+    </object>
+
     <object name="Device.GatewayInfo." access="readOnly" minEntries="1"
         maxEntries="1" version="2.0">
       <description>
@@ -94389,12 +104270,14 @@
         <syntax>
           <list minItems="1"/>
           <string>
-            <enumeration value="CoAP" status="deprecated">
+            <enumeration value="CoAP" status="obsoleted">
               <description>
                 See {{bibref|RFC7252}}.
 
                 {{deprecated|2.15|because the CoAP MTP was deprecated in USP
                 1.2}}
+
+                {{obsoleted|2.17}}
               </description>
             </enumeration>
             <enumeration value="WebSocket">
@@ -94417,7 +104300,7 @@
 
       <parameter name="SupportedFingerprintAlgorithms" access="readOnly">
         <description>
-          {{list|each entry is an algorithm for calculating firgerprints that
+          {{list|each entry is an algorithm for calculating fingerprints that
           is supported by the Agent}}
         </description>
         <syntax>
@@ -94542,7 +104425,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -94589,7 +104472,7 @@
 
       <parameter name="Protocol" access="readWrite">
         <description>
-          The Message Transport Protocol (MTP) to be used for communications by
+          The Message Transfer Protocol (MTP) to be used for communications by
           a USP Endpoint.
         </description>
         <syntax>
@@ -94615,7 +104498,7 @@
           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.AdvertisedInterfaces}} parameter.
+          {{param|.DNS.SD.Advertise.{i}.Interface}} parameter.
         </description>
         <syntax>
           <boolean/>
@@ -94626,12 +104509,14 @@
 
     <object name="Device.USPAgent.MTP.{i}.CoAP." access="readOnly"
         minEntries="0" maxEntries="1" discriminatorParameter="Protocol"
-        status="deprecated" version="2.15">
+        status="obsoleted" version="2.15">
       <description>
-        If the USP Endpoint uses the CoAP Message Transport Protocol (MTP),
-        then this object contains CoAP specific configuration parameters.
+        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>
 
       <parameter name="Interfaces" access="readWrite">
@@ -94672,7 +104557,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="IsEncrypted" status="obsoleted" access="readOnly">
+      <parameter name="IsEncrypted" status="deleted" access="readOnly">
         <description>
           This parameter represents whether or not communications that utilize
           this {{object}} object instance are encrypted.
@@ -94682,6 +104567,8 @@
           or are not encrypted}}
 
           {{obsoleted|2.16}}
+
+          {{deleted|2.17}}
         </description>
         <syntax>
           <boolean/>
@@ -94703,7 +104590,7 @@
         minEntries="0" maxEntries="1" discriminatorParameter="Protocol"
         version="2.15">
       <description>
-        If the USP Endpoint uses the STOMP Message Transport Protocol (MTP),
+        If the USP Endpoint uses the STOMP Message Transfer Protocol (MTP),
         then this object contains STOMP Client specific configuration
         parameters related to how the Agent communicates with the STOMP Server.
       </description>
@@ -94758,7 +104645,7 @@
         minEntries="0" maxEntries="1" discriminatorParameter="Protocol"
         version="2.15">
       <description>
-        If the USP Endpoint uses the WebSocket Message Transport Protocol (MTP)
+        If the USP Endpoint uses the WebSocket Message Transfer Protocol (MTP)
         as a WebSocket server, then this object contains WebSocket specific
         configuration parameters.
       </description>
@@ -94787,7 +104674,7 @@
           <unsignedInt>
             <range minInclusive="1" maxInclusive="65535"/>
           </unsignedInt>
-          <default type="object" value="5683"/>
+          <default type="object" value="8443"/>
         </syntax>
       </parameter>
 
@@ -94833,8 +104720,8 @@
         minEntries="0" maxEntries="1" discriminatorParameter="Protocol"
         version="2.15">
       <description>
-        If the USP Endpoint uses the MQTT Message Transport Protocol (MTP),
-        then this object contains MQTT Client specific configuration parameters
+        If the USP Endpoint uses the MQTT Message Transfer Protocol (MTP), then
+        this object contains MQTT Client specific configuration parameters
         related to how the Agent communicates with the MQTT broker.
       </description>
 
@@ -94914,9 +104801,12 @@
         version="2.16">
       <description>
         If the USP Endpoint uses the Unix Domain Socket (UDS) Message Transfer
-        Protocol (MTP), then this object contains UDS Client specific
-        configuration parameters related to how the Agent communicates with the
-        UDS Server.
+        Protocol (MTP), then this object contains UDS specific configuration
+        parameters related to how this Agent communicates with a Controller on
+        another USP Endpoint.
+
+        An example of how to set up this MTP can be found in {{bibref|TR-369|
+        Section "Example Data Models for a USP Broker and USP Services"}}.
       </description>
 
       <parameter name="UnixDomainSocketRef" access="readWrite">
@@ -94955,7 +104845,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -95212,7 +105102,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -95237,7 +105127,7 @@
 
       <parameter name="Protocol" access="readWrite">
         <description>
-          The Message Transport Protocol (MTP) to be used for communications by
+          The Message Transfer Protocol (MTP) to be used for communications by
           a USP Endpoint.
         </description>
         <syntax>
@@ -95273,12 +105163,14 @@
 
     <object name="Device.USPAgent.Controller.{i}.MTP.{i}.CoAP."
         access="readOnly" minEntries="0" maxEntries="1"
-        discriminatorParameter="Protocol" status="deprecated" version="2.15">
+        discriminatorParameter="Protocol" status="obsoleted" version="2.15">
       <description>
-        If the USP Endpoint uses the CoAP Message Transport Protocol (MTP),
-        then this object contains CoAP specific configuration parameters.
+        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>
 
       <parameter name="Host" access="readWrite">
@@ -95330,7 +105222,7 @@
         access="readOnly" minEntries="0" maxEntries="1"
         discriminatorParameter="Protocol" version="2.15">
       <description>
-        If the USP Endpoint uses the STOMP Message Transport Protocol (MTP),
+        If the USP Endpoint uses the STOMP Message Transfer Protocol (MTP),
         then this object contains STOMP Client specific configuration
         parameters related to how this Controller communicates with the STOMP
         Server.
@@ -95380,7 +105272,7 @@
         access="readOnly" minEntries="0" maxEntries="1"
         discriminatorParameter="Protocol" version="2.15">
       <description>
-        If the USP Endpoint uses the WebSocket Message Transport Protocol (MTP)
+        If the USP Endpoint uses the WebSocket Message Transfer Protocol (MTP)
         as a WebSocket client, then this object contains WebSocket specific
         configuration parameters.
       </description>
@@ -95419,7 +105311,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="IsEncrypted" status="obsoleted" access="readOnly">
+      <parameter name="IsEncrypted" status="deleted" access="readOnly">
         <description>
           This parameter represents whether or not communications that utilize
           this {{object}} object instance are encrypted.
@@ -95428,6 +105320,8 @@
           will dictate whether this {{object}} is or is not encrypted}}
 
           {{obsoleted|2.16}}
+
+          {{deleted|2.17}}
         </description>
         <syntax>
           <boolean/>
@@ -95528,8 +105422,8 @@
         access="readOnly" minEntries="0" maxEntries="1"
         discriminatorParameter="Protocol" version="2.15">
       <description>
-        If the USP Endpoint uses the MQTT Message Transport Protocol (MTP),
-        then this object contains MQTT Client specific configuration parameters
+        If the USP Endpoint uses the MQTT Message Transfer Protocol (MTP), then
+        this object contains MQTT Client specific configuration parameters
         related to how this Controller communicates with the MQTT broker.
       </description>
 
@@ -95620,10 +105514,13 @@
         access="readOnly" minEntries="0" maxEntries="1"
         discriminatorParameter="Protocol" version="2.16">
       <description>
-        If the USP Endpoint uses the Unix Domain Socket (UDS) Message Transport
-        Protocol (MTP), then this object contains UDS Client specific
-        configuration parameters related to how the Controller communicates
-        with the UDS Server.
+        If the USP Endpoint uses the Unix Domain Socket (UDS) Message Transfer
+        Protocol (MTP), then this object contains UDS specific configuration
+        parameters related to how this Agent communicates with a Controller on
+        another USP Endpoint.
+
+        An example of how to set up this MTP can be found in {{bibref|TR-369|
+        Section "Example Data Models for a USP Broker and USP Services"}}.
       </description>
 
       <parameter name="UnixDomainSocketRef" access="readWrite">
@@ -95674,7 +105571,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -95864,7 +105761,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -95921,7 +105818,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -96144,7 +106041,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -96270,7 +106167,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -96490,7 +106387,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -96751,7 +106648,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -96831,7 +106728,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -96901,7 +106798,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -96967,7 +106864,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -97035,7 +106932,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -97123,7 +107020,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -97225,7 +107122,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -97664,7 +107561,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -97910,7 +107807,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="IsEncrypted" status="obsoleted" access="readOnly">
+      <parameter name="IsEncrypted" status="deleted" access="readOnly">
         <description>
           This parameter represents whether or not communications that utilize
           this {{object}} object instance are encrypted.
@@ -97920,6 +107817,8 @@
           are not encrypted}}
 
           {{obsoleted|2.16}}
+
+          {{deleted|2.17}}
         </description>
         <syntax>
           <boolean/>
@@ -97939,7 +107838,7 @@
     </object>
 
     <profile name="IPLayerCapacity:1" dmr:previousProfile="" version="2.14"
-        status="deprecated">
+        status="obsoleted">
       <object ref="Device.IP.Diagnostics." requirement="present">
         <parameter ref="IPLayerCapacitySupported" requirement="readOnly"/>
       </object>
@@ -97951,10 +107850,11 @@
         <parameter ref="IPLayerCapSupportedMetrics" requirement="readOnly"/>
         <parameter ref="Interface" requirement="readWrite"/>
         <parameter ref="Role" requirement="readWrite"/>
-        <parameter ref="Host" requirement="readOnly"/>
-        <parameter ref="Port" requirement="readOnly"/>
+        <parameter ref="Host" requirement="readOnly" status="obsoleted"/>
+        <parameter ref="Port" requirement="readOnly" status="obsoleted"/>
         <parameter ref="JumboFramesPermitted" requirement="readOnly"/>
-        <parameter ref="NumberOfConnections" requirement="readOnly"/>
+        <parameter ref="NumberOfConnections" requirement="readOnly"
+            status="obsoleted"/>
         <parameter ref="EthernetPriority" requirement="readWrite"/>
         <parameter ref="DSCP" requirement="readWrite"/>
         <parameter ref="ProtocolVersion" requirement="readWrite"/>
@@ -97969,7 +107869,7 @@
         <parameter ref="TestSubInterval" requirement="readWrite"/>
         <parameter ref="StatusFeedbackInterval" requirement="readWrite"/>
         <parameter ref="TimeoutNoTraffic" requirement="readWrite"
-            status="deprecated"/>
+            status="obsoleted"/>
         <parameter ref="Tmax" requirement="readOnly"/>
         <parameter ref="TmaxRTT" requirement="readWrite"/>
         <parameter ref="TimestampResolution" requirement="readWrite"/>
@@ -98005,7 +107905,8 @@
     </profile>
 
     <profile name="IPLayerCapacityTest:1"
-        dmr:previousProfile="IPLayerCapacity:1" version="2.15">
+        dmr:previousProfile="IPLayerCapacity:1" version="2.15"
+        status="deprecated">
       <object ref="Device.IP.Diagnostics." requirement="present">
         <parameter ref="IPLayerCapacitySupported" requirement="readOnly"/>
       </object>
@@ -98018,7 +107919,7 @@
             requirement="readOnly"/>
         <parameter ref="IPLayerCapSupportedMetrics" requirement="readOnly"/>
         <parameter ref="Role" requirement="readWrite"/>
-        <parameter ref="Host" requirement="readOnly"/>
+        <parameter ref="Host" requirement="readOnly" status="deprecated"/>
         <parameter ref="JumboFramesPermitted" requirement="readOnly"/>
         <parameter ref="DSCP" requirement="readWrite"/>
         <parameter ref="TestType" requirement="readWrite"/>
@@ -98249,7 +108150,7 @@
       <object ref="Device.DSL.Line.{i}." requirement="present">
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Status" requirement="readOnly"/>
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Name" requirement="readOnly"/>
         <parameter ref="LastChange" requirement="readOnly"/>
         <parameter ref="Upstream" requirement="readOnly"/>
@@ -98287,7 +108188,7 @@
       <object ref="Device.DSL.Channel.{i}." requirement="present">
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Status" requirement="readOnly"/>
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Name" requirement="readOnly"/>
         <parameter ref="LastChange" requirement="readOnly"/>
         <parameter ref="UpstreamCurrRate" requirement="readOnly"/>
@@ -98335,7 +108236,7 @@
       <object ref="Device.DSL.Line.{i}." requirement="present">
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Status" requirement="readOnly"/>
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Name" requirement="readOnly"/>
         <parameter ref="LastChange" requirement="readOnly"/>
         <parameter ref="Upstream" requirement="readOnly"/>
@@ -98386,7 +108287,7 @@
       <object ref="Device.DSL.Channel.{i}." requirement="present">
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Status" requirement="readOnly"/>
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Name" requirement="readOnly"/>
         <parameter ref="LastChange" requirement="readOnly"/>
         <parameter ref="LinkEncapsulationSupported" requirement="readOnly"/>
@@ -98425,7 +108326,7 @@
       <object ref="Device.DSL.Line.{i}." requirement="present">
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Status" requirement="readOnly"/>
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Name" requirement="readOnly"/>
         <parameter ref="LastChange" requirement="readOnly"/>
         <parameter ref="Upstream" requirement="readOnly"/>
@@ -98467,7 +108368,7 @@
       <object ref="Device.DSL.Channel.{i}." requirement="present">
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Status" requirement="readOnly"/>
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Name" requirement="readOnly"/>
         <parameter ref="LastChange" requirement="readOnly"/>
         <parameter ref="LinkEncapsulationSupported" requirement="readOnly"/>
@@ -98494,7 +108395,7 @@
       <object ref="Device.DSL.Line.{i}." requirement="present">
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Status" requirement="readOnly"/>
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Name" requirement="readOnly"/>
         <parameter ref="LastChange" requirement="readOnly"/>
         <parameter ref="Upstream" requirement="readOnly"/>
@@ -98563,7 +108464,7 @@
       <object ref="Device.DSL.Channel.{i}." requirement="present">
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Status" requirement="readOnly"/>
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Name" requirement="readOnly"/>
         <parameter ref="LastChange" requirement="readOnly"/>
         <parameter ref="LinkEncapsulationSupported" requirement="readOnly"/>
@@ -98624,7 +108525,7 @@
       <object ref="Device.DSL.Line.{i}." requirement="present">
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Status" requirement="readOnly"/>
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Name" requirement="readOnly"/>
         <parameter ref="LastChange" requirement="readOnly"/>
         <parameter ref="Upstream" requirement="readOnly"/>
@@ -98692,7 +108593,7 @@
       <object ref="Device.DSL.Channel.{i}." requirement="present">
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Status" requirement="readOnly"/>
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Name" requirement="readOnly"/>
         <parameter ref="LastChange" requirement="readOnly"/>
         <parameter ref="LinkEncapsulationSupported" requirement="readOnly"/>
@@ -98718,7 +108619,7 @@
       <object ref="Device.DSL.BondingGroup.{i}." requirement="present">
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Status" requirement="readOnly"/>
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Name" requirement="readOnly"/>
         <parameter ref="LastChange" requirement="readOnly"/>
         <parameter ref="LowerLayers" requirement="readOnly"/>
@@ -98824,7 +108725,7 @@
       <object ref="Device.FAST.Line.{i}." requirement="present">
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Status" requirement="readOnly"/>
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Name" requirement="readOnly"/>
         <parameter ref="LastChange" requirement="readOnly"/>
         <parameter ref="Upstream" requirement="readOnly"/>
@@ -98874,7 +108775,7 @@
       <object ref="Device.Optical.Interface.{i}." requirement="present">
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Status" requirement="readOnly"/>
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Name" requirement="readOnly"/>
         <parameter ref="LastChange" requirement="readOnly"/>
         <parameter ref="Upstream" requirement="readOnly"/>
@@ -98921,7 +108822,7 @@
         <parameter ref="RoamingStatus" requirement="readOnly"/>
       </object>
       <object ref="Device.Cellular.Interface.{i}." requirement="present">
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Name" requirement="readOnly"/>
         <parameter ref="LastChange" requirement="readOnly"/>
         <parameter ref="IMEI" requirement="readOnly"/>
@@ -98954,7 +108855,7 @@
       <object ref="Device.ATM.Link.{i}." requirement="createDelete">
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Status" requirement="readOnly"/>
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Name" requirement="readOnly"/>
         <parameter ref="LastChange" requirement="readOnly"/>
         <parameter ref="LowerLayers" requirement="readWrite"/>
@@ -98995,7 +108896,7 @@
       <object ref="Device.PTM.Link.{i}." requirement="createDelete">
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Status" requirement="readOnly"/>
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Name" requirement="readOnly"/>
         <parameter ref="LastChange" requirement="readOnly"/>
         <parameter ref="LowerLayers" requirement="readWrite"/>
@@ -99042,7 +108943,7 @@
           requirement="createDelete">
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Status" requirement="readOnly"/>
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Name" requirement="readOnly"/>
         <parameter ref="LastChange" requirement="readOnly"/>
         <parameter ref="LowerLayers" requirement="readWrite"/>
@@ -99075,7 +108976,7 @@
       <object ref="Device.Ethernet.Link.{i}." requirement="createDelete">
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Status" requirement="readOnly"/>
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Name" requirement="readOnly"/>
         <parameter ref="LastChange" requirement="readOnly"/>
         <parameter ref="LowerLayers" requirement="readWrite"/>
@@ -99107,7 +109008,7 @@
       <object ref="Device.Ethernet.Interface.{i}." requirement="present">
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Status" requirement="readOnly"/>
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Name" requirement="readOnly"/>
         <parameter ref="LastChange" requirement="readOnly"/>
         <parameter ref="Upstream" requirement="readOnly"/>
@@ -99206,7 +109107,7 @@
       <object ref="Device.USB.Interface.{i}." requirement="present">
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Status" requirement="readOnly"/>
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Name" requirement="readOnly"/>
         <parameter ref="LastChange" requirement="readOnly"/>
         <parameter ref="Upstream" requirement="readOnly"/>
@@ -99254,7 +109155,7 @@
       <object ref="Device.HPNA.Interface.{i}." requirement="present">
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Status" requirement="readOnly"/>
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Name" requirement="readOnly"/>
         <parameter ref="LastChange" requirement="readOnly"/>
         <parameter ref="Upstream" requirement="readOnly"/>
@@ -99395,14 +109296,14 @@
       </object>
     </profile>
 
-    <profile name="MoCA:1" version="2.0">
+    <profile name="MoCA:1" version="2.0" status="deprecated">
       <object ref="Device.MoCA." requirement="present">
         <parameter ref="InterfaceNumberOfEntries" requirement="readOnly"/>
       </object>
       <object ref="Device.MoCA.Interface.{i}." requirement="present">
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Status" requirement="readOnly"/>
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Name" requirement="readOnly"/>
         <parameter ref="LastChange" requirement="readOnly"/>
         <parameter ref="Upstream" requirement="readOnly"/>
@@ -99413,7 +109314,8 @@
         <parameter ref="CurrentVersion" requirement="readOnly"/>
         <parameter ref="NetworkCoordinator" requirement="readOnly"/>
         <parameter ref="PrivacyEnabledSetting" requirement="readWrite"/>
-        <parameter ref="PrivacyEnabled" requirement="readOnly"/>
+        <parameter ref="PrivacyEnabled" requirement="readOnly"
+            status="deprecated"/>
         <parameter ref="FreqCapabilityMask" requirement="readOnly"/>
         <parameter ref="FreqCurrentMaskSetting" requirement="readWrite"/>
         <parameter ref="FreqCurrentMask" requirement="readOnly"/>
@@ -99431,6 +109333,310 @@
       </object>
     </profile>
 
+    <profile name="MoCA_Status:1" version="2.17"
+        id="mocaIfStatusGroup/1.3.6.1.4.1.31621.1.2.2.2.7">
+      <description>
+        Parameters to monitor the status of the MoCA interface.
+      </description>
+      <object ref="Device.MoCA." requirement="present">
+        <parameter ref="InterfaceNumberOfEntries" requirement="readOnly"/>
+      </object>
+      <object ref="Device.MoCA.Interface.{i}." requirement="present">
+        <parameter ref="Status" requirement="readOnly"/>
+        <parameter ref="LastChange" requirement="readOnly"/>
+        <parameter ref="FirmwareVersion" requirement="readOnly"/>
+        <parameter ref="HighestVersion" requirement="readOnly"/>
+        <parameter ref="CurrentVersion" requirement="readOnly"/>
+        <parameter ref="MACAddress" requirement="readOnly"/>
+        <parameter ref="NodeID" requirement="readOnly"/>
+        <parameter ref="Name" requirement="readOnly"/>
+        <parameter ref="NumNodes" requirement="readOnly"/>
+        <parameter ref="NetworkCoordinator" requirement="readOnly"/>
+        <parameter ref="BackupNC" requirement="readOnly"/>
+        <parameter ref="CurrentOperFreq" requirement="readOnly"/>
+        <parameter ref="NetworkTabooMask" requirement="readOnly"/>
+        <parameter ref="NodeTabooMask" requirement="readOnly"/>
+        <parameter ref="SupportedBands" requirement="readOnly"/>
+        <parameter ref="PacketAggregationCapability" requirement="readOnly"/>
+        <parameter ref="TxBcastRate" requirement="readOnly"/>
+        <parameter ref="NcVersion" requirement="readOnly"/>
+        <parameter ref="LinkState" requirement="readOnly"/>
+        <parameter ref="ConnectedNodesInfo" requirement="readOnly"/>
+        <parameter ref="MgntEntityNetIePayloadRx" requirement="readOnly"/>
+        <parameter ref="Moca25PhyCapable" requirement="readOnly"/>
+        <parameter ref="MpsInitScanPayload" requirement="readOnly"/>
+        <parameter ref="MpsState" requirement="readOnly"/>
+        <parameter ref="NetworkNamePayload" requirement="readOnly"/>
+        <parameter ref="PrivacyNc" requirement="readOnly"/>
+        <parameter ref="PowerStateResp" requirement="readOnly"/>
+        <parameter ref="PowerStateStatus" requirement="readOnly"/>
+        <parameter ref="ConnectedNodesDropReason" requirement="readOnly"/>
+      </object>
+    </profile>
+
+    <profile name="MoCA_Stats:1" version="2.17"
+        id="mocaIfStatsGroup/1.3.6.1.4.1.31621.1.2.2.2.9">
+      <description>
+        Parameters to monitor the packet statistics and the number of flows in
+        the MoCA interface.
+      </description>
+      <object ref="Device.MoCA.Interface.{i}.Stats." requirement="present">
+        <parameter ref="PacketsSent" requirement="readOnly"/>
+        <parameter ref="PacketsReceived" requirement="readOnly"/>
+      </object>
+      <object ref="Device.MoCA.Interface.{i}.QoS." requirement="present">
+        <parameter ref="EgressNumFlows" requirement="readOnly"/>
+        <parameter ref="IngressNumFlows" requirement="readOnly"/>
+      </object>
+    </profile>
+
+    <profile name="MoCA_FlowStats:1" version="2.17"
+        id="mocaIfFlowStatsGroup/1.3.6.1.4.1.31621.1.2.2.2.11">
+      <description>
+        Parameters to monitor the PQoS flow information of the MoCA interface.
+      </description>
+      <object ref="Device.MoCA.Interface.{i}.QoS." requirement="present">
+        <parameter ref="FlowStatsNumberOfEntries" requirement="readOnly"/>
+      </object>
+      <object ref="Device.MoCA.Interface.{i}.QoS.FlowStats.{i}."
+          requirement="present">
+        <parameter ref="FlowID" requirement="readOnly"/>
+        <parameter ref="PacketDA" requirement="readOnly"/>
+        <parameter ref="MaxRate" requirement="readOnly"/>
+        <parameter ref="MaxBurstSize" requirement="readOnly"/>
+        <parameter ref="LeaseTime" requirement="readOnly"/>
+        <parameter ref="Tag" requirement="readOnly"/>
+      </object>
+    </profile>
+
+    <profile name="MoCA_Node:1" version="2.17"
+        id="mocaNodeGroup/1.3.6.1.4.1.31621.1.2.2.2.14">
+      <description>
+        Parameters to monitor the status of other MoCA Nodes in the MoCA
+        network.
+      </description>
+      <object ref="Device.MoCA.Interface.{i}." requirement="present">
+        <parameter ref="AssociatedDeviceNumberOfEntries"
+            requirement="readOnly"/>
+      </object>
+      <object ref="Device.MoCA.Interface.{i}.AssociatedDevice.{i}."
+          requirement="present">
+        <parameter ref="HighestVersion" requirement="readOnly"/>
+        <parameter ref="MACAddress" requirement="readOnly"/>
+        <parameter ref="TxBcastRate" requirement="readOnly"/>
+        <parameter ref="PreferredNC" requirement="readOnly"/>
+        <parameter ref="BondingCapable" requirement="readOnly"/>
+        <parameter ref="PacketAggregationCapability" requirement="readOnly"/>
+      </object>
+    </profile>
+
+    <profile name="MoCA_Mesh:1" version="2.17"
+        id="mocaMeshGroup/1.3.6.1.4.1.31621.1.2.2.2.16">
+      <object ref="Device.MoCA.Interface.{i}." requirement="present">
+        <parameter ref="MeshNumberOfEntries" requirement="readOnly"/>
+      </object>
+      <object ref="Device.MoCA.Interface.{i}.Mesh.{i}." requirement="present">
+        <description>
+          Parameters to monitor the PHY rate of each link in the MoCA network.
+        </description>
+        <parameter ref="TxNodeIndex" requirement="readOnly"/>
+        <parameter ref="RxNodeIndex" requirement="readOnly"/>
+        <parameter ref="TxRate" requirement="readOnly"/>
+        <parameter ref="TxRateNper" requirement="readOnly"/>
+        <parameter ref="TxRateVlper" requirement="readOnly"/>
+      </object>
+    </profile>
+
+    <profile name="MoCA_AccessControl:1" version="2.17"
+        id="mocaIfAccessOptionalGroup/1.3.6.1.4.1.31621.1.2.2.2.2">
+      <description>
+        Parameters to configure the MAC address access control list for the
+        MoCA interface.
+      </description>
+      <object ref="Device.MoCA.Interface.{i}." requirement="present">
+        <parameter ref="AccessControlNumberOfEntries" requirement="readOnly"/>
+      </object>
+      <object ref="Device.MoCA.Interface.{i}.AccessControl.{i}."
+          requirement="present">
+        <parameter ref="MACAddress" requirement="readWrite"/>
+      </object>
+    </profile>
+
+    <profile name="MoCA_Rlapm:1" version="2.17"
+        id="mocaIfRlapmOptionalGroup/1.3.6.1.4.1.31621.1.2.2.2.3">
+      <description>
+        Parameters to configure RLAPM (Receive Level Added PHY Margin) for the
+        MoCA interface.
+      </description>
+      <object ref="Device.MoCA.Interface.{i}." requirement="present">
+        <parameter ref="RlapmNumberOfEntries" requirement="readOnly"/>
+      </object>
+      <object ref="Device.MoCA.Interface.{i}.Rlapm.{i}."
+          requirement="createDelete">
+        <parameter ref="Profile" requirement="readWrite"/>
+        <parameter ref="Frequency" requirement="readWrite"/>
+        <parameter ref="GlobalAggrRxPwrLevel" requirement="readWrite"/>
+        <parameter ref="PhyMargin" requirement="readWrite"/>
+        <parameter ref="Status" requirement="readOnly"/>
+      </object>
+    </profile>
+
+    <profile name="MoCA_Sapm:1" version="2.17"
+        id="mocaIfSapmOptionalGroup/1.3.6.1.4.1.31621.1.2.2.2.4">
+      <description>
+        Parameters to configure SAPM (Subcarrier Added PHY Margin) for the MoCA
+        interface.
+      </description>
+      <object ref="Device.MoCA.Interface.{i}." requirement="present">
+        <parameter ref="SapmNumberOfEntries" requirement="readOnly"/>
+      </object>
+      <object ref="Device.MoCA.Interface.{i}.Sapm.{i}."
+          requirement="createDelete">
+        <parameter ref="Profile" requirement="readWrite"/>
+        <parameter ref="Frequency" requirement="readWrite"/>
+        <parameter ref="AggrRxPwrLevelThreshold" requirement="readWrite"/>
+        <parameter ref="PhyMargin" requirement="readWrite"/>
+        <parameter ref="Status" requirement="readOnly"/>
+      </object>
+    </profile>
+
+    <profile name="MoCA_Reset:1" version="2.17"
+        id="mocaIfMrOptionalGroup/1.3.6.1.4.1.31621.1.2.2.2.6">
+      <description>
+        Parameters to control Moca Reset for the MoCA interface.
+      </description>
+      <object ref="Device.MoCA.Interface.{i}.Reset." requirement="present">
+        <parameter ref="NodeMask" requirement="readWrite"/>
+        <parameter ref="StartTime" requirement="readWrite"/>
+        <parameter ref="StatusTrapEnable" requirement="readWrite"/>
+        <parameter ref="NetworkTrapEnable" requirement="readWrite"/>
+      </object>
+    </profile>
+
+    <profile name="MoCA_StatusAdv:1" version="2.17"
+        id="mocaIfStatusOptionalGroup/1.3.6.1.4.1.31621.1.2.2.2.8">
+      <description>
+        Parameters to monitor the bandwidth of the MoCA interface.
+      </description>
+      <object ref="Device.MoCA.Interface.{i}." requirement="present">
+        <parameter ref="TxBcastPowerReduction" requirement="readOnly"/>
+        <parameter ref="MaxIngressBW" requirement="readOnly"/>
+        <parameter ref="FreqCapabilityMask" requirement="readOnly"/>
+        <parameter ref="PasswordHash" requirement="readOnly"/>
+        <parameter ref="AggregationSize" requirement="readOnly"/>
+        <parameter ref="AeNumber" requirement="readOnly"/>
+        <parameter ref="SupportedIngressPqosFlows" requirement="readOnly"/>
+        <parameter ref="AvbSupport" requirement="readOnly"/>
+        <parameter ref="ResetCount" requirement="readOnly"/>
+        <parameter ref="LinkDownCount" requirement="readOnly"/>
+        <parameter ref="LmoNodeID" requirement="readOnly"/>
+        <parameter ref="NetworkState" requirement="readOnly"/>
+        <parameter ref="PrimaryChannelOffset" requirement="readOnly"/>
+        <parameter ref="SecondaryChannelOffset" requirement="readOnly"/>
+      </object>
+    </profile>
+
+    <profile name="MoCA_StatsAdv:1" version="2.17"
+        id="mocaIfStatsOptionalGroup/1.3.6.1.4.1.31621.1.2.2.2.10">
+      <description>
+        Parameters to monitor the packet drop statistics of the MoCA interface.
+      </description>
+      <object ref="Device.MoCA.Interface.{i}.Stats." requirement="present">
+        <parameter ref="DiscardPacketsSent" requirement="readOnly"/>
+        <parameter ref="RxCorrectedErrors" requirement="readOnly"/>
+        <parameter ref="DiscardPacketsReceived" requirement="readOnly"/>
+        <parameter ref="BytesSent" requirement="readOnly"/>
+        <parameter ref="BytesReceived" requirement="readOnly"/>
+        <parameter ref="UnicastPacketsSent" requirement="readOnly"/>
+        <parameter ref="UnicastPacketsReceived" requirement="readOnly"/>
+        <parameter ref="MulticastPacketsSent" requirement="readOnly"/>
+        <parameter ref="MulticastPacketsReceived" requirement="readOnly"/>
+        <parameter ref="BroadcastPacketsSent" requirement="readOnly"/>
+        <parameter ref="BroadcastPacketsReceived" requirement="readOnly"/>
+      </object>
+    </profile>
+
+    <profile name="MoCA_FlowStatsAdv:1" version="2.17"
+        id="mocaIfFlowStatsOptionalGroup/1.3.6.1.4.1.31621.1.2.2.2.12">
+      <description>
+        Parameters to monitor the PQoS flow statistics of the MoCA interface.
+      </description>
+      <object ref="Device.MoCA.Interface.{i}.QoS.FlowStats.{i}."
+          requirement="present">
+        <parameter ref="LeaseTimeLeft" requirement="readOnly"/>
+        <parameter ref="FlowPackets" requirement="readOnly"/>
+        <parameter ref="IngressGuid" requirement="readOnly"/>
+        <parameter ref="EgressGuid" requirement="readOnly"/>
+        <parameter ref="MaximumLatency" requirement="readOnly"/>
+        <parameter ref="ShortTermAvgRatio" requirement="readOnly"/>
+        <parameter ref="FlowPer" requirement="readOnly"/>
+        <parameter ref="IngressClassify" requirement="readOnly"/>
+        <parameter ref="VlanTag" requirement="readOnly"/>
+        <parameter ref="DscpMoca" requirement="readOnly"/>
+        <parameter ref="Dfid" requirement="readOnly"/>
+      </object>
+    </profile>
+
+    <profile name="MoCA_LinkStats:1" version="2.17"
+        id="mocaLinkStatsOptionalGroup/1.3.6.1.4.1.31621.1.2.2.2.13">
+      <description>
+        Parameter to monitor the packet drop statistics per link of the MoCA
+        interface.
+      </description>
+      <object ref="Device.MoCA.Interface.{i}.AssociatedDevice.{i}."
+          requirement="present">
+        <parameter ref="TxPackets" requirement="readOnly"/>
+        <parameter ref="TxDrops" requirement="readOnly"/>
+        <parameter ref="EgressNodeNumFlows" requirement="readOnly"/>
+        <parameter ref="IngressNodeNumFlows" requirement="readOnly"/>
+      </object>
+    </profile>
+
+    <profile name="MoCA_NodeAdv:1" version="2.17"
+        id="mocaNodeOptionalGroup/1.3.6.1.4.1.31621.1.2.2.2.15">
+      <description>
+        Parameters to monitor Power Level to or from MoCA Nodes in the MoCA
+        network.
+      </description>
+      <object ref="Device.MoCA.Interface.{i}.AssociatedDevice.{i}."
+          requirement="present">
+        <parameter ref="RxBcastPowerLevel" requirement="readOnly"/>
+        <parameter ref="RxPackets" requirement="readOnly"/>
+        <parameter ref="RxCorrected" requirement="readOnly"/>
+        <parameter ref="RxErroredAndMissedPackets" requirement="readOnly"/>
+        <parameter ref="SupportedIngressPqosFlows" requirement="readOnly"/>
+        <parameter ref="SupportedEgressPqosFlows" requirement="readOnly"/>
+        <parameter ref="AggregationSize" requirement="readOnly"/>
+        <parameter ref="AeNumber" requirement="readOnly"/>
+        <parameter ref="PowerState" requirement="readOnly"/>
+        <parameter ref="PowerStateCapability" requirement="readOnly"/>
+        <parameter ref="PDelay" requirement="readOnly"/>
+        <parameter ref="EnhancedPrivacyCapable" requirement="readOnly"/>
+        <parameter ref="LinkType" requirement="readOnly"/>
+        <parameter ref="Moca25PhyCapable" requirement="readOnly"/>
+        <parameter ref="RxPwrList" requirement="readOnly"/>
+        <parameter ref="RxSNRList" requirement="readOnly"/>
+        <parameter ref="TxPwrList" requirement="readOnly"/>
+        <parameter ref="TxPwrReductionList" requirement="readOnly"/>
+      </object>
+    </profile>
+
+    <profile name="MoCA_Bridge:1" version="2.17"
+        id="mocaBridgeOptionalGroup/1.3.6.1.4.1.31621.1.2.2.2.17">
+      <description>
+        Parameters to monitor the MoCA bridge table of each MoCA Node in the
+        MoCA network.
+      </description>
+      <object ref="Device.MoCA.Interface.{i}." requirement="present">
+        <parameter ref="BridgeNumberOfEntries" requirement="readOnly"/>
+      </object>
+      <object ref="Device.MoCA.Interface.{i}.Bridge.{i}."
+          requirement="present">
+        <parameter ref="NodeIndex" requirement="readOnly"/>
+        <parameter ref="MACAddresses" requirement="readOnly"/>
+      </object>
+    </profile>
+
     <profile name="Ghn:1" version="2.4">
       <object ref="Device.Ghn." requirement="present">
         <parameter ref="InterfaceNumberOfEntries" requirement="readOnly"/>
@@ -99438,7 +109644,7 @@
       <object ref="Device.Ghn.Interface.{i}." requirement="present">
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Status" requirement="readOnly"/>
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Name" requirement="readOnly"/>
         <parameter ref="LastChange" requirement="readOnly"/>
         <parameter ref="Upstream" requirement="readOnly"/>
@@ -99481,7 +109687,7 @@
       <object ref="Device.HomePlug.Interface.{i}." requirement="present">
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Status" requirement="readOnly"/>
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Name" requirement="readOnly"/>
         <parameter ref="LastChange" requirement="readOnly"/>
         <parameter ref="Upstream" requirement="readOnly"/>
@@ -99526,7 +109732,7 @@
       <object ref="Device.UPA.Interface.{i}." requirement="present">
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Status" requirement="readOnly"/>
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Name" requirement="readOnly"/>
         <parameter ref="LastChange" requirement="readOnly"/>
         <parameter ref="Upstream" requirement="readOnly"/>
@@ -99589,7 +109795,7 @@
       <object ref="Device.WiFi.Radio.{i}." requirement="present">
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Status" requirement="readOnly"/>
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Name" requirement="readOnly"/>
         <parameter ref="Upstream" requirement="readOnly"/>
         <parameter ref="MaxBitRate" requirement="readOnly"/>
@@ -99628,7 +109834,7 @@
       <object ref="Device.WiFi.SSID.{i}." requirement="createDelete">
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Status" requirement="readOnly"/>
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Name" requirement="readOnly"/>
         <parameter ref="LowerLayers" requirement="readWrite"/>
         <parameter ref="BSSID" requirement="readOnly"/>
@@ -99645,6 +109851,12 @@
       </object>
     </profile>
 
+    <profile name="WiFiSSID:2" base="WiFiSSID:1" version="2.17">
+      <object ref="Device.WiFi.SSID.{i}." requirement="createDelete">
+        <parameter ref="MLDUnit" requirement="readWrite"/>
+      </object>
+    </profile>
+
     <profile name="WiFiAccessPoint:1" version="2.0">
       <object ref="Device.WiFi." requirement="present">
         <parameter ref="AccessPointNumberOfEntries" requirement="readOnly"/>
@@ -99688,7 +109900,7 @@
     </profile>
 
     <profile name="WiFiAccessPoint:2" base="WiFiAccessPoint:1" version="2.9">
-      <object ref="Device.WiFi.AccessPoint.{i}." requirement="present">
+      <object ref="Device.WiFi.AccessPoint.{i}." requirement="createDelete">
         <parameter ref="MACAddressControlEnabled" requirement="readWrite"/>
         <parameter ref="AllowedMACAddress" requirement="readWrite"/>
       </object>
@@ -99741,7 +109953,7 @@
       <object ref="Device.ZigBee.Interface.{i}." requirement="present">
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Status" requirement="readOnly"/>
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Name" requirement="readOnly"/>
         <parameter ref="LastChange" requirement="readOnly"/>
         <parameter ref="LowerLayers" requirement="readWrite"/>
@@ -99932,7 +110144,7 @@
           requirement="createDelete">
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Status" requirement="readOnly"/>
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Name" requirement="readOnly"/>
         <parameter ref="LastChange" requirement="readOnly"/>
         <parameter ref="LowerLayers" requirement="readWrite"/>
@@ -99979,7 +110191,7 @@
           requirement="createDelete">
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Status" requirement="readOnly"/>
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Name" requirement="readOnly"/>
         <parameter ref="LastChange" requirement="readOnly"/>
         <parameter ref="LowerLayers" requirement="readWrite"/>
@@ -100631,7 +110843,7 @@
         <parameter ref="PSIDLength" requirement="readWrite" status="obsoleted"/>
         <parameter ref="PSID" requirement="readWrite" status="obsoleted"/>
         <parameter ref="IncludeSystemPorts" requirement="readWrite"
-            status="deprecated"/>
+            status="obsoleted"/>
       </object>
       <object ref="Device.MAP.Domain.{i}.Rule.{i}." requirement="createDelete">
         <parameter ref="EABitsLength" requirement="readWrite"/>
@@ -100757,7 +110969,7 @@
       <object ref="Device.IP.Interface.{i}." requirement="createDelete">
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Status" requirement="readOnly"/>
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Name" requirement="readOnly"/>
         <parameter ref="LastChange" requirement="readOnly"/>
         <parameter ref="LowerLayers" requirement="readWrite"/>
@@ -100822,7 +111034,7 @@
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="IPv6Enable" requirement="readWrite"/>
         <parameter ref="Status" requirement="readOnly"/>
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Name" requirement="readOnly"/>
         <parameter ref="LastChange" requirement="readOnly"/>
         <parameter ref="LowerLayers" requirement="readWrite"/>
@@ -100842,7 +111054,7 @@
       <object ref="Device.PPP.Interface.{i}." requirement="createDelete">
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Status" requirement="readOnly"/>
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Name" requirement="readOnly"/>
         <parameter ref="LastChange" requirement="readOnly"/>
         <parameter ref="LowerLayers" requirement="readWrite"/>
@@ -101369,7 +111581,7 @@
       </object>
       <object ref="Device.Hosts.AccessControl.{i}.Schedule.{i}."
           requirement="present">
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Day" requirement="readWrite"/>
         <parameter ref="StartTime" requirement="readWrite"/>
@@ -101512,7 +111724,7 @@
       </object>
       <object ref="Device.DHCPv4.Server.Pool.{i}.Client.{i}."
           requirement="present">
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Chaddr" requirement="readOnly"/>
         <parameter ref="Active" requirement="readOnly"/>
         <parameter ref="IPv4AddressNumberOfEntries" requirement="readOnly"/>
@@ -101701,7 +111913,8 @@
 
     <profile name="IEEE8021xAuthentication:2" base="IEEE8021xAuthentication:1"
         version="2.7">
-      <object ref="Device.IEEE8021x.Supplicant.{i}." requirement="present">
+      <object ref="Device.IEEE8021x.Supplicant.{i}."
+          requirement="createDelete">
         <parameter ref="Interface" requirement="readWrite"/>
       </object>
     </profile>
@@ -101886,7 +112099,7 @@
         <parameter ref="ChainNumberOfEntries" requirement="readOnly"/>
       </object>
       <object ref="Device.Firewall.Level.{i}." requirement="createDelete">
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Name" requirement="readOnly"/>
         <parameter ref="Order" requirement="readWrite"/>
         <parameter ref="Chain" requirement="readOnly"/>
@@ -101900,7 +112113,7 @@
       </object>
       <object ref="Device.Firewall.Chain.{i}." requirement="createDelete">
         <parameter ref="Enable" requirement="readWrite"/>
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Name" requirement="readWrite"/>
         <parameter ref="Creator" requirement="readOnly"/>
         <parameter ref="RuleNumberOfEntries" requirement="readOnly"/>
@@ -101910,7 +112123,7 @@
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Status" requirement="readOnly"/>
         <parameter ref="Order" requirement="readWrite"/>
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Target" requirement="readWrite"/>
         <parameter ref="TargetChain" requirement="readWrite"/>
         <parameter ref="SourceInterface" requirement="readWrite"/>
@@ -102137,7 +112350,7 @@
       </object>
       <object ref="Device.BulkData.Profile.{i}." requirement="createDelete">
         <parameter ref="Enable" requirement="readWrite"/>
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Protocol" requirement="readWrite"/>
         <parameter ref="EncodingType" requirement="readWrite"/>
         <parameter ref="ReportingInterval" requirement="readWrite"/>
@@ -102802,7 +113015,7 @@
       </object>
       <object ref="Device.BASAPM.MeasurementEndpoint.{i}."
           requirement="createDelete">
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="MeasurementAgent" requirement="readWrite"/>
         <parameter ref="DeviceOwnership" requirement="readWrite"/>
         <parameter ref="OperationalDomain" requirement="readWrite"/>
@@ -102829,7 +113042,7 @@
       </object>
       <object ref="Device.LMAP.MeasurementAgent.{i}."
           requirement="createDelete">
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Version" requirement="readOnly"/>
         <parameter ref="CapabilityTags" requirement="readOnly"/>
@@ -102865,7 +113078,7 @@
       </object>
       <object ref="Device.LMAP.MeasurementAgent.{i}.Schedule.{i}."
           requirement="createDelete">
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Name" requirement="readWrite"/>
         <parameter ref="Start" requirement="readWrite"/>
@@ -102878,7 +113091,7 @@
       </object>
       <object ref="Device.LMAP.MeasurementAgent.{i}.Schedule.{i}.Action.{i}."
           requirement="createDelete">
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Order" requirement="readWrite"/>
         <parameter ref="Task" requirement="readWrite"/>
@@ -102888,7 +113101,7 @@
       <object
           ref="Device.LMAP.MeasurementAgent.{i}.Schedule.{i}.Action.{i}.Option.{i}."
           requirement="createDelete">
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Order" requirement="readWrite"/>
         <parameter ref="Name" requirement="readWrite"/>
@@ -102896,7 +113109,7 @@
       </object>
       <object ref="Device.LMAP.MeasurementAgent.{i}.Task.{i}."
           requirement="createDelete">
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Name" requirement="readWrite"/>
         <parameter ref="Tags" requirement="readWrite"/>
@@ -102905,14 +113118,14 @@
       </object>
       <object ref="Device.LMAP.MeasurementAgent.{i}.Task.{i}.Registry.{i}."
           requirement="createDelete">
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="RegistryEntry" requirement="readWrite"/>
         <parameter ref="Roles" requirement="readWrite"/>
       </object>
       <object ref="Device.LMAP.MeasurementAgent.{i}.Task.{i}.Option.{i}."
           requirement="createDelete">
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Order" requirement="readWrite"/>
         <parameter ref="Name" requirement="readWrite"/>
@@ -102920,7 +113133,7 @@
       </object>
       <object ref="Device.LMAP.MeasurementAgent.{i}.CommunicationChannel.{i}."
           requirement="createDelete">
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Name" requirement="readWrite"/>
         <parameter ref="UseBulkDataProfile" requirement="readWrite"/>
@@ -102929,7 +113142,7 @@
         <parameter ref="Interface" requirement="readWrite"/>
       </object>
       <object ref="Device.LMAP.Event.{i}." requirement="createDelete">
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Name" requirement="readWrite"/>
         <parameter ref="Type" requirement="readWrite"/>
@@ -103008,7 +113221,7 @@
       </object>
       <object ref="Device.LMAP.MeasurementAgent.{i}.Instruction.{i}."
           requirement="createDelete">
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="LastChange" requirement="readOnly"/>
         <parameter ref="InstructionSchedules" requirement="readWrite"/>
@@ -103020,7 +113233,7 @@
       <object
           ref="Device.LMAP.MeasurementAgent.{i}.Instruction.{i}.MeasurementSuppression.{i}."
           requirement="createDelete">
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Name" requirement="readWrite"/>
         <parameter ref="State" requirement="readOnly"/>
@@ -103093,7 +113306,7 @@
       <object ref="Device.Logical.Interface.{i}." requirement="present">
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Status" requirement="readOnly"/>
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Name" requirement="readOnly"/>
         <parameter ref="LastChange" requirement="readOnly"/>
         <parameter ref="LowerLayers" requirement="readWrite"/>
@@ -103326,6 +113539,74 @@
       </object>
     </profile>
 
+    <profile name="MoCA_Aca:1" version="2.17"
+        id="mocaIfAcaOptionalGroup/1.3.6.1.4.1.31621.1.2.2.2.5">
+      <description>
+        Parameters to control ACA (Alternate Channel Assessment) for the MoCA
+        interface.
+      </description>
+      <object ref="Device.MoCA.Interface.{i}.Aca." requirement="present">
+        <parameter ref="DiagnosticsState" requirement="readWrite"/>
+        <parameter ref="NodeID" requirement="readWrite"/>
+        <parameter ref="Type" requirement="readWrite"/>
+        <parameter ref="Channel" requirement="readWrite"/>
+        <parameter ref="ReportNodeMask" requirement="readWrite"/>
+        <parameter ref="TotalRxPower" requirement="readOnly"/>
+        <parameter ref="PowerProfile" requirement="readOnly"/>
+      </object>
+    </profile>
+
+    <profile name="MoCA_Trap:1" version="2.17"
+        id="mocaTrapOptionalGroup/1.3.6.1.4.1.31621.1.2.2.2.19">
+      <description>
+        Notifications for bandwidth threshold in the MoCA network.
+      </description>
+      <object ref="Device.MoCA.Interface.{i}." requirement="present">
+        <parameter ref="BelowPhyThresholdTrap" requirement="readOnly"/>
+        <parameter ref="AbovePhyThresholdTrap" requirement="readOnly"/>
+        <parameter ref="StatusChangeTrap" requirement="readOnly"/>
+        <parameter ref="NumNodesChangeTrap" requirement="readOnly"/>
+        <parameter ref="MrRstSuccessTrap" requirement="readOnly"/>
+        <parameter ref="MrNetworkSuccessTrap" requirement="readOnly"/>
+        <parameter ref="MrNetworkFailTrap" requirement="readOnly"/>
+        <parameter ref="PowerStateBcstRecTrap" requirement="readOnly"/>
+        <parameter ref="PowerStateM0NcTrap" requirement="readOnly"/>
+        <parameter ref="PowerStateNc1xTrap" requirement="readOnly"/>
+        <parameter ref="PowerStateRespTrap" requirement="readOnly"/>
+        <parameter ref="PowerStateUcstPenTrap" requirement="readOnly"/>
+        <parameter ref="PowerStateTrnsReqTrap" requirement="readOnly"/>
+        <parameter ref="PowerStateWupUrTrap" requirement="readOnly"/>
+        <parameter ref="LmoStatusTrap" requirement="readOnly"/>
+        <parameter ref="LinkFailureTrap" requirement="readOnly"/>
+        <parameter ref="ConnectedNodesChangeTrap" requirement="readOnly"/>
+        <parameter ref="MgntEntityNetwIePayloadRecTrap" requirement="readOnly"/>
+        <parameter ref="MpsInitScanRecTrap" requirement="readOnly"/>
+        <parameter ref="MpsPairFailTrap" requirement="readOnly"/>
+        <parameter ref="MpsPrivacyChangedTrap" requirement="readOnly"/>
+        <parameter ref="NcPrivacySupportedRecTrap" requirement="readOnly"/>
+        <parameter ref="NetworkNameRecTrap" requirement="readOnly"/>
+        <parameter ref="NodeDropAdmFailureTrap" requirement="readOnly"/>
+        <parameter ref="NodeDropNcTrap" requirement="readOnly"/>
+        <parameter ref="NodeDropMpsTriggeredTrap" requirement="readOnly"/>
+        <parameter ref="NodeDropNcChgTrap" requirement="readOnly"/>
+      </object>
+    </profile>
+
+    <profile
+        name="MoCA_Mandatory:1"
+        version="2.17"
+        id="mocaMIBCompliance/1.3.6.1.4.1.31621.1.2.2.1.1"
+        extends="
+          MoCA_Status:1
+          MoCA_Stats:1
+          MoCA_FlowStats:1
+          MoCA_Node:1
+          MoCA_Mesh:1">
+      <description>
+        The compliance statement for the mandatory groups.
+      </description>
+    </profile>
+
     <profile name="DownloadTCP:1" version="2.0">
       <object ref="Device.IP.Diagnostics.DownloadDiagnostics."
           requirement="present">
@@ -103386,6 +113667,48 @@
       </object>
     </profile>
 
+    <profile name="IPLayerCapacityTest:2"
+        dmr:previousProfile="IPLayerCapacity:2" version="2.17">
+      <object ref="Device.IP.Diagnostics." requirement="present">
+        <parameter ref="IPLayerCapacitySupported" requirement="readOnly"/>
+      </object>
+      <object ref="Device.IP.Diagnostics.IPLayerCapacityMetrics."
+          requirement="present">
+        <parameter ref="DiagnosticsState" requirement="readWrite"/>
+        <parameter ref="IPLayerCapSupportedSoftwareVersion"
+            requirement="readOnly"/>
+        <parameter ref="IPLayerCapSupportedControlProtocolVersion"
+            requirement="readOnly"/>
+        <parameter ref="IPLayerCapSupportedMetrics" requirement="readOnly"/>
+        <parameter ref="Role" requirement="readWrite"/>
+        <parameter ref="ServerList" requirement="readOnly"/>
+        <parameter ref="JumboFramesPermitted" requirement="readOnly"/>
+        <parameter ref="DSCP" requirement="readWrite"/>
+        <parameter ref="TestType" requirement="readWrite"/>
+        <parameter ref="IPDVEnable" requirement="readWrite"/>
+        <parameter ref="TestSubInterval" requirement="readWrite"/>
+        <parameter ref="StatusFeedbackInterval" requirement="readWrite"/>
+        <parameter ref="SeqErrThresh" requirement="readWrite"/>
+        <parameter ref="ReordDupIgnoreEnable" requirement="readOnly"/>
+        <parameter ref="LowerThresh" requirement="readWrite"/>
+        <parameter ref="UpperThresh" requirement="readWrite"/>
+        <parameter ref="HighSpeedDelta" requirement="readWrite"/>
+        <parameter ref="SlowAdjThresh" requirement="readWrite"/>
+        <parameter ref="MaxIPLayerCapacity" requirement="readOnly"/>
+        <parameter ref="TimeOfMax" requirement="readOnly"/>
+        <parameter ref="MaxETHCapacityNoFCS" requirement="readOnly"/>
+        <parameter ref="MaxETHCapacityWithFCS" requirement="readOnly"/>
+        <parameter ref="MaxETHCapacityWithFCSVLAN" requirement="readOnly"/>
+        <parameter ref="LossRatioAtMax" requirement="readOnly"/>
+        <parameter ref="RTTRangeAtMax" requirement="readOnly"/>
+        <parameter ref="PDVRangeAtMax" requirement="readOnly"/>
+        <parameter ref="IPLayerCapacitySummary" requirement="readOnly"/>
+        <parameter ref="LossRatioSummary" requirement="readOnly"/>
+        <parameter ref="MinRTTSummary" requirement="readOnly"/>
+        <parameter ref="ActiveFlows" requirement="readOnly"/>
+      </object>
+    </profile>
+
     <profile name="AutonXferComplPolicy:1" version="2.0"
         dmr:previousProfile="TempStatusAdv:2">
       <object ref="Device.ManagementServer.AutonomousTransferCompletePolicy."
diff --git a/test/tools/tr-181-2-16-0-usp-full.xml b/test/tools/tr-181-2-17-0-usp-full.xml
similarity index 88%
rename from test/tools/tr-181-2-16-0-usp-full.xml
rename to test/tools/tr-181-2-17-0-usp-full.xml
index d054fab9..f19d0a4f 100644
--- a/test/tools/tr-181-2-16-0-usp-full.xml
+++ b/test/tools/tr-181-2-17-0-usp-full.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  USP Device:2.16 Root Object definition
+  Device:2 Root Data Model definition [USP]
 
-  Copyright (c) 2010-2022, Broadband Forum
+  Copyright (c) 2010-2023, Broadband Forum
 
   The undersigned members have elected to grant the copyright to
   their contributed material used in this software:
@@ -59,8 +59,8 @@
         https://www.broadband-forum.org/cwmp/cwmp-datamodel-1-10.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-16-0-usp"
-    file="tr-181-2-16-0-usp.xml">
+    spec="urn:broadband-forum-org:tr-181-2-17-0-usp"
+    file="tr-181-2-17-0-usp.xml">
 
   <dataType name="_AliasCommon">
     <description>
@@ -190,6 +190,27 @@
     </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}}.
@@ -986,6 +1007,229 @@
     </string>
   </dataType>
 
+  <dataType name="MocaChannelMask">
+    <description>
+      Represents one or more MoCA channel RF center frequencies using a
+      hexadecimal encoded 64-bit mask.
+
+      Bit 63 (the leftmost bit of the leftmost character) is the most
+      significant bit (highest frequency), and bit 0 (the rightmost bit of the
+      rightmost character) is the least significant bit (lowest frequency). Not
+      all bits are valid MoCA channels.
+
+      Each bit represents 25 MHz of spectrum, but the mapping from bits to
+      frequencies varies with the MoCA version:
+
+      * MoCA 1.0 and MoCA 1.1: bits 63 through 32 are not used, bit 31
+        represents 1575 MHz and bit 0 represents 800 MHz
+
+      * MoCA 2.0 and MoCA 2.5: bit 63 represents 1975 MHz and bit 0 represents
+        400 MHz
+
+      For example, a MoCA 1.0 or MoCA 1.1 interface would use
+      0x000000001FFFC000 to represent 1150 MHz through 1500 MHz.
+
+      Note that the MoCA version is indicated by the {{param|HighestVersion}}
+      parameter.
+    </description>
+    <hexBinary>
+      <size minLength="8" maxLength="8"/>
+    </hexBinary>
+  </dataType>
+
+  <dataType name="MocaNodeID">
+    <description>
+      Represents a MoCA Node ID.
+
+      * MoCA 1.0 network can have a maximum of 8 MoCA Nodes, so Node ID is 0 to
+        7.
+
+      * MoCA 1.1, MoCA 2.0, or MoCA 2.5 network can have a maximum of 16 MoCA
+        Nodes, so Node ID is 0 to 15.
+    </description>
+    <unsignedInt>
+      <range minInclusive="0" maxInclusive="15"/>
+    </unsignedInt>
+  </dataType>
+
+  <dataType name="MocaPhyRate">
+    <description>
+      Represents the transmit PHY rate in Mbps.
+    </description>
+    <unsignedInt>
+      <range minInclusive="0" maxInclusive="2048"/>
+    </unsignedInt>
+  </dataType>
+
+  <dataType name="MocaMacRate">
+    <description>
+      Represents the MAC throughput in Kbps.
+    </description>
+    <unsignedInt/>
+  </dataType>
+
+  <dataType name="MocaDB">
+    <description>
+      Represents one decibel or 1 dB.
+    </description>
+    <unsignedInt/>
+  </dataType>
+
+  <dataType name="MocaDBm">
+    <description>
+      Represents a measure of power in mW expressed in decibels, and calculated
+      as follows:
+
+       power = 10*log10( Vrms^2 / R * 1000 )
+
+       where Vrms is the root-mean-square Voltage of the received waveform and
+       R is 75 ohms.
+    </description>
+    <int/>
+  </dataType>
+
+  <dataType name="MocaScMod">
+    <description>
+      Represents the subcarrier modulation.
+
+      Binary string array (array of two hexadecimal characters) with 1 byte for
+      each subcarrier. The value of each byte represents the subcarrier
+      modulation for the corresponding subcarrier.
+
+      See {{bibref|MoCAv2.0|section 14.3.6.3}} and {{bibref|MOCA20-MIB|Appendix
+      A}} for the encoding of this parameter.
+    </description>
+    <hexBinary/>
+  </dataType>
+
+  <dataType name="MocaBand">
+    <description>
+      Represents the MoCA Bands and sub-bands the device is configured to
+      operate in or that the device supports. {{enum}}
+
+      See {{bibref|MoCAv2.0|section 15}}.
+    </description>
+    <list/>
+    <string>
+      <enumeration value="reserved" access="readOnly" code="0"/>
+      <enumeration value="bandFCBL" code="1"/>
+      <enumeration value="bandFSAT" code="2"/>
+      <enumeration value="bandE" code="3"/>
+      <enumeration value="bandExD" code="4"/>
+      <enumeration value="bandDH" code="5"/>
+      <enumeration value="bandDL" code="6"/>
+      <enumeration value="noBand" code="7"/>
+    </string>
+  </dataType>
+
+  <dataType name="MocaPowerState">
+    <description>
+      Represents the Power State defined by the MoCA2.0 specification.
+
+      {{enum}}
+
+      See {{bibref|MoCAv2.0|section 12}}.
+    </description>
+    <string>
+      <enumeration value="m0Active" code="0">
+        <description>Power State M0: Active.</description>
+      </enumeration>
+      <enumeration value="m1LowPowerIdle" code="1">
+        <description>Power State M1: Low Power Idle.</description>
+      </enumeration>
+      <enumeration value="m2Standby" code="2">
+        <description>Power State M2: Standby.</description>
+      </enumeration>
+      <enumeration value="m3Sleep" code="3">
+        <description>Power State M3: Sleep.</description>
+      </enumeration>
+    </string>
+  </dataType>
+
+  <dataType name="MocaFlowIngrClassRule">
+    <description>
+      Represents the MoCA 2.0 PQOS Ingress Classification Rule.
+    </description>
+    <string>
+      <enumeration value="ruleDAVLANtag4or5" code="0"/>
+      <enumeration value="ruleDAonly" code="4"/>
+      <enumeration value="ruleDAandDSCPnoVLAN" code="5"/>
+      <enumeration value="ruleDAandVLANignoreDSCP" code="6"/>
+      <enumeration value="ruleDAandVLANorDSCP" code="7"/>
+    </string>
+  </dataType>
+
+  <dataType name="MocaChannelIndex">
+    <description>
+      Represents the MoCA 2.0 primary or secondary channel, or MoCA 2.5 first,
+      second, third, fourth, or fifth channel.
+    </description>
+    <string>
+      <enumeration value="primary" code="1"/>
+      <enumeration value="secondary" code="2"/>
+      <enumeration value="m25first" code="3"/>
+      <enumeration value="m25second" code="4"/>
+      <enumeration value="m25third" code="5"/>
+      <enumeration value="m25fourth" code="6"/>
+      <enumeration value="m25fifth" code="7"/>
+    </string>
+  </dataType>
+
+  <dataType name="MocaPrivacy">
+    <description>
+      Represents a type of MoCA Privacy.
+    </description>
+    <string>
+      <enumeration value="mocaReserved5" code="0"/>
+      <enumeration value="mocaReserved4" code="1"/>
+      <enumeration value="mocaReserved3" code="2"/>
+      <enumeration value="mocaReserved2" code="3"/>
+      <enumeration value="mocaReserved1" code="4"/>
+      <enumeration value="moca2EnhancedPrivacy" code="5"/>
+      <enumeration value="moca20Privacy" code="6"/>
+      <enumeration value="moca1Privacy" code="7"/>
+    </string>
+  </dataType>
+
+  <dataType name="RowStatus">
+    <description>
+      Cut-down version of SNMP RowStatus that supports only its "status"
+      values, not its "control" values.
+    </description>
+    <string>
+      <enumeration value="active" code="1">
+        <description>
+          The row is available for use by the managed device.
+        </description>
+      </enumeration>
+      <enumeration value="notInService" code="2">
+        <description>
+          The row exists in the Agent, but is unavailable for use by the
+          managed device (see NOTE below); "notInService" has no implication
+          regarding the internal consistency of the row, availability of
+          resources, or consistency with the current state of the managed
+          device.
+        </description>
+      </enumeration>
+      <enumeration value="notReady" code="3">
+        <description>
+          The row exists in the Agent, but is missing information necessary in
+          order to be available for use by the managed device, i.e., one or
+          more required parameter in the row have not been populated.
+        </description>
+      </enumeration>
+      <enumeration value="createAndGo" code="4">
+        <description>Not used.</description>
+      </enumeration>
+      <enumeration value="createAndWait" code="5">
+        <description>Not used.</description>
+      </enumeration>
+      <enumeration value="destroy" code="6">
+        <description>Not used.</description>
+      </enumeration>
+    </string>
+  </dataType>
+
   <dataType name="PSMBreakPointIndexAndLevel">
     <description>
       # The PSM breakpoint sub-carrier index in the range [0:4095], and
@@ -1298,6 +1542,15 @@
         https://standards.ieee.org/standard/802_11ax-2021.html
       </hyperlink>
     </reference>
+    <reference id="802.11be">
+      <name>IEEE Std 802.11be</name>
+      <title>
+        Enhancements for Exteremely High Throughput (EHT) WLAN - Draft
+      </title>
+      <organization>IEEE</organization>
+      <date>March 2019</date>
+      <hyperlink>https://standards.ieee.org/ieee/802.11be/7516/</hyperlink>
+    </reference>
     <reference id="802.11b-1999">
       <name>IEEE Std 802.11b-1999</name>
       <title>Higher Speed Physical Layer Extension in the 2.4 GHz band</title>
@@ -1417,6 +1670,30 @@
       <date>May 2021</date>
       <hyperlink>https://www.itu.int/rec/T-REC-G.989.3-202105-I/en</hyperlink>
     </reference>
+    <reference id="G.992.3">
+      <name>G.992.3</name>
+      <title>Asymmetric digital subscriber line transceivers 2 (ADSL2)</title>
+      <organization>ITU-T</organization>
+      <hyperlink>https://www.itu.int/rec/T-REC-G.992.3</hyperlink>
+    </reference>
+    <reference id="G.992.4">
+      <name>G.992.4</name>
+      <title>
+        Splitterless asymmetric digital subscriber line transceivers 2
+        (splitterless ADSL2)
+      </title>
+      <organization>ITU-T</organization>
+      <hyperlink>https://www.itu.int/rec/T-REC-G.992.4</hyperlink>
+    </reference>
+    <reference id="G.992.5">
+      <name>G.992.5</name>
+      <title>
+        Asymmetric Digital Subscriber Line (ADSL) transceivers - Extended
+        bandwidth ADSL2 (ADSL2plus)
+      </title>
+      <organization>ITU-T</organization>
+      <hyperlink>https://www.itu.int/rec/T-REC-G.992.5</hyperlink>
+    </reference>
     <reference id="G.993.1">
       <name>G.993.1</name>
       <title>Very high speed digital subscriber line transceivers</title>
@@ -1431,6 +1708,14 @@
       <organization>ITU-T</organization>
       <hyperlink>https://www.itu.int/rec/T-REC-G.993.2</hyperlink>
     </reference>
+    <reference id="G.994.1">
+      <name>G.994.1</name>
+      <title>
+        Handshake procedures for digital subscriber line (DSL) transceivers
+      </title>
+      <organization>ITU-T</organization>
+      <hyperlink>https://www.itu.int/rec/T-REC-G.994.1</hyperlink>
+    </reference>
     <reference id="G.996.2">
       <name>G.996.2</name>
       <title>
@@ -2289,6 +2574,29 @@
       <date>May 2008</date>
       <hyperlink>https://www.rfc-editor.org/rfc/rfc5280</hyperlink>
     </reference>
+    <reference id="RFC5424">
+      <name>RFC 5424</name>
+      <title>The Syslog Protocol</title>
+      <organization>IETF</organization>
+      <date>May 2009</date>
+      <hyperlink>https://www.rfc-editor.org/rfc/rfc5424</hyperlink>
+    </reference>
+    <reference id="RFC5425">
+      <name>RFC 5425</name>
+      <title>
+        Transport Layer Security (TLS) Transport Mapping for Syslog
+      </title>
+      <organization>IETF</organization>
+      <date>May 2009</date>
+      <hyperlink>https://www.rfc-editor.org/rfc/rfc5425</hyperlink>
+    </reference>
+    <reference id="RFC5426">
+      <name>RFC 5426</name>
+      <title>Transmission of Syslog Messages over UDP</title>
+      <organization>IETF</organization>
+      <date>May 2009</date>
+      <hyperlink>https://www.rfc-editor.org/rfc/rfc5425</hyperlink>
+    </reference>
     <reference id="RFC5491">
       <name>RFC 5491</name>
       <title>
@@ -2387,6 +2695,14 @@
       <date>December 2011</date>
       <hyperlink>https://www.rfc-editor.org/rfc/rfc6455</hyperlink>
     </reference>
+    <reference id="RFC6587">
+      <name>RFC 6587</name>
+      <title>Transmission of Syslog Messages over TCP</title>
+      <organization>IETF</organization>
+      <category>RFC</category>
+      <date>April 2012</date>
+      <hyperlink>https://www.rfc-editor.org/rfc/rfc6587</hyperlink>
+    </reference>
     <reference id="RFC6762">
       <name>RFC 6762</name>
       <title>Multicast DNS</title>
@@ -2563,6 +2879,22 @@
       <date>November 2015</date>
       <hyperlink>https://www.rfc-editor.org/rfc/rfc7693</hyperlink>
     </reference>
+    <reference id="RFC8089">
+      <name>RFC 8089</name>
+      <title>The "file" URI Scheme</title>
+      <organization>IETF</organization>
+      <category>RFC</category>
+      <date>February 2017</date>
+      <hyperlink>https://www.rfc-editor.org/rfc/rfc8089</hyperlink>
+    </reference>
+    <reference id="RFC8106">
+      <name>RFC 8106</name>
+      <title>IPv6 Router Advertisement Options for DNS Configuration</title>
+      <organization>IETF</organization>
+      <category>RFC</category>
+      <date>March 2017</date>
+      <hyperlink>https://www.rfc-editor.org/rfc/rfc8106</hyperlink>
+    </reference>
     <reference id="RFC8141">
       <name>RFC 8141</name>
       <title>Uniform Resource Names (URNs)</title>
@@ -2657,6 +2989,16 @@
       <date>July 2022</date>
       <hyperlink>https://www.rfc-editor.org/rfc/rfc9249</hyperlink>
     </reference>
+    <reference id="YANGSYSLOG">
+      <name>draft-ietf-netmod-syslog-model</name>
+      <title>A YANG Data Model for Syslog Configuration</title>
+      <organization>IETF</organization>
+      <category>Internet Draft</category>
+      <date>April 2023</date>
+      <hyperlink>
+        https://datatracker.ietf.org/doc/draft-ietf-netmod-syslog-model
+      </hyperlink>
+    </reference>
     <reference id="TR-064">
       <name>TR-064 Corrigendum 1</name>
       <title>LAN-Side DSL CPE Configuration Specification</title>
@@ -2765,9 +3107,9 @@
       </title>
       <organization>Broadband Forum</organization>
       <category>Technical Report</category>
-      <date>December 2021</date>
+      <date>December 2023</date>
       <hyperlink>
-        https://www.broadband-forum.org/download/TR-471_Issue-2.pdf
+        https://www.broadband-forum.org/download/TR-471_Issue-4.pdf
       </hyperlink>
     </reference>
     <reference id="AMB">
@@ -3119,6 +3461,37 @@
       <date>October 2007</date>
       <hyperlink>https://csa-iot.org/all-solutions/zigbee</hyperlink>
     </reference>
+    <reference id="MoCAv2.0">
+      <name>MoCA v2.0</name>
+      <title>MoCA MAC/PHY Specification v2.0</title>
+      <organization>MoCA Alliance</organization>
+      <date>2017</date>
+      <hyperlink>https://www.mocalliance.org</hyperlink>
+    </reference>
+    <reference id="MoCAv2.5">
+      <name>MoCA v2.5</name>
+      <title>MoCA MAC/PHY Specification v2.5</title>
+      <organization>MoCA Alliance</organization>
+      <date>2017</date>
+      <hyperlink>https://www.mocalliance.org</hyperlink>
+    </reference>
+    <reference id="MOCA20-MIB">
+      <name>MOCA20-MIB</name>
+      <title>Remote Management of MoCA Interfaces using SNMP MIB v2.0</title>
+      <organization>MoCA Alliance</organization>
+      <date>2020</date>
+      <hyperlink>https://www.mocalliance.org</hyperlink>
+    </reference>
+    <reference id="MOCA25-MIB">
+      <name>MOCA25-MIB</name>
+      <title>
+        Remote Management of MoCA Interfaces using SNMP MIB v2.5 (Approved
+        draft)
+      </title>
+      <organization>MoCA Alliance</organization>
+      <date>2018</date>
+      <hyperlink>https://www.mocalliance.org</hyperlink>
+    </reference>
   </bibliography>
 
   <template id="IP-DIAGNOSTICS-PARENT">
@@ -3234,7 +3607,7 @@
     restore this configuration file.
   </template>
 
-  <model name="Device:2.16">
+  <model name="Device:2.17">
 
     <object name="Device." access="readOnly" minEntries="1" maxEntries="1"
         version="2.0">
@@ -3718,10 +4091,12 @@
           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.{{np}}Any change would indicate
-          that it's 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.
+          including across firmware updates.
+
+          Any change would indicate that it's 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>
         <syntax>
           <string>
@@ -4006,6 +4381,15 @@
         </syntax>
       </parameter>
 
+      <parameter name="LogRotateNumberOfEntries" access="readOnly">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
       <parameter name="VendorLogFileNumberOfEntries" access="readOnly">
         <description>
           {{numentries}}
@@ -4101,7 +4485,7 @@
         <parameter ref="Name"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -4628,7 +5012,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -4951,7 +5335,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -4994,6 +5378,195 @@
       </parameter>
     </object>
 
+    <object name="Device.DeviceInfo.LogRotate.{i}." access="readWrite"
+        enableParameter="Enable" numEntriesParameter="LogRotateNumberOfEntries"
+        minEntries="0" maxEntries="unbounded" version="2.17">
+      <description>
+        This Object details the available rotation settings for vendor log file
+        rotation.
+
+        Based on {{bibref|YANGSYSLOG|A YANG Data Model for Syslog
+        Configuration}}.
+      </description>
+      <uniqueKey functional="false">
+        <parameter ref="Alias"/>
+      </uniqueKey>
+      <uniqueKey functional="true">
+        <parameter ref="Name"/>
+      </uniqueKey>
+
+      <parameter name="Alias" access="writeOnceReadOnly">
+        <description>
+          {{datatype|expand}}
+        </description>
+        <syntax>
+          <dataType ref="Alias"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Enable" access="readWrite">
+        <description>
+          Enables or disables the log rotation functionality for this item.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Name" access="readWrite">
+        <description>
+          Specifies the full path and filename of the log file that must be
+          rotated. Which MUST use the uri scheme file {{bibref|RFC8089|The file
+          URI Scheme}}.
+        </description>
+        <syntax>
+          <string/>
+        </syntax>
+      </parameter>
+
+      <parameter name="NumberOfFiles" access="readWrite">
+        <description>
+          Specifies the maximum number of log files retained. When during log
+          rotation the maximum number of log files is reached, the oldest log
+          file will be deleted.
+
+          Specify ''1'' for implementations that only support one log file.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range minInclusive="1"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="MaxFileSize" access="readWrite">
+        <description>
+          Specifies the maximum log file size in {{units}}. Log events that
+          arrive after the maximum file size is reached will cause the current
+          log file to be closed and a new log file to be opened.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="KiB"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="RollOver" access="readWrite">
+        <description>
+          Specifies the length of time, in {{units}}, that log events should be
+          written to a specific log file. Log events that arrive after the
+          rollover period cause the current log file to be closed and a new log
+          file to be opened.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="minutes"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="Retention" access="readWrite">
+        <description>
+          Specifies the length of time, in {{units}}, that completed/closed log
+          event files should be stored in the file system before they are
+          removed.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="minutes"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="Compression" access="readWrite">
+        <description>
+          Specifies the post-rotation compression method that must be applied
+          exclusively on the initial log file in a rotation sequence.
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="None"/>
+            <enumeration value="GZIP"/>
+            <enumeration value="BZIP2"/>
+            <enumeration value="LZO"/>
+            <enumeration value="XZ"/>
+            <enumeration value="ZSTD"/>
+          </string>
+          <default type="object" value="None"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="LogFileNumberOfEntries" access="readOnly">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object name="Device.DeviceInfo.LogRotate.{i}.LogFile.{i}."
+        access="readOnly" numEntriesParameter="LogFileNumberOfEntries"
+        minEntries="0" maxEntries="unbounded" version="2.17">
+      <description>
+        Each table entry represents a Log File.
+
+        This table of log files is informational only and does not allow the
+        Controller to operate on these files in any way.
+      </description>
+      <uniqueKey functional="false">
+        <parameter ref="Alias"/>
+      </uniqueKey>
+      <uniqueKey functional="true">
+        <parameter ref="Name"/>
+      </uniqueKey>
+
+      <parameter name="Alias" access="writeOnceReadOnly">
+        <description>
+          {{datatype|expand}}
+        </description>
+        <syntax>
+          <dataType ref="Alias"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Name" access="readOnly">
+        <description>
+          Name of the rotated log file stored within the same directory that
+          {{param|#.Name}} is specified. Which MUST use the uri scheme file
+          {{bibref|RFC8089|The file URI Scheme}}.
+        </description>
+        <syntax>
+          <string>
+            <size maxLength="64"/>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="Size" access="readOnly">
+        <description>
+          The size of the log file in {{units}}. If the device doesn't know the
+          file size then {{param}} will be 0.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="bytes"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="LastChange" access="readOnly" activeNotify="canDeny">
+        <description>
+          Last modification date of the file specified by {{param|Name}}.
+        </description>
+        <syntax>
+          <dateTime/>
+        </syntax>
+      </parameter>
+    </object>
+
     <object name="Device.DeviceInfo.VendorLogFile.{i}." access="readOnly"
         numEntriesParameter="VendorLogFileNumberOfEntries" minEntries="0"
         maxEntries="unbounded" version="2.1">
@@ -5010,7 +5583,7 @@
         <parameter ref="Name"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -5253,7 +5826,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -5303,7 +5876,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -5433,8 +6006,8 @@
             </enumeration>
             <enumeration value="ActivationFailed">
               <description>
-                The Agent has attempted to active this Firmware Image instance,
-                but ultimately failed while being activated.
+                The Agent has attempted to activate this Firmware Image
+                instance, but ultimately the activation failed.
               </description>
             </enumeration>
           </string>
@@ -5769,6 +6342,489 @@
       </command>
     </object>
 
+    <object name="Device.DeviceInfo.KernelFaults." access="readOnly"
+        version="2.17">
+      <description>
+        A fault in the context of the Kernel refers to a situation where the
+        kernel encounters a critical error or a bug that it cannot recover
+        from. When this happens, the kernel generates a "fault message" or
+        "kernel panic", which provides information about the error, the state
+        of the system at the time of the error, and a stack trace of function
+        calls leading up to the error.
+      </description>
+
+      <parameter name="StoragePath" access="readOnly">
+        <description>
+          Path where the Kernel faults logs must be stored.
+        </description>
+        <syntax>
+          <string/>
+        </syntax>
+      </parameter>
+
+      <parameter name="LastUpgradeCount" access="readOnly">
+        <description>
+          Total number of Kernel faults which occured since last firmware
+          upgrade.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="PreviousBootCount" access="readOnly">
+        <description>
+          The number of Kernel faults which occurred during the previous boot
+          cycle.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="MinFreeSpace" access="readWrite">
+        <description>
+          Minimum free space in {{units}} on the device that must be free
+          before attempting to create a {{object|KernelFault}} instance. This
+          setting does not affect the counting of Kernel faults.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="KiB"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="MaxKernelFaultEntries" access="readWrite">
+        <description>
+          The maximum number of entries available in the {{object|KernelFault}}
+          table. Defines the maximum number of {{object|KernelFault}} instances
+          that can be stored on the device.
+
+          If this limit is hit, No new {{object|KernelFault}} instances will be
+          created until sufficient Kernel fault instances are removed. Set this
+          parameter to 0 to completely disable the creation of
+          {{object|KernelFault}} instances.
+
+          Reducing the {{param}} will cause for the implementation to delete
+          the oldest {{object|KernelFault}} instances.
+
+          This setting does not affect the counting of Kernel faults.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="KernelFaultNumberOfEntries" access="readOnly">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <command name="RemoveAllKernelFaults()" async="true">
+        <description>
+          This command removes all the {{object|KernelFault.{i}.}} from the
+          device, together with all the associated Kernel fault data stored on
+          the device.
+        </description>
+      </command>
+    </object>
+
+    <object name="Device.DeviceInfo.KernelFaults.KernelFault.{i}."
+        access="readOnly" numEntriesParameter="KernelFaultNumberOfEntries"
+        minEntries="0" maxEntries="unbounded" dmr:noUniqueKeys="true"
+        version="2.17">
+      <description>
+        Each table entry represents a Kernel fault that is stored on the
+        device.
+      </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="FaultLocation" access="readOnly">
+        <description>
+          Specifies the location of where to create and keep the logs. Can
+          either be a relative path or file within the {{param|#.StoragePath}}
+          location.
+        </description>
+        <syntax>
+          <string/>
+        </syntax>
+      </parameter>
+
+      <parameter name="LastInstruction" access="readOnly">
+        <description>
+          The last instruction executed when the Kernel fault was triggered.
+        </description>
+        <syntax>
+          <string/>
+        </syntax>
+      </parameter>
+
+      <parameter name="TimeStamp" access="readOnly">
+        <description>
+          The time when the Kernel fault was registered.
+        </description>
+        <syntax>
+          <dateTime/>
+        </syntax>
+      </parameter>
+
+      <parameter name="FirmwareVersion" access="readOnly">
+        <description>
+          The firmeware version that triggered the Kernel fault.
+        </description>
+        <syntax>
+          <string/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ProcessName" access="readOnly">
+        <description>
+          The name of the process that was active while the kernel fault
+          occurred.
+        </description>
+        <syntax>
+          <string/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Reason" access="readOnly">
+        <description>
+          The reason why the kernel fault occurred.
+        </description>
+        <syntax>
+          <string/>
+        </syntax>
+      </parameter>
+
+      <command name="Upload()" async="true">
+        <description>
+          This command is issued to upload the Kernel fault information
+          specified by this KernelFault instance.
+
+          All results of the actual upload will be contained within the
+          {{event|.LocalAgent.TransferComplete!}} event.
+        </description>
+        <input>
+
+          <parameter name="URL" mandatory="true">
+            <description>
+              The {{datatype}} specifying the destination file location. The
+              HTTPS transport MUST be supported, and the HTTP transport MAY be
+              supported.
+
+              This argument specifies only the destination file location, and
+              does not indicate in any way the name or location of the local
+              file to be uploaded.
+
+              If the Agent receives multiple upload requests with the same URL,
+              the Agent MUST perform each upload as requested, and MUST NOT
+              assume that the content of the file to be uploaded is the same
+              each time.
+
+              This URL MUST NOT include the "userinfo" component, as defined in
+              {{bibref|RFC3986}}.
+            </description>
+            <syntax>
+              <dataType ref="URL"/>
+            </syntax>
+          </parameter>
+
+          <parameter name="Username" mandatory="true">
+            <description>
+              Username to be used by the Agent to authenticate with the file
+              server. This string is set to {{empty}} if no authentication is
+              required.
+            </description>
+            <syntax>
+              <string>
+                <size maxLength="256"/>
+              </string>
+            </syntax>
+          </parameter>
+
+          <parameter name="Password" mandatory="true">
+            <description>
+              Password to be used by the Agent to authenticate with the file
+              server. This string is set to {{empty}} if no authentication is
+              required.
+            </description>
+            <syntax>
+              <string>
+                <size maxLength="256"/>
+              </string>
+            </syntax>
+          </parameter>
+        </input>
+      </command>
+
+      <command name="Remove()" async="true">
+        <description>
+          Remove this row from the table, together with the associated Kernel
+          fault data stored on the device.
+        </description>
+      </command>
+    </object>
+
+    <object name="Device.DeviceInfo.ProcessFaults." access="readOnly"
+        version="2.17">
+      <description>
+        Monitoring process faults and configuring the operating system to
+        generate crash dumps and core files is essential for diagnosing and
+        troubleshooting issues with applications and processes.
+      </description>
+
+      <parameter name="StoragePath" access="readOnly">
+        <description>
+          Path where the process fault logs must be stored.
+        </description>
+        <syntax>
+          <string/>
+        </syntax>
+      </parameter>
+
+      <parameter name="LastUpgradeCount" access="readOnly">
+        <description>
+          Total number of process faults which occured since last firmware
+          upgrade.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="PreviousBootCount" access="readOnly">
+        <description>
+          The number of process faults which occurred during the previous boot
+          cycle.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="MinFreeSpace" access="readWrite">
+        <description>
+          Minimum free space in {{units}} on the device that must be free
+          before attempting to create a {{object|ProcessFault}} instance. This
+          setting does not affect the counting of process faults.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="KiB"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="MaxProcessFaultEntries" access="readWrite">
+        <description>
+          The maximum number of entries available in the
+          {{object|ProcessFault}} table. Defines the maximum number of
+          {{object|ProcessFault}} instances that can be stored on the device.
+
+          If this limit is hit, No new {{object|ProcessFault}} instances will
+          be created until sufficient process fault instances are removed. Set
+          this parameter to 0 to completely disable the creation of
+          {{object|ProcessFault}} instances.
+
+          Reducing the {{param}} will cause for the implementation to delete
+          the oldest {{object|ProcessFault}} instances.
+
+          This setting does not affect the counting of process faults.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ProcessFaultNumberOfEntries" access="readOnly">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <command name="RemoveAllProcessFaults()" async="true">
+        <description>
+          This command removes all the {{object|ProcessFault.{i}.}} from the
+          device, together with all the associated faulty data stored on the
+          device.
+        </description>
+      </command>
+    </object>
+
+    <object name="Device.DeviceInfo.ProcessFaults.ProcessFault.{i}."
+        access="readOnly" numEntriesParameter="ProcessFaultNumberOfEntries"
+        minEntries="0" maxEntries="unbounded" dmr:noUniqueKeys="true"
+        version="2.17">
+      <description>
+        Each table entry represents a process fault that is stored on the
+        device.
+      </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="ProcessID" access="readOnly">
+        <description>
+          Process ID of the process that crashed.
+        </description>
+        <syntax>
+          <string/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ProcessName" access="readOnly">
+        <description>
+          Process Name of the process that crashed.
+        </description>
+        <syntax>
+          <string/>
+        </syntax>
+      </parameter>
+
+      <parameter name="FaultLocation" access="readOnly">
+        <description>
+          Specifies the location of where to create and keep the process fault
+          logs. Can either be a relative path or file within the
+          {{param|#.StoragePath}} location.
+        </description>
+        <syntax>
+          <string/>
+        </syntax>
+      </parameter>
+
+      <parameter name="TimeStamp" access="readOnly">
+        <description>
+          The time when the process fault occured.
+        </description>
+        <syntax>
+          <dateTime/>
+        </syntax>
+      </parameter>
+
+      <parameter name="FirmwareVersion" access="readOnly">
+        <description>
+          The firmware version that triggered the the process fault.
+        </description>
+        <syntax>
+          <string/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Arguments" access="readOnly">
+        <description>
+          The command arguments that were used to start to the process.
+        </description>
+        <syntax>
+          <string/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Reason" access="readOnly">
+        <description>
+          The reason why the process fault occurred.
+        </description>
+        <syntax>
+          <string/>
+        </syntax>
+      </parameter>
+
+      <command name="Upload()" async="true">
+        <description>
+          This command is issued to upload the Fault information specified by
+          this Fault instance.
+
+          All results of the actual upload will be contained within the
+          {{event|.LocalAgent.TransferComplete!}} event.
+        </description>
+        <input>
+
+          <parameter name="URL" mandatory="true">
+            <description>
+              The {{datatype}} specifying the destination file location. The
+              HTTPS transport MUST be supported, and the HTTP transport MAY be
+              supported.
+
+              This argument specifies only the destination file location, and
+              does not indicate in any way the name or location of the local
+              file to be uploaded.
+
+              If the Agent receives multiple upload requests with the same URL,
+              the Agent MUST perform each upload as requested, and MUST NOT
+              assume that the content of the file to be uploaded is the same
+              each time.
+
+              This URL MUST NOT include the "userinfo" component, as defined in
+              {{bibref|RFC3986}}.
+            </description>
+            <syntax>
+              <dataType ref="URL"/>
+            </syntax>
+          </parameter>
+
+          <parameter name="Username" mandatory="true">
+            <description>
+              Username to be used by the Agent to authenticate with the file
+              server. This string is set to {{empty}} if no authentication is
+              required.
+            </description>
+            <syntax>
+              <string>
+                <size maxLength="256"/>
+              </string>
+            </syntax>
+          </parameter>
+
+          <parameter name="Password" mandatory="true">
+            <description>
+              Password to be used by the Agent to authenticate with the file
+              server. This string is set to {{empty}} if no authentication is
+              required.
+            </description>
+            <syntax>
+              <string>
+                <size maxLength="256"/>
+              </string>
+            </syntax>
+          </parameter>
+        </input>
+      </command>
+
+      <command name="Remove()" async="true">
+        <description>
+          Remove this row from the table, together with the associated faulty
+          data stored on the device.
+        </description>
+      </command>
+    </object>
+
     <object name="Device.Time." access="readOnly" minEntries="1"
         maxEntries="1" version="2.0">
       <description>
@@ -5996,7 +7052,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -6337,7 +7393,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -6896,7 +7952,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -6907,22 +7963,14 @@
 
       <parameter name="Order" access="readWrite">
         <description>
-          Position of the {{object}} entry in the order of precedence. A value
-          of ''1'' indicates the first entry considered (highest precedence).
+          {{datatype|expand}}
+
           For each incoming connection, the highest ordered entry that matches
           the Host: HTTP header and path prefix is applied. All lower {{param}}
-          entries are ignored. When this value is set, if the value matches
-          that of an existing entry, the {{param}} value for the existing entry
-          and all lower {{param}} entries is 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.
+          entries are ignored.
         </description>
         <syntax>
-          <unsignedInt>
-            <range minInclusive="1"/>
-          </unsignedInt>
+          <dataType ref="Order"/>
         </syntax>
       </parameter>
 
@@ -7028,9 +8076,9 @@
           The IP or Logical Interface associated with the {{object}} entry.
           Example:
 
-          * ''Device.IP.Interface.1''.
+          * ''Device.IP.Interface.1''
 
-          * ''Device.Logical.Interface.1''.
+          * ''Device.Logical.Interface.1''
 
           {{template|INTERFACE-ROUTING}}
         </description>
@@ -7055,7 +8103,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Protocol" access="readOnly">
+      <parameter name="Protocol" access="readWrite">
         <description>
           Protocol being used.
         </description>
@@ -7217,6 +8265,9 @@
         minEntries="0" maxEntries="unbounded" version="2.16">
       <description>
         Web server session list.
+
+        Note: This parameter was demoted to readOnly in the Device:2.17
+        version.
       </description>
       <uniqueKey functional="false">
         <parameter ref="SessionID"/>
@@ -7233,10 +8284,13 @@
         </syntax>
       </parameter>
 
-      <parameter name="User" access="readWrite">
+      <parameter name="User" access="readOnly">
         <description>
           The user to whom the session belongs. When the user is unknown
           {{empty}} string SHOULD be used.
+
+          Note: This parameter was demoted to readOnly in the Device:2.17
+          version.
         </description>
         <syntax>
           <string>
@@ -7618,7 +8672,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -7805,7 +8859,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -8819,6 +9873,35 @@
         </syntax>
       </parameter>
 
+      <parameter name="XTURVersion" access="readOnly">
+        <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,
+          encoded in this order and separated by a space character, i.e.,
+          '(xTU-R firmware version) (xTU-R model)'.
+        </description>
+        <syntax>
+          <string>
+            <size maxLength="16"/>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="XTURSerial" access="readOnly">
+        <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
+          the equipment firmware version. All shall be encoded in this order
+          and separated by space characters, i.e., '(equipment serial number)
+          (equipment model) (equipment firmware version)'.
+        </description>
+        <syntax>
+          <string>
+            <size maxLength="32"/>
+          </string>
+        </syntax>
+      </parameter>
+
       <parameter name="XTURVendor" access="readOnly">
         <description>
           xTU-R vendor identifier as defined in G.994.1 and T1.413. In the case
@@ -8839,6 +9922,26 @@
         </syntax>
       </parameter>
 
+      <parameter name="XTURVendorSpecific" access="readOnly">
+        <description>
+          xTU-R vendor-specific information as defined in {{bibref|G.994.1}}.
+          This corresponds to the two-octet vendor-specific information, which
+          MUST be represented as four hexadecimal digits.
+
+          Note: This parameter is OPTIONAL at the G and S/T interfaces in
+          G.997.1 Amendment 1. If the parameter is implemented but no value is
+          available, it MUST have the value "0000".
+
+          Note: In {{bibref|G.997.1}}, this parameter is called "xTU-R G.994.1
+          Vendor ID". See ITU-T Recommendation {{bibref|G.997.1}}.
+        </description>
+        <syntax>
+          <hexBinary>
+            <size minLength="2" maxLength="2"/>
+          </hexBinary>
+        </syntax>
+      </parameter>
+
       <parameter name="XTURCountry" access="readOnly">
         <description>
           T.35 country code of the xTU-R vendor as defined in G.994.1, where
@@ -8859,6 +9962,50 @@
         </syntax>
       </parameter>
 
+      <parameter name="XTURSystemVendor" access="readOnly">
+        <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
+          be represented as eight hexadecimal digits as defined in
+          {{bibref|G.994.1}} as Vendor ID.
+        </description>
+        <syntax>
+          <hexBinary>
+            <size minLength="4" maxLength="4"/>
+          </hexBinary>
+        </syntax>
+      </parameter>
+
+      <parameter name="XTURSystemVendorSpecific" access="readOnly">
+        <description>
+          xTU-R system vendor-specific information as defined in
+          {{bibref|G.997.1|Section 7.4.4}}. This corresponds to the two-octet
+          vendor-specific information, which MUST be represented as four
+          hexadecimal digits as defined in {{bibref|G.994.1}} as Vendor ID.
+
+          Note: If the parameter is implemented but no value is available, it
+          MUST have the value "0000".
+        </description>
+        <syntax>
+          <hexBinary>
+            <size minLength="2" maxLength="2"/>
+          </hexBinary>
+        </syntax>
+      </parameter>
+
+      <parameter name="XTURSystemCountry" access="readOnly">
+        <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
+          in {{bibref|G.997.1}} MUST be represented as four hexadecimal digits.
+        </description>
+        <syntax>
+          <hexBinary>
+            <size minLength="2" maxLength="2"/>
+          </hexBinary>
+        </syntax>
+      </parameter>
+
       <parameter name="XTURANSIStd" access="readOnly">
         <description>
           xTU-R T1.413 Revision Number as defined in T1.413 Issue 2.
@@ -8883,6 +10030,33 @@
         </syntax>
       </parameter>
 
+      <parameter name="XTUCVersion" access="readOnly">
+        <description>
+          The xTU-C version number is the version number as inserted by the
+          xTU-C in the overhead messages ({{bibref|G.992.3}},
+          {{bibref|G.992.4}}, {{bibref|G.992.5}} and {{bibref|G.993.2}}). It is
+          for version control and is vendor specific information. It consists
+          of up to 16 binary octets.
+        </description>
+        <syntax>
+          <hexBinary>
+            <size minLength="16" maxLength="16"/>
+          </hexBinary>
+        </syntax>
+      </parameter>
+
+      <parameter name="XTUCSerial" access="readOnly">
+        <description>
+          xTU-C serial number as defined in {{bibref|G.997.1|Section 7.4.7}}.
+          This corresponds to the equipment serial number.
+        </description>
+        <syntax>
+          <string>
+            <size maxLength="32"/>
+          </string>
+        </syntax>
+      </parameter>
+
       <parameter name="XTUCVendor" access="readOnly">
         <description>
           xTU-C vendor identifier as defined in G.994.1 and T1.413. In the case
@@ -8900,6 +10074,20 @@
         </syntax>
       </parameter>
 
+      <parameter name="XTUCVendorSpecific" access="readOnly">
+        <description>
+          xTU-C vendor-specific information as defined in
+          {{bibref|G.997.1|Section 7.4.3}}. This corresponds to the two-octet
+          vendor-specific information, which MUST be represented as four
+          hexadecimal digits as defined in G.994.1 as Vendor ID.
+        </description>
+        <syntax>
+          <hexBinary>
+            <size minLength="2" maxLength="2"/>
+          </hexBinary>
+        </syntax>
+      </parameter>
+
       <parameter name="XTUCCountry" access="readOnly">
         <description>
           T.35 country code of the xTU-C vendor as defined in G.994.1, where
@@ -8917,6 +10105,50 @@
         </syntax>
       </parameter>
 
+      <parameter name="XTUCSystemVendor" access="readOnly">
+        <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
+          be represented as eight hexadecimal digits as defined in
+          {{bibref|G.994.1}} as Vendor ID..
+        </description>
+        <syntax>
+          <hexBinary>
+            <size minLength="4" maxLength="4"/>
+          </hexBinary>
+        </syntax>
+      </parameter>
+
+      <parameter name="XTUCSystemVendorSpecific" access="readOnly">
+        <description>
+          xTU-C system vendor-specific information as defined in
+          {{bibref|G.997.1|Section 7.4.4}}. This corresponds to the two-octet
+          vendor-specific information, which MUST be represented as four
+          hexadecimal digits as defined in {{bibref|G.994.1}} as Vendor ID..
+
+          Note: If the parameter is implemented but no value is available, it
+          MUST have the value "0000".
+        </description>
+        <syntax>
+          <hexBinary>
+            <size minLength="2" maxLength="2"/>
+          </hexBinary>
+        </syntax>
+      </parameter>
+
+      <parameter name="XTUCSystemCountry" access="readOnly">
+        <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
+          in G.997.1 MUST be represented as four hexadecimal digits.
+        </description>
+        <syntax>
+          <hexBinary>
+            <size minLength="2" maxLength="2"/>
+          </hexBinary>
+        </syntax>
+      </parameter>
+
       <parameter name="XTUCANSIStd" access="readOnly">
         <description>
           xTU-C T1.413 Revision Number as defined in T1.413 Issue 2.
@@ -9907,7 +11139,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -10947,7 +12179,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -11221,7 +12453,7 @@
         <parameter ref="Channel"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -13508,7 +14740,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -15307,7 +16539,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -15398,7 +16630,7 @@
       </parameter>
 
       <parameter name="LowerOpticalThreshold" access="readOnly"
-          status="deprecated">
+          status="obsoleted">
         <description>
           Optical level that is used to declare the downstream low received
           optical power alarm.
@@ -15414,6 +16646,8 @@
 
           {{deprecated|2.15|because it is not intended for the device to raise
           an optical power alarm.}}
+
+          {{obsoleted|2.17}}
         </description>
         <syntax>
           <dataType ref="Dbm1000">
@@ -15423,7 +16657,7 @@
       </parameter>
 
       <parameter name="UpperOpticalThreshold" access="readOnly"
-          status="deprecated">
+          status="obsoleted">
         <description>
           Optical level that is used to declare the downstream high received
           optical power alarm.
@@ -15439,6 +16673,8 @@
 
           {{deprecated|2.15|because it is not intended for the device to raise
           an optical power alarm.}}
+
+          {{obsoleted|2.17}}
         </description>
         <syntax>
           <dataType ref="Dbm1000">
@@ -15467,7 +16703,7 @@
       </parameter>
 
       <parameter name="LowerTransmitPowerThreshold" access="readOnly"
-          status="deprecated">
+          status="obsoleted">
         <description>
           Minimum mean optical launch power that is used to declare the low
           transmit optical power alarm.
@@ -15483,6 +16719,8 @@
 
           {{deprecated|2.15|because it is not intended for the device to raise
           an optical power alarm.}}
+
+          {{obsoleted|2.17}}
         </description>
         <syntax>
           <dataType ref="Dbm1000">
@@ -15492,7 +16730,7 @@
       </parameter>
 
       <parameter name="UpperTransmitPowerThreshold" access="readOnly"
-          status="deprecated">
+          status="obsoleted">
         <description>
           Maximum mean optical launch power that is used to declare the high
           transmit optical power alarm.
@@ -15508,6 +16746,8 @@
 
           {{deprecated|2.15|because it is not intended for the device to raise
           an optical power alarm.}}
+
+          {{obsoleted|2.17}}
         </description>
         <syntax>
           <dataType ref="Dbm1000">
@@ -15749,7 +16989,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -16364,7 +17604,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -16533,7 +17773,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -17268,7 +18508,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -17637,7 +18877,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -17955,7 +19195,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -18335,7 +19575,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -18708,7 +19948,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -19679,7 +20919,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -20015,8 +21255,7 @@
         {{bibref|TR-181i2|Section 4.2}}). This table models physical Ethernet
         ports, but in terms of the interface stack it only models the PHY and
         Connection Access Method of the Ethernet interface MAC. A
-        {{object|#.Interface}} is also required to model a full Ethernet
-        device.
+        {{object|#.Link}} is also required to model a full Ethernet device.
       </description>
       <uniqueKey functional="false">
         <parameter ref="Alias"/>
@@ -20076,7 +21315,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -20248,6 +21487,37 @@
           <boolean/>
         </syntax>
       </parameter>
+
+      <parameter name="EEEStatus" access="readOnly">
+        <description>
+          Indicates the active state of Energy Efficient Ethernet
+          {{bibref|802.3-2012_section6|Section 78}}.
+
+          The {{enum|Disabled}} value indicates that {{param|EEEEnable}} is
+          disabled.
+
+          The {{enum|Active}} value indicates that {{param|EEEEnable}} is
+          enabled and that EEE support has been negotiated with the link
+          partner. In this state EEE will be used.
+
+          The {{enum|Inactive}} value indicates that {{param|EEEEnable}} is
+          disabled, or that EEE support has not been negotiated with the link
+          partner, either because the link parter is not EEE capable, or its
+          support for EEE is disabled.
+
+          The {{enum|Unsupported}} value indicates that this physical interface
+          does not support EEE. In which case {{param|EEECapability}} will be
+          {{false}}.
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="Disabled"/>
+            <enumeration value="Active"/>
+            <enumeration value="Inactive"/>
+            <enumeration value="Unsupported"/>
+          </string>
+        </syntax>
+      </parameter>
     </object>
 
     <object name="Device.Ethernet.Interface.{i}.Stats." access="readOnly"
@@ -20511,7 +21781,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -20860,7 +22130,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -21230,7 +22500,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -21674,7 +22944,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -22017,7 +23287,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -22328,7 +23598,7 @@
         <parameter ref="Name"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -22465,7 +23735,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -22990,7 +24260,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -23571,7 +24841,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -24641,7 +25911,62 @@
         <parameter ref="Name"/>
       </uniqueKey>
 
-      <parameter name="Enable" access="readWrite">
+      <parameter name="AccessControlNumberOfEntries" access="readOnly">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="RlapmNumberOfEntries" access="readOnly">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="SapmNumberOfEntries" access="readOnly">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="MeshNumberOfEntries" access="readOnly">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="BridgeNumberOfEntries" access="readOnly">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="MeshScModNumberOfEntries" access="readOnly">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Enable" access="readWrite"
+          id="mocaIfEnable/1.3.6.1.4.1.31621.1.2.1.1.1.1">
         <description>
           Enables or disables the interface.
 
@@ -24649,10 +25974,12 @@
         </description>
         <syntax>
           <boolean/>
+          <default type="factory" value="true"/>
         </syntax>
       </parameter>
 
-      <parameter name="Status" access="readOnly">
+      <parameter name="Status" access="readOnly"
+          id="mocaIfStatus/1.3.6.1.4.1.31621.1.2.1.7.1.1">
         <description>
           The current operational state of the interface (see
           {{bibref|TR-181i2|Section 4.2.2}}). {{enum}}
@@ -24692,7 +26019,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -24701,7 +26028,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="Name" access="readOnly">
+      <parameter name="Name" access="readOnly"
+          id="mocaIfName/1.3.6.1.4.1.31621.1.2.1.7.1.8">
         <description>
           The textual name of the interface as assigned by the CPE.
         </description>
@@ -24712,7 +26040,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="LastChange" access="readOnly" activeNotify="canDeny">
+      <parameter name="LastChange" access="readOnly" activeNotify="canDeny"
+          id="mocaIfStatus/1.3.6.1.4.1.31621.1.2.1.7.1.1">
         <description>
           The accumulated time in {{units}} since the interface entered its
           current operational state.
@@ -24763,7 +26092,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="MACAddress" access="readOnly">
+      <parameter name="MACAddress" access="readOnly"
+          id="mocaIfMacAddress/1.3.6.1.4.1.31621.1.2.1.7.1.6">
         <description>
           The MAC Address of the interface.
 
@@ -24777,7 +26107,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="FirmwareVersion" access="readOnly">
+      <parameter name="FirmwareVersion" access="readOnly"
+          id="mocaIfSoftwareVersion/1.3.6.1.4.1.31621.1.2.1.7.1.3">
         <description>
           This interface's firmware version.
 
@@ -24794,6 +26125,9 @@
       <parameter name="MaxBitRate" access="readOnly">
         <description>
           The maximum MoCA PHY bit rate (expressed in {{units}}).
+
+          This parameter MUST NOT be implemented for MoCA 2.0 because it
+          doesn't map to a MIB object.
         </description>
         <syntax>
           <unsignedInt>
@@ -24802,33 +26136,31 @@
         </syntax>
       </parameter>
 
-      <parameter name="MaxIngressBW" access="readOnly">
+      <parameter name="MaxIngressBW" access="readOnly"
+          id="mocaIfMaxIngressNodeThroughput/1.3.6.1.4.1.31621.1.2.1.7.1.18">
         <description>
           The maximum bandwidth of this interface for flows onto the MoCA
-          network in {{units}}.
+          network.
 
           This parameter is based on ''mocaIfMaxIngressNodeBw'' from
           {{bibref|MOCA11-MIB}}.
         </description>
         <syntax>
-          <unsignedInt>
-            <units value="Mbps"/>
-          </unsignedInt>
+          <dataType ref="MocaMacRate"/>
         </syntax>
       </parameter>
 
-      <parameter name="MaxEgressBW" access="readOnly">
+      <parameter name="MaxEgressBW" access="readOnly"
+          id="mocaIfMaxEgressNodeThroughput/1.3.6.1.4.1.31621.1.2.1.7.1.19">
         <description>
           The maximum bandwidth of this interface for flows from the MoCA
-          network in {{units}}.
+          network.
 
           This parameter is based on ''mocaIfMaxEgressNodeBw'' from
           {{bibref|MOCA11-MIB}}.
         </description>
         <syntax>
-          <unsignedInt>
-            <units value="Mbps"/>
-          </unsignedInt>
+          <dataType ref="MocaMacRate"/>
         </syntax>
       </parameter>
 
@@ -24852,7 +26184,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="CurrentVersion" access="readOnly">
+      <parameter name="CurrentVersion" access="readOnly"
+          id="mocaIfNetworkVersion/1.3.6.1.4.1.31621.1.2.1.7.1.5">
         <description>
           Identifies the MoCA version that the MoCA network is currently
           running.
@@ -24873,7 +26206,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="NetworkCoordinator" access="readOnly">
+      <parameter name="NetworkCoordinator" access="readOnly"
+          id="mocaIfNC/1.3.6.1.4.1.31621.1.2.1.7.1.10">
         <description>
           The Node ID of the current Network Coordinator (NC) for the MoCA
           network.
@@ -24881,11 +26215,12 @@
           This parameter is based on ''mocaIfNC'' from {{bibref|MOCA11-MIB}}.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="MocaNodeID"/>
         </syntax>
       </parameter>
 
-      <parameter name="NodeID" access="readOnly">
+      <parameter name="NodeID" access="readOnly"
+          id="mocaIfNodeID/1.3.6.1.4.1.31621.1.2.1.7.1.7">
         <description>
           The Node ID of this interface.
 
@@ -24893,7 +26228,7 @@
           {{bibref|MOCA11-MIB}}.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="MocaNodeID"/>
         </syntax>
       </parameter>
 
@@ -24903,13 +26238,36 @@
           {{param}} is {{true}} then the interface supports 16 nodes (the
           maximum for a MoCA 1.1 network). If {{param}} is false then the
           interface supports 8 nodes (the maximum for a MoCA 1.0 network).
+
+          This parameter MUST NOT be implemented for MoCA 2.0 because it
+          doesn't map to a MIB object.
         </description>
         <syntax>
           <boolean/>
         </syntax>
       </parameter>
 
-      <parameter name="PreferredNC" access="readWrite">
+      <parameter name="NumNodes" access="readOnly"
+          id="mocaIfNumNodes/1.3.6.1.4.1.31621.1.2.1.7.1.9">
+        <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
+          MoCA Node communicates to in the MoCA network.
+
+          This value may be smaller than the number of MoCA Nodes reported by
+          the NC Node.
+
+          See {{bibref|MoCAv1.1|Section 3.6.3.2}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range minInclusive="0" maxInclusive="16"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="PreferredNC" access="readWrite"
+          id="mocaIfPreferredNC/1.3.6.1.4.1.31621.1.2.1.1.1.9">
         <description>
           Whether this interface is a preferred Network Coordinator (NC).
 
@@ -24918,10 +26276,12 @@
         </description>
         <syntax>
           <boolean/>
+          <default type="factory" value="false"/>
         </syntax>
       </parameter>
 
-      <parameter name="BackupNC" access="readOnly">
+      <parameter name="BackupNC" access="readOnly"
+          id="mocaIfBackupNC/1.3.6.1.4.1.31621.1.2.1.7.1.11">
         <description>
           The Node ID of the backup Network Coordinator node.
 
@@ -24929,93 +26289,215 @@
           {{bibref|MOCA11-MIB}}.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="MocaNodeID"/>
         </syntax>
       </parameter>
 
-      <parameter name="PrivacyEnabledSetting" access="readWrite">
+      <parameter name="PrivacyEnabledSetting" access="readWrite"
+          id="mocaIfPrivacyEnable/1.3.6.1.4.1.31621.1.2.1.1.1.7">
         <description>
           The configured privacy mode. This indicates whether link-layer
           security is enabled ({{true}}) or disabled ({{false}}) for network
           admission.
-
-          The configured privacy setting MAY NOT match the current operational
-          state ({{param|PrivacyEnabled}}), since this setting is only applied
-          during network formation or admission.
         </description>
         <syntax>
           <boolean/>
+          <default type="factory" value="false"/>
         </syntax>
       </parameter>
 
-      <parameter name="PrivacyEnabled" access="readOnly">
+      <parameter name="PrivacyEnabled" access="readOnly" status="deprecated"
+          id="mocaIfPrivacyEnable/1.3.6.1.4.1.31621.1.2.1.1.1.7">
         <description>
           Indicates whether link-layer security is enabled or disabled.
 
           This parameter is based on ''mocaIfPrivacyEnable'' from
           {{bibref|MOCA11-MIB}}.
+
+          {{deprecated|2.17|because it and {{param|PrivacyEnabledSetting}} are
+          associated with the same underlying MIB object and it is therefore
+          unnecessary. If implemented, it MUST return the same value as
+          {{param|PrivacyEnabledSetting}}}}
         </description>
         <syntax>
           <boolean/>
         </syntax>
       </parameter>
 
-      <parameter name="FreqCapabilityMask" access="readOnly">
+      <parameter name="AccessControlEnable" access="readWrite"
+          id="mocaIfAccessEnable/1.3.6.1.4.1.31621.1.2.1.1.1.10">
         <description>
-          Hexadecimal encoded 64-bit mask of supported frequencies. This is the
-          bit map of the spectrum that the interface supports, and each bit
-          represents 25 MHz of spectrum. The least significant bit of the
-          rightmost character corresponds to 800MHz, which is the lowest
-          frequency.
+          Enable MAC address access control on the MoCA interface if this value
+          is {{true}}. Disable MAC address access control on the MoCA interface
+          if this value is {{false}}.
 
-          For example, an interface that supports 1150 MHz through 1500 MHz
-          would have a value of 0x000000001FFFC000.
-
-          This parameter is based on ''mocaIfCapabilityMask'' from
-          {{bibref|MOCA11-MIB}}.
+          Access control applies to subsequent MoCA Node admission.
         </description>
         <syntax>
-          <hexBinary>
-            <size minLength="8" maxLength="8"/>
-          </hexBinary>
+          <boolean/>
+          <default type="factory" value="false"/>
         </syntax>
       </parameter>
 
-      <parameter name="FreqCurrentMaskSetting" access="readWrite">
+      <parameter name="PhyThreshold" access="readWrite"
+          id="mocaIfPhyThreshold/1.3.6.1.4.1.31621.1.2.1.1.1.11"
+          dmr:previousParameter="PacketAggregationCapability">
         <description>
-          The configured hexadecimal encoded 64-bit mask of enabled frequencies
-          for network admission.
+          The minimum PHY rate.
 
-          The configured frequencies MAY NOT match the current operational
+          If transmit PHY rate between all pairs of MoCA Nodes are greater than
+          or equal to this value, and subsequently the transmit PHY rate of one
+          pair of MoCA Nodes is less than this value, send
+          {{event|BelowPhyThresholdTrap!}} if {{param|PhyThresholdTrapEnable}}
+          is {{true}}.
+
+          If transmit PHY rate between one or more pairs of MoCA Nodes are less
+          than this value, and subsequently the transmit PHY rate between all
+          pairs of MoCA Nodes are greater than or equal to this value, send
+          {{event|AbovePhyThresholdTrap!}} if {{param|PhyThresholdTrapEnable}}
+          is {{true}}.
+
+          See {{bibref|MoCAv2.0|Section 3, Unusable Link definition}}.
+        </description>
+        <syntax>
+          <dataType ref="MocaPhyRate"/>
+          <default type="factory" value="123"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="PhyThresholdTrapEnable" access="readWrite"
+          id="mocaIfPhyThresholdEnable/1.3.6.1.4.1.31621.1.2.1.1.1.12">
+        <description>
+          If transmit PHY rate between all pairs of MoCA Nodes are greater than
+          or equal to {{param|PhyThreshold}}, and subsequently the transmit PHY
+          rate of one pair of MoCA Node is less than {{param|PhyThreshold}},
+          send {{event|BelowPhyThresholdTrap!}} if this value is {{true}}, do
+          not send {{event|BelowPhyThresholdTrap!}} if this value is {{false}}.
+
+          If transmit PHY rate between one or more pairs of MoCA Nodes are less
+          than {{param|PhyThreshold}}, and subsequently the transmit PHY rate
+          between all pairs of MoCA Nodes are greater than or equal to
+          {{param|PhyThreshold}}, send {{event|AbovePhyThresholdTrap!}} if this
+          value is {{true}}, do not send {{event|AbovePhyThresholdTrap!}} if
+          this value is {{false}}.
+
+          Only one MoCA Node in the MoCA network should set {{param}} to
+          {{true}}.
+
+          Only one MoCA Node in the MoCA network should set {{param}} to
+          {{true}}.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="factory" value="false"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="StatusChangeEnable" access="readWrite"
+          id="mocaIfStatusChangeEnable/1.3.6.1.4.1.31621.1.2.1.1.1.13">
+        <description>
+          If {{param}} is {{true}} and {{param|Status}} changes, then the trap
+          {{event|StatusChangeTrap!}} is sent.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="factory" value="false"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="NumNodesChangeEnable" access="readWrite"
+          id="mocaIfNumNodesChangeEnable/1.3.6.1.4.1.31621.1.2.1.1.1.14">
+        <description>
+          If {{param}} is {{true}} and {{param|NumNodes}} changes, then the
+          trap {{event|NumNodesChangeTrap!}} is sent.
+
+          Only one MoCA Node in the MoCA network should set {{param}} to
+          {{true}}.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="factory" value="false"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="TpcTargetRateNper" access="readWrite"
+          id="mocaIfTpcTargetRateNper/1.3.6.1.4.1.31621.1.2.1.1.1.15">
+        <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
+          transmitting and receiving MoCA Nodes when TPC is enabled and PERMODE
+          = NPER.
+        </description>
+        <syntax>
+          <dataType ref="MocaPhyRate"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Band" access="readWrite"
+          id="mocaIfBand/1.3.6.1.4.1.31621.1.2.1.1.1.16">
+        <description>
+          Configure the band or sub-band for the MoCA Node to operate in (BND
+          Managed Parameter). See {{bibref|MoCAv2.0|section 15}}.
+        </description>
+        <syntax>
+          <dataType ref="MocaBand"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="LastOperFreqUpdateEnable" access="readWrite"
+          id="mocaIfLofUpdateEnable/1.3.6.1.4.1.31621.1.2.1.1.1.17">
+        <description>
+          Controls whether the LOF is updated when joining a network
+          (LOF_UPDATE_EN Managed Parameter). See {{bibref|MoCAv2.0|section
+          8.1.1, and Table 17-1}}.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="FreqCapabilityMask" access="readOnly"
+          id="mocaIfChannelSupport/1.3.6.1.4.1.31621.1.2.1.7.1.22">
+        <description>
+          The frequencies that the interface supports. {{datatype|expand}}
+        </description>
+        <syntax>
+          <dataType ref="MocaChannelMask"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="FreqCurrentMaskSetting" access="readWrite"
+          id="mocaIfChannelMask/1.3.6.1.4.1.31621.1.2.1.1.1.2">
+        <description>
+          The enabled frequencies that the interface supports for network
+          admission.
+
+          {{datatype|expand}}
+
+          The configured frequencies might not match the current operational
           state ({{param|FreqCurrentMask}}), since this setting is only applied
           during network formation or admission.
         </description>
         <syntax>
-          <hexBinary>
-            <size minLength="8" maxLength="8"/>
-          </hexBinary>
+          <dataType ref="MocaChannelMask"/>
         </syntax>
       </parameter>
 
-      <parameter name="FreqCurrentMask" access="readOnly">
+      <parameter name="FreqCurrentMask" access="readOnly"
+          id="mocaIfChannelSupport/1.3.6.1.4.1.31621.1.2.1.7.1.22">
         <description>
-          Hexadecimal encoded 64-bit mask of used frequencies. This is the bit
-          map of the spectrum that can be used and is a subset of the
-          {{param|FreqCapabilityMask}}. Each bit represents 25 MHz of spectrum.
-          The least significant bit of the rightmost character corresponds to
-          800MHz, which is the lowest frequency.
+          The frequencies that can be used. This is a subset of the
+          {{param|FreqCapabilityMask}} frequencies.
 
-          This parameter is based on ''mocaIfChannelMask'' from
-          {{bibref|MOCA11-MIB}}.
+          {{datatype|expand}}
         </description>
         <syntax>
-          <hexBinary>
-            <size minLength="8" maxLength="8"/>
-          </hexBinary>
+          <dataType ref="MocaChannelMask"/>
         </syntax>
       </parameter>
 
-      <parameter name="CurrentOperFreq" access="readOnly">
+      <parameter name="CurrentOperFreq" access="readOnly"
+          id="mocaIfRFChannel/1.3.6.1.4.1.31621.1.2.1.7.1.12">
         <description>
           Current Operational Frequency. The RF frequency in Hz to which the
           MoCA interface is currently tuned. This parameter is only valid when
@@ -25029,19 +26511,39 @@
         </syntax>
       </parameter>
 
-      <parameter name="LastOperFreq" access="readOnly">
+      <parameter name="LastOperFreq" access="readWrite"
+          id="mocaIfLof/1.3.6.1.4.1.31621.1.2.1.1.1.18">
         <description>
           Last Operational Frequency. The RF frequency in Hz to which the MoCA
           interface was tuned when last in the {{enum|Up|Status}} state.
 
           This parameter is based on ''mocaIfLOF'' from {{bibref|MOCA11-MIB}}.
+
+          (LOF Managed Parameter)
+
+          This parameter is writable only for MoCA 2.0.
         </description>
         <syntax>
           <unsignedInt/>
         </syntax>
       </parameter>
 
-      <parameter name="KeyPassphrase" access="readWrite">
+      <parameter name="TpcEnable" access="readWrite"
+          id="mocaIfTpcEnable/1.3.6.1.4.1.31621.1.2.1.1.1.3">
+        <description>
+          Enable automatic power control if this value is {{true}}. Use a fixed
+          transmit power level if this value is {{false}}.
+
+          (TPC_EN Managed Parameter)
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="factory" value="true"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="KeyPassphrase" access="readWrite"
+          id="mocaIfPassword/1.3.6.1.4.1.31621.1.2.1.1.1.8">
         <description>
           MoCA Password. The value consists of numeric characters (0-9).
           {{pattern}}
@@ -25057,25 +26559,802 @@
         </syntax>
       </parameter>
 
-      <parameter name="TxPowerLimit" access="readWrite">
+      <parameter name="PerMode" access="readWrite"
+          id="mocaIfPerMode/1.3.6.1.4.1.31621.1.2.1.1.1.20">
         <description>
-          Transmit Power attenuation in dB relative to the maximum transmit
-          power.
+          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
+          indicates VLPER. By default PER mode is set to 1 in band E, while it
+          is set to 0 for all other bands (PER_MODE Managed Parameter).
 
-          The MoCA interface SHOULD have {{param|Enable}} set to {{false}} for
-          any change in this configuration. If the parameter is modified when
-          {{param|Enable}} is {{true}} then this change might take several
-          minutes to complete.
-
-          This parameter is based on ''mocaIfTxPowerLimit'' from
-          {{bibref|MOCA11-MIB}}.
+          See {{bibref|MoCAv2.0|section 8.2 and Table 17-2}}.
         </description>
         <syntax>
           <unsignedInt/>
         </syntax>
       </parameter>
 
-      <parameter name="PowerCntlPhyTarget" access="readWrite">
+      <parameter name="TurboModeEnable" access="readWrite"
+          id="mocaIfTurboModeEnable/1.3.6.1.4.1.31621.1.2.1.1.1.21">
+        <description>
+          Controls whether the MoCA Node operates in point-to-point Turbo Mode
+          or not.
+
+          When set to {{true}} the turbo mode is enabled; when set to {{false}}
+          the turbo mode is disabled (TURBO_MODE_EN Managed Parameter).
+
+          See {{bibref|MoCAv2.0|section 10 and Table 17-1}}.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="factory" value="false"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="PolicingEnable" access="readWrite"
+          id="mocaIfPolicingEnable/1.3.6.1.4.1.31621.1.2.1.1.1.22">
+        <description>
+          Controls whether policing of PQoS Flows is enabled or disabled. When
+          {{false}} the policy is disabled, and when {{true}} the policy is
+          enabled (POLICING_EN Managed Parameter).
+
+          See {{bibref|MoCAv2.0|section 8.8 and Table 17-1}}.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="factory" value="false"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="TlpMin" access="readWrite"
+          id="mocaIfTlpMin/1.3.6.1.4.1.31621.1.2.1.1.1.23">
+        <description>
+          The minimum time (in milliseconds) a MoCA Node is required to stay in
+          the Listening Phase of the Network Search (TLP_MIN Managed
+          Parameter).
+
+          See {{bibref|MoCAv2.0|Table 17-2}}.
+        </description>
+        <syntax>
+          <unsignedInt/>
+          <default type="factory" value="0"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="TlpMax" access="readWrite"
+          id="mocaIfTlpMax/1.3.6.1.4.1.31621.1.2.1.1.1.24">
+        <description>
+          The maximum time (in milliseconds) a MoCA Node is required to stay in
+          the Listening Phase of the Network Search (TLP_MAX Managed
+          Parameter).
+
+          Default value of {{param}} depends on the band configuration as
+          follows:
+
+          * 20 seconds for band E
+
+          * 35 seconds for band F
+
+          * 95 seconds for Band ExD
+
+          * 10 seconds for Band D-Low
+
+          * 55 seconds for Band D-High
+
+          See {{bibref|MoCAv2.0|section 8.1}}.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="RlapmEnable" access="readWrite"
+          id="mocaIfRlapmEnable/1.3.6.1.4.1.31621.1.2.1.1.1.25">
+        <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
+          MoCA Node needs to ignore it.
+
+          RLAPM function is enabled when set to {{true}}. RLAPM function is
+          disabled when set to {{false}}.
+
+          The RLAPM function allows a Node to add a specific global PHY margin
+          (RLAPM) to all the subcarriers' bitloadings at each estimated
+          aggregate receive power level. This RLAPM value is obtained from the
+          RLAPM table {{object|Device.MoCA.Interface.{i}.Rlapm.{i}.}}.
+
+          See {{bibref|MoCAv2.0|section 7.15 and Table 17-1}}.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="RlapmProfileSelect" access="readWrite"
+          id="mocaIfRlapmProfileSelect/1.3.6.1.4.1.31621.1.2.1.1.1.26">
+        <description>
+          Controls which RLAPM (Receive Level Added PHY Margin) profile is
+          Active.
+
+          See {{bibref|MoCAv2.0|section 7.15.2 and Table 17-1}}.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="SapmEnable" access="readWrite"
+          id="mocaIfSapmEnable/1.3.6.1.4.1.31621.1.2.1.1.1.27">
+        <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
+          Node needs to ignore it.
+
+          SAPM function is enabled when set to {{true}}. SAPM function is
+          disabled when set to {{false}}.
+
+          The SAPM function allows a Node to add a prespecified PHY margin to
+          each subcarrier’s bitloading (SAPM value) whenever the aggregate
+          received power levels (ARPLs) are below a pre-specified threshold.
+          This SAPM value is obtained from the SAPM table
+          {{object|Device.MoCA.Interface.{i}.Sapm.{i}.}}.
+
+          See {{bibref|MoCAv2.0|section 7.15 and Table 17-1}}.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="SapmProfileSelect" access="readWrite"
+          id="mocaIfSapmProfileSelect/1.3.6.1.4.1.31621.1.2.1.1.1.28">
+        <description>
+          Controls which SAPM (Subcarrier Added PHY Margin) profile is Active.
+
+          See {{bibref|MoCAv2.0|section 7.15.1 and Table 17-1}}.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="PowerStateRequest" access="readWrite"
+          id="mocaIfPowerStateRequest/1.3.6.1.4.1.31621.1.2.1.1.1.29">
+        <description>
+          Carries a request to the MoCA Node to transition into a specified
+          Power State (POWER_STATE_REQ Managed Parameter).
+
+          See {{bibref|MoCAv2.0|section 12}}.
+        </description>
+        <syntax>
+          <dataType ref="MocaPowerState"/>
+          <default type="factory" value="m0Active"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="SeqNumMr" access="readWrite"
+          id="mocaIfSeqNumMr/1.3.6.1.4.1.31621.1.2.1.1.1.30">
+        <description>
+          Sequence Number used by the MR Transaction (SEQ_NUM_MR Managed
+          Parameter).
+
+          See {{bibref|MoCAv2.0|section 7.15 and Table 17-1}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range minInclusive="0" maxInclusive="65535"/>
+          </unsignedInt>
+          <default type="factory" value="0"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="PowerStateTrapEnable" access="readWrite"
+          id="mocaIfPowerStateTrapEnable/1.3.6.1.4.1.31621.1.2.1.1.1.31">
+        <description>
+          Used for power state message trap.
+
+          * When set to {{true}} it allows the MoCA Node to report a trap on
+            each Power State transition.
+
+          * When set to {{false}} no trap report is generated when the MoCA
+            Node Power State changes.
+
+          See {{bibref|MoCAv2.0|section 12}}.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="factory" value="false"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="LmoTrapEnable" access="readWrite"
+          id="mocaIfLmoTrapEnable/1.3.6.1.4.1.31621.1.2.1.1.1.32">
+        <description>
+          Used for LMO (Link Maintenance Operation) message trap.
+
+          * When set to {{true}} it allows the MoCA Node to report a trap on
+            transitioning to LMO.
+
+          * When set to {{false}} no trap report the MoCA Node is not
+            transitioning to LMO.
+
+          See {{bibref|MoCAv2.0|section 12}}.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="factory" value="false"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="PrimaryOffset" access="readWrite"
+          id="mocaIfPrimaryOffset/1.3.6.1.4.1.31621.1.2.1.1.1.33">
+        <description>
+          The offset in {{units}} of the primary channel relative to the beacon
+          channel (PRIMARY_OFFSET Managed Parameter).
+        </description>
+        <syntax>
+          <int>
+            <range minInclusive="-25" maxInclusive="25" step="25"/>
+            <units value="MHz"/>
+          </int>
+        </syntax>
+      </parameter>
+
+      <parameter name="SecondaryOffset" access="readWrite"
+          id="mocaIfSecondaryOffset/1.3.6.1.4.1.31621.1.2.1.1.1.34">
+        <description>
+          The offset in {{units}} of the secondary channel relative to the
+          beacon channel (SECONDARY_OFFSET Managed Parameter).
+
+          A value of 0 indicates that there is no secondary channel.
+        </description>
+        <syntax>
+          <int>
+            <range minInclusive="-125" maxInclusive="125" step="125"/>
+            <units value="MHz"/>
+          </int>
+        </syntax>
+      </parameter>
+
+      <parameter name="BeaconPowerDistributed" access="readWrite"
+          id="moca25IfBeaconPowerDistributed/1.3.6.1.4.1.31621.1.3.1.1.1.1">
+        <description>
+          The networkwide (see {{param|BeaconPowerMePie}}) value of Beacon
+          transmit power in {{units}} sent by the NC (Network Coordinator) in
+          Beacon Power PIEs (Power Information Elements).
+
+          A value of 255 indicates that no networkwide PIE is sent.
+
+          See {{bibref|MoCAv2.5|section 7.1.5 and Table 17-1}}.
+        </description>
+        <syntax>
+          <int>
+            <range minInclusive="-10" maxInclusive="7"/>
+            <range minInclusive="255" maxInclusive="255"/>
+            <units value="dBm"/>
+          </int>
+        </syntax>
+      </parameter>
+
+      <parameter name="BeaconPowerLocal" access="readWrite"
+          id="moca25IfBeaconPowerLocal/1.3.6.1.4.1.31621.1.3.1.1.1.2">
+        <description>
+          The value of Beacon transmit power in {{units}} used by the Node when
+          it transmits beacons.
+        </description>
+        <syntax>
+          <int>
+            <range minInclusive="-10" maxInclusive="7"/>
+            <units value="dBm"/>
+          </int>
+        </syntax>
+      </parameter>
+
+      <parameter name="BeaconPowerMePie" access="readWrite"
+          id="moca25IfBeaconPowerMePie/1.3.6.1.4.1.31621.1.3.1.1.1.3">
+        <description>
+          The Beacon Power PIE (Power Information Element) that the ME
+          (Management Entity) wants the NC (Network Coordinator) to send to
+          configure the Beacon Transmit Power of the different nodes. See
+          {{bibref|MoCAv2.5|section 7.1.5}}.
+
+          This parameter specifies if the Beacon transmit power is intended to
+          set the Beacon Power Local (individual type) or the Beacon Power
+          Distributed (networkwide type) of the selected nodes.
+
+          It is encoded as specified in {{bibref|MOCA25-MIB|section 4.11}}.
+        </description>
+        <syntax>
+          <hexBinary>
+            <size minLength="4" maxLength="4"/>
+          </hexBinary>
+        </syntax>
+      </parameter>
+
+      <parameter name="BeaconPowerMePieSend" access="readWrite"
+          id="moca25IfBeaconPowerMePieSend/1.3.6.1.4.1.31621.1.3.1.1.1.4">
+        <description>
+          When this parameter is written, instructs the Node (in case of
+          Network Coordinator) to send a set of Beacon Power PIEs (Power
+          Information Element) with the Beacon Power PIE fields set as
+          specified in {{param|BeaconPowerMePie}}.
+
+          See {{bibref|MoCAv2.5|section 7.1.5}}.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="BeaconPowerNetConfig" access="readWrite"
+          id="moca25IfBeaconPowerNetConfig/1.3.6.1.4.1.31621.1.3.1.1.1.5">
+        <description>
+          Controls whether the Node is allowed to configure its Beacon power
+          (both Beacon Power Distributed and Beacon Power Local) according to
+          the Beacon Power PIE (Power Information Element) sent by the NC
+          (Network Coordinator).
+
+          * When set to true the Node is allowed to configure its Beacon power.
+
+          * When set to false the Node is not allowed to configure its Beacon
+            power.
+
+          See {{bibref|MoCAv2.5|section 7.1.5 and Table 17-1}}.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="EnhancedPassword" access="readWrite"
+          id="moca25IfEnhancedPassword/1.3.6.1.4.1.31621.1.3.1.1.1.6">
+        <description>
+          The MoCA Enhanced Password using an ASCII printable character.
+
+          This value must be 12 to 64 ASCII printable characters with decimal
+          codes in the range 33 to 126 inclusive. Access is only allowed when
+          used with SNMPv3 protocol, but not allowed when used with SNMPv1 or
+          SNMPv2c protocol.
+
+          If this value changes, this node will drop from the network if
+          {{param|PrivacyEnabledSetting}} is {{true}}. If this managed object
+          is changed, it may not be possible to change this object again via
+          the SNMP protocol. The mechanism to change this object again is out
+          of the scope of this MIB definition draft.
+
+          See {{bibref|MoCAv2.5|section 11.3.1}}.
+        </description>
+        <syntax hidden="true">
+          <string>
+            <size minLength="12" maxLength="64"/>
+            <size minLength="0" maxLength="0"/>
+          </string>
+          <default type="factory" value=""/>
+        </syntax>
+      </parameter>
+
+      <parameter name="FirstOffset" access="readWrite"
+          id="moca25IfFirstOffset/1.3.6.1.4.1.31621.1.3.1.1.1.7">
+        <description>
+          The offset of the First Channel's center frequency below the center
+          frequency of the Primary Channel. Valid values are -4 to 0.
+
+          See {{bibref|MoCAv2.5|Table 17-1}}.
+        </description>
+        <syntax>
+          <int>
+            <range minInclusive="-4" maxInclusive="0"/>
+          </int>
+        </syntax>
+      </parameter>
+
+      <parameter name="HandoffToLowerVersionEnable" access="readWrite"
+          id="moca25IfHandoffToLowerVersionEnable/1.3.6.1.4.1.31621.1.3.1.1.1.8">
+        <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
+          {{false}}.
+
+          See {{bibref|MoCAv2.5|section 8.11.1 and Table 17-1}}.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="factory" value="false"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="MgntEntityNetIePayloadRespTimeout" access="readWrite"
+          id="moca25IfMgntEntityNetIePayloadRespTimeout/1.3.6.1.4.1.31621.1.3.1.1.1.9">
+        <description>
+          The number of Discovery Request transmission opportunities a NN has
+          to wait for a response to a Management Entity Response Network IE
+          before continuing its network search.
+
+          See {{bibref|MoCAv2.5|section 8.3.3.2 and Table 17-1}}.
+        </description>
+        <syntax>
+          <unsignedInt/>
+          <default type="factory" value="1000"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="MgntEntityNetIePayloadTx" access="readWrite"
+          id="moca25IfMgntEntityNetIePayloadTx/1.3.6.1.4.1.31621.1.3.1.1.1.10">
+        <description>
+          The payload of the Management Entity Request Network IE (when the
+          Node is trying to join the network), or of the Management Entity
+          Response Network IE (when the Node is the NC).
+
+          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) }
+        </description>
+        <syntax>
+          <hexBinary>
+            <size minLength="2" maxLength="62"/>
+          </hexBinary>
+        </syntax>
+      </parameter>
+
+      <parameter name="MpsPrivacyDown" access="readWrite"
+          id="moca25IfMpsPrivacyDown/1.3.6.1.4.1.31621.1.3.1.1.1.11">
+        <description>
+          Controls whether the Node, during its MPS (MoCA Protected Setup)
+          session, is allowed to accept privacy setting of Privacy Disabled
+          from another Node when its own setting is Privacy Enabled. This
+          parameter is valid only when {{param|MpsPrivacyReceive}} is set to
+          {{true}}.
+
+          See {{bibref|MoCAv2.5|section 8.3.1 and Table 17-1}}.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="factory" value="false"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="MpsPrivacyReceive" access="readWrite"
+          id="moca25IfMpsPrivacyReceive/1.3.6.1.4.1.31621.1.3.1.1.1.12">
+        <description>
+          Controls whether the Node, during its MPS (MoCA Protected Setup)
+          session, is allowed to accept privacy settings (Privacy Enabled /
+          Disabled and Network Password and/or Enhanced Network Password) from
+          another Node.
+
+          See {{bibref|MoCAv2.5|section 8.3.1 and Table 17-1}}.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="factory" value="true"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="MpsReset" access="readWrite"
+          id="moca25IfMpsReset/1.3.6.1.4.1.31621.1.3.1.1.1.13">
+        <description>
+          Resets the MPS (MoCA Protected Setup) state of the Node
+          {{param|MpsState}} to un-Paired and reinitializes MPS local variables
+          and relevant parameters when this parameter is written.
+
+          See {{bibref|MoCAv2.5|Section 8.3.1 and Table 17-1}}.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="MpsTriggered" access="readWrite"
+          id="moca25IfMpsTriggered/1.3.6.1.4.1.31621.1.3.1.1.1.14">
+        <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
+          written.
+
+          See {{bibref|MoCAv2.5|Section 8.3.1 and Table 17-1}}.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="MpsUnpairedTime" access="readWrite"
+          id="moca25IfMpsUnpairedTime/1.3.6.1.4.1.31621.1.3.1.1.1.15">
+        <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
+          joins a network without using MPS (MoCA Protected Setup).
+
+          See {{bibref|MoCAv2.5|Section 8.3.1 and Table 17-1}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+          <default type="factory" value="300"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="MpsWalkTime" access="readWrite"
+          id="moca25IfMpsWalkTime/1.3.6.1.4.1.31621.1.3.1.1.1.16">
+        <description>
+          The allowed time interval in {{units}} to trigger MPS (MoCA Protected
+          Setup) on two Nodes.
+
+          See {{bibref|MoCAv2.5|Section 8.3.1 and Table 17-1}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range minInclusive="12" maxInclusive="1200"/>
+            <units value="seconds"/>
+          </unsignedInt>
+          <default type="factory" value="120"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="NetworkJoin" access="readWrite"
+          id="moca25IfNetworkJoin/1.3.6.1.4.1.31621.1.3.1.1.1.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
+          is {{true}} and No if this value is {{false}}.
+
+          See {{bibref|MoCAv2.5|Section 8.3.3 and Table 17-1}}.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="NetworkNameAdmissionRule" access="readWrite"
+          id="moca25IfNetworkNameAdmissionRule/1.3.6.1.4.1.31621.1.3.1.1.1.18">
+        <description>
+          Controls which Admission rule to follow.
+
+          See {{bibref|MoCAv2.5|Section 8.3.3 and Table 17-1}}.
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="none">
+              <description>Join no network.</description>
+            </enumeration>
+            <enumeration value="all">
+              <description>Join any network.</description>
+            </enumeration>
+            <enumeration value="name">
+              <description>
+                Join only the network with a network name that matches
+                {{param|NetworkNameNcNn}}.
+              </description>
+            </enumeration>
+            <enumeration value="osp">
+              <description>
+                Wait for management entity instructions after exchanging OSP
+                messages.
+              </description>
+            </enumeration>
+          </string>
+          <default type="factory" value="none"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="NetworkNameNcNn" access="readWrite"
+          id="moca25IfNetworkNameNcNn/1.3.6.1.4.1.31621.1.3.1.1.1.19">
+        <description>
+          The Network Name the Node is to use for any MoCA network it creates.
+
+          When {{param|NetworkNameAdmissionRule}} is set to
+          {{enum|name|NetworkNameAdmissionRule}}, this object also indicates to
+          the Node the name of the network to join.
+
+          See {{bibref|MoCAv2.5|Section 8.3.3 and Table 17-1}}.
+        </description>
+        <syntax>
+          <string/>
+        </syntax>
+      </parameter>
+
+      <parameter name="NumChannels" access="readWrite"
+          id="moca25IfNumChannels/1.3.6.1.4.1.31621.1.3.1.1.1.20">
+        <description>
+          The maximum number of 100MHz channels the Node uses when the Node
+          forms the network.
+
+          See {{bibref|MoCAv2.5|Table 17-1}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range minInclusive="1" maxInclusive="5"/>
+          </unsignedInt>
+          <default type="factory" value="5"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Per25Mode" access="readWrite"
+          id="moca25IfPer25Mode/1.3.6.1.4.1.31621.1.3.1.1.1.21">
+        <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
+          NPER and 1 indicates VLPER.
+
+          See {{bibref|MoCAv2.5|Table 17-1}}.
+        </description>
+        <syntax>
+          <unsignedInt/>
+          <default type="factory" value="0"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="PrivacySupported" access="readWrite"
+          id="moca25IfPrivacySupported/1.3.6.1.4.1.31621.1.3.1.1.1.22">
+        <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}}.
+        </description>
+        <syntax>
+          <list/>
+          <dataType ref="MocaPrivacy"/>
+          <default type="factory"
+              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">
+        <description>
+          The EtherType value of MSDUs that are allowed to transmit/receive
+          to/from a Non-Secured Admitted Node.
+
+          See {{bibref|MoCAv2.5|Section 11.7 and Table 17-1}}.
+        </description>
+        <syntax>
+          <hexBinary>
+            <size minLength="2" maxLength="2"/>
+          </hexBinary>
+          <default type="factory" value="888E"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="TrafficPermissionLink" access="readWrite"
+          id="moca25IfTrafficPermissionLink/1.3.6.1.4.1.31621.1.3.1.1.1.24">
+        <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
+          with the given Node ID in an Authorized Link PIE that the ME of the
+          Authorization Server wants to distribute if the Node is the
+          Authorization Server; otherwise, the value of SOURCE_NODE_BITMASK in
+          the last received Authorized Link PIE.
+
+          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];
+           };
+        </description>
+        <syntax>
+          <hexBinary/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ConnectedNodesChangeTrapEn" access="readWrite"
+          id="moca25IfConnectedNodesChangeTrapEn/1.3.6.1.4.1.31621.1.3.1.1.1.25">
+        <description>
+          Used to enable {{event|ConnectedNodesChangeTrap!}}.
+
+          * When set to {{true}} it allows the MoCA Node to report a trap on
+            the change of {{param|NumNodes}}.
+
+          * When set to {{false}} no trap report is generated when
+            {{param|NumNodes}} changes.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="factory" value="false"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="MgntEntityNetwIePayloadRecTrapEn" access="readWrite"
+          id="moca25IfMgntEntityNetwIePayloadRecTrapEn/1.3.6.1.4.1.31621.1.3.1.1.1.26">
+        <description>
+          Used to enable {{event|MgntEntityNetwIePayloadRecTrap!}}.
+
+          * When set to {{true}} it allows the MoCA Node to report a trap on
+            reception of a Management Entity Request/Response Network IE.
+
+          * When set to {{false}} no trap report is generated when a Management
+            Entity Request/Response Network IE is received.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="factory" value="false"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="MpsTrapEn" access="readWrite"
+          id="moca25IfMpsTrapEn/1.3.6.1.4.1.31621.1.3.1.1.1.27">
+        <description>
+          Used to enable the MPS-related traps: {{event|MpsInitScanRecTrap!}},
+          {{event|MpsPairFailTrap!}}, and {{event|MpsPrivacyChangedTrap!}}.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="factory" value="false"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="NcPrivSupportedRecTrapEn" access="readWrite"
+          id="moca25IfNcPrivSupportedRecTrapEn/1.3.6.1.4.1.31621.1.3.1.1.1.28">
+        <description>
+          Used to enable {{event|NcPrivacySupportedRecTrap!}}.
+
+          * When set to {{true}} it allows the MoCA Node to report a trap on
+            reception of a new NC_PRIVACY_SUPPORTED value.
+
+          * When set to {{false}} no trap report is generated when a new
+            NC_PRIVACY_SUPPORTED value is received.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="factory" value="false"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="NetworkNameRecTrapEn" access="readWrite"
+          id="moca25IfNetworkNameRecTrapEn/1.3.6.1.4.1.31621.1.3.1.1.1.29">
+        <description>
+          Used to enable {{event|NetworkNameRecTrap!}}.
+
+          * When set to {{true}} it allows the MoCA Node to report a trap on
+            reception of a Network Name.
+
+          * When set to {{false}} no trap report is generated when a Network
+            Name is received.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="factory" value="false"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="NodeDropTrapEn" access="readWrite"
+          id="moca25IfNodeDropTrapEn/1.3.6.1.4.1.31621.1.3.1.1.1.30">
+        <description>
+          Used to enable {{event|NodeDropAdmFailureTrap!}},
+          {{event|NodeDropNcTrap!}}, {{event|NodeDropMpsTriggeredTrap!}}, and
+          {{event|NodeDropNcChgTrap!}}.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="factory" value="false"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="TxPowerLimit" access="readWrite"
+          id="mocaIfTxPowerLimit/1.3.6.1.4.1.31621.1.2.1.1.1.4">
+        <description>
+          The value in dB by which to reduce the transmit power of the node
+          from its maximum transmit power. The transmit power SHALL only be
+          changed when {{param|Status}} is not {{enum|Up|Status}}, which means
+          the interface is not part of a MoCA network. If changed, the
+          parameter may not take effect until the MoCA interface is restarted.
+
+          This parameter is based on ''mocaIfTxPowerLimit'' from
+          {{bibref|MOCA11-MIB}}.
+        </description>
+        <syntax>
+          <dataType ref="MocaDB"/>
+          <default type="factory" value="0"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="PowerCntlPhyTarget" access="readWrite"
+          id="mocaIfPowerControlTargetRate/1.3.6.1.4.1.31621.1.2.1.1.1.6">
         <description>
           Target PHY rate in Mbps for the power control algorithm.
 
@@ -25088,92 +27367,94 @@
           {{bibref|MOCA11-MIB}}.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="MocaPhyRate"/>
+          <default type="factory" value="630"/>
         </syntax>
       </parameter>
 
-      <parameter name="BeaconPowerLimit" access="readWrite">
+      <parameter name="BeaconPowerLimit" access="readWrite"
+          status="deprecated"
+          id="mocaIfBeaconPowerBackoff/1.3.6.1.4.1.31621.1.2.1.1.1.5">
         <description>
-          Beacon Transmit Power attenuation in {{units}} relative to the
-          maximum transmit power.
-
-          The MoCA interface SHOULD have {{param|Enable}} set to {{false}} for
-          any change in this configuration. If the parameter is modified when
-          {{param|Enable}} is {{true}} then this change might take several
-          minutes to complete.
+          The value in dB by which to reduce the setting of the transmit power
+          of the Beacon from the maximum transmit power (BEACON_PWR_BACKOFF
+          Managed Parameter). The beacon transmit power SHALL only be changed
+          when {{param|Status}} is not {{enum|Up|Status}}, which means the
+          interface is not part of a MoCA network. If changed, the parameter
+          may not take effect until the MoCA interface is restarted.
 
           This parameter is based on ''mocaIfBeaconPowerLimit'' from
           {{bibref|MOCA11-MIB}}.
+
+          Note that this parameter maps to different MIB objects for MoCA
+          1.0/1.1 and MoCA 2.0.
+
+          {{deprecated|2.17|for MoCA 2.5}}
         </description>
         <syntax>
-          <unsignedInt>
-            <units value="dB"/>
-          </unsignedInt>
+          <dataType ref="MocaDB"/>
+          <default type="factory" value="0"/>
         </syntax>
       </parameter>
 
-      <parameter name="NetworkTabooMask" access="readOnly">
+      <parameter name="NetworkTabooMask" access="readOnly"
+          id="mocaIfTabooChannelMask/1.3.6.1.4.1.31621.1.2.1.7.1.13">
         <description>
-          Hexadecimal encoded 64-bit mask of MoCA taboo channels identified for
-          the home network. This is the bit map of the spectrum that the
-          interface supports, and each bit represents 25 MHz of spectrum. The
-          least significant bit of the rightmost character corresponds to
-          800MHz, which is the lowest frequency.
+          The MoCA taboo channels identified for the home network.
 
-          This parameter is based on ''mocaIfTabooChannelMask'' from
-          {{bibref|MOCA11-MIB}}.
+          {{datatype|expand}}
         </description>
         <syntax>
-          <hexBinary>
-            <size minLength="8" maxLength="8"/>
-          </hexBinary>
+          <dataType ref="MocaChannelMask"/>
         </syntax>
       </parameter>
 
-      <parameter name="NodeTabooMask" access="readOnly">
+      <parameter name="NodeTabooMask" access="readOnly"
+          id="mocaIfNodeTabooChannelMask/1.3.6.1.4.1.31621.1.2.1.7.1.14">
         <description>
-          Hexadecimal encoded 64-bit mask of supported frequencies. This is the
-          bit map of the spectrum that the interface supports, and each bit
-          represents 25 MHz of spectrum. The least significant bit of the
-          rightmost character corresponds to 800MHz, which is the lowest
-          frequency.
+          The MoCA taboo channels identified for this device.
 
-          This parameter is based on ''mocaIfNodeTabooChannelMask'' from
-          {{bibref|MOCA11-MIB}}.
+          {{datatype|expand}}
         </description>
         <syntax>
-          <hexBinary>
-            <size minLength="8" maxLength="8"/>
-          </hexBinary>
+          <dataType ref="MocaChannelMask"/>
         </syntax>
       </parameter>
 
-      <parameter name="TxBcastRate" access="readOnly">
+      <parameter name="SupportedBands" access="readOnly"
+          id="mocaIfSupportedBands/1.3.6.1.4.1.31621.1.2.1.7.1.15">
         <description>
-          The broadcast PHY transmit rate in {{units}} for this interface.
+          Lists all the supported bands and sub-bands by this device.
+        </description>
+        <syntax>
+          <dataType ref="MocaBand"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="TxBcastRate" access="readOnly"
+          id="mocaIfTxGcdRate/1.3.6.1.4.1.31621.1.2.1.7.1.20">
+        <description>
+          The broadcast PHY transmit rate for this interface.
 
           This parameter is based on ''mocaIfTxGcdRate'' from
           {{bibref|MOCA11-MIB}}.
         </description>
         <syntax>
-          <unsignedInt>
-            <units value="Mbps"/>
-          </unsignedInt>
+          <dataType ref="MocaPhyRate"/>
         </syntax>
       </parameter>
 
-      <parameter name="TxBcastPowerReduction" access="readOnly">
+      <parameter name="TxBcastPowerReduction" access="readOnly"
+          id="mocaIfTxGcdPowerReduction/1.3.6.1.4.1.31621.1.2.1.7.1.16">
         <description>
-          Transmit Power attenuation in {{units}} relative to the maximum
-          transmit power for broadcast transmissions.
+          Transmit Power attenuation relative to the maximum transmit power for
+          broadcast transmissions.
 
           This parameter is based on ''mocaIfTxGcdPowerReduction'' from
           {{bibref|MOCA11-MIB}}.
         </description>
         <syntax>
-          <unsignedInt>
-            <units value="dB"/>
-          </unsignedInt>
+          <dataType ref="MocaDB"/>
         </syntax>
       </parameter>
 
@@ -25183,13 +27464,17 @@
 
           This parameter is based on ''mocaIfQAM256Capable'' from
           {{bibref|MOCA11-MIB}}.
+
+          This parameter MUST NOT be implemented for MoCA 2.0 because it
+          doesn't map to a MIB object.
         </description>
         <syntax>
           <boolean/>
         </syntax>
       </parameter>
 
-      <parameter name="PacketAggregationCapability" access="readOnly">
+      <parameter name="PacketAggregationCapability" access="readOnly"
+          id="mocaIfPduNumber/1.3.6.1.4.1.31621.1.2.1.7.1.17">
         <description>
           The packet aggregation capability supported by the interface.
           Standard values are 0 (no support), 6 (6 {{units}}) or 10 (10
@@ -25197,10 +27482,14 @@
 
           This parameter is based on ''mocaIfPacketsAggrCapability'' from
           {{bibref|MOCA11-MIB}}.
+
+          Note that this parameter maps to different MIB objects for MoCA
+          1.0/1.1 and MoCA 2.0. [XXX1: Need to modify the syntax to
+          'unsignedInt' because MoCA 2.0 requires a minimum of 20 packets and
+          MoCA 2.5 requires a minimum of 80 packets.]
         </description>
         <syntax>
           <unsignedInt>
-            <range minInclusive="0" maxInclusive="10"/>
             <units value="packets"/>
           </unsignedInt>
         </syntax>
@@ -25214,6 +27503,1277 @@
           <unsignedInt/>
         </syntax>
       </parameter>
+
+      <parameter name="PasswordHash" access="readOnly"
+          id="mocaIfPasswordHash/1.3.6.1.4.1.31621.1.2.1.7.1.21">
+        <description>
+          The 16 LSBs of a SHA1 performed on a 0-extended password
+          ({{param|KeyPassphrase}}) concatenated with the SALT string
+          "MocaPasswordHash". This parameter allows to remotely validate the
+          MoCA password configuration without exposing its value. This value
+          must be 4 hexadecimal digits long.
+        </description>
+        <syntax>
+          <hexBinary>
+            <size minLength="2" maxLength="2"/>
+          </hexBinary>
+        </syntax>
+      </parameter>
+
+      <parameter name="AggregationSize" access="readOnly"
+          id="mocaIfAggregationSize/1.3.6.1.4.1.31621.1.2.1.7.1.23">
+        <description>
+          The maximum number of bytes in one aggregate which can be received by
+          the MoCA Node.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="AeNumber" access="readOnly"
+          id="mocaIfAeNumber/1.3.6.1.4.1.31621.1.2.1.7.1.24">
+        <description>
+          Maximum number of allocation elements, excluding the TAUs and the
+          Dummy DAUs, in one MAP the MoCA Node can process.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="SupportedIngressPqosFlows" access="readOnly"
+          id="mocaIfSupportedIngressPqosFlows/1.3.6.1.4.1.31621.1.2.1.7.1.25">
+        <description>
+          Maximum number of Ingress PQoS Flows supported by the MoCA Node.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="SupportedEgressPqosFlows" access="readOnly"
+          id="mocaIfSupportedEgressPqosFlows/1.3.6.1.4.1.31621.1.2.1.7.1.26">
+        <description>
+          Maximum number of Egress PQoS Flows supported by the MoCA Node.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="PowerStateCap" access="readOnly"
+          id="mocaIfPowerStateCap/1.3.6.1.4.1.31621.1.2.1.7.1.27">
+        <description>
+          The Power State capabilities of the MoCA Node (e.g., which Power
+          States it can transition to) (POWER_STATE_CAP Managed Parameter).
+          This value can change over time (e.g. when a MoCA 1 Node joins the
+          network).
+        </description>
+        <syntax>
+          <dataType ref="MocaPowerState"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="AvbSupport" access="readOnly"
+          id="mocaIfAvbSupport/1.3.6.1.4.1.31621.1.2.1.7.1.28">
+        <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
+          supported if this value is {{false}}.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ResetCount" access="readOnly"
+          id="mocaIfResetCount/1.3.6.1.4.1.31621.1.2.1.7.1.29">
+        <description>
+          Count of MoCA resets since the interface was enabled for this MoCA
+          Node.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="LinkDownCount" access="readOnly"
+          id="mocaIfLinkDownCount/1.3.6.1.4.1.31621.1.2.1.7.1.30">
+        <description>
+          The number of times that this MoCA Node has lost link with the MoCA
+          network since the interface was enabled.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="LmoNodeID" access="readOnly"
+          id="mocaIfLmoNodeID/1.3.6.1.4.1.31621.1.2.1.7.1.31">
+        <description>
+          The ID of the MoCA Node currently undergoing LMO (Link Maintenance
+          Operation), i.e. the LMO node.
+        </description>
+        <syntax>
+          <dataType ref="MocaNodeID"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="NetworkState" access="readOnly"
+          id="mocaIfNetworkState/1.3.6.1.4.1.31621.1.2.1.7.1.32">
+        <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>
+        <syntax>
+          <string>
+            <enumeration value="beginNodeAdmissionState">
+              <description>{{bibref|MoCAv2.0|Section 8.3.3}}</description>
+            </enumeration>
+            <enumeration value="newNodeTypeOneProbeTxState">
+              <description>{{bibref|MoCAv2.0|Section 8.3.4}}</description>
+            </enumeration>
+            <enumeration value="newNodeTypeOneProbeRxState">
+              <description>{{bibref|MoCAv2.0|Section 8.3.5}}</description>
+            </enumeration>
+            <enumeration value="newGcdDistributionState">
+              <description>{{bibref|MoCAv2.0|Section 8.3.6}}</description>
+            </enumeration>
+            <enumeration value="beginPhyProfileState">
+              <description>{{bibref|MoCAv2.0|Section 8.3.7}}</description>
+            </enumeration>
+            <enumeration value="steadyState">
+              <description>
+                {{bibref|MoCAv2.0|Section 8.3.8}} {{bibref|MoCAv2.0|Section
+                8.9.2.2.3}}
+              </description>
+            </enumeration>
+            <enumeration value="typeThreeProbeState">
+              <description>{{bibref|MoCAv2.0|Section 8.9.1.2}}</description>
+            </enumeration>
+            <enumeration value="lmoTypeOneProbeState">
+              <description>{{bibref|MoCAv2.0|Section 8.9.1.3}}</description>
+            </enumeration>
+            <enumeration value="lmoNodeGcdDistributionState">
+              <description>{{bibref|MoCAv2.0|Section 8.9.1.5}}</description>
+            </enumeration>
+            <enumeration value="beginLmoPhyProfileState">
+              <description>{{bibref|MoCAv2.0|Section 8.9.1.6}}</description>
+            </enumeration>
+            <enumeration value="lmoGcdTypeOneProbeLinkState">
+              <description>{{bibref|MoCAv2.0|Section 8.9.1.4}}</description>
+            </enumeration>
+            <enumeration value="alternateChannelQuietLineState">
+              <description>{{bibref|MoCAv2.0|Section 8.9.2.5}}</description>
+            </enumeration>
+            <enumeration value="alternateChannelEvmProbeState">
+              <description>{{bibref|MoCAv2.0|Section 8.9.2.5}}</description>
+            </enumeration>
+            <enumeration value="unsolicitedProbeReportState">
+              <description>{{bibref|MoCAv2.0|Section 8.9.2.2.1}}</description>
+            </enumeration>
+            <enumeration value="beginUnsolicitedPhyProfileState">
+              <description>{{bibref|MoCAv2.0|Section 8.9.2.2.2}}</description>
+            </enumeration>
+            <enumeration value="rxDeterminedProbeState">
+              <description>{{bibref|MoCAv2.0|Section 8.9.2.1}}</description>
+            </enumeration>
+            <enumeration value="calibrationState">
+              <description>{{bibref|MoCAv2.0|Section 8.14.1}}</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">
+        <description>
+          The offset in MHz of the primary channel relative to the beacon
+          channel. The allowed values are -25, 0, and +25.
+        </description>
+        <syntax>
+          <int/>
+        </syntax>
+      </parameter>
+
+      <parameter name="SecondaryChannelOffset" access="readOnly"
+          id="mocaIfSecondaryChannelOffset/1.3.6.1.4.1.31621.1.2.1.7.1.34">
+        <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
+          that there is no secondary channel.
+        </description>
+        <syntax>
+          <int/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ResetReason" access="readOnly"
+          id="mocaIfResetReason/1.3.6.1.4.1.31621.1.2.1.7.1.35">
+        <description>
+          Describes the reason for a MoCA link reset or failure to join a
+          network.
+        </description>
+        <syntax>
+          <string>
+            <size minLength="0" maxLength="80"/>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="NcVersion" access="readOnly"
+          id="mocaIfNcVersion/1.3.6.1.4.1.31621.1.2.1.7.1.36">
+        <description>
+          Indicates the MoCA version of the NC.
+
+          This element MUST be in the form of dot-delimited integers, where
+          each successive integer represents a more minor category of
+          variation. For example, 1.0, where the components mean major.minor
+          revision number. Possible patterns:
+
+          * ''\d+(\.\d+)*''
+        </description>
+        <syntax>
+          <string>
+            <size minLength="0" maxLength="64"/>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="LinkState" access="readOnly"
+          id="mocaIfLinkState/1.3.6.1.4.1.31621.1.2.1.7.1.37">
+        <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 };
+        </description>
+        <syntax>
+          <hexBinary>
+            <size minLength="3" maxLength="3"/>
+          </hexBinary>
+        </syntax>
+      </parameter>
+
+      <parameter name="ConnectedNodesInfo" access="readOnly"
+          id="moca25IfConnectedNodesInfo/1.3.6.1.4.1.31621.1.3.1.2.1.1">
+        <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]; };
+        </description>
+        <syntax>
+          <hexBinary>
+            <size minLength="12" maxLength="156"/>
+          </hexBinary>
+        </syntax>
+      </parameter>
+
+      <parameter name="MgntEntityNetIePayloadRx" access="readOnly"
+          id="moca25IfMgntEntityNetIePayloadRx/1.3.6.1.4.1.31621.1.3.1.2.1.2">
+        <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) };
+        </description>
+        <syntax>
+          <hexBinary>
+            <size minLength="2" maxLength="62"/>
+          </hexBinary>
+        </syntax>
+      </parameter>
+
+      <parameter name="Moca25PhyCapable" access="readOnly"
+          id="moca25IfMoca25PhyCapable/1.3.6.1.4.1.31621.1.3.1.2.1.3">
+        <description>
+          Indicate the MoCA Node supports MoCA 2.5 PHY if the value is
+          {{true}}.
+
+          Indicate the MoCA Node does not support MoCA 2.5 PHY if this value is
+          {{false}}.
+
+          See {{bibref|MoCAv2.5|section 8.3.4.1.1}}.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="MpsInitScanPayload" access="readOnly"
+          id="moca25IfMpsInitScanPayload/1.3.6.1.4.1.31621.1.3.1.2.1.4">
+        <description>
+          Reports the channel number, NC's (Network Coordinators) MoCA version,
+          Network MPS (MoCA Protected Setup) trigger, and Network MPS
+          parameters (if any) and Network Name of the latest MoCA network found
+          during Initial MPS Scanning. See {{bibref|MoCAv2.5|section
+          8.3.1.1.1}}.
+
+          It is encoded as specified in {{bibref|MOCA25-MIB|section 4.6}}.
+        </description>
+        <syntax>
+          <hexBinary>
+            <size minLength="4" maxLength="4"/>
+          </hexBinary>
+        </syntax>
+      </parameter>
+
+      <parameter name="MpsState" access="readOnly"
+          id="moca25IfMpsState/1.3.6.1.4.1.31621.1.3.1.2.1.5">
+        <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}}.
+
+          See {{bibref|MoCAv2.5|section 8.3.1}}.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="NetworkNamePayload" access="readOnly"
+          id="moca25IfNetworkNamePayload/1.3.6.1.4.1.31621.1.3.1.2.1.6">
+        <description>
+          The payload of the latest received Network Name from the NC.
+
+          See {{bibref|MoCAv2.5|section 8.3.3.2}}.
+        </description>
+        <syntax>
+          <hexBinary>
+            <size minLength="0" maxLength="32"/>
+          </hexBinary>
+        </syntax>
+      </parameter>
+
+      <parameter name="PrivacyNc" access="readOnly"
+          id="moca25IfPrivacyNc/1.3.6.1.4.1.31621.1.3.1.2.1.7">
+        <description>
+          The latest NC_PRIVACY_SUPPORTED value received from the NC. Before
+          any NC_PRIVACY_SUPPORTED is received, reflects the value of
+          {{param|PrivacySupported}}.
+
+          See {{bibref|MoCAv2.5|Table 17-1}}.
+        </description>
+        <syntax>
+          <list/>
+          <dataType ref="MocaPrivacy"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="PowerStateResp" access="readOnly"
+          id="moca25IfPowerStateResp/1.3.6.1.4.1.31621.1.3.1.2.1.8">
+        <description>
+          Carries the response of the MoCA Node to a request (through
+          POWER_STATEREQ) to transition into a desired Power State: yes if the
+          value if {{true}} and no if the value is {{false}}.
+
+          See {{bibref|MoCAv2.5|section 12}}.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="PowerStateStatus" access="readOnly"
+          id="moca25IfPowerStateStatus/1.3.6.1.4.1.31621.1.3.1.2.1.9">
+        <description>
+          Reports the current Power State of the Node (POWER_STATE_STATUS
+          Managed Parameter).
+        </description>
+        <syntax>
+          <dataType ref="MocaPowerState"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ConnectedNodesDropReason" access="readOnly"
+          id="moca25IfConnectedNodesDropReason/1.3.6.1.4.1.31621.1.3.1.2.1.10">
+        <description>
+          Reports the GUID(s) of the dropped EN(s) and the reason of node drop
+          for up to 15 nodes.
+
+          This object is valid only when the Node is the NC.
+
+          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]; };
+        </description>
+        <syntax>
+          <hexBinary/>
+        </syntax>
+      </parameter>
+
+      <event name="BelowPhyThresholdTrap!"
+          id="mocaBelowPhyThresholdTrap/1.3.6.1.4.1.31621.1.2.0.1">
+        <description>
+          If transmit PHY rate between all pairs of MoCA Nodes are greater than
+          or equal to {{param|PhyThreshold}}, and subsequently the transmit PHY
+          rate of one pair of MoCA Nodes drops below {{param|PhyThreshold}},
+          send this notification if {{param|PhyThresholdTrapEnable}} is
+          {{true}}.
+
+          This trap comes from the {{bibref|MOCA20-MIB}} and is provided for
+          debug purposes.
+        </description>
+
+        <parameter name="LowestPhyRate">
+          <description>
+            The lowest PHY rate in the MoCA network, of
+            {{param|#.Mesh.{i}.TxRate}}, which is the transmit PHY rate from
+            the MoCA Node specified with {{param|#.Mesh.{i}.TxNodeIndex}}, to
+            the MoCA Node specified with {{param|#.Mesh.{i}.RxNodeIndex}}.
+
+            If multiple links have the same lowest PHY rate, sends the PHY rate
+            for the link with the lowest {{param|#.Mesh.{i}.TxNodeIndex}}. If
+            multiple links with the same {{param|#.Mesh.{i}.TxNodeIndex}} have
+            the same lowest PHY rate, sends the PHY rate for the link with the
+            lowest {{param|#.Mesh.{i}.RxNodeIndex}}.
+
+            Network management system should access the table to find if there
+            are additional links below the threshold bandwidth.
+          </description>
+          <syntax>
+            <hexBinary>
+              <size minLength="13" maxLength="13"/>
+            </hexBinary>
+          </syntax>
+        </parameter>
+      </event>
+
+      <event name="AbovePhyThresholdTrap!"
+          id="mocaTrapAbovePhyThreshold/1.3.6.1.4.1.31621.1.2.0.2">
+        <description>
+          If transmit PHY rate between one or more pairs of MoCA Nodes are less
+          than {{param|PhyThreshold}}, and subsequently the transmit PHY rate
+          between all pairs of MoCA Nodes goes above or is equal to
+          {{param|PhyThreshold}}, send this notification if
+          {{param|PhyThresholdTrapEnable}} is {{true}}.
+
+          This trap comes from the {{bibref|MOCA20-MIB}} and is provided for
+          debug purposes.
+        </description>
+      </event>
+
+      <event name="StatusChangeTrap!"
+          id="mocaStatusChangeTrap/1.3.6.1.4.1.31621.1.2.0.3">
+        <description>
+          This trap is sent when {{param|StatusChangeEnable}} is {{true}} and
+          {{param|#.Status}} changes value.
+
+          This trap comes from the {{bibref|MOCA20-MIB}} and is provided for
+          debug purposes.
+        </description>
+
+        <parameter name="Status">
+          <description>
+            The current value of {{param|#.Status}}.
+          </description>
+          <syntax>
+            <string/>
+          </syntax>
+        </parameter>
+      </event>
+
+      <event name="NumNodesChangeTrap!"
+          id="mocaTrapIfNumNodesChange/1.3.6.1.4.1.31621.1.2.0.4">
+        <description>
+          This trap is sent when {{param|NumNodesChangeEnable}} is {{true}} and
+          {{param|#.NumNodes}} changes value.
+
+          This trap comes from the {{bibref|MOCA20-MIB}} and is provided for
+          debug purposes.
+        </description>
+
+        <parameter name="NumNodes">
+          <description>
+            The current value of {{param|#.NumNodes}}.
+          </description>
+          <syntax>
+            <unsignedInt>
+              <range minInclusive="0" maxInclusive="16"/>
+            </unsignedInt>
+          </syntax>
+        </parameter>
+      </event>
+
+      <event name="MrRstSuccessTrap!"
+          id="mocaTrapMrRstSuccess/1.3.6.1.4.1.31621.1.2.0.5">
+        <description>
+          An MR Entry Node reports that the network got reset successfully
+          (MRRST_SUCCESS Event).
+
+          This trap comes from the {{bibref|MOCA20-MIB}} and is provided for
+          debug purposes.
+        </description>
+      </event>
+
+      <event name="MrRstFailTrap!"
+          id="mocaTrapMrRstFail/1.3.6.1.4.1.31621.1.2.0.6">
+        <description>
+          An MR Entry Node reports that the network reset did not complete
+          successfully (MRRST_FAIL Event).
+
+          This trap comes from the {{bibref|MOCA20-MIB}} and is provided for
+          debug purposes.
+        </description>
+      </event>
+
+      <event name="MrNetworkSuccessTrap!"
+          id="mocaTrapMrNetworkSuccess/1.3.6.1.4.1.31621.1.2.0.7">
+        <description>
+          An MR Entry Node reports that the network got reformed successfully
+          following the MR transaction (MRNETWORK_SUCCESS Event).
+
+          This trap comes from the {{bibref|MOCA20-MIB}} and is provided for
+          debug purposes.
+        </description>
+      </event>
+
+      <event name="MrNetworkFailTrap!"
+          id="mocaTrapMrNetworkFail/1.3.6.1.4.1.31621.1.2.0.8">
+        <description>
+          An MR Entry Node reports that the MR transaction failed, and the
+          network did not get reformed (MRNETWORK_FAIL Event).
+
+          This trap comes from the {{bibref|MOCA20-MIB}} and is provided for
+          debug purposes.
+        </description>
+      </event>
+
+      <event name="PowerStateBcstRecTrap!"
+          id="mocaTrapPowerStateBcstRec/1.3.6.1.4.1.31621.1.2.0.9">
+        <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
+          the data interface (POWER_STATEBCST_REC Event).
+
+          This trap comes from the {{bibref|MOCA20-MIB}} and is provided for
+          debug purposes.
+        </description>
+      </event>
+
+      <event name="PowerStateM0NcTrap!"
+          id="mocaTrapPowerStateM0Nc/1.3.6.1.4.1.31621.1.2.0.10">
+        <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.
+
+          This trap comes from the {{bibref|MOCA20-MIB}} and is provided for
+          debug purposes.
+        </description>
+      </event>
+
+      <event name="PowerStateNc1xTrap!"
+          id="mocaTrapPowerStateNc1x/1.3.6.1.4.1.31621.1.2.0.11">
+        <description>
+          When the MoCA Node is in Power State M1/M2/M3, indicates that MoCA 1
+          Node is the NC (POWER_STATENC_1X Event).
+
+          This trap comes from the {{bibref|MOCA20-MIB}} and is provided for
+          debug purposes.
+        </description>
+      </event>
+
+      <event name="PowerStateNetVerTrap!"
+          id="mocaTrapPowerStateNetVer/1.3.6.1.4.1.31621.1.2.0.12">
+        <description>
+          When the MoCA Node is in Power State M2 or M3, indicates that the
+          network MoCA version is changed (POWER_STATENET_VER Event).
+
+          This trap comes from the {{bibref|MOCA20-MIB}} and is provided for
+          debug purposes.
+        </description>
+      </event>
+
+      <event name="PowerStateRespTrap!"
+          id="mocaTrapPowerStateResp/1.3.6.1.4.1.31621.1.2.0.13">
+        <description>
+          Carries the response of the MoCA Node to a request (through
+          POWER_STATEREQ) to transition into a desired Power State
+          (POWER_STATERESP Event).
+
+          This trap comes from the {{bibref|MOCA20-MIB}} and is provided for
+          debug purposes.
+        </description>
+      </event>
+
+      <event name="PowerStateUcstPenTrap!"
+          id="mocaTrapPowerStateUcstPen/1.3.6.1.4.1.31621.1.2.0.14">
+        <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
+          Event).
+
+          This trap comes from the {{bibref|MOCA20-MIB}} and is provided for
+          debug purposes.
+        </description>
+      </event>
+
+      <event name="PowerStateTrnsReqTrap!"
+          id="mocaTrapPowerStateTrnsReq/1.3.6.1.4.1.31621.1.2.0.15">
+        <description>
+          When a MoCA Node is in Power State M1 or M2, requests to transition
+          to Power State M0 (POWER_STATETRNS_REQ Event).
+
+          This trap comes from the {{bibref|MOCA20-MIB}} and is provided for
+          debug purposes.
+        </description>
+      </event>
+
+      <event name="PowerStateWupUrTrap!"
+          id="mocaTrapPowerStateWupUr/1.3.6.1.4.1.31621.1.2.0.16">
+        <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).
+
+          This trap comes from the {{bibref|MOCA20-MIB}} and is provided for
+          debug purposes.
+        </description>
+      </event>
+
+      <event name="LmoStatusTrap!"
+          id="mocaTrapLmoStatus/1.3.6.1.4.1.31621.1.2.0.17">
+        <description>
+          When {{param|LmoTrapEnable}} is enabled, reports that the MoCA Node
+          is starting LMO (Link Maintenance Operation).
+
+          This trap comes from the {{bibref|MOCA20-MIB}} and is provided for
+          debug purposes.
+        </description>
+      </event>
+
+      <event name="LinkFailureTrap!"
+          id="mocaTrapLinkFailure/1.3.6.1.4.1.31621.1.2.0.18">
+        <description>
+          Indicates a link failure. If the failure was an Admission or LMO
+          failure, {{param|LinkState}} indicates when the link was dropped
+          within the sequence.
+
+          This trap comes from the {{bibref|MOCA20-MIB}} and is provided for
+          debug purposes.
+        </description>
+      </event>
+
+      <event name="ConnectedNodesChangeTrap!"
+          id="moca25TrapConnectedNodesChange/1.3.6.1.4.1.31621.1.3.0.1">
+        <description>
+          This trap is sent when {{param|ConnectedNodesChangeTrapEn}} is
+          {{true}} and {{param|#.ConnectedNodesInfo}} changes value.
+
+          This trap comes from the MOCA25-MIB and is provided for debug
+          purposes.
+        </description>
+
+        <parameter name="ConnectedNodesInfo">
+          <description>
+            The current value of {{param|#.ConnectedNodesInfo}}.
+          </description>
+          <syntax>
+            <hexBinary>
+              <size minLength="12" maxLength="156"/>
+            </hexBinary>
+          </syntax>
+        </parameter>
+      </event>
+
+      <event name="MgntEntityNetwIePayloadRecTrap!"
+          id="moca25TrapMgntEntityNetwIePayloadRec/1.3.6.1.4.1.31621.1.3.0.2">
+        <description>
+          This trap is sent when {{param|MgntEntityNetwIePayloadRecTrapEn}} is
+          {{true}} and {{param|MgntEntityNetIePayloadRx}} changes value.
+
+          This trap comes from the MOCA25-MIB and is provided for debug
+          purposes.
+        </description>
+      </event>
+
+      <event name="MpsInitScanRecTrap!"
+          id="moca25TrapMpsInitScanRec/1.3.6.1.4.1.31621.1.3.0.3">
+        <description>
+          This trap is sent when {{param|MpsTrapEn}} is {{true}} and
+          {{param|MpsInitScanPayload}} changes value.
+
+          This trap comes from the MOCA25-MIB and is provided for debug
+          purposes.
+        </description>
+
+        <parameter name="MpsInitScanPayload">
+          <description>
+            The current value of {{param|#.MpsInitScanPayload}}.
+          </description>
+          <syntax>
+            <hexBinary>
+              <size minLength="4" maxLength="4"/>
+            </hexBinary>
+          </syntax>
+        </parameter>
+      </event>
+
+      <event name="MpsPairFailTrap!"
+          id="moca25TrapMpsPairFail/1.3.6.1.4.1.31621.1.3.0.4">
+        <description>
+          This trap is sent when {{param|MpsTrapEn}} is {{true}}, indicates a
+          MPS pairing failure.
+
+          This trap comes from the MOCA25-MIB and is provided for debug
+          purposes.
+        </description>
+      </event>
+
+      <event name="MpsPrivacyChangedTrap!"
+          id="moca25TrapMpsPrivacyChanged/1.3.6.1.4.1.31621.1.3.0.5">
+        <description>
+          This trap is sent when {{param|MpsTrapEn}} is {{true}}, indicates
+          that the Node's privacy settings (PRIVACYEN and/or PSWD) have been
+          changed by MPS.
+
+          This trap comes from the MOCA25-MIB and is provided for debug
+          purposes.
+        </description>
+      </event>
+
+      <event name="NcPrivacySupportedRecTrap!"
+          id="moca25TrapNcPrivacySupportedRec/1.3.6.1.4.1.31621.1.3.0.6">
+        <description>
+          This trap is sent when {{param|NcPrivSupportedRecTrapEn}} is {{true}}
+          and {{param|PrivacyNc}} changes value.
+
+          This trap comes from the MOCA25-MIB and is provided for debug
+          purposes.
+        </description>
+
+        <parameter name="PrivacyNc">
+          <description>
+            The current value of {{param|#.PrivacyNc}}.
+          </description>
+          <syntax>
+            <string/>
+          </syntax>
+        </parameter>
+      </event>
+
+      <event name="NetworkNameRecTrap!"
+          id="moca25TrapNetworkNameRec/1.3.6.1.4.1.31621.1.3.0.7">
+        <description>
+          This trap is sent when {{param|NetworkNameRecTrapEn}} is {{true}} and
+          {{param|NetworkNamePayload}} changes value.
+
+          This trap comes from the MOCA25-MIB and is provided for debug
+          purposes.
+        </description>
+
+        <parameter name="NetworkNamePayload">
+          <description>
+            The current value of {{param|#.NetworkNamePayload}}.
+          </description>
+          <syntax>
+            <hexBinary>
+              <size minLength="0" maxLength="32"/>
+            </hexBinary>
+          </syntax>
+        </parameter>
+      </event>
+
+      <event name="NodeDropAdmFailureTrap!"
+          id="moca25TrapNodeDropAdmFailure/1.3.6.1.4.1.31621.1.3.0.8">
+        <description>
+          This trap is sent when {{param|NodeDropTrapEn}} is {{true}},
+          indicates that the Node drops from the network due to admission
+          failure.
+
+          This trap comes from the MOCA25-MIB and is provided for debug
+          purposes.
+        </description>
+      </event>
+
+      <event name="NodeDropNcTrap!"
+          id="moca25TrapTrapNodeDropNc/1.3.6.1.4.1.31621.1.3.0.9">
+        <description>
+          This trap is sent when {{param|NodeDropTrapEn}} is {{true}},
+          indicates that the Node is dropped by the NC as indicated in the
+          NODE_BITMASK and LOW_POWER_NODE_BITMASK.
+
+          This trap comes from the MOCA25-MIB and is provided for debug
+          purposes.
+        </description>
+      </event>
+
+      <event name="NodeDropMpsTriggeredTrap!"
+          id="moca25TrapNodeDropMpsTriggered/1.3.6.1.4.1.31621.1.3.0.10">
+        <description>
+          This trap is sent when {{param|NodeDropTrapEn}} is {{true}},
+          indicates that MPS is locally triggered when the Node is un-Paired.
+
+          This trap comes from the MOCA25-MIB and is provided for debug
+          purposes.
+        </description>
+      </event>
+
+      <event name="NodeDropNcChgTrap!"
+          id="moca25TrapNodeDropNcChg/1.3.6.1.4.1.31621.1.3.0.11">
+        <description>
+          This trap is sent when {{param|NodeDropTrapEn}} is {{true}}},
+          indicates that there is a NC change when the Node is Non-Secured
+          Admitted Node.
+
+          This trap comes from the MOCA25-MIB and is provided for debug
+          purposes.
+        </description>
+      </event>
+    </object>
+
+    <object name="Device.MoCA.Interface.{i}.AccessControl.{i}."
+        access="readWrite" minEntries="0" maxEntries="unbounded"
+        numEntriesParameter="AccessControlNumberOfEntries"
+        enableParameter="Enable"
+        id="mocaIfAccessTable/1.3.6.1.4.1.31621.1.2.1.2" version="2.17">
+      <description>
+        MoCA interface MAC access control table. This table contains a list of
+        MAC addresses that are allowed to connect to the MoCA network. In
+        addition to being in this access control list, a MoCA Node must have
+        the proper {{param|#.FreqCurrentMask}},
+        {{param|#.PrivacyEnabledSetting}}, and {{param|#.KeyPassphrase}} before
+        the MoCA Node can form or join a MoCA network.
+      </description>
+      <uniqueKey functional="true">
+        <parameter ref="MACAddress"/>
+      </uniqueKey>
+
+      <parameter name="Enable" access="readWrite">
+        <description>
+          Enables or disables this MAC address to be allowed to connect to the
+          MoCA network.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="object" value="true"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="MACAddress" access="readWrite"
+          id="mocaIfAccessMacAddress/1.3.6.1.4.1.31621.1.2.1.2.1.2">
+        <description>
+          If {{param|#.AccessControlEnable}} is set to {{true}}, MoCA Node with
+          this MAC address is allowed to join the MoCA network. It is not
+          guaranteed that the MoCA Node with this MAC address can form or join
+          a network.
+        </description>
+        <syntax>
+          <dataType ref="MACAddress"/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object name="Device.MoCA.Interface.{i}.Rlapm.{i}." access="readWrite"
+        minEntries="0" maxEntries="unbounded"
+        numEntriesParameter="RlapmNumberOfEntries" enableParameter="Enable"
+        id="mocaIfRlapmTable/1.3.6.1.4.1.31621.1.2.1.3" version="2.17">
+      <description>
+        Interface RLAPM Table supporting the configuration of RLAPM (Receive
+        Level Added PHY Margin) function parameters for the selected profile.
+
+        The pairs [{{param|GlobalAggrRxPwrLevel}} (GARPLi ),
+        {{param|PhyMargin}} (RLAPMi)] are used to determine the subcarriers'
+        bitloadings according {{bibref|MoCAv2.0|section 7.15.2 and Table
+        17-1}}.
+      </description>
+      <uniqueKey functional="true">
+        <parameter ref="Profile"/>
+        <parameter ref="Frequency"/>
+        <parameter ref="GlobalAggrRxPwrLevel"/>
+      </uniqueKey>
+
+      <parameter name="Enable" access="readWrite">
+        <description>
+          Enables or disables this Rlamp entry.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="object" value="true"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Profile" access="readWrite"
+          id="mocaIfRlapmProfile/1.3.6.1.4.1.31621.1.2.1.3.1.1">
+        <description>
+          Profile index used for the RLAPM (Receive Level Added PHY Margin)
+          table.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Frequency" access="readWrite"
+          id="mocaIfRlapmFrequency/1.3.6.1.4.1.31621.1.2.1.3.1.2">
+        <description>
+          Frequency (band) index used for the RLAPM (Receive Level Added PHY
+          Margin) table.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="GlobalAggrRxPwrLevel" access="readWrite"
+          id="mocaIfRlapmGarpl/1.3.6.1.4.1.31621.1.2.1.3.1.3">
+        <description>
+          Global Aggregated Receive Power Level (GARPL).
+
+          The parameter contains the "Ni" value, where GARPLi = -Ni dBm.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range minInclusive="0" maxInclusive="65"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="PhyMargin" access="readWrite"
+          id="mocaIfRlapmPhyMargin/1.3.6.1.4.1.31621.1.2.1.3.1.4">
+        <description>
+          Receive Level Added Phy Margin (RLAPM).
+
+          The parameter contains the "Ni" value, where RLAPMi = 0.5*Ni dB.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range minInclusive="0" maxInclusive="60"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="Status" access="readOnly"
+          id="mocaIfRlapmStatus/1.3.6.1.4.1.31621.1.2.1.3.1.5">
+        <description>
+          Reflects the status of a row in this table.
+        </description>
+        <syntax>
+          <dataType ref="RowStatus"/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object name="Device.MoCA.Interface.{i}.Sapm.{i}." access="readWrite"
+        minEntries="0" maxEntries="unbounded"
+        numEntriesParameter="SapmNumberOfEntries" enableParameter="Enable"
+        id="mocaIfSapmTable/1.3.6.1.4.1.31621.1.2.1.4" version="2.17">
+      <description>
+        Interface SAPM Table supporting the configuration of SAPM (Subcarrier
+        Added PHY Margin) function parameters for the selected profile.
+
+        When the aggregate received power level (ARPL) is below the
+        pre-specified threshold {{param|AggrRxPwrLevelThreshold}}, for each
+        subcarrier, its corresponding value on the list {{param|PhyMargin}}
+        will be considered to determine the subcarriers' bitloading according
+        {{bibref|MoCAv2.0|section 7.15.2 and Table 17-1}}.
+      </description>
+      <uniqueKey functional="true">
+        <parameter ref="Profile"/>
+        <parameter ref="Frequency"/>
+      </uniqueKey>
+
+      <parameter name="Enable" access="readWrite">
+        <description>
+          Enables or disables this Sapm entry.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="object" value="true"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Profile" access="readWrite"
+          id="mocaIfSapmProfile/1.3.6.1.4.1.31621.1.2.1.4.1.1">
+        <description>
+          Profile index used for the SAPM (Subcarrier Added PHY Margin) table.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Frequency" access="readWrite"
+          id="mocaIfSapmFrequency/1.3.6.1.4.1.31621.1.2.1.4.1.2">
+        <description>
+          Frequency (band) index used for the SAPM (Subcarrier Added PHY
+          Margin) table.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="AggrRxPwrLevelThreshold" access="readWrite"
+          id="mocaIfSapmARPLTHLD/1.3.6.1.4.1.31621.1.2.1.4.1.3">
+        <description>
+          Aggregate Received Power Level Threshold (ARPL_THLD).
+
+          The parameter contains the "N" value, where ARPL_THLD = -N dBm.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range minInclusive="0" maxInclusive="65"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="PhyMargin" access="readWrite"
+          id="mocaIfSapmPhyMargin/1.3.6.1.4.1.31621.1.2.1.4.1.4">
+        <description>
+          Subcarrier Added PHY Margin (SAPM).
+
+          List of SAPM values representing the PHY margin the Node is required
+          to add to the bitloading of each of the available subcarriers when
+          the received power level is below ARPL_THLD
+          ({{param|AggrRxPwrLevelThreshold}}).
+
+          Each value contains the "Ni" value for a OFDM subcarrier "i", where
+          SAPMi = 0.5*Ni dB.
+        </description>
+        <syntax>
+          <list/>
+          <unsignedInt>
+            <range minInclusive="0" maxInclusive="120"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="Status" access="readOnly"
+          id="mocaIfSapmStatus/1.3.6.1.4.1.31621.1.2.1.4.1.5">
+        <description>
+          Reflects the status of a row in this table.
+        </description>
+        <syntax>
+          <dataType ref="RowStatus"/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object name="Device.MoCA.Interface.{i}.Aca." version="2.17"
+        access="readOnly" minEntries="1" maxEntries="1"
+        id="mocaIfAcaTable/1.3.6.1.4.1.31621.1.2.1.5"
+        dmr:previousObject="Device.MoCA.Interface.{i}.Sapm.{i}.">
+      <description>
+        This diagnostic test corresponds to the MoCA ACA (Alternate Channel
+        Assessment) operation.
+      </description>
+
+      <command name="Aca()" async="true"
+          id="mocaIfAcaTable/1.3.6.1.4.1.31621.1.2.1.5.1                                             mocaIfAcaInitiate/1.3.6.1.4.1.31621.1.2.1.5.1.5                                             mocaIfAcaStatusCompletedTrap/1.3.6.1.4.1.31621.1.2.1.5.1.9">
+        <description>
+          This command corresponds to the MoCA ACA (Alternate Channel
+          Assessment) operation. When this command is invoked the managed MoCA
+          Node will initiate a MoCA On Demand LMO (Link Maintenance Operation).
+        </description>
+        <input>
+
+          <parameter name="NodeID"
+              id="mocaIfAcaNodeID/1.3.6.1.4.1.31621.1.2.1.5.1.1">
+            <description>
+              The Node ID of the MoCA Node to transmit the EVM Probe when the
+              parameter {{param|Type}} = {{enum|evm|Type}}.
+            </description>
+            <syntax>
+              <dataType ref="MocaNodeID"/>
+            </syntax>
+          </parameter>
+
+          <parameter name="Type"
+              id="mocaIfAcaType/1.3.6.1.4.1.31621.1.2.1.5.1.2">
+            <description>
+              The ACA (Alternate Channel Assessment) type is either
+              {{enum|evm}} or {{enum|quiet}}.
+            </description>
+            <syntax>
+              <string>
+                <enumeration value="quiet"/>
+                <enumeration value="evm"/>
+              </string>
+            </syntax>
+          </parameter>
+
+          <parameter name="Channel"
+              id="mocaIfAcaChannel/1.3.6.1.4.1.31621.1.2.1.5.1.3">
+            <description>
+              The channel number under assessment, starting from 0 in
+              increments of 25 MHz.
+            </description>
+            <syntax>
+              <unsignedInt/>
+            </syntax>
+          </parameter>
+
+          <parameter name="ReportNodeMask"
+              id="mocaIfAcaReportNodeMask/1.3.6.1.4.1.31621.1.2.1.5.1.4">
+            <description>
+              Specifies the MoCA Nodes that are requested to be part of the
+              channel assessment: Setting bits corresponding to Node IDs of
+              these MoCA Nodes to 1.
+
+              See {{bibref|MoCAv2.0|Section 6.2.1}}
+            </description>
+            <syntax>
+              <hexBinary>
+                <size minLength="2" maxLength="2"/>
+              </hexBinary>
+            </syntax>
+          </parameter>
+        </input>
+        <output>
+
+          <parameter name="Status"
+              id="mocaIfAcaStatus/1.3.6.1.4.1.31621.1.2.1.5.1.6">
+            <description>
+              Status of the ACA operation.
+
+              If the value of this parameter is anything other than
+              {{enum|success}}, the values of the other output arguments for
+              this operation are indeterminate.
+            </description>
+            <syntax>
+              <string>
+                <enumeration value="success" code="0"/>
+                <enumeration value="failBADCHANNEL" code="1"/>
+                <enumeration value="failNOEVMPROBE" code="2"/>
+                <enumeration value="fail" code="3"/>
+                <enumeration value="inPROGRESS" code="4">
+                  <description>Not used.</description>
+                </enumeration>
+              </string>
+            </syntax>
+          </parameter>
+
+          <parameter name="TotalRxPower"
+              id="mocaIfAcaTotalRxPower/1.3.6.1.4.1.31621.1.2.1.5.1.7">
+            <description>
+              dBm (-128 to +127 dBm).
+            </description>
+            <syntax>
+              <dataType ref="MocaDBm"/>
+            </syntax>
+          </parameter>
+
+          <parameter name="PowerProfile"
+              id="mocaIfAcaPowerProfile/1.3.6.1.4.1.31621.1.2.1.5.1.8">
+            <description>
+              Binary string array with 1 byte (represented as two hexadecimal
+              digits) for each subcarrier. See {{bibref|MOCA11-MIB|Appendix A}}
+              for the encoding of this object.
+            </description>
+            <syntax>
+              <hexBinary/>
+            </syntax>
+          </parameter>
+        </output>
+      </command>
+    </object>
+
+    <object name="Device.MoCA.Interface.{i}.Reset." access="readOnly"
+        minEntries="1" maxEntries="1"
+        id="mocaIfMrTable/1.3.6.1.4.1.31621.1.2.1.6" version="2.17">
+      <description>
+        Used by the managed MoCA Node to initiate MoCA Reset Transaction.
+      </description>
+
+      <parameter name="NodeMask" access="readWrite"
+          id="mocaIfMrNodeMask/1.3.6.1.4.1.31621.1.2.1.6.1.1">
+        <description>
+          The MoCA Nodes that must respond to the MR transaction L2ME request
+          sent by the NC except for the MR Entry Node (LSB corresponds to Node
+          ID 0x0).
+
+          See {{bibref|MoCAv2.0|Section 6.2.1}}
+        </description>
+        <syntax>
+          <hexBinary>
+            <size minLength="2" maxLength="2"/>
+          </hexBinary>
+        </syntax>
+      </parameter>
+
+      <parameter name="StartTime" access="readWrite"
+          id="mocaIfMrStartTime/1.3.6.1.4.1.31621.1.2.1.6.1.2">
+        <description>
+          Time in seconds after this parameter is written that a MoCA Node must
+          initiate a MoCA Reset (MR).
+
+          See {{bibref|MoCAv2.0|Section 7.15}}.
+        </description>
+        <syntax command="true">
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="StatusTrapEnable" access="readWrite"
+          id="mocaIfMrStatusTrapEnable/1.3.6.1.4.1.31621.1.2.1.6.1.3">
+        <description>
+          Used to enable {{event|#.MrRstSuccessTrap!}} and
+          {{event|#.MrRstFailTrap!}} that the network reset was completed
+          successfully or failed for MR transaction status trap.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="NetworkTrapEnable" access="readWrite"
+          id="mocaIfMrNetworkTrapEnable/1.3.6.1.4.1.31621.1.2.1.6.1.4">
+        <description>
+          Used to enable {{event|#.MrNetworkSuccessTrap!}} and
+          {{event|#.MrNetworkFailTrap!}} that the network was reformed or not
+          reformed successfully following the MR transaction.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
     </object>
 
     <object name="Device.MoCA.Interface.{i}.Stats." access="readOnly"
@@ -25232,42 +28792,58 @@
         4.2.2}}.
       </description>
 
-      <parameter name="BytesSent" access="readOnly" activeNotify="canDeny">
+      <parameter name="BytesSent" access="readOnly" activeNotify="canDeny"
+          id="mocaIfTxBytes/1.3.6.1.4.1.31621.1.2.1.8.1.8">
         <description>
           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">
+      <parameter name="BytesReceived" access="readOnly" activeNotify="canDeny"
+          id="mocaIfRxBytes/1.3.6.1.4.1.31621.1.2.1.8.1.9">
         <description>
           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">
+      <parameter name="PacketsSent" access="readOnly" activeNotify="canDeny"
+          id="mocaIfTxPackets/1.3.6.1.4.1.31621.1.2.1.8.1.1">
         <description>
           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">
+          activeNotify="canDeny"
+          id="mocaIfRxPackets/1.3.6.1.4.1.31621.1.2.1.8.1.3">
         <description>
           The total number of packets received on the interface.
         </description>
         <syntax>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="RxCorrectedErrors" access="readOnly"
+          activeNotify="canDeny"
+          id="mocaIfRxCorrectedErrors/1.3.6.1.4.1.31621.1.2.1.8.1.4">
+        <description>
+          The number of received Ethernet packets that have errors and are
+          corrected by this MoCA interface.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
@@ -25275,9 +28851,12 @@
         <description>
           The total number of outbound packets that could not be transmitted
           because of errors.
+
+          This parameter MUST NOT be implemented for MoCA 2.0 because it
+          doesn't map to a MIB object.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="StatsCounter32"/>
         </syntax>
       </parameter>
 
@@ -25286,33 +28865,38 @@
         <description>
           The total number of inbound packets that contained errors preventing
           them from being delivered to a higher-layer protocol.
+
+          This parameter MUST NOT be implemented for MoCA 2.0 because it
+          doesn't map to a MIB object.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="StatsCounter32"/>
         </syntax>
       </parameter>
 
       <parameter name="UnicastPacketsSent" access="readOnly"
-          activeNotify="canDeny">
+          activeNotify="canDeny"
+          id="mocaIfTxUnicast/1.3.6.1.4.1.31621.1.2.1.8.1.10">
         <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/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
       <parameter name="UnicastPacketsReceived" access="readOnly"
-          activeNotify="canDeny">
+          activeNotify="canDeny"
+          id="mocaIfRxUnicast/1.3.6.1.4.1.31621.1.2.1.8.1.11">
         <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>
 
@@ -25330,7 +28914,8 @@
       </parameter>
 
       <parameter name="DiscardPacketsReceived" access="readOnly"
-          activeNotify="canDeny">
+          activeNotify="canDeny"
+          id="mocaIfRxDrops/1.3.6.1.4.1.31621.1.2.1.8.1.5">
         <description>
           The total number of inbound packets which were chosen to be discarded
           even though no errors had been detected to prevent their being
@@ -25338,55 +28923,59 @@
           to free up buffer space.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="StatsCounter32"/>
         </syntax>
       </parameter>
 
       <parameter name="MulticastPacketsSent" access="readOnly"
-          activeNotify="canDeny">
+          activeNotify="canDeny"
+          id="mocaIfTxMulticast/1.3.6.1.4.1.31621.1.2.1.8.1.12">
         <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="MulticastPacketsReceived" access="readOnly"
-          activeNotify="canDeny">
+          activeNotify="canDeny"
+          id="mocaIfRxMulticast/1.3.6.1.4.1.31621.1.2.1.8.1.13">
         <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>
-          <unsignedLong/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
       <parameter name="BroadcastPacketsSent" access="readOnly"
-          activeNotify="canDeny">
+          activeNotify="canDeny"
+          id="mocaIfTxBroadcast/1.3.6.1.4.1.31621.1.2.1.8.1.14">
         <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">
+          activeNotify="canDeny"
+          id="mocaIfRxBroadcast/1.3.6.1.4.1.31621.1.2.1.8.1.15">
         <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>
 
@@ -25395,9 +28984,12 @@
         <description>
           The total number of packets received via the interface which were
           discarded because of an unknown or unsupported protocol.
+
+          This parameter MUST NOT be implemented for MoCA 2.0 because it
+          doesn't map to a MIB object.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="StatsCounter32"/>
         </syntax>
       </parameter>
     </object>
@@ -25409,7 +29001,8 @@
         interface {{bibref|MoCAv1.1}}.
       </description>
 
-      <parameter name="EgressNumFlows" access="readOnly">
+      <parameter name="EgressNumFlows" access="readOnly"
+          id="mocaIfEgressNodeNumFlows/1.3.6.1.4.1.31621.1.2.1.8.1.6">
         <description>
           The number of QoS flows that this interface has from the MoCA
           network.
@@ -25422,7 +29015,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="IngressNumFlows" access="readOnly">
+      <parameter name="IngressNumFlows" access="readOnly"
+          id="mocaIfIngressNodeNumFlows/1.3.6.1.4.1.31621.1.2.1.8.1.7">
         <description>
           The number of QoS flows that this interface has onto the MoCA
           network.
@@ -25457,19 +29051,25 @@
         <parameter ref="FlowID"/>
       </uniqueKey>
 
-      <parameter name="FlowID" access="readOnly">
+      <parameter name="FlowID" access="readOnly"
+          id="mocaIfFlowID/1.3.6.1.4.1.31621.1.2.1.9.1.2">
         <description>
           The flow ID used to identify a flow in the network.
 
           This parameter is based on ''mocaIfFlowID'' from
           {{bibref|MOCA11-MIB}}.
+
+          Note that the data type has changed from ''unsignedInt'' to
+          ''MACAddress''. This is because the original data type was an error
+          and could not have been implemented as specified.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="MACAddress"/>
         </syntax>
       </parameter>
 
-      <parameter name="PacketDA" access="readOnly">
+      <parameter name="PacketDA" access="readOnly"
+          id="mocaIfPacketDA/1.3.6.1.4.1.31621.1.2.1.9.1.3">
         <description>
           The Destination Address (DA) for the packets in this flow.
 
@@ -25481,7 +29081,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="MaxRate" access="readOnly">
+      <parameter name="MaxRate" access="readOnly"
+          id="mocaIfPeakDataRate/1.3.6.1.4.1.31621.1.2.1.9.1.4">
         <description>
           Maximum required rate in {{units}}.
 
@@ -25495,7 +29096,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="MaxBurstSize" access="readOnly">
+      <parameter name="MaxBurstSize" access="readOnly"
+          id="mocaIfBurstSize/1.3.6.1.4.1.31621.1.2.1.9.1.5">
         <description>
           Maximum burst size.
 
@@ -25507,7 +29109,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="LeaseTime" access="readOnly">
+      <parameter name="LeaseTime" access="readOnly"
+          id="mocaIfLeaseTime/1.3.6.1.4.1.31621.1.2.1.9.1.6">
         <description>
           Flow lease time (expressed in {{units}}).
 
@@ -25523,7 +29126,21 @@
         </syntax>
       </parameter>
 
-      <parameter name="LeaseTimeLeft" access="readOnly" activeNotify="canDeny">
+      <parameter name="Tag" access="readOnly"
+          id="mocaIfFlowTag/1.3.6.1.4.1.31621.1.2.1.9.1.7">
+        <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
+          FLOW_TAG carries application specific content of this PQoS flow. See
+          {{bibref|MoCAv2.0|Section 6.3.13.1}}.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="LeaseTimeLeft" access="readOnly" activeNotify="canDeny"
+          id="mocaIfLeaseTimeLeft/1.3.6.1.4.1.31621.1.2.1.9.1.8">
         <description>
           Flow lease time remaining (expressed in {{units}}).
 
@@ -25540,13 +29157,126 @@
         </syntax>
       </parameter>
 
-      <parameter name="FlowPackets" access="readOnly" activeNotify="canDeny">
+      <parameter name="FlowPackets" access="readOnly" activeNotify="canDeny"
+          id="mocaIfTxPacketsFlow/1.3.6.1.4.1.31621.1.2.1.9.1.9">
         <description>
           The number of packets transmitted for this flow.
 
           This parameter is based on ''mocaIfTxPacketsFlow'' from
           {{bibref|MOCA11-MIB}}.
         </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="IngressGuid" access="readOnly"
+          id="mocaIfFlowStatsIngressGuid/1.3.6.1.4.1.31621.1.2.1.9.1.10">
+        <description>
+          The MAC address of the MoCA Node specified by the INGRESS_NODE_ID
+          parameter of the flow.
+
+          See {{bibref|MoCAv2.0|Section 6.3.13.1}}.
+        </description>
+        <syntax>
+          <dataType ref="MACAddress"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="EgressGuid" access="readOnly"
+          id="mocaIfFlowStatsEgressGuid/1.3.6.1.4.1.31621.1.2.1.9.1.11">
+        <description>
+          The MAC address of the MoCA Node specified by the EGRESS_NODE_ID
+          parameter of the flow.
+
+          See {{bibref|MoCAv2.0|section 6.3.13.1}}.
+        </description>
+        <syntax>
+          <dataType ref="MACAddress"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="MaximumLatency" access="readOnly"
+          id="mocaIfFlowStatsMaximumLatency/1.3.6.1.4.1.31621.1.2.1.9.1.12">
+        <description>
+          The MAXIMUM_LATENCY parameter of the flow in units of milliseconds. A
+          value of 0 indicates no value available.
+
+          See {{bibref|MoCAv2.0|section 6.3.13.1}}.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ShortTermAvgRatio" access="readOnly"
+          id="mocaIfFlowStatsShortTermAvgRatio/1.3.6.1.4.1.31621.1.2.1.9.1.13">
+        <description>
+          The SHORT_TERM_AVERAGE_RATIO parameter of the flow.
+
+          See {{bibref|MoCAv2.0|section 6.3.13.1}}.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="FlowPer" access="readOnly"
+          id="mocaIfFlowStatsFlowPer/1.3.6.1.4.1.31621.1.2.1.9.1.15">
+        <description>
+          The FLOW_PER parameter of this flow, where a value of 0 indicates
+          NPER and 1 indicates VLPER.
+
+          See {{bibref|MoCAv2.0|section 6.3.13.1}}.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="IngressClassify" access="readOnly"
+          id="mocaIfFlowStatsIngressClassify/1.3.6.1.4.1.31621.1.2.1.9.1.16">
+        <description>
+          The INGRESS_CLASSIFICATION_RULE parameter of the flow.
+
+          See {{bibref|MoCAv2.0|section 6.3.13.1}}.
+        </description>
+        <syntax>
+          <dataType ref="MocaFlowIngrClassRule"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="VlanTag" access="readOnly"
+          id="mocaIfFlowStatsVlanTag/1.3.6.1.4.1.31621.1.2.1.9.1.17">
+        <description>
+          The VLAN_TAG parameter of the flow.
+
+          See {{bibref|MoCAv2.0|section 6.3.13.1}}.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="DscpMoca" access="readOnly"
+          id="mocaIfFlowStatsDscpMoca/1.3.6.1.4.1.31621.1.2.1.9.1.18">
+        <description>
+          The DSCP_MOCA parameter of the flow.
+
+          See {{bibref|MoCAv2.0|section 6.3.13.1}}.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Dfid" access="readOnly"
+          id="mocaIfFlowStatsDfid/1.3.6.1.4.1.31621.1.2.1.9.1.19">
+        <description>
+          The destination flow ID of the flow assigned by the Ingress Node.
+
+          See {{bibref|MoCAv2.0|section 7.8.1.2}}.
+        </description>
         <syntax>
           <unsignedInt/>
         </syntax>
@@ -25555,16 +29285,22 @@
 
     <object name="Device.MoCA.Interface.{i}.AssociatedDevice.{i}."
         access="readOnly" numEntriesParameter="AssociatedDeviceNumberOfEntries"
-        minEntries="0" maxEntries="unbounded" version="2.0">
+        minEntries="0" maxEntries="unbounded" version="2.0"
+        id="mocaNodeTable/1.3.6.1.4.1.31621.1.2.1.11 mocaLinkStatsTable/1.3.6.1.4.1.31621.1.2.1.10">
       <description>
         This table contains information about other MoCA devices currently
         associated with this MoCA interface.
+
+        Entries in this table cannot be created or deleted by the network
+        management system. All entries are created or deleted by the device
+        software.
       </description>
       <uniqueKey functional="true">
         <parameter ref="MACAddress"/>
       </uniqueKey>
 
-      <parameter name="MACAddress" access="readOnly">
+      <parameter name="MACAddress" access="readOnly"
+          id="mocaNodeMacAddress/1.3.6.1.4.1.31621.1.2.1.11.1.3">
         <description>
           The MAC address of the associated device's MoCA interface.
         </description>
@@ -25573,7 +29309,8 @@
         </syntax>
       </parameter>
 
-      <parameter name="NodeID" access="readOnly">
+      <parameter name="NodeID" access="readOnly"
+          id="mocaNodeIndex/1.3.6.1.4.1.31621.1.2.1.11.1.1">
         <description>
           The Node ID of this remote device.
 
@@ -25581,11 +29318,12 @@
           {{bibref|MOCA11-MIB}}.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="MocaNodeID"/>
         </syntax>
       </parameter>
 
-      <parameter name="PreferredNC" access="readOnly">
+      <parameter name="PreferredNC" access="readOnly"
+          id="mocaNodePreferredNC/1.3.6.1.4.1.31621.1.2.1.11.1.8">
         <description>
           Whether this remote device is a preferred Network Coordinator (NC).
 
@@ -25594,10 +29332,12 @@
         </description>
         <syntax>
           <boolean/>
+          <default type="factory" value="false"/>
         </syntax>
       </parameter>
 
-      <parameter name="HighestVersion" access="readOnly">
+      <parameter name="HighestVersion" access="readOnly"
+          id="mocaNodeMocaVersion/1.3.6.1.4.1.31621.1.2.1.11.1.2">
         <description>
           Identifies the highest MoCA version that this remote device supports.
 
@@ -25623,6 +29363,9 @@
 
           This parameter is based on ''mocaMeshTxRate'' from
           {{bibref|MOCA11-MIB}}.
+
+          This parameter MUST NOT be implemented for MoCA 2.0 because it
+          doesn't map to a MIB object.
         </description>
         <syntax>
           <unsignedInt>
@@ -25634,6 +29377,9 @@
       <parameter name="PHYRxRate" access="readOnly">
         <description>
           The PHY receive rate (in {{units}}) from this remote device.
+
+          This parameter MUST NOT be implemented for MoCA 2.0 because it
+          doesn't map to a MIB object.
         </description>
         <syntax>
           <unsignedInt>
@@ -25642,28 +29388,37 @@
         </syntax>
       </parameter>
 
-      <parameter name="TxPowerControlReduction" access="readOnly">
+      <parameter name="TxPowerControlReduction" access="readOnly"
+          status="deprecated"
+          id="mocaNodeTxPowerReduction/1.3.6.1.4.1.31621.1.2.1.11.1.6">
         <description>
-          The reduction in transmitter level (in {{units}}) due to power
-          control.
+          The reduction in transmitter level due to power control.
 
           This parameter is based on ''mocaNodeTxPowerReduction'' from
           {{bibref|MOCA11-MIB}}.
+
+          {{deprecated|2.17|since it is replaced by
+          {{param|Device.MoCA.Interface.{i}.Mesh.{i}.PowerReduction}}. See
+          {{bibref|MOCA20-MIB}}}}
         </description>
         <syntax>
-          <unsignedInt>
-            <units value="dB"/>
-          </unsignedInt>
+          <dataType ref="MocaDB"/>
         </syntax>
       </parameter>
 
-      <parameter name="RxPowerLevel" access="readOnly" activeNotify="canDeny">
+      <parameter name="RxPowerLevel" access="readOnly" activeNotify="canDeny"
+          status="deprecated"
+          id="mocaNodeRxPower/1.3.6.1.4.1.31621.1.2.1.11.1.7">
         <description>
           The power level (in {{units}}) received at the MoCA interface from
           this remote device.
 
           This parameter is based on ''mocaNodeRxPower'' from
           {{bibref|MOCA11-MIB}}.
+
+          {{deprecated|2.17|since it is replaced by
+          {{param|Device.MoCA.Interface.{i}.Mesh.{i}.Power}}. See
+          {{bibref|MOCA20-MIB}}}}
         </description>
         <syntax>
           <unsignedInt>
@@ -25672,48 +29427,58 @@
         </syntax>
       </parameter>
 
-      <parameter name="TxBcastRate" access="readOnly">
+      <parameter name="TxBcastRate" access="readOnly"
+          id="mocaNodeTxGcdRate/1.3.6.1.4.1.31621.1.2.1.11.1.4">
         <description>
-          The broadcast PHY transmit rate (in {{units}}) from this remote
-          device.
+          The broadcast PHY transmit rate from this remote device.
 
           This parameter is based on ''mocaNodeTxGcdRate'' from
           {{bibref|MOCA11-MIB}}.
         </description>
         <syntax>
-          <unsignedInt>
-            <units value="Mbps"/>
-          </unsignedInt>
+          <dataType ref="MocaPhyRate"/>
         </syntax>
       </parameter>
 
       <parameter name="RxBcastPowerLevel" access="readOnly"
-          activeNotify="canDeny">
+          activeNotify="canDeny"
+          id="mocaNodeRxGcdPower/1.3.6.1.4.1.31621.1.2.1.11.1.5">
         <description>
-          The power level (in {{units}}) received at the MoCA interface from
-          this remote device.
+          The power level received at the MoCA interface from this remote
+          device.
 
           This parameter is based on ''mocaNodeRxGcdPower'' from
           {{bibref|MOCA11-MIB}}.
         </description>
         <syntax>
-          <unsignedInt>
-            <units value="dBm"/>
-          </unsignedInt>
+          <dataType ref="MocaDBm"/>
         </syntax>
       </parameter>
 
-      <parameter name="TxPackets" access="readOnly" activeNotify="canDeny">
+      <parameter name="TxPackets" access="readOnly" activeNotify="canDeny"
+          id="mocaLinkTxPackets/1.3.6.1.4.1.31621.1.2.1.10.1.2">
         <description>
           The number of packets transmitted to this remote device (Note:
           Includes Broadcast, Multicast and Unicast packets).
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
-      <parameter name="RxPackets" access="readOnly" activeNotify="canDeny">
+      <parameter name="TxDrops" access="readOnly"
+          id="mocaLinkTxDrops/1.3.6.1.4.1.31621.1.2.1.10.1.3">
+        <description>
+          The number of Unicast EPDUs received at the ECL, destined to the
+          associated MoCA Node, and not transmitted by this MoCA interface.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="RxPackets" access="readOnly" activeNotify="canDeny"
+          id="mocaNodeRxPackets/1.3.6.1.4.1.31621.1.2.1.11.1.11">
         <description>
           The number of packets received from this remote device (Note:
           Includes Broadcast, Multicast and Unicast packets).
@@ -25722,11 +29487,24 @@
           {{bibref|MOCA11-MIB}}.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="StatsCounter64"/>
         </syntax>
       </parameter>
 
-      <parameter name="RxErroredAndMissedPackets" access="readOnly">
+      <parameter name="RxCorrected" access="readOnly"
+          id="mocaNodeRxCorrected/1.3.6.1.4.1.31621.1.2.1.11.1.12">
+        <description>
+          The number of Ethernet packets received by this MoCA interface that
+          have errors and are corrected from the MoCA Node identified by
+          {{param|MACAddress}}.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter64"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="RxErroredAndMissedPackets" access="readOnly"
+          id="mocaNodeRxDrops/1.3.6.1.4.1.31621.1.2.1.11.1.13">
         <description>
           The number of errored and missed packets received from this remote
           device.
@@ -25735,7 +29513,20 @@
           {{bibref|MOCA11-MIB}}.
         </description>
         <syntax>
-          <unsignedInt/>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="BondingCapable" access="readOnly"
+          id="mocaNodeBondingCapable/1.3.6.1.4.1.31621.1.2.1.11.1.9">
+        <description>
+          The MoCA Node identified by {{param|MACAddress}} supports Bonding if
+          the value is {{true}}. The MoCA Node identified by
+          {{param|MACAddress}} does not support Bonding if this value is
+          {{false}}.
+        </description>
+        <syntax>
+          <boolean/>
         </syntax>
       </parameter>
 
@@ -25745,13 +29536,17 @@
 
           This parameter is based on ''mocaNodeQAM256Capable'' from
           {{bibref|MOCA11-MIB}}.
+
+          This parameter MUST NOT be implemented for MoCA 2.0 because it
+          doesn't map to a MIB object.
         </description>
         <syntax>
           <boolean/>
         </syntax>
       </parameter>
 
-      <parameter name="PacketAggregationCapability" access="readOnly">
+      <parameter name="PacketAggregationCapability" access="readOnly"
+          id="mocaNodePduNumber/1.3.6.1.4.1.31621.1.2.1.11.1.10">
         <description>
           The packet aggregation capability supported by the remote device.
           Standard values are 0 (no support), 6 (6 {{units}}) or 10 (10
@@ -25759,27 +29554,34 @@
 
           This parameter is based on ''mocaNodePacketsAggrCapability'' from
           {{bibref|MOCA11-MIB}}.
+
+          Note that this parameter maps to different MIB objects for MoCA
+          1.0/1.1 and MoCA 2.0. [XXX2: Need to modify the syntax to
+          'unsignedInt' because MoCA 2.0 requires a minimum of 20 packets and
+          MoCA 2.5 requires a minimum of 80 packets.]
         </description>
         <syntax>
           <unsignedInt>
-            <range minInclusive="0" maxInclusive="10"/>
             <units value="packets"/>
           </unsignedInt>
         </syntax>
       </parameter>
 
-      <parameter name="RxSNR" access="readOnly">
+      <parameter name="RxSNR" access="readOnly" status="deprecated"
+          id="mocaNodeSNR/1.3.6.1.4.1.31621.1.2.1.11.1.14">
         <description>
-          The signal to noise level (in {{units}}) received at this interface
-          from this remote device.
+          The signal to noise level received at this interface from this remote
+          device.
 
           This parameter is based on ''mocaNodeSNR'' from
           {{bibref|MOCA11-MIB}}.
+
+          {{deprecated|2.17|since it is replaced by
+          {{param|Device.MoCA.Interface.{i}.Mesh.{i}.RxSNR}}. See
+          {{bibref|MOCA20-MIB}}}}
         </description>
         <syntax>
-          <unsignedInt>
-            <units value="dBm"/>
-          </unsignedInt>
+          <dataType ref="MocaDB"/>
         </syntax>
       </parameter>
 
@@ -25797,6 +29599,677 @@
           <boolean/>
         </syntax>
       </parameter>
+
+      <parameter name="SupportedIngressPqosFlows" access="readOnly"
+          id="mocaNodeSupportedIngressPqosFlows/1.3.6.1.4.1.31621.1.2.1.11.1.15">
+        <description>
+          The number of Ingress PQoS Flows supported by this MoCA interface
+          from the MoCA Node identified by {{param|MACAddress}}.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="SupportedEgressPqosFlows" access="readOnly"
+          id="mocaNodeSupportedEgressPqosFlows/1.3.6.1.4.1.31621.1.2.1.11.1.16">
+        <description>
+          The number of Egress PQoS Flows supported by this MoCA interface from
+          the MoCA Node identified by {{param|MACAddress}}.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="AggregationSize" access="readOnly"
+          id="mocaNodeAggregationSize/1.3.6.1.4.1.31621.1.2.1.11.1.17">
+        <description>
+          The maximum number of bytes that can be aggregated in a MoCA frame
+          that this MoCA Node supports.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="AeNumber" access="readOnly"
+          id="mocaNodeAeNumber/1.3.6.1.4.1.31621.1.2.1.11.1.18">
+        <description>
+          The maximum number of allocation elements, excluding the TAUs and the
+          Dummy DAUs, in one MAP that this MoCA Node supports.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="PowerState" access="readOnly"
+          id="mocaNodePowerState/1.3.6.1.4.1.31621.1.2.1.11.1.19">
+        <description>
+          Power State of the MoCA Node identified by the {{param|MACAddress}}.
+        </description>
+        <syntax>
+          <dataType ref="MocaPowerState"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="PowerStateCapability" access="readOnly"
+          id="mocaNodePowerStateCapability/1.3.6.1.4.1.31621.1.2.1.11.1.20">
+        <description>
+          Power State capability of the MoCA Node identified by the
+          {{param|MACAddress}}.
+        </description>
+        <syntax>
+          <dataType ref="MocaPowerState"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="PDelay" access="readOnly"
+          id="mocaNodePDelay/1.3.6.1.4.1.31621.1.2.1.11.1.21">
+        <description>
+          Propagation delay measured in units of 10ns between the local MoCA
+          Node and the MoCA Node identified by the {{param|MACAddress}}.
+        </description>
+        <syntax>
+          <int/>
+        </syntax>
+      </parameter>
+
+      <parameter name="EnhancedPrivacyCapable" access="readOnly"
+          id="moca25NodeEnhancedPrivacyCapable/1.3.6.1.4.1.31621.1.3.1.3.1.2">
+        <description>
+          Indicates the MoCA Node identified by {{param|MACAddress}} supports
+          MoCA 2 Enhanced Privacy if the value is {{true}}. Indicates the MoCA
+          Node identified by {{param|MACAddress}} does not support MoCA 2
+          Enhanced Privacy if this value is {{false}}.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="LinkType" access="readOnly"
+          id="moca25NodeLinkType/1.3.6.1.4.1.31621.1.3.1.3.1.3">
+        <description>
+          Indicates the type of link used for unicast data transmissions
+          between the managed MoCA Node and the MoCA Node identified by
+          {{param|MACAddress}}.
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="moca1PHY">
+              <description>MoCA 1 PHY.</description>
+            </enumeration>
+            <enumeration value="primary">
+              <description>Primary.</description>
+            </enumeration>
+            <enumeration value="bonded">
+              <description>Bonded.</description>
+            </enumeration>
+            <enumeration value="m25300MHz">
+              <description>300 MHz MoCA 2.5 PHY.</description>
+            </enumeration>
+            <enumeration value="m25400MHz">
+              <description>400 MHz MoCA 2.5 PHY.</description>
+            </enumeration>
+            <enumeration value="m25500MHz">
+              <description>500 MHz MoCA 2.5 PHY.</description>
+            </enumeration>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="Moca25PhyCapable" access="readOnly"
+          id="moca25NodeMoca25PhyCapable/1.3.6.1.4.1.31621.1.3.1.3.1.4">
+        <description>
+          Indicates the MoCA Node identified by {{param|MACAddress}} supports
+          MoCA 2.5 PHY if the value is {{true}}. Indicates the MoCA Node
+          identified by {{param|MACAddress}} does not support MoCA 2.5 PHY if
+          this value is {{false}}.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="RxPwrList" access="readOnly"
+          id="moca25NodeRxPwrList/1.3.6.1.4.1.31621.1.3.1.3.1.5">
+        <description>
+          Per channel list of Receive power levels in dBm from the MoCA Node
+          identified by {{param|MACAddress}} to the managed MoCA Node.
+
+          The power measurement should cover the preamble and/or at least a
+          symbol time. The averaging method employed for this measurement is
+          implementation specific and not specified. It is recommended but not
+          required to utilize the LMO (Link Maintenance Operation) EVM probes
+          for this measurement.
+
+          The field numValues is a function of {{param|LinkType}}:
+
+          * MoCA 1 PHY - 1
+
+          * Primary - 1
+
+          * Bonded - 2
+
+          * 300 MHz MoCA 2.5 PHY - 3
+
+          * 400 MHz MoCA 2.5 PHY - 4
+
+          * 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]; };
+        </description>
+        <syntax>
+          <string>
+            <size minLength="2" maxLength="6"/>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="RxSNRList" access="readOnly"
+          id="moca25NodeRxSNRList/1.3.6.1.4.1.31621.1.3.1.3.1.6">
+        <description>
+          Per channel list of Average Receive Signal to Noise Ratio (SNR)
+          across all available subcarriers based on the EVM probe from the MoCA
+          Node identified by {{param|MACAddress}} to the managed MoCA Node.
+
+          The field numValues is a function of {{param|LinkType}}:
+
+          * MoCA 1 PHY - 1
+
+          * Primary - 1
+
+          * Bonded - 2
+
+          * 300 MHz MoCA 2.5 PHY - 3
+
+          * 400 MHz MoCA 2.5 PHY - 4
+
+          * 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]; };
+        </description>
+        <syntax>
+          <string>
+            <size minLength="2" maxLength="6"/>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="TxPwrList" access="readOnly"
+          id="moca25NodeTxPwrList/1.3.6.1.4.1.31621.1.3.1.3.1.7">
+        <description>
+          Per channel list of Transmit power levels in dBm from the managed
+          MoCA Node to the MoCA Node identified by {{param|MACAddress}}. The
+          transmit power should be max power for the channel less the Transmit
+          Power Control.
+
+          The field numValues is a function of {{param|LinkType}}:
+
+          * MoCA 1 PHY - 1
+
+          * Primary - 1
+
+          * Bonded - 2
+
+          * 300 MHz MoCA 2.5 PHY - 3
+
+          * 400 MHz MoCA 2.5 PHY - 4
+
+          * 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]; };
+        </description>
+        <syntax>
+          <string>
+            <size minLength="2" maxLength="6"/>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="TxPwrReductionList" access="readOnly"
+          id="moca25NodeTxPwrReductionList/1.3.6.1.4.1.31621.1.3.1.3.1.8">
+        <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
+          identified by {{param|MACAddress}}.
+
+          {{param}} is identical to the TPC back-off utilized for transmission
+          from the TPC backoff parameter TX_POWER_ADJUSTMENT_100MHZ.
+
+          The field numValues is a function of {{param|LinkType}}:
+
+          * MoCA 1 PHY - 1
+
+          * Primary - 1
+
+          * Bonded - 2
+
+          * 300 MHz MoCA 2.5 PHY - 3
+
+          * 400 MHz MoCA 2.5 PHY - 4
+
+          * 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]; };
+        </description>
+        <syntax>
+          <string>
+            <size minLength="2" maxLength="6"/>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="EgressNodeNumFlows" access="readOnly"
+          id="mocaLinkEgressNodeNumFlows/1.3.6.1.4.1.31621.1.2.1.10.1.4">
+        <description>
+          The number of PQoS flows in which this MoCA interface is an Egress
+          Node for these PQoS flows.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="IngressNodeNumFlows" access="readOnly"
+          id="mocaLinkIngressNodeNumFlows/1.3.6.1.4.1.31621.1.2.1.10.1.5">
+        <description>
+          The number of PQoS flows in which this MoCA interface is an Ingress
+          Node for these PQoS flows.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object name="Device.MoCA.Interface.{i}.Mesh.{i}." access="readOnly"
+        minEntries="0" maxEntries="unbounded"
+        numEntriesParameter="MeshNumberOfEntries"
+        id="mocaMeshTable/1.3.6.1.4.1.31621.1.2.1.12" version="2.17">
+      <description>
+        MoCA mesh PHY rate table. This table contains the unicast transmit PHY
+        rate between all pairs of MoCA Nodes in the MoCA network.
+
+        Since {{param|TxRate}} is the transmit PHY rate from
+        {{param|TxNodeIndex}} to {{param|RxNodeIndex}}, this table does not
+        contain any entries with {{param|TxNodeIndex}} equals
+        {{param|RxNodeIndex}}. In addition, a MoCA network can have less than
+        16 Nodes, hence some values of {{param|TxNodeIndex}} and
+        {{param|RxNodeIndex}} in the range of 0 to 15 may not exist.
+
+        Entries in this table cannot be created or deleted by the network
+        management system. All entries are created or deleted by the device
+        software.
+      </description>
+      <uniqueKey functional="true">
+        <parameter ref="TxNodeIndex"/>
+        <parameter ref="RxNodeIndex"/>
+      </uniqueKey>
+
+      <parameter name="TxNodeIndex" access="readOnly"
+          id="mocaMeshTableTxNodeIndex/1.3.6.1.4.1.31621.1.2.1.12.1.1">
+        <description>
+          The Node ID of the transmit MoCA Node is used as one of the index to
+          order the mesh PHY rate table.
+        </description>
+        <syntax>
+          <dataType ref="MocaNodeID"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="RxNodeIndex" access="readOnly"
+          id="mocaMeshTableRxNodeIndex/1.3.6.1.4.1.31621.1.2.1.12.1.2">
+        <description>
+          The Node ID of the receive MoCA Node is used as one of the index to
+          order the mesh PHY rate table.
+        </description>
+        <syntax>
+          <dataType ref="MocaNodeID"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="TxRate" access="readOnly"
+          id="mocaMeshTxRate/1.3.6.1.4.1.31621.1.2.1.12.1.3">
+        <description>
+          The transmit MoCA 1 PHY rate in Mbps from the MoCA Node identified by
+          {{param|TxNodeIndex}} to the MoCA Node identified by
+          {{param|RxNodeIndex}}.
+        </description>
+        <syntax>
+          <dataType ref="MocaPhyRate"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="TxRateNper" access="readOnly"
+          id="mocaMeshTxRateNper/1.3.6.1.4.1.31621.1.2.1.12.1.4">
+        <description>
+          The transmit normal packet error PHY Rate from the MoCA Node
+          identified by {{param|TxNodeIndex}} to the MoCA Node identified by
+          {{param|RxNodeIndex}}.
+        </description>
+        <syntax>
+          <dataType ref="MocaPhyRate"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="TxRateVlper" access="readOnly"
+          id="mocaMeshTxRateVlper/1.3.6.1.4.1.31621.1.2.1.12.1.5">
+        <description>
+          The transmit very low packet error PHY Rate from the MoCA Node
+          identified by {{param|TxNodeIndex}} to the MoCA Node identified by
+          {{param|RxNodeIndex}}.
+        </description>
+        <syntax>
+          <dataType ref="MocaPhyRate"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="LinkType" access="readOnly"
+          id="mocaMeshLinkType/1.3.6.1.4.1.31621.1.2.1.12.1.6">
+        <description>
+          The type of link which exists from the MoCA Node identified by
+          {{param|TxNodeIndex}} to the MoCA Node identified by
+          {{param|RxNodeIndex}}. {{enum}}
+
+          This parameter is only used for MoCA 2.0.
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="moca1PHY" code="0"/>
+            <enumeration value="primary" code="1"/>
+            <enumeration value="bonded" code="2"/>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="Power" access="readOnly"
+          id="mocaMeshPower/1.3.6.1.4.1.31621.1.2.1.12.1.7">
+        <description>
+          Per channel list of Transmit or Receive power levels in dBm. If the
+          MoCA Node identified by {{param|TxNodeIndex}} is equal to
+          {{param|#.NodeID}}, then indicates the unicast transmit power in dBm
+          from the MoCA Node identified by {{param|TxNodeIndex}} to the MoCA
+          Node identified by {{param|RxNodeIndex}}, else indicates the unicast
+          receive power in dBm from the MoCA Node identified by
+          {{param|TxNodeIndex}} at the MoCA Node identified by
+          {{param|RxNodeIndex}}.
+
+          For transmit power, the power should be max power for the channel
+          less the Transmit Power Control. For received power, the power
+          measurement should cover the preamble and/or at least a symbol time.
+          The averaging method employed for this measurement is implementation
+          specific and not specified. It is recommended but not required to
+          utilize the LMO (Link Maintenance Operation) EVM probes for this
+          measurement.
+
+          The field ''numValues'' is a function of {{param|LinkType}}:
+
+          * {{enum|moca1PHY|LinkType}} - 1
+
+          * {{enum|primary|LinkType}} - 1
+
+          * {{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]; };
+
+          This parameter is only used for MoCA 2.0.
+        </description>
+        <syntax>
+          <hexBinary>
+            <size minLength="2" maxLength="3"/>
+          </hexBinary>
+        </syntax>
+      </parameter>
+
+      <parameter name="PowerReduction" access="readOnly"
+          id="mocaMeshPowerReduction/1.3.6.1.4.1.31621.1.2.1.12.1.8">
+        <description>
+          Per channel list of The Transmit Power Control (TPC) back-off in dB.
+          If the MoCA Node identified by {{param|TxNodeIndex}} is equal to
+          {{param|#.NodeID}}, then indicates the TPC in dB utilized to back-off
+          transmission to the MoCA Node identified by {{param|RxNodeIndex}}.
+          Otherwise indicates the TPC in dB that the MoCA Node identified by
+          {{param|TxNodeIndex}} utilized to back-off its transmission.
+
+          {{param}} is identical to the TPC back-off utilized for transmission
+          and determined from the TPC backoff parameters TPC_BACKOFF_MAJOR and
+          TPC_BACKOFF_MINOR as follows: {{param}} = TPC_BACKOFF_MAJOR * 3
+          +TPC_BACKOFF_MINOR.
+
+          The field ''numValues'' is a function of {{param|LinkType}}:
+
+          * {{enum|moca1PHY|LinkType}} - 1
+
+          * {{enum|primary|LinkType}} - 1
+
+          * {{enum|bonded|LinkType}} - 2
+
+           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>
+        <syntax>
+          <hexBinary>
+            <size minLength="2" maxLength="3"/>
+          </hexBinary>
+        </syntax>
+      </parameter>
+
+      <parameter name="RxSNR" access="readOnly"
+          id="mocaMeshRxSNR/1.3.6.1.4.1.31621.1.2.1.12.1.9">
+        <description>
+          Per channel list of average received Signal to Noise Ratio (SNR) in
+          dB. If the MoCA Node identified by {{param|RxNodeIndex}} is not equal
+          to {{param|#.NodeID}} or the MoCA Node identified by
+          {{param|TxNodeIndex}} is equal to {{param|#.NodeID}}, then this
+          parameter is not present. Otherwise indicates the average received
+          SNR across all the available carriers based on the EVM probe from the
+          MoCA Node identified by {{param|TxNodeIndex}}.
+
+          The field ''numValues'' is a function of {{param|LinkType}}:
+
+          * {{enum|moca1PHY|LinkType}} - 1
+
+          * {{enum|primary|LinkType}} - 1
+
+          * {{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]; };
+
+          This parameter is only used for MoCA 2.0.
+        </description>
+        <syntax>
+          <hexBinary>
+            <size minLength="2" maxLength="3"/>
+          </hexBinary>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object name="Device.MoCA.Interface.{i}.Bridge.{i}." access="readOnly"
+        minEntries="0" maxEntries="unbounded"
+        numEntriesParameter="BridgeNumberOfEntries"
+        id="mocaBridgeTable/1.3.6.1.4.1.31621.1.2.1.13" version="2.17">
+      <description>
+        MoCA bridge Ethernet MAC address table. This table contains an entry
+        for every MoCA Node in the MoCA network.
+
+        Entries in this table cannot be created or deleted by the network
+        management system. All entries are created or deleted by the device
+        software.
+      </description>
+      <uniqueKey functional="true">
+        <parameter ref="NodeIndex"/>
+      </uniqueKey>
+
+      <parameter name="NodeIndex" access="readOnly"
+          id="mocaBridgeNodeIndex/1.3.6.1.4.1.31621.1.2.1.13.1.1">
+        <description>
+          The Node ID is used as an index to order the MAC entries in the MoCA
+          bridge table.
+        </description>
+        <syntax>
+          <dataType ref="MocaNodeID"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="MACAddresses" access="readOnly"
+          id="mocaBridgeMacAddress/1.3.6.1.4.1.31621.1.2.1.13.1.3">
+        <description>
+          The Ethernet MAC addresses identified by the Node ID.
+        </description>
+        <syntax>
+          <list/>
+          <dataType ref="MACAddress"/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object name="Device.MoCA.Interface.{i}.MeshScMod.{i}." access="readOnly"
+        minEntries="0" maxEntries="unbounded"
+        numEntriesParameter="MeshScModNumberOfEntries"
+        id="mocaMeshScModTable/1.3.6.1.4.1.31621.1.2.1.14" version="2.17">
+      <description>
+        MoCA mesh Subcarrier Modulation table. This table contains the Unicast
+        transmit subcarrier modulation between all pairs of MoCA Nodes in the
+        MoCA network.
+
+        Since {{param|Mod}} is the subcarrier modulation from
+        {{param|TxNodeIndex}} to {{param|RxNodeIndex}}, this table does not
+        contain any entries with {{param|TxNodeIndex}} equals
+        {{param|RxNodeIndex}}. In addition, a MoCA network can have less than
+        16 MoCA Nodes, hence some values of {{param|TxNodeIndex}} and
+        {{param|RxNodeIndex}} in the range of 0 to 15 may not exist. The
+        {{param|ChannelIndex}} index is used to differentiate between the
+        primary and secondary channels in a bonded channel network. The primary
+        channel index is always present, the secondary channel index may not
+        always be present.
+
+        Entries in this table cannot be created or deleted by the network
+        management system. All entries are created or deleted by the device
+        software.
+      </description>
+      <uniqueKey functional="true">
+        <parameter ref="TxNodeIndex"/>
+        <parameter ref="RxNodeIndex"/>
+        <parameter ref="ChannelIndex"/>
+      </uniqueKey>
+
+      <parameter name="TxNodeIndex" access="readOnly"
+          id="mocaMeshTxNodeIndex/1.3.6.1.4.1.31621.1.2.1.14.1.1">
+        <description>
+          The Node ID of the transmit MoCA Node is used as one of the index to
+          order the mesh PHY rate table.
+        </description>
+        <syntax>
+          <dataType ref="MocaNodeID"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="RxNodeIndex" access="readOnly"
+          id="mocaMeshRxNodeIndex/1.3.6.1.4.1.31621.1.2.1.14.1.2">
+        <description>
+          The Node ID of the receive MoCA Node is used as one of the index to
+          order the mesh subcarrier modulation.
+        </description>
+        <syntax>
+          <dataType ref="MocaNodeID"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ChannelIndex" access="readOnly"
+          id="mocaMeshChannelIndex/1.3.6.1.4.1.31621.1.2.1.14.1.3">
+        <description>
+          {{enum|primary}} or {{enum|secondary}} channel for MoCA 2.0 Node
+          associated with {{param|Nper}} and {{param|Vlper}}. For MoCA 1 Node,
+          the same as the {{enum|primary}} channel associated with
+          {{param|Mod}}. In a bonded MoCA 2.0 network, the {{enum|primary}} and
+          {{enum|secondary}} channels each have their own subcarrier modulation
+          data.
+
+          {{enum|m25first}}, {{enum|m25second}}, {{enum|m25third}},
+          {{enum|m25fourth}} or {{enum|m25fifth}} channel for MoCA 2.5 Node
+          associated with {{param|ModM25}}.
+        </description>
+        <syntax>
+          <dataType ref="MocaChannelIndex"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Mod" access="readOnly"
+          id="mocaMeshScMod/1.3.6.1.4.1.31621.1.2.1.14.1.4">
+        <description>
+          1 Byte Hex array values with no delimiters where each byte indicates
+          the subcarrier modulation of one subcarrier from the MoCA Node
+          identified by {{param|TxNodeIndex}} to the MoCA Node identified by
+          {{param|RxNodeIndex}} for the MoCA 1 Unicast transmission PHY
+          profile.
+        </description>
+        <syntax>
+          <dataType ref="MocaScMod"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Nper" access="readOnly"
+          id="mocaMeshScModNper/1.3.6.1.4.1.31621.1.2.1.14.1.5">
+        <description>
+          1 Byte Hex array values with no delimiters where each byte indicates
+          the unicast NPER subcarrier modulation of one subcarrier from the
+          MoCA Node identified by {{param|TxNodeIndex}} to the MoCA Node
+          identified by {{param|RxNodeIndex}} for the associated
+          {{param|ChannelIndex}}.
+        </description>
+        <syntax>
+          <dataType ref="MocaScMod"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Vlper" access="readOnly"
+          id="mocaMeshScModVlper/1.3.6.1.4.1.31621.1.2.1.14.1.6">
+        <description>
+          1 Byte Hex array values with no delimiters where each byte indicates
+          the unicast VLPER subcarrier modulation of one subcarrier from the
+          MoCA Node identified by {{param|TxNodeIndex}} to the MoCA Node
+          identified by {{param|RxNodeIndex}} for the associated
+          {{param|ChannelIndex}}.
+        </description>
+        <syntax>
+          <dataType ref="MocaScMod"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ModM25" access="readOnly"
+          id="mocaMeshScModM25/1.3.6.1.4.1.31621.1.3.1.4.1.4">
+        <description>
+          1 Byte Hex array values with no delimiters where each byte indicates
+          the MoCA 2.5 unicast subcarrier modulation for all subcarriers from
+          the MoCA Node identified by {{param|TxNodeIndex}} to the MoCA Node
+          identified by {{param|RxNodeIndex}} for the associated
+          {{param|ChannelIndex}}.
+
+          For MoCA 2.5 First Channel, Second Channel, Third Channel, Fourth
+          Channel and Fifth Channel, the total number of subcarriers is 512.
+        </description>
+        <syntax>
+          <dataType ref="MocaScMod"/>
+        </syntax>
+      </parameter>
     </object>
 
     <object name="Device.Ghn." access="readOnly" minEntries="1" maxEntries="1"
@@ -25885,7 +30358,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -27804,7 +32277,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -28422,7 +32895,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -29019,7 +33492,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -29085,7 +33558,7 @@
         <parameter ref="MACAddress"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -29499,15 +33972,15 @@
 
                 If {{param|OperatingFrequencyBand}} is set to
                 {{enum|2.4GHz|OperatingFrequencyBand}}, only values {{enum|b}},
-                {{enum|g}}, {{enum|n}}, {{enum|ax}} are allowed.
+                {{enum|g}}, {{enum|n}}, {{enum|ax}}, {{enum|be}} are allowed.
 
                 If {{param|OperatingFrequencyBand}} is set to
                 {{enum|5GHz|OperatingFrequencyBand}}, only values {{enum|a}},
-                {{enum|n}}, {{enum|ac}}, {{enum|ax}} are allowed.
+                {{enum|n}}, {{enum|ac}}, {{enum|ax}}, {{enum|be}} are allowed.
 
                 If {{param|OperatingFrequencyBand}} is set to
-                {{enum|6GHz|OperatingFrequencyBand}}, only value {{enum|ax}} is
-                allowed.
+                {{enum|6GHz|OperatingFrequencyBand}}, only values {{enum|ax}},
+                {{enum|be}} are allowed.
               </description>
               <syntax>
                 <list/>
@@ -29530,6 +34003,9 @@
                   <enumeration value="ax">
                     <description>{{bibref|802.11ax}}</description>
                   </enumeration>
+                  <enumeration value="be">
+                    <description>{{bibref|802.11be}}</description>
+                  </enumeration>
                 </string>
               </syntax>
             </parameter>
@@ -29543,16 +34019,17 @@
 
                 If {{param|OperatingFrequencyBand}} is set to
                 {{enum|2.4GHz|##.Radio.{i}.SupportedFrequencyBands}}, only
-                values {{enum|b}}, {{enum|g}}, {{enum|n}}, {{enum|ax}} are
-                allowed.
+                values {{enum|b}}, {{enum|g}}, {{enum|n}}, {{enum|ax}},
+                {{enum|be}} are allowed.
 
                 If {{param|OperatingFrequencyBand}} is set to
                 {{enum|5GHz|##.Radio.{i}.SupportedFrequencyBands}}, only values
-                {{enum|a}}, {{enum|n}}, {{enum|ac}}, {{enum|ax}} are allowed.
+                {{enum|a}}, {{enum|n}}, {{enum|ac}}, {{enum|ax}}, {{enum|be}}
+                are allowed.
 
                 If {{param|OperatingFrequencyBand}} is set to
                 {{enum|6GHz|##.Radio.{i}.SupportedFrequencyBands}}, only value
-                {{enum|ax}} is allowed.
+                {{enum|ax}}, {{enum|be}} are allowed.
 
                 For example, a value of "g,b" (or "b,g" - order is not
                 important) means that the 802.11g standard
@@ -29578,6 +34055,8 @@
                   <enumeration value="40MHz"/>
                   <enumeration value="80MHz"/>
                   <enumeration value="160MHz"/>
+                  <enumeration value="320MHz-1"/>
+                  <enumeration value="320MHz-2"/>
                   <enumeration value="Auto"/>
                 </string>
               </syntax>
@@ -29663,7 +34142,7 @@
     </object>
 
     <object name="Device.WiFi.MultiAP." access="readOnly" minEntries="1"
-        maxEntries="1" status="deprecated" version="2.13">
+        maxEntries="1" status="obsoleted" version="2.13">
       <description>
         This object describes a Wi-Fi network containing 1 or more Access Point
         devices.
@@ -29680,15 +34159,19 @@
 
         {{deprecated|2.15|because it has moved to
         {{object|##.WiFi.DataElements.Network}} MultiAP objects}}
+
+        {{obsoleted|2.17}}
       </description>
 
       <parameter name="APDeviceNumberOfEntries" access="readOnly"
-          status="deprecated">
+          status="obsoleted">
         <description>
           {{numentries}}
 
-          {{deprecated|2.15| because the {{object|APDevice.{i}}}}} is being
-          deprecated.
+          {{deprecated|2.15| because the {{object|APDevice.{i}}} is being
+          deprecated}}
+
+          {{obsoleted|2.17}}
         </description>
         <syntax>
           <unsignedInt/>
@@ -29697,7 +34180,7 @@
     </object>
 
     <object name="Device.WiFi.MultiAP.SteeringSummaryStats." access="readOnly"
-        minEntries="1" maxEntries="1" status="deprecated" version="2.13">
+        minEntries="1" maxEntries="1" status="obsoleted" version="2.13">
       <description>
         The summary of statistics related to Multi-AP Steering for the Wi-Fi
         network.
@@ -29706,6 +34189,8 @@
 
         {{deprecated|2.15|because it has moved to
         {{object|##.DataElements.Network.MultiAPSteeringSummaryStats}}}}
+
+        {{obsoleted|2.17}}
       </description>
 
       <parameter name="NoCandidateAPFailures" access="readOnly">
@@ -29788,7 +34273,7 @@
 
     <object name="Device.WiFi.MultiAP.APDevice.{i}." access="readOnly"
         numEntriesParameter="APDeviceNumberOfEntries" minEntries="0"
-        maxEntries="unbounded" status="deprecated" version="2.13">
+        maxEntries="unbounded" status="obsoleted" version="2.13">
       <description>
         Each instance of this object represents an individual Access Point
         device in the Wi-Fi network.
@@ -29799,32 +34284,38 @@
         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.
+        {{param|##.DataElements.Network.Device.{i}.ID}}. All the rest are
+        deprecated as noted}}
+
+        {{obsoleted|2.17}}
       </description>
       <uniqueKey functional="true">
         <parameter ref="MACAddress"/>
       </uniqueKey>
 
-      <parameter name="MACAddress" access="readOnly" status="deprecated">
+      <parameter name="MACAddress" access="readOnly" status="obsoleted">
         <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>
         <syntax>
           <dataType ref="MACAddress"/>
         </syntax>
       </parameter>
 
-      <parameter name="Manufacturer" access="readOnly" status="deprecated">
+      <parameter name="Manufacturer" access="readOnly" status="obsoleted">
         <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>
         <syntax>
           <string/>
@@ -29850,7 +34341,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ProductClass" access="readOnly" status="deprecated">
+      <parameter name="ProductClass" access="readOnly" status="obsoleted">
         <description>
           Identifier of the class of product for which the serial number
           applies. That is, for a given manufacturer, this parameter is used to
@@ -29862,6 +34353,8 @@
 
           {{deprecated|2.15|because this information will be part of Data
           Elements R2}}
+
+          {{obsoleted|2.17}}
         </description>
         <syntax>
           <string>
@@ -29870,7 +34363,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SerialNumber" access="readOnly" status="deprecated">
+      <parameter name="SerialNumber" access="readOnly" status="obsoleted">
         <description>
           Identifier of the particular Access Point device that is unique for
           the indicated class of product and manufacturer.
@@ -29880,6 +34373,8 @@
 
           {{deprecated|2.15|because this information will be part of Data
           Elements R2}}
+
+          {{obsoleted|2.17}}
         </description>
         <syntax>
           <string>
@@ -29888,7 +34383,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="SoftwareVersion" access="readOnly" status="deprecated">
+      <parameter name="SoftwareVersion" access="readOnly" status="obsoleted">
         <description>
           A string identifying the software version currently installed in the
           Access Point device (i.e. version of the overall firmware).
@@ -29900,6 +34395,8 @@
 
           {{deprecated|2.15|because this information will be part of Data
           Elements R2}}
+
+          {{obsoleted|2.17}}
         </description>
         <syntax>
           <string>
@@ -30037,12 +34534,14 @@
         </syntax>
       </parameter>
 
-      <parameter name="DFSEnable" access="readWrite" status="deprecated">
+      <parameter name="DFSEnable" access="readWrite" status="obsoleted">
         <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>
         <syntax>
           <boolean/>
@@ -30050,12 +34549,14 @@
       </parameter>
 
       <parameter name="RadioNumberOfEntries" access="readOnly"
-          status="deprecated">
+          status="obsoleted">
         <description>
           {{numentries}}
 
-          {{deprecated|2.15| because the {{object|Radio.{i}}}}} is being
-          deprecated
+          {{deprecated|2.15| because the {{object|Radio.{i}}} is being
+          deprecated}}
+
+          {{obsoleted|2.17}}
         </description>
         <syntax>
           <unsignedInt/>
@@ -30065,8 +34566,7 @@
 
     <object name="Device.WiFi.MultiAP.APDevice.{i}.Radio.{i}."
         access="readOnly" numEntriesParameter="RadioNumberOfEntries"
-        minEntries="0" maxEntries="unbounded" status="deprecated"
-        version="2.13">
+        minEntries="0" maxEntries="unbounded" status="obsoleted" version="2.13">
       <description>
         This object represents all of the individual Radios contained within
         the identified Access Point device known to the controller.
@@ -30078,20 +34578,24 @@
         {{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.
+        {{param|###.DataElements.Network.Device.{i}.Radio.{i}.CurrentOperatingClassProfile.{i}.TxPower}}.
+        The remaining parameters deprecated as noted}}
+
+        {{obsoleted|2.17}}
       </description>
       <uniqueKey functional="true">
         <parameter ref="MACAddress"/>
       </uniqueKey>
 
-      <parameter name="MACAddress" access="readOnly" status="deprecated">
+      <parameter name="MACAddress" access="readOnly" status="obsoleted">
         <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>
         <syntax>
           <dataType ref="MACAddress"/>
@@ -30099,13 +34603,15 @@
       </parameter>
 
       <parameter name="OperatingFrequencyBand" access="readOnly"
-          status="deprecated">
+          status="obsoleted">
         <description>
           Indicates the frequency band at which the radio is operating.
           {{enum}}
 
           {{deprecated|2.15|because it is replaced with
           {{param|###.DataElements.Network.Device.{i}.Radio.{i}.CurrentOperatingClassProfile.{i}.Class}}}}
+
+          {{obsoleted|2.17}}
         </description>
         <syntax>
           <string>
@@ -30117,7 +34623,7 @@
       </parameter>
 
       <parameter name="OperatingStandards" access="readOnly"
-          status="deprecated">
+          status="obsoleted">
         <description>
           {{list}} List items indicate which IEEE 802.11 standard this
           {{object}} instance is configured for. {{enum}}
@@ -30141,6 +34647,8 @@
 
           {{deprecated|2.15|because this information cannot be obtained by
           EasyMesh}}
+
+          {{obsoleted|2.17}}
         </description>
         <syntax>
           <list/>
@@ -30167,7 +34675,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Channel" access="readWrite" status="deprecated">
+      <parameter name="Channel" access="readWrite" status="obsoleted">
         <description>
           The current radio channel used by the connection.
 
@@ -30189,6 +34697,8 @@
 
           {{deprecated|2.15|because it is replaced with
           {{param|###.DataElements.Network.Device.{i}.Radio.{i}.CurrentOperatingClassProfile.{i}.Channel}}}}
+
+          {{obsoleted|2.17}}
         </description>
         <syntax>
           <unsignedInt>
@@ -30197,7 +34707,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="ExtensionChannel" access="readOnly" status="deprecated">
+      <parameter name="ExtensionChannel" access="readOnly" status="obsoleted">
         <description>
           The secondary extension channel position, applicable when operating
           in wide channel mode (i.e. when
@@ -30211,6 +34721,8 @@
 
           {{deprecated|2.15|because this information is not available via
           EasyMesh}}
+
+          {{obsoleted|2.17}}
         </description>
         <syntax>
           <string>
@@ -30221,7 +34733,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="PossibleChannels" access="readOnly" status="deprecated">
+      <parameter name="PossibleChannels" access="readOnly" status="obsoleted">
         <description>
           {{list}} List items represent possible radio channels for the
           wireless standard (a, b, g, n, ac, ax) and the regulatory domain.
@@ -30231,6 +34743,8 @@
           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>
         <syntax>
           <list>
@@ -30241,11 +34755,13 @@
       </parameter>
 
       <parameter name="CurrentOperatingChannelBandwidth" access="readOnly"
-          status="deprecated">
+          status="obsoleted">
         <description>
           The channel bandwidth currently in use. {{enum}}
 
           {{deprecated|2.15|because it is not available via EasyMesh}}
+
+          {{obsoleted|2.17}}
         </description>
         <syntax>
           <string>
@@ -30257,7 +34773,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="MCS" access="readOnly" status="deprecated">
+      <parameter name="MCS" access="readOnly" status="obsoleted">
         <description>
           The Modulation Coding Scheme index (applicable to 802.11n and
           802.11ac specifications only). Values from 0 to 15 MUST be supported
@@ -30266,6 +34782,8 @@
 
           {{deprecated|2.15|because this information is not available in
           EasyMesh}}
+
+          {{obsoleted|2.17}}
         </description>
         <syntax>
           <int>
@@ -30275,13 +34793,15 @@
         </syntax>
       </parameter>
 
-      <parameter name="TransmitPower" access="readOnly" status="deprecated">
+      <parameter name="TransmitPower" access="readOnly" status="obsoleted">
         <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>
         <syntax>
           <int>
@@ -30292,7 +34812,7 @@
       </parameter>
 
       <parameter name="TransmitPowerLimit" access="readWrite"
-          status="deprecated">
+          status="obsoleted">
         <description>
           Indicates the maximum Effective Isotropic Radiated Power (EIRP) per
           20 MHz bandwidth representing the nominal transmit power limit for
@@ -30300,6 +34820,8 @@
           mW. {{bibref|EasyMesh|Clause 17.2.15}}
 
           {{deprecated|2.15|because it is not available in EasyMesh}}
+
+          {{obsoleted|2.17}}
         </description>
         <syntax>
           <int>
@@ -30309,13 +34831,14 @@
         </syntax>
       </parameter>
 
-      <parameter name="APNumberOfEntries" access="readOnly"
-          status="deprecated">
+      <parameter name="APNumberOfEntries" access="readOnly" status="obsoleted">
         <description>
           {{numentries}}
 
-          {{deprecated|2.15| because the {{object|AP.{i}.}}}} is being
-          deprecated.
+          {{deprecated|2.15| because the {{object|AP.{i}.}} is being
+          deprecated}}
+
+          {{obsoleted|2.17}}
         </description>
         <syntax>
           <unsignedInt/>
@@ -30325,15 +34848,16 @@
 
     <object name="Device.WiFi.MultiAP.APDevice.{i}.Radio.{i}.AP.{i}."
         access="readOnly" numEntriesParameter="APNumberOfEntries"
-        minEntries="0" maxEntries="unbounded" status="deprecated"
-        version="2.13">
+        minEntries="0" maxEntries="unbounded" status="obsoleted" version="2.13">
       <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
+        except {{param|SSID}} and {{param|BSSID}} which are duplicated in
         {{object|####.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.}}}}
+
+        {{obsoleted|2.17}}
       </description>
       <uniqueKey functional="true">
         <parameter ref="BSSID"/>
@@ -30392,12 +34916,14 @@
       </parameter>
 
       <parameter name="AssociatedDeviceNumberOfEntries" access="readOnly"
-          status="deprecated">
+          status="obsoleted">
         <description>
           {{numentries}}
 
-          {{deprecated|2.15| because the {{object|AssociatedDevice.{i}.}}}} is
-          being deprecated.
+          {{deprecated|2.15| because the {{object|AssociatedDevice.{i}.}} is
+          being deprecated}}
+
+          {{obsoleted|2.17}}
         </description>
         <syntax>
           <unsignedInt/>
@@ -30408,8 +34934,7 @@
     <object
         name="Device.WiFi.MultiAP.APDevice.{i}.Radio.{i}.AP.{i}.AssociatedDevice.{i}."
         access="readOnly" numEntriesParameter="AssociatedDeviceNumberOfEntries"
-        minEntries="0" maxEntries="unbounded" status="deprecated"
-        version="2.13">
+        minEntries="0" maxEntries="unbounded" status="obsoleted" version="2.13">
       <description>
         Object describing a single Associated Device (STA).
 
@@ -30418,7 +34943,9 @@
         {{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.
+        except {{param|OperatingStandard}} which was deprecated as noted}}
+
+        {{obsoleted|2.17}}
       </description>
       <uniqueKey functional="true">
         <parameter ref="MACAddress"/>
@@ -30433,14 +34960,15 @@
         </syntax>
       </parameter>
 
-      <parameter name="OperatingStandard" access="readOnly"
-          status="deprecated">
+      <parameter name="OperatingStandard" access="readOnly" status="obsoleted">
         <description>
           The operating standard that this associated device is connected with.
           {{enum}}
 
           {{deprecated|2.15|because this information cannot be obtained by
           EasyMesh}}
+
+          {{obsoleted|2.17}}
         </description>
         <syntax>
           <string>
@@ -30466,7 +34994,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Active" access="readOnly" status="deprecated">
+      <parameter name="Active" access="readOnly" status="obsoleted">
         <description>
           Whether or not this associated device is currently present on the
           Wi-Fi Access Point device.
@@ -30478,6 +35006,8 @@
 
           {{deprecated|2.15|because this information cannot be obtained by
           EasyMesh}}
+
+          {{obsoleted|2.17}}
         </description>
         <syntax>
           <boolean/>
@@ -30549,13 +35079,15 @@
       </parameter>
 
       <parameter name="SteeringHistoryNumberOfEntries" access="readOnly"
-          status="deprecated">
+          status="obsoleted">
         <description>
           {{numentries}}
 
           {{deprecated|2.15| because the
-          {{object|#####.MultiAP.APDevice.{i}.Radio.{i}.AP.{i}.AssociatedDevice.{i}.SteeringHistory.{i}.}}}}
-          is being deprecated.
+          {{object|#####.MultiAP.APDevice.{i}.Radio.{i}.AP.{i}.AssociatedDevice.{i}.SteeringHistory.{i}.}}
+          is being deprecated}}
+
+          {{obsoleted|2.17}}
         </description>
         <syntax>
           <unsignedInt/>
@@ -30565,13 +35097,15 @@
 
     <object
         name="Device.WiFi.MultiAP.APDevice.{i}.Radio.{i}.AP.{i}.AssociatedDevice.{i}.Stats."
-        access="readOnly" minEntries="1" maxEntries="1" status="deprecated"
+        access="readOnly" minEntries="1" maxEntries="1" status="obsoleted"
         version="2.13">
       <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>
 
       <parameter name="BytesSent" access="readOnly">
@@ -30645,7 +35179,7 @@
 
     <object
         name="Device.WiFi.MultiAP.APDevice.{i}.Radio.{i}.AP.{i}.AssociatedDevice.{i}.SteeringSummaryStats."
-        access="readOnly" minEntries="1" maxEntries="1" status="deprecated"
+        access="readOnly" minEntries="1" maxEntries="1" status="obsoleted"
         version="2.13">
       <description>
         The summary of statistics related to Multi-AP Steering for an
@@ -30655,6 +35189,8 @@
 
         {{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>
 
       <parameter name="NoCandidateAPFailures" access="readOnly">
@@ -30753,8 +35289,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="deprecated"
-        version="2.13">
+        minEntries="0" maxEntries="unbounded" status="obsoleted" version="2.13">
       <description>
         The history of Multi-AP Steering for an individual STA on the Wi-Fi
         network.
@@ -30763,6 +35298,8 @@
 
         {{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>
       <uniqueKey functional="true">
         <parameter ref="Time"/>
@@ -30918,6 +35455,18 @@
         </syntax>
       </parameter>
 
+      <parameter name="ColocatedAgentID" access="readOnly">
+        <description>
+          AL MAC address of the EasyMesh Agent that is co-located in the same
+          device with the Wi-Fi EasyMesh Controller.
+
+          Set to null if there is no such collocated agent.
+        </description>
+        <syntax>
+          <dataType ref="MACAddress"/>
+        </syntax>
+      </parameter>
+
       <parameter name="SSIDNumberOfEntries" access="readOnly">
         <description>
           {{numentries}}
@@ -30927,6 +35476,24 @@
         </syntax>
       </parameter>
 
+      <parameter name="STABlockNumberOfEntries" access="readOnly">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="PreferredBackhaulsNumberOfEntries" access="readOnly">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
       <command name="SetTrafficSeparation()" async="true">
         <description>
           This command allows or disallows EasyMesh traffic separation
@@ -31070,7 +35637,7 @@
 
             <parameter name="Precedence">
               <description>
-                Rule Precedence – higher number means higher priority.
+                Rule Precedence - higher number means higher priority.
               </description>
               <syntax>
                 <unsignedInt>
@@ -31105,7 +35672,7 @@
             <description>
               A hexadecimal string of 64 PCP values (one octet per value)
               corresponding to the DSCP markings 0x00 to 0x3F, ordered by
-              increasing DSCP value. Each octet is in the range 0x00 – 0x07.
+              increasing DSCP value. Each octet is in the range 0x00 - 0x07.
               This is used to select a PCP value if a Service Prioritization
               Rule specifies Rule Output: 0x08.
 
@@ -31165,7 +35732,7 @@
               network.
             </description>
             <uniqueKey functional="true">
-              <parameter ref="BackhaulMACAddress"/>
+              <parameter ref="bSTAMACAddress"/>
             </uniqueKey>
 
             <parameter name="BackhaulMACAddress" mandatory="true">
@@ -31215,19 +35782,21 @@
 
       <command name="SetSSID()" async="true">
         <description>
-          This command specifies an {{param|SSID}} for fronthaul use across
-          this Wi-Fi Multi-AP network, or on this single-AP. Also specifies the
+          This command specifies an {{param|SSID}} for use across this Wi-Fi
+          Multi-AP network, or on this single-AP. Also specifies the
           {{param|PassPhrase}}, whether to add or remove this SSID, and
           specifies the {{param|Band}} for each {{param|SSID}}.
 
           This command applies to all EasyMesh Agent devices in the Wi-Fi
           network, or to this AP in the single-AP case.
 
-          This command can be used to set only {{param|PassPhrase}} if
-          {{param|SSID}} matches an existing {{param|#.SSID.{i}.SSID}} for this
-          {{param|Band}} for fronthaul use across this Wi-Fi Multi-AP network.
+          This command can be used to change any input parameter(s) if
+          {{param|AddRemoveChange}} is set to {{enum|Change|AddRemoveChange}}.
 
-          This command can configure {{object|#.SSID.{i}}}
+          This command can configure {{object|#.SSID.{i}}}.
+
+          Note that VLAN IDs (VIDs) can be configured per SSID with
+          {{object|#.Device.{i}.SSIDtoVIDMapping.{i}}}.
 
           Status is to be returned after implementation or failed
           implementation on all agents/devices/APs in this Multi-AP network.
@@ -31243,24 +35812,44 @@
             </syntax>
           </parameter>
 
-          <parameter name="AddRemove" mandatory="true">
+          <parameter name="Enable">
             <description>
-              Indicates whether to add or remove this {{param|SSID}}.
+              Enable or disable this {{param|SSID}}. Disable stops the use of
+              this {{param|SSID}}, but the object is retained.
 
-              : {{true}}: add this SSID,
+              : {{true}}: this {{param|SSID}} is to be enabled.
 
-              : {{false}}: remove this SSID.
+              : {{false}}: this {{param|SSID}} is to be disabled.
+            </description>
+            <syntax>
+              <boolean/>
+            </syntax>
+          </parameter>
+
+          <parameter name="AddRemoveChange" mandatory="true">
+            <description>
+              Indicates whether to add, remove or change this {{param|SSID}}.
+              {{enum}}
 
               Status is to be returned after implementation or failed
               implementation on all agents/devices/APs in this Multi-AP
               network.
 
-              If set to {{true}}, and this {{param|SSID}} already exists for
-              this {{param|Band}}, then there is no change to the
-              {{param|SSID}}, but the {{param|PassPhrase}} is set.
+              If set to {{enum|Change}}, then all input parameters for this
+              {{param|SSID}} that do not have null values are to be changed.
             </description>
             <syntax>
-              <string/>
+              <string>
+                <enumeration value="Add">
+                  <description>Add this SSID.</description>
+                </enumeration>
+                <enumeration value="Remove">
+                  <description>Remove this SSID.</description>
+                </enumeration>
+                <enumeration value="Change">
+                  <description>Change this SSID.</description>
+                </enumeration>
+              </string>
             </syntax>
           </parameter>
 
@@ -31338,6 +35927,115 @@
               </string>
             </syntax>
           </parameter>
+
+          <parameter name="AKMsAllowed">
+            <description>
+              {{list}} List items indicate Authentication and Key Management
+              (AKM) suites/security modes allowed on this BSS. {{enum}}
+            </description>
+            <syntax>
+              <list/>
+              <string>
+                <enumeration value="psk">
+                  <description>
+                    "psk" indicates one or more of the PSK and FT-PSK AKMs
+                    defined in {{bibref|802.11-2020|Table 9-151}} typically at
+                    least "00-0F-AC:2" for interoperability.
+                  </description>
+                </enumeration>
+                <enumeration value="dpp">
+                  <description>
+                    "dpp" indicates one or more of the DPP and FT-DPP AKMs
+                    defined in {{bibref|EasyConnect|Section 8.4}}, typically at
+                    least "50-6F-9A:2" for interoperability.
+                  </description>
+                </enumeration>
+                <enumeration value="sae">
+                  <description>
+                    "sae" indicates one or more of the SAE and FT-SAE AKMs
+                    defined in {{bibref|802.11-2020|Table 9-151}} typically at
+                    least "00-0F-AC:8" for interoperability.
+                  </description>
+                </enumeration>
+                <enumeration value="psk+sae"/>
+                <enumeration value="dpp+sae"/>
+                <enumeration value="dpp+psk+sae"/>
+                <enumeration value="SuiteSelector">
+                  <description>
+                    "SuiteSelector" indicates an AKM suite selector, the value
+                    of which is indicated in {{param|SuiteSelector}}.
+                  </description>
+                </enumeration>
+              </string>
+            </syntax>
+          </parameter>
+
+          <parameter name="SuiteSelector">
+            <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. 506F9A02 {{bibref|802.11-2020|Table 9-151}}.
+
+              This parameter applies if {{param|AKMsAllowed}} includes value
+              "SuiteSelector".
+            </description>
+            <syntax>
+              <hexBinary>
+                <size minLength="4" maxLength="4"/>
+              </hexBinary>
+            </syntax>
+          </parameter>
+
+          <parameter name="AdvertisementEnabled">
+            <description>
+              Indicates if the SSID is advertised in beacons, or not.
+
+              : {{true}}: this {{param|SSID}} is to be advertised in beacons.
+
+              : {{false}}: this {{param|SSID}} is not to be advertised in
+                beacons.
+            </description>
+            <syntax>
+              <boolean/>
+            </syntax>
+          </parameter>
+
+          <parameter name="MFPConfig">
+            <description>
+              Management Frame Protection (MFP) configuration. {{enum}}
+            </description>
+            <syntax>
+              <string>
+                <enumeration value="Disabled"/>
+                <enumeration value="Optional"/>
+                <enumeration value="Required"/>
+              </string>
+            </syntax>
+          </parameter>
+
+          <parameter name="MobilityDomain">
+            <description>
+              The IEEE 802.11 mobility domain {{bibref|802.11-2020|Section
+              9.4.2.46}}.
+            </description>
+            <syntax>
+              <list/>
+              <dataType ref="MACAddress"/>
+            </syntax>
+          </parameter>
+
+          <parameter name="HaulType">
+            <description>
+              Indicates the use of this {{param|SSID}}. {{enum}}
+            </description>
+            <syntax>
+              <list/>
+              <string>
+                <enumeration value="Fronthaul"/>
+                <enumeration value="Backhaul"/>
+              </string>
+            </syntax>
+          </parameter>
         </input>
         <output>
 
@@ -31453,6 +36151,9 @@
         This object specifies SSIDs for fronthaul use across all agents in this
         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}}}.
       </description>
       <uniqueKey functional="false">
         <parameter ref="SSID"/>
@@ -31515,6 +36216,247 @@
           </string>
         </syntax>
       </parameter>
+
+      <parameter name="Enable" access="readOnly">
+        <description>
+          Enable or disable of this {{param|SSID}}. Disable stops the use of
+          this {{param|SSID}}, but the object is retained.
+
+          : {{true}}: this {{param|SSID}} is enabled.
+
+          : {{false}}: this {{param|SSID}} is disabled.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="AKMsAllowed" access="readOnly">
+        <description>
+          {{list}} List items indicate Authentication and Key Management (AKM)
+          suites/security modes allowed on this BSS. {{enum}}
+        </description>
+        <syntax>
+          <list/>
+          <string>
+            <enumeration value="psk">
+              <description>
+                "psk" indicates one or more of the PSK and FT-PSK AKMs defined
+                in {{bibref|802.11-2020|Table 9-151}} typically at least
+                "00-0F-AC:2" for interoperability.
+              </description>
+            </enumeration>
+            <enumeration value="dpp">
+              <description>
+                "dpp" indicates one or more of the DPP and FT-DPP AKMs defined
+                in {{bibref|EasyConnect|Section 8.4}}, typically at least
+                "50-6F-9A:2" for interoperability.
+              </description>
+            </enumeration>
+            <enumeration value="sae">
+              <description>
+                "sae" indicates one or more of the SAE and FT-SAE AKMs defined
+                in {{bibref|802.11-2020|Table 9-151}} typically at least
+                "00-0F-AC:8" for interoperability.
+              </description>
+            </enumeration>
+            <enumeration value="psk+sae"/>
+            <enumeration value="dpp+sae"/>
+            <enumeration value="dpp+psk+sae"/>
+            <enumeration value="SuiteSelector">
+              <description>
+                "SuiteSelector" indicates an AKM suite selector, the value of
+                which is indicated in {{param|SuiteSelector}}.
+              </description>
+            </enumeration>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="SuiteSelector" access="readOnly">
+        <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.
+          506F9A02 {{bibref|802.11-2020|Table 9-151}}.
+
+          This parameter applies if {{param|AKMsAllowed}} includes value
+          "SuiteSelector".
+        </description>
+        <syntax>
+          <hexBinary>
+            <size minLength="4" maxLength="4"/>
+          </hexBinary>
+        </syntax>
+      </parameter>
+
+      <parameter name="AdvertisementEnabled" access="readOnly">
+        <description>
+          Indicates if the SSID is advertised in beacons, or not.
+
+          : {{true}}: this {{param|SSID}} is to be advertised in beacons.
+
+          : {{false}}: this {{param|SSID}} is not to be advertised in beacons.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="MFPConfig" access="readOnly">
+        <description>
+          Management Frame Protection (MFP) configuration. {{enum}}
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="Disabled"/>
+            <enumeration value="Optional"/>
+            <enumeration value="Required"/>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="MobilityDomain" access="readOnly">
+        <description>
+          The IEEE 802.11 mobility domain {{bibref|802.11-2020|Section
+          9.4.2.46}}.
+        </description>
+        <syntax>
+          <dataType ref="MACAddress"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="HaulType" access="readOnly">
+        <description>
+          Indicates the use of this {{param|SSID}}. {{enum}}
+        </description>
+        <syntax>
+          <list/>
+          <string>
+            <enumeration value="Fronthaul"/>
+            <enumeration value="Backhaul"/>
+          </string>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object name="Device.WiFi.DataElements.Network.STABlock.{i}."
+        access="readWrite" numEntriesParameter="STABlockNumberOfEntries"
+        minEntries="0" maxEntries="unbounded" version="2.17">
+      <description>
+        This object indicates stations (STAs) for which client association is
+        blocked.
+
+        optionally the BSSID(s) the STA is blocked from associating to. In
+        multi-AP cases, this should be implemented by Wi-Fi EasyMesh
+        {{bibref|EasyMesh}} client association control.
+
+        Stations that are already associated shall be disassociated if
+        {{object|#.STABlock.{i}.Schedule.{i}.}} indicates so.
+      </description>
+      <uniqueKey functional="false">
+        <parameter ref="BlockedSTA"/>
+      </uniqueKey>
+
+      <parameter name="BlockedSTA" access="readWrite">
+        <description>
+          MAC addresses of the STA that is blocked.
+        </description>
+        <syntax>
+          <dataType ref="MACAddress"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="BSSID" access="readWrite">
+        <description>
+          {{list}} Indicates BSS from which the {{param|BlockedSTA}} is blocked
+          from association and cannot associate to. A null list indicates that
+          all SSIDs are blocked.
+        </description>
+        <syntax>
+          <list/>
+          <dataType ref="MACAddress"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ScheduleNumberOfEntries" access="readOnly">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object name="Device.WiFi.DataElements.Network.STABlock.{i}.Schedule.{i}."
+        access="readWrite" numEntriesParameter="ScheduleNumberOfEntries"
+        minEntries="0" maxEntries="unbounded" version="2.17">
+      <description>
+        Each instance of this object provides a schedule where client
+        association is blocked for {{param|#.BlockedSTA}}
+        {{bibref|EasyMesh|Section 11.6}}.
+      </description>
+      <uniqueKey functional="false">
+        <parameter ref="Alias"/>
+      </uniqueKey>
+
+      <parameter name="Alias" access="writeOnceReadOnly">
+        <description>
+          {{datatype|expand}}
+        </description>
+        <syntax>
+          <dataType ref="Alias"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Day" access="readWrite">
+        <description>
+          {{list|the days for which the STA is blocked}} {{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 STA block 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 STA is blocked. If
+          {{param|StartTime}} is defined, the STA is blocked for the {{param}}
+          period starting from {{param|StartTime}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range minInclusive="1"/>
+            <units value="seconds"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
     </object>
 
     <object
@@ -31609,8 +36551,8 @@
         access="readOnly" numEntriesParameter="DeviceNumberOfEntries"
         minEntries="1" maxEntries="unbounded" version="2.13">
       <description>
-        Each instance of this object represents an individual Access Point
-        device in the Wi-Fi network.
+        Each instance of this object represents an individual EasyMesh Agent or
+        single-AP device in the Wi-Fi network.
       </description>
       <uniqueKey functional="true">
         <parameter ref="ID"/>
@@ -31680,7 +36622,23 @@
 
           : 0: Do not report AP Metrics periodically;
 
-          : 1 – 255: AP Metrics reporting interval in {{units}}.
+          : 1 - 255: AP Metrics reporting interval in {{units}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+            <range maxInclusive="255"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="AssociatedSTAReportingInterval" access="readWrite">
+        <description>
+          Associated STA Reporting Interval.
+
+          0: Do not report associated STA Metrics periodically;
+
+          1 - 255: Associated STA Metrics reporting interval in {{units}}.
         </description>
         <syntax>
           <unsignedInt>
@@ -31768,7 +36726,7 @@
           A hexadecimal string of 64 Priority Code Point (PCP) values (one
           octet per value) corresponding to the Differentiated Services Code
           Point (DSCP) markings 0x00 to 0x3F, ordered by increasing DSCP value.
-          Each octet is in the range 0x00 – 0x07. This is used to select a PCP
+          Each octet is in the range 0x00 - 0x07. This is used to select a PCP
           value if a Service Prioritization Rule specifies Rule Output: 0x08
         </description>
         <syntax>
@@ -31972,6 +36930,180 @@
         </syntax>
       </parameter>
 
+      <parameter name="ControllerOperationMode" access="readOnly">
+        <description>
+          This parameter represents the status of Wi-Fi EasyMesh controller
+          functionality. {{enum}}
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="NotSupported">
+              <description>
+                Wi-Fi EasyMesh controller is not supported.
+              </description>
+            </enumeration>
+            <enumeration value="SupportedNotEnabled">
+              <description>
+                Wi-Fi EasyMesh controller is supported but not enabled.
+              </description>
+            </enumeration>
+            <enumeration value="Running">
+              <description>Wi-Fi EasyMesh controller is running.</description>
+            </enumeration>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="BackhaulMACAddress" access="readOnly">
+        <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
+          BSSID or AP MLD address of the backhaul BSS.
+        </description>
+        <syntax>
+          <dataType ref="MACAddress"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="BackhaulALID" access="readOnly">
+        <description>
+          The IEEE 1905 {{bibref|IEEE1905.1a}} Abstraction-Layer ID (ALID) of
+          the EasyMesh Agent on the network that is providing the backhaul for
+          this EasyMesh Agent.
+        </description>
+        <syntax>
+          <dataType ref="MACAddress"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="BackhaulDownMACAddress" access="readOnly">
+        <description>
+          {{list}} Each MAC address is that of a downstream EasyMesh agent's
+          backhaul link.
+        </description>
+        <syntax>
+          <list/>
+          <dataType ref="MACAddress"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="BackhaulMediaType" access="readOnly">
+        <description>
+          Media type of the backhaul link of this EasyMesh Agent.
+
+          This value can be derived from the neighbor's topology response
+          message 1905 device information type TLV Media Type field defined in
+          {{bibref|IEEE1905.1a|Table 6-12}}. {{enum}}
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="IEEE 802.3u">
+              <description>IEEE 802.3u Fast Ethernet</description>
+            </enumeration>
+            <enumeration value="IEEE 802.3ab">
+              <description>IEEE 802.3ab Gigabit Ethernet</description>
+            </enumeration>
+            <enumeration value="IEEE 802.11b">
+              <description>IEEE 802.11b (2.4GHz)</description>
+            </enumeration>
+            <enumeration value="IEEE 802.11g">
+              <description>IEEE 802.11g (2.4GHz)</description>
+            </enumeration>
+            <enumeration value="IEEE 802.11a">
+              <description>IEEE 802.11a (5GHz)</description>
+            </enumeration>
+            <enumeration value="IEEE 802.11n 2.4">
+              <description>IEEE 802.11n (2.4GHz)</description>
+            </enumeration>
+            <enumeration value="IEEE 802.11n 5.0">
+              <description>IEEE 802.11n (5GHz)</description>
+            </enumeration>
+            <enumeration value="IEEE 802.11ac">
+              <description>IEEE 802.11ac (5GHz)</description>
+            </enumeration>
+            <enumeration value="IEEE 802.11ad">
+              <description>IEEE 802.11ad (60GHz)</description>
+            </enumeration>
+            <enumeration value="IEEE 802.11af">
+              <description>IEEE 802.11af</description>
+            </enumeration>
+            <enumeration value="IEEE 802.11ax">
+              <description>IEEE 802.11ax</description>
+            </enumeration>
+            <enumeration value="IEEE 802.11be">
+              <description>IEEE 802.11be</description>
+            </enumeration>
+            <enumeration value="IEEE 1901 Wavelet">
+              <description>IEEE 1901 Wavelet</description>
+            </enumeration>
+            <enumeration value="IEEE 1901 FFT">
+              <description>IEEE 1901 FFT</description>
+            </enumeration>
+            <enumeration value="MoCAv1.1">
+              <description>MoCAv1.1</description>
+            </enumeration>
+            <enumeration value="Generic PHY"/>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="BackhaulPHYRate" access="readOnly">
+        <description>
+          The Physical Layer (PHY) rate in {{units}} on the backhaul link of
+          this EasyMesh agent.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="Mb/s"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="TrafficSeparationCapability" access="readOnly">
+        <description>
+          Indicator of EasyMesh Agent capability to support EasyMesh
+          {{bibref|EasyMesh}} 802.1Q C-TAG Traffic Separation.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="EasyConnectCapability" access="readOnly">
+        <description>
+          Indicator of the device capability to support Wi-Fi Easy Connect
+          onboarding.
+
+          Indicated in the DPP Onboarding field of the EasyMesh Profile-2 AP
+          Capability TLV {{bibref|EasyMesh}}.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="TestCapabilities" access="readOnly">
+        <description>
+          Indicates EasyMesh agent support for running a throughput or latency
+          test.
+
+          0 indicates that the EasyMesh Agent or single-AP does not support any
+          throughput test and does not support a latency test.
+
+          1 indicates that the EasyMesh Agent or single-AP supports a
+          throughput test but does not support a latency test.
+
+          2 indicates that the EasyMesh Agent or single-AP supports a latency
+          test but does not support a throughput test.
+
+          3 indicates that the EasyMesh Agent or single-AP supports a
+          throughput test and a latency test.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
       <parameter name="RadioNumberOfEntries" access="readOnly">
         <description>
           {{numentries}}
@@ -32045,6 +37177,81 @@
         </syntax>
       </parameter>
 
+      <parameter name="MaxNumMLDs" access="readOnly">
+        <description>
+          The maximum number of MLDs that the EasyMesh Agent can support.
+          {{bibref|EasyMesh}} source: Wi-Fi 7 Agent Capabilities TLV.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="APMLDMaxLinks" access="readOnly">
+        <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
+          of affiliated APs minus 1. The value of 15 is reserved.
+          {{bibref|EasyMesh}} source: Wi-Fi 7 Agent Capabilities TLV.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range minInclusive="0" maxInclusive="15"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="bSTAMLDMaxLinks" access="readOnly">
+        <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
+          number of affiliated bSTAs minus 1. The value of 15 is reserved.
+          {{bibref|EasyMesh}} source: Wi-Fi 7 Agent Capabilities TLV.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range minInclusive="0" maxInclusive="15"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="TIDLinkMapCapability" access="readOnly">
+        <description>
+          Indicates the EasyMesh Agent support for TID to Link mapping.
+          {{bibref|EasyMesh}} source: Wi-Fi 7 Agent Capabilities TLV. {{enum}}
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="0">
+              <description>
+                The EasyMesh Agent does not support TID-to-link mapping.
+              </description>
+            </enumeration>
+            <enumeration value="1">
+              <description>
+                The EasyMesh Agent supports the mapping of each TID to the same
+                or different link set.
+              </description>
+            </enumeration>
+            <enumeration value="2">
+              <description>
+                The EasyMesh Agent only supports the mapping of all TIDs to the
+                same link set.
+              </description>
+            </enumeration>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="APMLDNumberOfEntries" access="readOnly">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
       <command name="SetSTASteeringState()" async="true">
         <description>
           Disallow or allow EasyMesh {{bibref|EasyMesh}} controller-initiated
@@ -32179,6 +37386,30 @@
           </parameter>
         </output>
       </command>
+
+      <command name="InitiateWPSPBC()" async="true">
+        <description>
+          Initiates a Wi-Fi Protected Setup (WPS) Push Button Configuration
+          (PBC) process as defined in {{bibref|WPS 2.0}} .
+        </description>
+        <output>
+
+          <parameter name="Status">
+            <description>
+              Indicates the response to the request to start Wi-Fi Protected
+              Setup (WPS) Push Button Configuration (PBC). {{enum}}
+            </description>
+            <syntax>
+              <string>
+                <enumeration value="Success"/>
+                <enumeration value="Error_Invalid_Input"/>
+                <enumeration value="Error_Timeout"/>
+                <enumeration value="Error_Other" optional="true"/>
+              </string>
+            </syntax>
+          </parameter>
+        </output>
+      </command>
     </object>
 
     <object
@@ -32481,7 +37712,7 @@
 
       <parameter name="Precedence" access="readOnly">
         <description>
-          Rule Precedence – higher number means higher priority.
+          Rule Precedence - higher number means higher priority.
         </description>
         <syntax>
           <unsignedInt>
@@ -32744,14 +37975,14 @@
           One of:
 
           : MAC address: if the entry corresponds to channel usage by a single
-            client STA associated to an AP of the Agent;
+            client STA associated to the BSS of the Agent;
 
           : BSSID: if the entry corresponds to channel usage by multiple or
-            unspecified client STAs associated to an AP of the Agent;
+            unspecified client STAs associated to the BSS of the Agent;
 
           : BSS Color: (first 42-bits are zero) if the channel usage is caused
             by a source external to the BSSs operated by the Agent and the
-            BSSID can’t be decoded (since frame sent at high MCS) but the BSS
+            BSSID cannot be decoded (since frame sent at high MCS) but the BSS
             Color in the PHY headers could still be identified;
 
           : Zero: if the channel usage is caused by a source external to the
@@ -32931,8 +38162,8 @@
         {{param|BackhaulMACAddress}}) of the uplinked Backhaul Device -
         {{param|MACAddress}} of this Access Point Device
 
-          {{param|BackhaulDeviceID}} / {{param|BackhaulMACAddress}} &lt;--
-          {{param|LinkType}} --- &lt; {{param|MACAddress}}
+            {{param|BackhaulDeviceID}} / {{param|BackhaulMACAddress}} &lt;--
+            {{param|LinkType}} --- &lt; {{param|MACAddress}}
 
         {{empty}} is reserved for the {{object}} instance that represents the
         Multi-AP Controller.
@@ -33480,7 +38711,7 @@
 
           : 0: Do not report STA Metrics based on RCPI threshold.
 
-          : 1 – 220: RCPI threshold (encoded per {{bibref|802.11-2020|Table
+          : 1 - 220: RCPI threshold (encoded per {{bibref|802.11-2020|Table
             9-176}}).
         </description>
         <syntax>
@@ -33631,20 +38862,24 @@
       <command name="ChannelScanRequest()" async="true">
         <description>
           Request to initiate a channel scan. The operating classes, and list
-          of channels for each operating class, are input. For 2.4GHz and 5GHz
-          bands, only 20MHz operating classes are valid inputs.
+          of channels for each operating class, are input. If no operating
+          class is provided to the input, then all available opclasses and
+          channels are to be scanned. For 2.4GHz and 5GHz bands, only 20MHz
+          operating classes are valid inputs.
 
           This command should result in updating
           {{object|Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.ScanResult.}}
         </description>
         <input>
 
-          <parameter name="OpClass" mandatory="true">
+          <parameter name="OpClass">
             <description>
-              The Operating Class per {{bibref|802.11-2020|Table E-4}} For
-              2.4GHz and 5GHz bands, only 20MHz Operating Classes are valid.
+              The Operating Class per {{bibref|802.11-2020|Table E-4}}. For
+              2.4GHz and 5GHz bands, only 20MHz Operating Classes are valid. If
+              this input is not provided, then all available opclasses and
+              channels are to be scanned.
 
-              Note that the operating class identifies the band and channel
+              Note that the operating class identifies the band, and channel
               width.
             </description>
             <syntax>
@@ -33654,7 +38889,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="ChannelList" mandatory="true">
+          <parameter name="ChannelList">
             <description>
               The channel numbers in this Operating Class for which the request
               to initiate a channel scan applies.
@@ -33666,6 +38901,69 @@
               </unsignedInt>
             </syntax>
           </parameter>
+
+          <parameter name="ScanType">
+            <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}}
+            </description>
+            <syntax>
+              <string>
+                <enumeration value="Interrupt_Radio"/>
+                <enumeration value="Time_Sliced"/>
+                <enumeration value="Spatial_Stream"/>
+                <enumeration value="Unused_Radio"/>
+              </string>
+            </syntax>
+          </parameter>
+
+          <parameter name="DwellTime">
+            <description>
+              The duration of the time to scan each channel in {{units}}. A
+              value of 50 {{units}} is suggested.
+
+              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="DFSDwellTime">
+            <description>
+              The duration of time to scan each Dynamic Frequency Selection
+              (DFS) channel in {{units}}. Note that this is the time to scan
+              the channel, and is not the time to perform DFS. A value of at
+              least one beacon interval, typically 100 {{units}}, is suggested.
+
+              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="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>
         </input>
         <output>
 
@@ -34014,6 +39312,27 @@
         </syntax>
       </parameter>
 
+      <parameter name="AggregateScanDuration" access="readOnly">
+        <description>
+          Total time spent performing the scan of this channel in {{units}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="milliseconds"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="ScanType" access="readOnly">
+        <description>
+          Indicates whether the scan was performed passively (false) or with
+          active probing (true).
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
       <parameter name="OpClassScanNumberOfEntries" access="readOnly">
         <description>
           {{numentries}}
@@ -34123,6 +39442,47 @@
         </syntax>
       </parameter>
 
+      <parameter name="ScanStatus" access="readOnly">
+        <description>
+          Status code to indicate whether a scan has been performed and if not
+          the reason for failure {{enum}}
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="0">
+              <description>Success</description>
+            </enumeration>
+            <enumeration value="1">
+              <description>
+                Scan not supported on this opclass and channel
+              </description>
+            </enumeration>
+            <enumeration value="2">
+              <description>
+                Request too soon after last scan
+              </description>
+            </enumeration>
+            <enumeration value="3">
+              <description>Radio too busy to perform scan</description>
+            </enumeration>
+            <enumeration value="4">
+              <description>Scan not completed</description>
+            </enumeration>
+            <enumeration value="5">
+              <description>Scan aborted</description>
+            </enumeration>
+            <enumeration value="6">
+              <description>
+                Fresh scan not supported, radio only supports on boot scans
+              </description>
+            </enumeration>
+            <enumeration value="7">
+              <description>reserved</description>
+            </enumeration>
+          </string>
+        </syntax>
+      </parameter>
+
       <parameter name="NeighborBSSNumberOfEntries" access="readOnly">
         <description>
           {{numentries}}
@@ -34168,10 +39528,6 @@
           Response frames of the neighboring BSS as received by the radio
           measured in {{units}}. (RSSI is encoded per
           {{bibref|802.11-2020|Table 9-176}}). Reserved: 221 - 255.
-
-          NOTE: The underlying WFA specification is in the process of being
-          reviewed for possible clarification. Please refer to that
-          specification for more details.
         </description>
         <syntax>
           <unsignedInt>
@@ -34214,6 +39570,62 @@
           <unsignedInt/>
         </syntax>
       </parameter>
+
+      <parameter name="MLDMACAddress" access="readOnly">
+        <description>
+          The Multi-Link Device (MLD) MAC address of the Multi-Link Operation
+          (MLO) capable access point this neighboring BSS is affiliated to.
+          Null if the neighboring BSS is not an affiliated AP.
+        </description>
+        <syntax>
+          <dataType ref="MACAddress"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ReportingBSSID" access="readOnly">
+        <description>
+          The BSSID of the reporting BSSID if different from {{param|BSSID}}.
+          This will be set if the NeigborBSS was discovered through, for
+          example, a Reduced Neighbor Report. EasyMesh {{bibref|EasyMesh}}
+          source: Channel Scan Result TLV.
+        </description>
+        <syntax>
+          <dataType ref="MACAddress"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="MultiBSSID" access="readOnly">
+        <description>
+          Indicates if the neighboring BSS is part of a MultiBSSID set and may
+          be a non-transmitted BSSID.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="BSSLoadElementPresent" access="readOnly">
+        <description>
+          Set to true if the neighbour BSS Beacon/Probe Responses include a
+          BSSLoad Element as defined in {{bibref|802.11-2020|Section
+          9.4.2.28}}.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="BSSColor" access="readOnly">
+        <description>
+          Set to the BSS Color from the BSS Color Information field in the
+          BSS's HE Operation element.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range maxInclusive="63"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
     </object>
 
     <object
@@ -34244,8 +39656,8 @@
 
       <parameter name="OnBootOnly" access="readOnly">
         <description>
-          “On boot only” flag, Indicates whether the specified radio is capable
-          only of “On boot” scans.
+          On boot only flag, Indicates whether the specified radio is capable
+          only of On boot scans.
         </description>
         <syntax>
           <boolean/>
@@ -34476,13 +39888,15 @@
         </syntax>
       </parameter>
 
-      <parameter name="HECapabilities" access="readOnly" status="deprecated">
+      <parameter name="HECapabilities" access="readOnly" status="obsoleted">
         <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}}.}}
+          and {{object|WiFi6bSTARole}}}}
+
+          {{obsoleted|2.17}}
         </description>
         <syntax>
           <base64>
@@ -34491,6 +39905,62 @@
         </syntax>
       </parameter>
 
+      <parameter name="MSCSCapability" access="readOnly">
+        <description>
+          This parameter indicates support for Mirrored Stream Classification
+          Service (MSCS) and EasyMesh configuration of MSCS
+          {{bibref|EasyMesh|AP Radio Advanced Capabilities TLV}}.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="SCSCapability" access="readOnly">
+        <description>
+          This parameter indicates support for Stream Classification Service
+          (SCS) and EasyMesh {{bibref|EasyMesh}} configuration of SCS
+          {{bibref|EasyMesh|AP Radio Advanced Capabilities TLV}}.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="QoSMapCapability" access="readOnly">
+        <description>
+          This parameter indicates support for QoS Map {{bibref|EasyMesh|AP
+          Radio Advanced Capabilities TLV}}.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="DSCPPolicyCapability" access="readOnly">
+        <description>
+          This parameter indicates support for DSCP Mapping Table TLV based
+          DSCP-to-UP mapping and EasyMesh distribution of QoS Map elements to
+          associated STAs {{bibref|EasyMesh|AP Radio Advanced Capabilities
+          TLV}}.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="SCSTrafficDescriptionCapability" access="readOnly">
+        <description>
+          This parameter indicates support for QoS Management Stream
+          Classification Service (SCS) Traffic Description and EasyMesh
+          configuration of and/or extensions to SCS using traffic descriptions
+          {{bibref|EasyMesh|AP Radio Advanced Capabilities TLV}}.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
       <parameter name="CapableOperatingClassProfileNumberOfEntries"
           access="readOnly">
         <description>
@@ -34626,10 +40096,20 @@
         </syntax>
       </parameter>
 
+      <parameter name="DLOFDMA" access="readOnly">
+        <description>
+          Indicates support for Downlink (DL) Orthogonal Frequency Division
+          Multiplexing (OFDMA).
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
       <parameter name="MaxDLMUMIMO" access="readOnly">
         <description>
-          Max number of users supported per DL MU-MIMO Transmitter (TX) in an
-          AP role.
+          Max number of users supported per DL MU-MIMO Transmitter (TX) in the
+          BSS role.
         </description>
         <syntax>
           <unsignedInt>
@@ -34640,7 +40120,7 @@
 
       <parameter name="MaxULMUMIMO" access="readOnly">
         <description>
-          Max number of users supported per UL MU-MIMO Receiver (RX) in an AP
+          Max number of users supported per UL MU-MIMO Receiver (RX) in the BSS
           role.
         </description>
         <syntax>
@@ -34652,7 +40132,7 @@
 
       <parameter name="MaxDLOFDMA" access="readOnly">
         <description>
-          Max number of users supported per Downlink (DL) OFDMA TX in an AP
+          Max number of users supported per Downlink (DL) OFDMA TX in the BSS
           role.
         </description>
         <syntax>
@@ -34664,7 +40144,7 @@
 
       <parameter name="MaxULOFDMA" access="readOnly">
         <description>
-          Max number of users supported per UL OFDMA RX in an AP role.
+          Max number of users supported per UL OFDMA RX in the BSS role.
         </description>
         <syntax>
           <unsignedInt>
@@ -34854,10 +40334,20 @@
         </syntax>
       </parameter>
 
+      <parameter name="DLOFDMA" access="readOnly">
+        <description>
+          Indicates support for Downlink (DL) Orthogonal Frequency Division
+          Multiplexing (OFDMA).
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
       <parameter name="MaxDLMUMIMO" access="readOnly">
         <description>
-          Max number of users supported per DL MU-MIMO Transmitter (TX) in an
-          AP role.
+          Max number of users supported per DL MU-MIMO Transmitter (TX) in the
+          BSS role.
         </description>
         <syntax>
           <unsignedInt>
@@ -34868,7 +40358,7 @@
 
       <parameter name="MaxULMUMIMO" access="readOnly">
         <description>
-          Max number of users supported per UL MU-MIMO Receiver (RX) in an AP
+          Max number of users supported per UL MU-MIMO Receiver (RX) in the BSS
           role.
         </description>
         <syntax>
@@ -34880,7 +40370,7 @@
 
       <parameter name="MaxDLOFDMA" access="readOnly">
         <description>
-          Max number of users supported per Downlink (DL) OFDMA TX in an AP
+          Max number of users supported per Downlink (DL) OFDMA TX in the BSS
           role.
         </description>
         <syntax>
@@ -34892,7 +40382,7 @@
 
       <parameter name="MaxULOFDMA" access="readOnly">
         <description>
-          Max number of users supported per UL OFDMA RX in an AP role.
+          Max number of users supported per UL OFDMA RX in the BSS role.
         </description>
         <syntax>
           <unsignedInt>
@@ -34975,6 +40465,518 @@
       </parameter>
     </object>
 
+    <object
+        name="Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi7APRole."
+        access="readOnly" minEntries="1" maxEntries="1" version="2.17">
+      <description>
+        This object describes the Wi-Fi 7 capabilities for the AP role
+        including Multi-Link Operation (MLO) capabilities. {{bibref|EasyMesh}}
+        Source: Wi-Fi 7 Agent Capabilities TLV.
+      </description>
+
+      <parameter name="EMLMRSupport" access="readOnly">
+        <description>
+          Indicates if the Enhanced Multi-Link Multi-Radio (EMLMR) operation is
+          supported.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="EMLSRSupport" access="readOnly">
+        <description>
+          Indicates if Enhanced Multi-Link Single-Radio (EMLSR) operation is
+          supported.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="STRSupport" access="readOnly">
+        <description>
+          Indicates if Simultaneous Transmit and Receive (STR) operation is
+          supported.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="NSTRSupport" access="readOnly">
+        <description>
+          Indicates if Non-Simultaneous Transmit and Receive (NSTR) operation
+          is supported.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="TIDLinkMapNegotiation" access="readOnly">
+        <description>
+          Indicates if Traffic Identifier (TID) to Link Mapping Negotiation is
+          supported.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="EMLMRFreqSeparationNumberOfEntries" access="readOnly">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="EMLSRFreqSeparationNumberOfEntries" access="readOnly">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="STRFreqSeparationNumberOfEntries" access="readOnly">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="NSTRFreqSeparationNumberOfEntries" access="readOnly">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object
+        name="Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi7APRole.EMLMRFreqSeparation.{i}."
+        access="readOnly"
+        numEntriesParameter="EMLMRFreqSeparationNumberOfEntries" minEntries="0"
+        maxEntries="unbounded" version="2.17">
+      <description>
+        This object describes the required frequency separation from the
+        specified radio {{param|RUID}} for MLO Enhanced Multi-Link Multi-Radio
+        (EMLMR) operation. {{bibref|EasyMesh}} Source: Wi-Fi 7 Agent
+        Capabilities TLV.
+      </description>
+      <uniqueKey functional="true">
+        <parameter ref="RUID"/>
+      </uniqueKey>
+
+      <parameter name="RUID" access="readOnly">
+        <description>
+          The Radio unique identifier (RUID) of another radio to which the
+          specified frequency separation gap applies.
+        </description>
+        <syntax>
+          <base64/>
+        </syntax>
+      </parameter>
+
+      <parameter name="FreqSeparation" access="readOnly">
+        <description>
+          Frequency separation to the specified radio for the particular MLO
+          operation mode. A value of 0 indicates that no frequency separation
+          information is provided. Set to a nonzero value to indicate the
+          required frequency gap is ({{param}} - 1) x {{units}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="80 MHz"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object
+        name="Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi7APRole.EMLSRFreqSeparation.{i}."
+        access="readOnly"
+        numEntriesParameter="EMLSRFreqSeparationNumberOfEntries" minEntries="0"
+        maxEntries="unbounded" version="2.17">
+      <description>
+        This object describes the required frequency separation from the
+        specified radio {{param|RUID}} for MLO Enhanced Multi-Link Single-Radio
+        (EMLSR) operation. {{bibref|EasyMesh}} Source: Wi-Fi 7 Agent
+        Capabilities TLV.
+      </description>
+      <uniqueKey functional="true">
+        <parameter ref="RUID"/>
+      </uniqueKey>
+
+      <parameter name="RUID" access="readOnly">
+        <description>
+          The Radio unique identifier (RUID) of another radio to which the
+          specified frequency separation gap applies.
+        </description>
+        <syntax>
+          <base64/>
+        </syntax>
+      </parameter>
+
+      <parameter name="FreqSeparation" access="readOnly">
+        <description>
+          Frequency separation to the specified radio for the particular MLO
+          operation mode. A value of 0 indicates that no frequency separation
+          information is provided. Set to a nonzero value to indicate the
+          required frequency gap is ({{param}} - 1) x {{units}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="80 MHz"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object
+        name="Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi7APRole.STRFreqSeparation.{i}."
+        access="readOnly"
+        numEntriesParameter="STRFreqSeparationNumberOfEntries" minEntries="0"
+        maxEntries="unbounded" version="2.17">
+      <description>
+        This object describes the required frequency separation from the
+        specified radio {{param|RUID}} for MLO Simultaneous Transmit and
+        Receive (STR) operation. {{bibref|EasyMesh}} Source: Wi-Fi 7 Agent
+        Capabilities TLV.
+      </description>
+      <uniqueKey functional="true">
+        <parameter ref="RUID"/>
+      </uniqueKey>
+
+      <parameter name="RUID" access="readOnly">
+        <description>
+          The Radio unique identifier (RUID) of another radio to which the
+          specified frequency separation gap applies.
+        </description>
+        <syntax>
+          <base64/>
+        </syntax>
+      </parameter>
+
+      <parameter name="FreqSeparation" access="readOnly">
+        <description>
+          Frequency separation to the specified radio for the particular MLO
+          operation mode. A value of 0 indicates that no frequency separation
+          information is provided. Set to a nonzero value to indicate the
+          required frequency gap is ({{param}} - 1) x {{units}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="80 MHz"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object
+        name="Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi7APRole.NSTRFreqSeparation.{i}."
+        access="readOnly"
+        numEntriesParameter="NSTRFreqSeparationNumberOfEntries" minEntries="0"
+        maxEntries="unbounded" version="2.17">
+      <description>
+        This object describes the required frequency separation from the
+        specified radio {{param|RUID}} for MLO Non-Simultaneous Transmit and
+        Receive (NSTR) operation. {{bibref|EasyMesh}} Source: Wi-Fi 7 Agent
+        Capabilities TLV.
+      </description>
+      <uniqueKey functional="true">
+        <parameter ref="RUID"/>
+      </uniqueKey>
+
+      <parameter name="RUID" access="readOnly">
+        <description>
+          The Radio unique identifier (RUID) of another radio to which the
+          specified frequency separation gap applies.
+        </description>
+        <syntax>
+          <base64/>
+        </syntax>
+      </parameter>
+
+      <parameter name="FreqSeparation" access="readOnly">
+        <description>
+          Frequency separation to the specified radio for the particular MLO
+          operation mode. A value of 0 indicates that no frequency separation
+          information is provided. Set to a nonzero value to indicate the
+          required frequency gap is ({{param}} - 1) x {{units}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="80 MHz"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object
+        name="Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi7bSTARole."
+        access="readOnly" minEntries="1" maxEntries="1" version="2.17">
+      <description>
+        This object describes the Wi-Fi 7 capabilities for the backhaul Station
+        (bSTA) role including Multi-Link Operation (MLO) capabilities.
+        {{bibref|EasyMesh}} Source: Wi-Fi 7 Agent Capabilities TLV.
+      </description>
+
+      <parameter name="EMLMRSupport" access="readOnly">
+        <description>
+          Indicates if the Enhanced Multi-Link Multi-Radio (EMLMR) operation is
+          supported.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="EMLSRSupport" access="readOnly">
+        <description>
+          Indicates if Enhanced Multi-Link Single-Radio (EMLSR) operation is
+          supported.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="STRSupport" access="readOnly">
+        <description>
+          Indicates if Simultaneous Transmit and Receive (STR) operation is
+          supported.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="NSTRSupport" access="readOnly">
+        <description>
+          Indicates if Non-Simultaneous Transmit and Receive (NSTR) operation
+          is supported.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="TIDLinkMapNegotiation" access="readOnly">
+        <description>
+          Indicates if Traffic Identifier (TID) to Link Mapping Negotiation is
+          supported.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="EMLMRFreqSeparationNumberOfEntries" access="readOnly">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="EMLSRFreqSeparationNumberOfEntries" access="readOnly">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="STRFreqSeparationNumberOfEntries" access="readOnly">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="NSTRFreqSeparationNumberOfEntries" access="readOnly">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object
+        name="Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi7bSTARole.EMLMRFreqSeparation.{i}."
+        access="readOnly"
+        numEntriesParameter="EMLMRFreqSeparationNumberOfEntries" minEntries="0"
+        maxEntries="unbounded" version="2.17">
+      <description>
+        This object describes the required frequency separation from the
+        specified radio {{param|RUID}} for MLO Enhanced Multi-Link Multi-Radio
+        (EMLMR) operation. {{bibref|EasyMesh}} Source: Wi-Fi 7 Agent
+        Capabilities TLV.
+      </description>
+      <uniqueKey functional="true">
+        <parameter ref="RUID"/>
+      </uniqueKey>
+
+      <parameter name="RUID" access="readOnly">
+        <description>
+          The Radio unique identifier (RUID) of another radio to which the
+          specified frequency separation gap applies.
+        </description>
+        <syntax>
+          <base64/>
+        </syntax>
+      </parameter>
+
+      <parameter name="FreqSeparation" access="readOnly">
+        <description>
+          Frequency separation to the specified radio for the particular MLO
+          operation mode. A value of 0 indicates that no frequency separation
+          information is provided. Set to a nonzero value to indicate the
+          required frequency gap is ({{param}} - 1) x {{units}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="80 MHz"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object
+        name="Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi7bSTARole.EMLSRFreqSeparation.{i}."
+        access="readOnly"
+        numEntriesParameter="EMLSRFreqSeparationNumberOfEntries" minEntries="0"
+        maxEntries="unbounded" version="2.17">
+      <description>
+        This object describes the required frequency separation from the
+        specified radio {{param|RUID}} for MLO Enhanced Multi-Link Single-Radio
+        (EMLSR) operation. {{bibref|EasyMesh}} Source: Wi-Fi 7 Agent
+        Capabilities TLV.
+      </description>
+      <uniqueKey functional="true">
+        <parameter ref="RUID"/>
+      </uniqueKey>
+
+      <parameter name="RUID" access="readOnly">
+        <description>
+          The Radio unique identifier (RUID) of another radio to which the
+          specified frequency separation gap applies.
+        </description>
+        <syntax>
+          <base64/>
+        </syntax>
+      </parameter>
+
+      <parameter name="FreqSeparation" access="readOnly">
+        <description>
+          Frequency separation to the specified radio for the particular MLO
+          operation mode. A value of 0 indicates that no frequency separation
+          information is provided. Set to a nonzero value to indicate the
+          required frequency gap is ({{param}} - 1) x {{units}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="80 MHz"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object
+        name="Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi7bSTARole.STRFreqSeparation.{i}."
+        access="readOnly"
+        numEntriesParameter="STRFreqSeparationNumberOfEntries" minEntries="0"
+        maxEntries="unbounded" version="2.17">
+      <description>
+        This object describes the required frequency separation from the
+        specified radio {{param|RUID}} for MLO Simultaneous Transmit and
+        Receive (STR) operation. {{bibref|EasyMesh}} Source: Wi-Fi 7 Agent
+        Capabilities TLV.
+      </description>
+      <uniqueKey functional="true">
+        <parameter ref="RUID"/>
+      </uniqueKey>
+
+      <parameter name="RUID" access="readOnly">
+        <description>
+          The Radio unique identifier (RUID) of another radio to which the
+          specified frequency separation gap applies.
+        </description>
+        <syntax>
+          <base64/>
+        </syntax>
+      </parameter>
+
+      <parameter name="FreqSeparation" access="readOnly">
+        <description>
+          Frequency separation to the specified radio for the particular MLO
+          operation mode. A value of 0 indicates that no frequency separation
+          information is provided. Set to a nonzero value to indicate the
+          required frequency gap is ({{param}} - 1) x {{units}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="80 MHz"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object
+        name="Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi7bSTARole.NSTRFreqSeparation.{i}."
+        access="readOnly"
+        numEntriesParameter="NSTRFreqSeparationNumberOfEntries" minEntries="0"
+        maxEntries="unbounded" version="2.17">
+      <description>
+        This object describes the required frequency separation from the
+        specified radio {{param|RUID}} for MLO Non-Simultaneous Transmit and
+        Receive (NSTR) operation. {{bibref|EasyMesh}} Source: Wi-Fi 7 Agent
+        Capabilities TLV.
+      </description>
+      <uniqueKey functional="true">
+        <parameter ref="RUID"/>
+      </uniqueKey>
+
+      <parameter name="RUID" access="readOnly">
+        <description>
+          The Radio unique identifier (RUID) of another radio to which the
+          specified frequency separation gap applies.
+        </description>
+        <syntax>
+          <base64/>
+        </syntax>
+      </parameter>
+
+      <parameter name="FreqSeparation" access="readOnly">
+        <description>
+          Frequency separation to the specified radio for the particular MLO
+          operation mode. A value of 0 indicates that no frequency separation
+          information is provided. Set to a nonzero value to indicate the
+          required frequency gap is ({{param}} - 1) x {{units}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="80 MHz"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+    </object>
+
     <object
         name="Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.AKMFrontHaul.{i}."
         access="readOnly" numEntriesParameter="AKMFrontHaulNumberOfEntries"
@@ -35801,15 +41803,30 @@
             <enumeration value="dpp+psk+sae"/>
             <enumeration value="SuiteSelector">
               <description>
-                AKM suite selector, each AKM suite selector (OUI and type) is
-                encoded as a 4-octet hex-encoded value without internal
-                delimiters, e.g. 506F9A02 {{bibref|802.11-2020|Table 9-151}}.
+                "SuiteSelector" indicates an AKM suite selector, the value of
+                which is indicated in {{param|FronthaulSuiteSelector}}.
               </description>
             </enumeration>
           </string>
         </syntax>
       </parameter>
 
+      <parameter name="FronthaulSuiteSelector" access="readWrite">
+        <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.
+          506F9A02 {{bibref|802.11-2020|Table 9-151}}.
+
+          This parameter applies if {{param|FronthaulAKMsAllowed}} includes
+          value "SuiteSelector".
+        </description>
+        <syntax>
+          <hexBinary>
+            <size minLength="4" maxLength="4"/>
+          </hexBinary>
+        </syntax>
+      </parameter>
+
       <parameter name="BackhaulAKMsAllowed" access="readWrite">
         <description>
           {{list}} List items indicate Authentication and Key Management (AKM)
@@ -35844,15 +41861,46 @@
             <enumeration value="dpp+psk+sae"/>
             <enumeration value="SuiteSelector">
               <description>
-                AKM suite selector, each AKM suite selector (OUI and type) is
-                encoded as a 4-octet hex-encoded value without internal
-                delimiters, e.g. 506F9A02 {{bibref|802.11-2020|Table 9-151}}.
+                "SuiteSelector" indicates an AKM suite selector, the value of
+                which is indicated in {{param|BackhaulSuiteSelector}}.
               </description>
             </enumeration>
           </string>
         </syntax>
       </parameter>
 
+      <parameter name="BackhaulSuiteSelector" access="readWrite">
+        <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.
+          506F9A02 {{bibref|802.11-2020|Table 9-151}}.
+
+          This parameter applies if {{param|BackhaulAKMsAllowed}} includes
+          value "SuiteSelector".
+        </description>
+        <syntax>
+          <hexBinary>
+            <size minLength="4" maxLength="4"/>
+          </hexBinary>
+        </syntax>
+      </parameter>
+
+      <parameter name="BasicDataTransmitRates" access="readOnly">
+        <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
+          join this BSS. The stations have to be able to receive and transmit
+          at each of the data rates listed in {{param}}. Most control packets
+          use a data rate in {{param}}.
+        </description>
+        <syntax>
+          <list/>
+          <unsignedInt>
+            <units value="kbps"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
       <parameter name="STANumberOfEntries" access="readOnly">
         <description>
           {{numentries}}
@@ -35898,6 +41946,15 @@
               <parameter ref="ClientMAC"/>
             </uniqueKey>
 
+            <parameter name="BSSID">
+              <description>
+                The BSSID of BSS for which this descriptor applies.
+              </description>
+              <syntax>
+                <dataType ref="MACAddress"/>
+              </syntax>
+            </parameter>
+
             <parameter name="ClientMAC" mandatory="true">
               <description>
                 MAC address of the Station (STA) for which this descriptor
@@ -35946,6 +42003,202 @@
           </parameter>
         </output>
       </command>
+
+      <command name="ThroughputTest()" async="true">
+        <description>
+          This command represents a request to initiate a throughput (speed)
+          test from a BSS to a STA.
+        </description>
+        <input>
+
+          <parameter name="STAMACAddress">
+            <description>
+              MAC address of the STA that the throughput test is to be run to.
+            </description>
+            <syntax>
+              <dataType ref="MACAddress"/>
+            </syntax>
+          </parameter>
+
+          <parameter name="VID">
+            <description>
+              The VLAN ID (VID) that the throughput test is to run on.
+            </description>
+            <syntax>
+              <unsignedInt>
+                <range maxInclusive="4095"/>
+              </unsignedInt>
+            </syntax>
+          </parameter>
+
+          <parameter name="WMMUP">
+            <description>
+              Wi-Fi MultiMedia (WMM) User Priority {{bibref|AMB}} that the
+              throughput test is to run on. A value of 8 indicates that the WMM
+              UP is not specified.
+
+              If WMM is not supported by the BSS and the STA, then this is
+              ignored.
+            </description>
+            <syntax>
+              <unsignedInt>
+                <range maxInclusive="8"/>
+              </unsignedInt>
+            </syntax>
+          </parameter>
+
+          <parameter name="TestDuration">
+            <description>
+              Duration of the throughput test in {{units}}.
+            </description>
+            <syntax>
+              <unsignedInt>
+                <range maxInclusive="65535"/>
+                <units value="milliseconds"/>
+              </unsignedInt>
+            </syntax>
+          </parameter>
+
+          <parameter name="TestDirection">
+            <description>
+              Direction to run the throughput test. {{enum}}
+            </description>
+            <syntax>
+              <string>
+                <enumeration value="Downlink"/>
+                <enumeration value="Uplink"/>
+                <enumeration value="Roundtrip">
+                  <description>Both uplink and downlink.</description>
+                </enumeration>
+              </string>
+            </syntax>
+          </parameter>
+        </input>
+        <output>
+
+          <parameter name="Status">
+            <description>
+              Indicates the type of outcome of the throughput test request.
+              {{enum}}
+            </description>
+            <syntax>
+              <string>
+                <enumeration value="Success"/>
+                <enumeration value="Error_Invalid_Input"/>
+                <enumeration value="Error_Timeout"/>
+                <enumeration value="Error_Other" optional="true"/>
+              </string>
+            </syntax>
+          </parameter>
+        </output>
+      </command>
+
+      <command name="LatencyTest()" async="true">
+        <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
+          individual echo tests. Each echo test result provides a sample of
+          round-trip time.
+        </description>
+        <input>
+
+          <parameter name="STAMACAddress">
+            <description>
+              MAC address of the STA that the latency test is to be run to.
+            </description>
+            <syntax>
+              <dataType ref="MACAddress"/>
+            </syntax>
+          </parameter>
+
+          <parameter name="VID">
+            <description>
+              The VLAN ID (VID) that the latency test is to run on.
+            </description>
+            <syntax>
+              <unsignedInt>
+                <range maxInclusive="4095"/>
+              </unsignedInt>
+            </syntax>
+          </parameter>
+
+          <parameter name="WMMUP">
+            <description>
+              Wi-Fi MultiMedia (WMM) User Priority {{bibref|AMB}} that the
+              latency test is to run on. A value of 8 indicates that the WMM UP
+              is not specified.
+
+              If WMM is not supported by the BSS and the STA, then this is
+              ignored.
+            </description>
+            <syntax>
+              <unsignedInt>
+                <range maxInclusive="8"/>
+              </unsignedInt>
+            </syntax>
+          </parameter>
+
+          <parameter name="NumberOfRepetitions">
+            <description>
+              Number of echo tests to run in the latency test set.
+
+              If the value of this field is 0, then this field is ignored.
+            </description>
+            <syntax>
+              <unsignedInt>
+                <range maxInclusive="65535"/>
+              </unsignedInt>
+            </syntax>
+          </parameter>
+
+          <parameter name="Timeout">
+            <description>
+              If any echo test duration exceeds this time in {{units}}, then
+              the echo test is declared a failure.
+
+              A value of 0 indicates that no Timeout is specified.
+            </description>
+            <syntax>
+              <unsignedInt>
+                <range maxInclusive="65535"/>
+                <units value="milliseconds"/>
+              </unsignedInt>
+            </syntax>
+          </parameter>
+
+          <parameter name="DataBlockSize">
+            <description>
+              The size of each data block, in {{units}}, transmitted in each
+              echo test.
+
+              A value of 0 indicates that no DataBlockSize is specified.
+            </description>
+            <syntax>
+              <unsignedInt>
+                <range maxInclusive="65535"/>
+                <units value="bytes"/>
+              </unsignedInt>
+            </syntax>
+          </parameter>
+        </input>
+        <output>
+
+          <parameter name="Status">
+            <description>
+              Indicates the type of outcome of the latency test request.
+              {{enum}}
+            </description>
+            <syntax>
+              <string>
+                <enumeration value="Success"/>
+                <enumeration value="Error_Invalid_Input"/>
+                <enumeration value="Error_Timeout"/>
+                <enumeration value="Error_Other" optional="true"/>
+              </string>
+            </syntax>
+          </parameter>
+        </output>
+      </command>
     </object>
 
     <object
@@ -35959,6 +42212,15 @@
         <parameter ref="ClientMAC"/>
       </uniqueKey>
 
+      <parameter name="BSSID" access="readOnly">
+        <description>
+          The BSSID of BSS for which this descriptor applies.
+        </description>
+        <syntax>
+          <dataType ref="MACAddress"/>
+        </syntax>
+      </parameter>
+
       <parameter name="ClientMAC" access="readOnly">
         <description>
           MAC address of STA for which this descriptor applies.
@@ -35988,6 +42250,296 @@
       </parameter>
     </object>
 
+    <object
+        name="Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.MUConfig."
+        minEntries="1" maxEntries="1" version="2.17">
+      <description>
+        This object provides Multiuser (MU)-specific BSS configuration.
+      </description>
+
+      <parameter name="DLOFDMAEnable" access="readWrite">
+        <description>
+          Enable downlink (DL) Orthogonal Frequency-Division Multiple Access
+          (OFDMA).
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ULOFDMAEnable" access="readWrite">
+        <description>
+          Enable uplink (UL) OFDMA.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="DLMUMIMOEnable" access="readWrite">
+        <description>
+          Enable DL Multi-User Multi-Input Multi-Output (MU-MIMO).
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ULMUMIMOEnable" access="readWrite">
+        <description>
+          Enable UL MU-MIMO.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object
+        name="Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.MUStats."
+        minEntries="1" maxEntries="1" version="2.17">
+      <description>
+        This object provides packet statistics for a Multiuser (MU) BSS.
+      </description>
+
+      <parameter name="DLTotalPPDUCount" access="readOnly">
+        <description>
+          Total number of Physical-layer Protocol Data Units (PPDUs)
+          transmitted by the Wi-Fi Basic Service Set (BSS).
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="DLHEPPDUCount" access="readOnly">
+        <description>
+          Number of High-Efficiency (HE) PPDUs transmitted by the BSS.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="DLMUPPDUCount" access="readOnly">
+        <description>
+          Number of Multi-User (MU) PPDUs transmitted by the BSS.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="DLOFDMAPPDUCount" access="readOnly">
+        <description>
+          Number of Orthogonal Frequency-Division Multiple Access (OFDMA) PPDUs
+          transmitted by the BSS.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="DLMUMIMOPPDUCount" access="readOnly">
+        <description>
+          Number of Multi-Input Multi-Output (MU-MIMO) PPDUs transmitted by the
+          BSS.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="DLOFDMAMUMIMOPPDUCount" access="readOnly">
+        <description>
+          Number of PPDUs transmitted by the BSS with OFDMA and MU-MIMO.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ULTotalPPDUCount" access="readOnly">
+        <description>
+          Total number of PPDUs received by the BSS.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ULHEPPDUCount" access="readOnly">
+        <description>
+          Number of High-Efficiency (HE) PPDUs received by the BSS.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ULMUPPDUCount" access="readOnly">
+        <description>
+          Number of MU PPDUs received by the BSS.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ULOFDMAPPDUCount" access="readOnly">
+        <description>
+          Number of OFDMA PPDUs received by the BSS.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ULMUMIMOPPDUCount" access="readOnly">
+        <description>
+          Number of MU-MIMO PDDUs received by the BSS.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ULOFDMAMUMIMOPPDUCount" access="readOnly">
+        <description>
+          Number of PPDUs received by the BSS with OFDMA and MU-MIMO.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="DLRU26PPDUCount" access="readOnly">
+        <description>
+          Number of PPDUs sent on the downlink using Resource Unit (RU) RU26.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="DLRU52PPDUCount" access="readOnly">
+        <description>
+          Number of PPDUs sent on the downlink using RU52.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="DLRU106PPDUCount" access="readOnly">
+        <description>
+          Number of PPDUs sent on the downlink using RU106.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="DLRU242PPDUCount" access="readOnly">
+        <description>
+          Number of PPDUs sent on the downlink using RU242.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="DLRU484PPDUCount" access="readOnly">
+        <description>
+          Number of PPDUs sent on the downlink using RU484.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="DLRU996PPDUCount" access="readOnly">
+        <description>
+          Number of PPDUs sent on the downlink using RU996.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="DLRU1992PPDUCount" access="readOnly">
+        <description>
+          Number of PPDUs sent on the downlink using RU1992.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ULRU26PPDUCount" access="readOnly">
+        <description>
+          Number of PPDUs received on the uplink using RU26.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ULRU52PPDUCount" access="readOnly">
+        <description>
+          Number of PPDUs received on the uplink using RU52.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ULRU106PPDUCount" access="readOnly">
+        <description>
+          Number of PPDUs received on the uplink using RU106.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ULRU242PPDUCount" access="readOnly">
+        <description>
+          Number of PPDUs received on the uplink using RU242.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ULRU484PPDUCount" access="readOnly">
+        <description>
+          Number of PPDUs received on the uplink using RU484.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ULRU996PPDUCount" access="readOnly">
+        <description>
+          Number of PPDUs received on the uplink using RU996.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ULRU1992PPDUCount" access="readOnly">
+        <description>
+          Number of PPDUs received on the uplink using RU1992.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+    </object>
+
     <object
         name="Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.MultiAPSteering."
         access="readOnly" minEntries="1" maxEntries="1" version="2.15">
@@ -36011,8 +42563,9 @@
 
       <parameter name="BTMAttempts" access="readOnly">
         <description>
-          Number of times a BTM (BSS Transition Management; {{bibref|802.11k}})
-          steer was attempted for this Access Point.
+          Number of times a BTM (BSS Transition Management;
+          {{bibref|802.11-2020|sections 4.3.19.3 and 6.3.57}} steer was
+          attempted for this Access Point.
         </description>
         <syntax>
           <dataType ref="StatsCounter64"/>
@@ -36022,8 +42575,8 @@
       <parameter name="BTMQueryResponses" access="readOnly">
         <description>
           Number of asynchronous BTM (BSS Transition Management;
-          {{bibref|802.11k}}) Queries for which a BTM Request was issued by
-          this Access Point.
+          {{bibref|802.11-2020|sections 4.3.19.3 and 6.3.57}} Queries for which
+          a BTM Request was issued by this Access Point.
         </description>
         <syntax>
           <dataType ref="StatsCounter64"/>
@@ -36031,10 +42584,271 @@
       </parameter>
     </object>
 
+    <object
+        name="Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.ThroughputTestResult."
+        access="readOnly" minEntries="1" maxEntries="1" version="2.17">
+      <description>
+        Object containing the results of the most recent throughput (speed)
+        test from the BSS to a station (STA).
+      </description>
+
+      <parameter name="TimeStamp" access="readOnly">
+        <description>
+          Timestamp for the throughput test, indicating when the test
+          completed.
+        </description>
+        <syntax>
+          <dateTime/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ClientMAC" access="readOnly">
+        <description>
+          MAC address of the STA that the throughput test ran to.
+        </description>
+        <syntax>
+          <dataType ref="MACAddress"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="VID" access="readOnly">
+        <description>
+          The VLAN ID (VID) that the throughput test ran on.
+
+          A value of 0 indicates that no VLAN was specified.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range minInclusive="0" maxInclusive="4095"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="WMMUP" access="readOnly">
+        <description>
+          Wireless MultiMedia (WMM) User Priority (UP) {{bibref|WMM}} that the
+          throughput test was requested to run on.
+
+          A value of 8 indicates that no UP was specified.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range minInclusive="0" maxInclusive="8"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="TestDuration" access="readOnly">
+        <description>
+          Duration of the throughput test in {{units}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="milliseconds"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="TestLayer" access="readOnly">
+        <description>
+          The OSI layer that the throughput test ran on.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="TestAlgorithm" access="readOnly">
+        <description>
+          The test algorithm that the throughput test used.
+        </description>
+        <syntax>
+          <string/>
+        </syntax>
+      </parameter>
+
+      <parameter name="DownlinkSpeed" access="readOnly">
+        <description>
+          Downlink speed found by the throughput test in {{units}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="kbps"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="UplinkSpeed" access="readOnly">
+        <description>
+          Uplink speed found by the throughput test in {{units}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="kbps"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object
+        name="Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.LatencyTestResult."
+        access="readOnly" minEntries="1" maxEntries="1" version="2.17">
+      <description>
+        Object containing the results of the most recent latency test set from
+        the BSS to a station (STA). Each latency test set includes a number of
+        individual echo tests. Each echo test result provides a sample of
+        round-trip times and statistics on all the echo tests in this latency
+        test are reported in this object.
+      </description>
+
+      <parameter name="TimeStamp" access="readOnly">
+        <description>
+          Timestamp for the latency test, indicating when the last echo in the
+          latency test set was received or timed-out.
+        </description>
+        <syntax>
+          <dateTime/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ClientMAC" access="readOnly">
+        <description>
+          MAC address of the station (STA) or EasyMesh Agent that the latency
+          test ran to.
+        </description>
+        <syntax>
+          <dataType ref="MACAddress"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="VID" access="readOnly">
+        <description>
+          The VLAN ID (VID) that the latency test ran on.
+
+          A value of 0 indicates that no VLAN was specified.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range minInclusive="0" maxInclusive="4095"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="WMMUP" access="readOnly">
+        <description>
+          Wireless MultiMedia (WMM) User Priority (UP) {{bibref|WMM}} that the
+          latency test was requested to run on.
+
+          A value of 8 indicates that no UP was specified.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range minInclusive="0" maxInclusive="8"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="DataBlockSize" access="readOnly">
+        <description>
+          The size of each data block, in {{units}}, that was transmitted in
+          each echo test. The data block excludes the packet or frame header.
+
+          A value of 0 indicates that no DataBlockSize was specified.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="bytes"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="TestLayer" access="readOnly">
+        <description>
+          The OSI layer that the latency test ran on.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="TestAlgorithm" access="readOnly">
+        <description>
+          The test algorithm that the latency test used.
+        </description>
+        <syntax>
+          <string/>
+        </syntax>
+      </parameter>
+
+      <parameter name="SuccessCount" access="readOnly">
+        <description>
+          The number of successfully received echo responses.
+
+          This parameter is an output of the latency test.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="LostCount" access="readOnly">
+        <description>
+          The number of lost echoes in the latency test set.
+
+          This parameter is an output of the latency test.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="AverageResponseTime" access="readOnly">
+        <description>
+          The average round-trip time of the results of the latency test set in
+          {{units}}. This average is across successfully received echoes only.
+
+          This parameter is an output of the latency test.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="milliseconds"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="MinimumResponseTime" access="readOnly">
+        <description>
+          The minimum round-trip time of the results of the latency test set in
+          {{units}}. This minimum is across successfully received echoes only.
+
+          This parameter is an output of the latency test.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="milliseconds"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="MaximumResponseTime" access="readOnly">
+        <description>
+          The maximum round-trip time of the results of the latency test set in
+          {{units}}. This maximum is across successfully received echoes only.
+
+          This parameter is an output of the latency test.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="milliseconds"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+    </object>
+
     <object
         name="Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}."
         access="readOnly" numEntriesParameter="STANumberOfEntries"
-        minEntries="0" maxEntries="unbounded" version="2.13">
+        minEntries="1" maxEntries="unbounded" version="2.13">
       <description>
         Object describing a single Associated Device (STA).
       </description>
@@ -36088,12 +42902,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.15|because it is superseded by
-          {{object|WiFi6Capabilities}}.}}
+          {{object|WiFi6Capabilities}}}}
+
+          {{obsoleted|2.17}}
         </description>
         <syntax>
           <base64>
@@ -36207,10 +43023,6 @@
           encoded per {{bibref|802.11-2020|Table 9-176}}, and described in
           {{bibref|EasyMesh|Section 10.3.1}}). Reserved: 221 - 255.
 
-          NOTE: The underlying WFA specification is in the process of being
-          reviewed for possible clarification. Please refer to that
-          specification for more details.
-
           If the instance of this {{object}} is the same as
           {{object|Device.WiFi.AccessPoint.{i}.AssociatedDevice.{i}}}, then
           this parameter is the same as
@@ -36417,6 +43229,48 @@
         </syntax>
       </parameter>
 
+      <parameter name="SleepMode" access="readOnly">
+        <description>
+          This parameter indicates the current operating sleep mode as recorded
+          by the BSS {{bibref|802.11-2020}}. {{enum}}
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="Not_Asleep"/>
+            <enumeration value="WNM_Sleep_Mode"/>
+            <enumeration value="TPU_Sleep"/>
+            <enumeration value="TDLS_Peer_Power_Save_Mode_(PSM)"/>
+            <enumeration value="AP_PS-Poll"/>
+            <enumeration value="TWT_Sleep"/>
+            <enumeration value="Light_Sleep"/>
+            <enumeration value="Deep_Sleep"/>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="SecurityAssociation" access="readOnly">
+        <description>
+          This parameter indicates the current operating security state as
+          defined in {{bibref|802.11-2020|Section 12.6.1.1}}. {{enum}}
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="PMKSA"/>
+            <enumeration value="PMK-R0"/>
+            <enumeration value="PMK-R1"/>
+            <enumeration value="Mesh_PMKSA"/>
+            <enumeration value="Mesh_TKSA"/>
+            <enumeration value="PTKSA"/>
+            <enumeration value="GTKSA"/>
+            <enumeration value="IGTKSA"/>
+            <enumeration value="Mesh_GTKSA"/>
+            <enumeration value="BIGTKSA"/>
+            <enumeration value="TPKSA"/>
+            <enumeration value="Other"/>
+          </string>
+        </syntax>
+      </parameter>
+
       <parameter name="TIDQueueSizesNumberOfEntries" access="readOnly">
         <description>
           {{numentries}}
@@ -36425,6 +43279,157 @@
           <unsignedInt/>
         </syntax>
       </parameter>
+
+      <command name="ClientSteer()" async="true">
+        <description>
+          Initiates an EasyMesh {{bibref|EasyMesh}} Controller initiated
+          steering mandate request to steer a STA from one EasyMesh agent to
+          another.
+
+          The steering mechanism is determined by the EasyMesh controller.
+          Application of BTM or non BTM steering, timing, failsafes, and
+          command rejection are determined by the EasyMesh controller.
+
+          The {{param|TargetBSSID}} should be an instance of a
+          {{param|#.BSSID}}.
+        </description>
+        <input>
+
+          <parameter name="TargetBSSID">
+            <description>
+              Basic Service Set Identifier (BSSID) or AP MLD MAC Address of the
+              target BSS which the associated device(s) is to be steered to.
+
+              Wildcard BSSID is represented by FFFFFFFFFFFF.
+            </description>
+            <syntax>
+              <dataType ref="MACAddress"/>
+            </syntax>
+          </parameter>
+
+          <parameter name="RequestMode">
+            <description>
+              The request mode. {{enum}}
+            </description>
+            <syntax>
+              <string>
+                <enumeration value="Steering_Opportunity">
+                  <description>
+                    Request is a Steering Opportunity, indicated by 0 in
+                    {{bibref|EasyMesh|Table 49}}.
+                  </description>
+                </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}}.
+                  </description>
+                </enumeration>
+              </string>
+            </syntax>
+          </parameter>
+
+          <parameter name="BTMDisassociationImminent">
+            <description>
+              BTM disassociation imminent.
+            </description>
+            <syntax>
+              <boolean/>
+            </syntax>
+          </parameter>
+
+          <parameter name="BTMAbridged">
+            <description>
+              BTM abridged.
+            </description>
+            <syntax>
+              <boolean/>
+            </syntax>
+          </parameter>
+
+          <parameter name="LinkRemovalImminent">
+            <description>
+              Link removal imminent.
+            </description>
+            <syntax>
+              <boolean/>
+            </syntax>
+          </parameter>
+
+          <parameter name="SteeringOpportunityWindow">
+            <description>
+              Time period in {{units}} (from reception of the Steering Request
+              message) for which the request is valid. If {{param|RequestMode}}
+              is Steering_Mandate, then this is ignored.
+            </description>
+            <syntax>
+              <unsignedInt>
+                <units value="seconds"/>
+              </unsignedInt>
+            </syntax>
+          </parameter>
+
+          <parameter name="BTMDisassociationTimer">
+            <description>
+              Time period in {{units}} of the disassociation timer in the BTM
+              Request.
+            </description>
+            <syntax>
+              <unsignedInt>
+                <units value="TUs"/>
+              </unsignedInt>
+            </syntax>
+          </parameter>
+
+          <parameter name="TargetBSSOperatingClass">
+            <description>
+              The Target BSS Operating Class per {{bibref|802.11-2020|Table
+              E-4}}.
+
+              If the {{param|TargetBSSID}} is set to "Wildcard BSSID", then
+              this is ignored.
+            </description>
+            <syntax>
+              <unsignedInt>
+                <range maxInclusive="255"/>
+              </unsignedInt>
+            </syntax>
+          </parameter>
+
+          <parameter name="TargetBSSChannel">
+            <description>
+              Target BSS channel number for channel on which the Target BSS is
+              transmitting Beacon frames.
+
+              If the {{param|TargetBSSID}} is set to "Wildcard BSSID", then
+              then this is ignored.
+            </description>
+            <syntax>
+              <unsignedInt>
+                <range maxInclusive="255"/>
+              </unsignedInt>
+            </syntax>
+          </parameter>
+        </input>
+        <output>
+
+          <parameter name="Status">
+            <description>
+              Indicates the response to the Wi-Fi backhaul steering request.
+              {{enum}}
+            </description>
+            <syntax>
+              <string>
+                <enumeration value="Success"/>
+                <enumeration value="Error_Invalid_Input"/>
+                <enumeration value="Error_Timeout"/>
+                <enumeration value="Error_Other" optional="true"/>
+              </string>
+            </syntax>
+          </parameter>
+        </output>
+      </command>
     </object>
 
     <object
@@ -36946,10 +43951,20 @@
         </syntax>
       </parameter>
 
+      <parameter name="DLOFDMA" access="readOnly">
+        <description>
+          Indicates support for Downlink (DL) Orthogonal Frequency Division
+          Multiplexing (OFDMA).
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
       <parameter name="MaxDLMUMIMO" access="readOnly">
         <description>
-          Max number of users supported per DL MU-MIMO Transmitter (TX) in an
-          AP role.
+          Max number of users supported per DL MU-MIMO Transmitter (TX) in the
+          BSS role.
         </description>
         <syntax>
           <unsignedInt>
@@ -36960,7 +43975,7 @@
 
       <parameter name="MaxULMUMIMO" access="readOnly">
         <description>
-          Max number of users supported per UL MU-MIMO Receiver (RX) in an AP
+          Max number of users supported per UL MU-MIMO Receiver (RX) in the BSS
           role.
         </description>
         <syntax>
@@ -36972,7 +43987,7 @@
 
       <parameter name="MaxDLOFDMA" access="readOnly">
         <description>
-          Max number of users supported per Downlink (DL) OFDMA TX in an AP
+          Max number of users supported per Downlink (DL) OFDMA TX in the BSS
           role.
         </description>
         <syntax>
@@ -36984,7 +43999,7 @@
 
       <parameter name="MaxULOFDMA" access="readOnly">
         <description>
-          Max number of users supported per UL OFDMA RX in an AP role.
+          Max number of users supported per UL OFDMA RX in the BSS role.
         </description>
         <syntax>
           <unsignedInt>
@@ -37127,7 +44142,7 @@
 
       <command name="FullScan()" async="true">
         <description>
-          This parameter represents a request to initiate a full scan on this
+          This command represents a request to initiate a full scan on this
           radio, including all channels supported by this radio, for a specific
           {{param|DwellTime}} and {{param|HomeTime}}. This command will result
           in updating
@@ -37225,6 +44240,28 @@
                 <string/>
               </syntax>
             </parameter>
+
+            <parameter name="AggregateScanDuration">
+              <description>
+                Total time spent performing the scan of this channel in
+                {{units}}.
+              </description>
+              <syntax>
+                <unsignedInt>
+                  <units value="milliseconds"/>
+                </unsignedInt>
+              </syntax>
+            </parameter>
+
+            <parameter name="ScanType">
+              <description>
+                Indicates whether the scan was performed passively (false) or
+                with active probing (true).
+              </description>
+              <syntax>
+                <boolean/>
+              </syntax>
+            </parameter>
           </object>
 
           <object name="ScanResult.{i}.OpClassScan.{i}." minEntries="0"
@@ -37314,6 +44351,48 @@
                 </unsignedInt>
               </syntax>
             </parameter>
+
+            <parameter name="ScanStatus">
+              <description>
+                Status code to indicate whether a scan has been performed and
+                if not the reason for failure {{enum}}
+              </description>
+              <syntax>
+                <string>
+                  <enumeration value="0">
+                    <description>Success</description>
+                  </enumeration>
+                  <enumeration value="1">
+                    <description>
+                      Scan not supported on this opclass and channel
+                    </description>
+                  </enumeration>
+                  <enumeration value="2">
+                    <description>
+                      Request too soon after last scan
+                    </description>
+                  </enumeration>
+                  <enumeration value="3">
+                    <description>Radio too busy to perform scan</description>
+                  </enumeration>
+                  <enumeration value="4">
+                    <description>Scan not completed</description>
+                  </enumeration>
+                  <enumeration value="5">
+                    <description>Scan aborted</description>
+                  </enumeration>
+                  <enumeration value="6">
+                    <description>
+                      Fresh scan not supported, radio only supports on boot
+                      scans
+                    </description>
+                  </enumeration>
+                  <enumeration value="7">
+                    <description>reserved</description>
+                  </enumeration>
+                </string>
+              </syntax>
+            </parameter>
           </object>
 
           <object
@@ -37350,10 +44429,6 @@
                 Probe Response frames of the neighboring BSS as received by the
                 radio measured in {{units}}. (RSSI is encoded per
                 {{bibref|802.11-2020|Table 9-176}}). Reserved: 221 - 255.
-
-                NOTE: The underlying WFA specification is in the process of
-                being reviewed for possible clarification. Please refer to that
-                specification for more details.
               </description>
               <syntax>
                 <unsignedInt>
@@ -37398,6 +44473,63 @@
               </syntax>
             </parameter>
 
+            <parameter name="MLDMACAddress">
+              <description>
+                The Multi-Link Device (MLD) MAC address of the Multi-Link
+                Operation (MLO) capable access point this neighboring BSS is
+                affiliated to. Null if the neighboring BSS is not an affiliated
+                AP.
+              </description>
+              <syntax>
+                <dataType ref="MACAddress"/>
+              </syntax>
+            </parameter>
+
+            <parameter name="ReportingBSSID">
+              <description>
+                The BSSID of the reporting BSSID if different from
+                {{param|BSSID}}. This will be set if the NeigborBSS was
+                discovered through, for example, a Reduced Neighbor Report.
+                EasyMesh {{bibref|EasyMesh}} source: Channel Scan Result TLV.
+              </description>
+              <syntax>
+                <dataType ref="MACAddress"/>
+              </syntax>
+            </parameter>
+
+            <parameter name="MultiBSSID">
+              <description>
+                Indicates if the neighboring BSS is part of a MultiBSSID set
+                and may be a non-transmitted BSSID.
+              </description>
+              <syntax>
+                <boolean/>
+              </syntax>
+            </parameter>
+
+            <parameter name="BSSLoadElementPresent">
+              <description>
+                Set to true if the neighbour BSS Beacon/Probe Responses include
+                a BSSLoad Element as defined in {{bibref|802.11-2020|Section
+                9.4.2.28}}.
+              </description>
+              <syntax>
+                <boolean/>
+              </syntax>
+            </parameter>
+
+            <parameter name="BSSColor">
+              <description>
+                Set to the BSS Color from the BSS Color Information field in
+                the BSS's HE Operation element.
+              </description>
+              <syntax>
+                <unsignedInt>
+                  <range maxInclusive="63"/>
+                </unsignedInt>
+              </syntax>
+            </parameter>
+
             <parameter name="SecurityModeEnabled">
               <description>
                 The type of encryption the neighboring WiFi SSID advertises.
@@ -37481,6 +44613,9 @@
                   <enumeration value="ax">
                     <description>{{bibref|802.11ax}}</description>
                   </enumeration>
+                  <enumeration value="be">
+                    <description>{{bibref|802.11be}}</description>
+                  </enumeration>
                 </string>
               </syntax>
             </parameter>
@@ -37713,6 +44848,28 @@
                 <string/>
               </syntax>
             </parameter>
+
+            <parameter name="AggregateScanDuration">
+              <description>
+                Total time spent performing the scan of this channel in
+                {{units}}.
+              </description>
+              <syntax>
+                <unsignedInt>
+                  <units value="milliseconds"/>
+                </unsignedInt>
+              </syntax>
+            </parameter>
+
+            <parameter name="ScanType">
+              <description>
+                Indicates whether the scan was performed passively (false) or
+                with active probing (true).
+              </description>
+              <syntax>
+                <boolean/>
+              </syntax>
+            </parameter>
           </object>
 
           <object name="ScanResult.{i}.OpClassScan.{i}." minEntries="0"
@@ -37802,6 +44959,48 @@
                 </unsignedInt>
               </syntax>
             </parameter>
+
+            <parameter name="ScanStatus">
+              <description>
+                Status code to indicate whether a scan has been performed and
+                if not the reason for failure {{enum}}
+              </description>
+              <syntax>
+                <string>
+                  <enumeration value="0">
+                    <description>Success</description>
+                  </enumeration>
+                  <enumeration value="1">
+                    <description>
+                      Scan not supported on this opclass and channel
+                    </description>
+                  </enumeration>
+                  <enumeration value="2">
+                    <description>
+                      Request too soon after last scan
+                    </description>
+                  </enumeration>
+                  <enumeration value="3">
+                    <description>Radio too busy to perform scan</description>
+                  </enumeration>
+                  <enumeration value="4">
+                    <description>Scan not completed</description>
+                  </enumeration>
+                  <enumeration value="5">
+                    <description>Scan aborted</description>
+                  </enumeration>
+                  <enumeration value="6">
+                    <description>
+                      Fresh scan not supported, radio only supports on boot
+                      scans
+                    </description>
+                  </enumeration>
+                  <enumeration value="7">
+                    <description>reserved</description>
+                  </enumeration>
+                </string>
+              </syntax>
+            </parameter>
           </object>
 
           <object
@@ -37838,10 +45037,6 @@
                 Probe Response frames of the neighboring BSS as received by the
                 radio measured in {{units}}. (RSSI is encoded per
                 {{bibref|802.11-2020|Table 9-176}}). Reserved: 221 - 255.
-
-                NOTE: The underlying WFA specification is in the process of
-                being reviewed for possible clarification. Please refer to that
-                specification for more details.
               </description>
               <syntax>
                 <unsignedInt>
@@ -37886,6 +45081,63 @@
               </syntax>
             </parameter>
 
+            <parameter name="MLDMACAddress">
+              <description>
+                The Multi-Link Device (MLD) MAC address of the Multi-Link
+                Operation (MLO) capable access point this neighboring BSS is
+                affiliated to. Null if the neighboring BSS is not an affiliated
+                AP.
+              </description>
+              <syntax>
+                <dataType ref="MACAddress"/>
+              </syntax>
+            </parameter>
+
+            <parameter name="ReportingBSSID">
+              <description>
+                The BSSID of the reporting BSSID if different from
+                {{param|BSSID}}. This will be set if the NeigborBSS was
+                discovered through, for example, a Reduced Neighbor Report.
+                EasyMesh {{bibref|EasyMesh}} source: Channel Scan Result TLV.
+              </description>
+              <syntax>
+                <dataType ref="MACAddress"/>
+              </syntax>
+            </parameter>
+
+            <parameter name="MultiBSSID">
+              <description>
+                Indicates if the neighboring BSS is part of a MultiBSSID set
+                and may be a non-transmitted BSSID.
+              </description>
+              <syntax>
+                <boolean/>
+              </syntax>
+            </parameter>
+
+            <parameter name="BSSLoadElementPresent">
+              <description>
+                Set to true if the neighbour BSS Beacon/Probe Responses include
+                a BSSLoad Element as defined in {{bibref|802.11-2020|Section
+                9.4.2.28}}.
+              </description>
+              <syntax>
+                <boolean/>
+              </syntax>
+            </parameter>
+
+            <parameter name="BSSColor">
+              <description>
+                Set to the BSS Color from the BSS Color Information field in
+                the BSS's HE Operation element.
+              </description>
+              <syntax>
+                <unsignedInt>
+                  <range maxInclusive="63"/>
+                </unsignedInt>
+              </syntax>
+            </parameter>
+
             <parameter name="SecurityModeEnabled">
               <description>
                 The type of encryption the neighboring WiFi SSID advertises.
@@ -37969,6 +45221,9 @@
                   <enumeration value="ax">
                     <description>{{bibref|802.11ax}}</description>
                   </enumeration>
+                  <enumeration value="be">
+                    <description>{{bibref|802.11be}}</description>
+                  </enumeration>
                 </string>
               </syntax>
             </parameter>
@@ -38068,8 +45323,9 @@
         access="readOnly" numEntriesParameter="UnassociatedSTANumberOfEntries"
         minEntries="0" maxEntries="unbounded" version="2.13">
       <description>
-        Each instance represents a Non-AP STA that has been discovered by the
-        Radio but is not associated to any of the BSS operating on the Radio.
+        Each instance represents a station (STA) that has been discovered by
+        the Radio but is not associated to any of the BSS operating on the
+        Radio.
       </description>
       <uniqueKey functional="true">
         <parameter ref="MACAddress"/>
@@ -38090,10 +45346,6 @@
           Non-AP STA - measured in {{units}}. RCPI is encoded per
           {{bibref|802.11-2020|Table 9-176}}, and described in
           {{bibref|EasyMesh|Section 10.3.2}}. Reserved: 221 - 255.
-
-          NOTE: The underlying WFA specification is in the process of being
-          reviewed for possible clarification. Please refer to that
-          specification for more details.
         </description>
         <syntax>
           <unsignedInt>
@@ -38102,6 +45354,1114 @@
           </unsignedInt>
         </syntax>
       </parameter>
+
+      <parameter name="OperatingClass" access="readOnly">
+        <description>
+          Operating class on which this unassociated STA was last detected, per
+          {{bibref|802.11-2020|Table E-4}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range maxInclusive="255"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="Channel" access="readOnly">
+        <description>
+          Channel on which this unassociated STA was last detected.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range maxInclusive="255"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object name="Device.WiFi.DataElements.Network.Device.{i}.WPS."
+        access="readOnly" minEntries="1" maxEntries="1" version="2.17">
+      <description>
+        This object contains Wi-Fi Protected Setup (WPS) Push Button
+        Configuration (PBC) configuration and status as specified in
+        {{bibref|WPSv1.0}} or {{bibref|WPS 2.0}}). In EasyMesh
+        {{bibref|EasyMesh}} this object applies to fronthaul only.
+      </description>
+
+      <parameter name="Enable" access="readWrite">
+        <description>
+          Enables or disables WPS functionality for this EasyMesh agent or
+          single AP.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Status" access="readOnly">
+        <description>
+          Indicates the current status of WPS. If the device goes to
+          {{enum|SetupLocked}} the WPS needs to be disabled and re-enabled to
+          come out of this state.
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="Disabled"/>
+            <enumeration value="Error"/>
+            <enumeration value="Unconfigured"/>
+            <enumeration value="Configured"/>
+            <enumeration value="SetupLocked"/>
+            <enumeration value="InProgress"/>
+          </string>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object name="Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}."
+        access="readOnly" numEntriesParameter="APMLDNumberOfEntries"
+        minEntries="0" maxEntries="unbounded" version="2.17">
+      <description>
+        Table of Multi-Link Operation (MLO) capable Access Points (APs) on this
+        EasyMesh Agent or Single AP device. {{bibref|EasyMesh}} source: Agent
+        AP MLD Configuration TLV.
+      </description>
+      <uniqueKey functional="true">
+        <parameter ref="MLDMACAddress"/>
+      </uniqueKey>
+
+      <parameter name="MLDMACAddress" access="readOnly">
+        <description>
+          The Multi-Link Device (MLD) MAC Address of the MLO Capable access
+          point (AP). {{bibref|EasyMesh}} Source: Agent AP MLD Configuration
+          TLV.
+        </description>
+        <syntax>
+          <dataType ref="MACAddress"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="TIDLinkMapNumberOfEntries" access="readOnly">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="AffiliatedAPNumberOfEntries" access="readOnly">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="STAMLDNumberOfEntries" access="readOnly">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object
+        name="Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.APMLDConfig."
+        access="readOnly" minEntries="1" maxEntries="1" version="2.17">
+      <description>
+        This object describes the Wi-Fi 7 Multi-Link Operation (MLO)
+        configuration of the Multi-Link Device (MLD) Access Point (AP),
+        {{bibref|EasyMesh}} source: Agent AP MLD Configuration TLV.
+      </description>
+
+      <parameter name="EMLMREnabled" access="readOnly">
+        <description>
+          Indicates if the Enhanced Multi-Link Multi-Radio (EMLMR) operation is
+          enabled.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="EMLSREnabled" access="readOnly">
+        <description>
+          Indicates if Enhanced Multi-Link Single-Radio (EMLSR) operation is
+          enabled.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="STREnabled" access="readOnly">
+        <description>
+          Indicates if Simultaneous Transmit and Receive (STR) operation is
+          enabled.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="NSTREnabled" access="readOnly">
+        <description>
+          Indicates if Non-Simultaneous Transmit and Receive (NSTR) operation
+          is enabled.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="TIDLinkMapNegotiation" access="readOnly">
+        <description>
+          Indicates if Traffic Identifier (TID) to Link Mapping Negotiation is
+          enabled. {{bibref|EasyMesh}} source: TID-to-Link Mapping Policy TLV.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object
+        name="Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.TIDLinkMap.{i}."
+        access="readOnly" numEntriesParameter="TIDLinkMapNumberOfEntries"
+        minEntries="0" maxEntries="unbounded" version="2.17">
+      <description>
+        Table of Traffic Identifier (TID) to Link Mappings of the Multi-Link
+        Operation (MLO) capable access point (AP). Each table entry describes
+        the mapping between a particular TID and direction and preferred link.
+        {{bibref|EasyMesh}} source: TID-to-Link Mapping Policy TLV.
+      </description>
+      <uniqueKey functional="true">
+        <parameter ref="TID"/>
+      </uniqueKey>
+
+      <parameter name="Direction" access="readOnly">
+        <description>
+          The direction of the traffic flow from the perspective of the APMLD.
+          {{enum}}
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="Up"/>
+            <enumeration value="Down"/>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="TID" access="readOnly">
+        <description>
+          The traffic identifier (TID) for this mapping.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range minInclusive="0" maxInclusive="255"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="BSSID" access="readOnly">
+        <description>
+          The BSSID of the preferred link (affiliated AP) to use for traffic
+          with matching direction and TID values.
+        </description>
+        <syntax>
+          <dataType ref="MACAddress"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="LinkID" access="readOnly">
+        <description>
+          The Link ID of the preferred link (affiliated AP) to use for traffic
+          with matching direction and TID values.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range minInclusive="0" maxInclusive="255"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object
+        name="Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.AffiliatedAP.{i}."
+        access="readOnly" numEntriesParameter="AffiliatedAPNumberOfEntries"
+        minEntries="0" maxEntries="unbounded" version="2.17">
+      <description>
+        The Access Points (APs) affiliated to the AP MLD. {{bibref|EasyMesh}}
+        Source: Agent AP MLD Configuration TLV.
+
+        Counters in this object include all traffic, MLD and non-MLD.
+      </description>
+      <uniqueKey functional="true">
+        <parameter ref="BSSID"/>
+      </uniqueKey>
+
+      <parameter name="BSSID" access="readOnly">
+        <description>
+          The BSSID of the affiliated AP. This should be set to one of the
+          values of {{param|##.Radio.{i}.BSS.{i}.BSSID}}. {{bibref|EasyMesh}}
+          source: Agent AP MLD Configuration TLV.
+        </description>
+        <syntax>
+          <dataType ref="MACAddress"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="LinkID" access="readOnly">
+        <description>
+          The Link ID assigned to this affiliated AP. {{bibref|EasyMesh}}
+          source: Agent AP MLD Configuration TLV.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range minInclusive="0" maxInclusive="255"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="RUID" access="readOnly">
+        <description>
+          The Radio unique identifier (RUID) of the Radio that this affiliated
+          AP is operating on. {{bibref|EasyMesh}} source: Agent AP MLD
+          Configuration TLV.
+        </description>
+        <syntax>
+          <base64/>
+        </syntax>
+      </parameter>
+
+      <parameter name="DisabledSubChannels" access="readOnly">
+        <description>
+          Disabled Subchannel Bitmap subfield from the EHT Operation element in
+          transmitted Management frames. Null value or not present for
+          stations. {{bibref|EasyMesh}} source: Static Puncturing Configuration
+          TLV.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range minInclusive="0" maxInclusive="65535"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="PacketsSent" access="readOnly">
+        <description>
+          The number of packets transmitted by the Affiliated AP. Note: this
+          counter counts only MLD traffic through this BSSID, not legacy
+          (non-MLD) traffic. {{bibref|EasyMesh}} source: Associated STA Traffic
+          Stats TLV.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="PacketsReceived" access="readOnly">
+        <description>
+          The total number of packets received from the affiliated STAs by this
+          Affiliated AP. {{bibref|EasyMesh}} source: Associated STA Traffic
+          Stats TLV.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="UnicastBytesSent" access="readOnly">
+        <description>
+          Total number of unicast bytes transmitted to MLD STAs associated with
+          the affiliated AP. {{bibref|EasyMesh}} source: Affiliated AP Metrics
+          TLV.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="UnicastBytesReceived" access="readOnly">
+        <description>
+          Total number of unicast bytes received from MLD STAs associated with
+          the affiliated AP. {{bibref|EasyMesh}} source: Affiliated AP Metrics
+          TLV.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ErrorsSent" access="readOnly">
+        <description>
+          The number of packets which could not be transmitted by the
+          Affiliated AP due to errors. This counter counts only MLD traffic
+          through this BSSID, not legacy (non-MLD) traffic. {{bibref|EasyMesh}}
+          source: Affiliated AP Metrics TLV.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="MulticastBytesSent" access="readOnly">
+        <description>
+          Total multicast bytes transmitted to MLD STAs associated with the
+          affiliated AP. {{bibref|EasyMesh}} source: Affiliated AP Metrics TLV.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="MulticastBytesReceived" access="readOnly">
+        <description>
+          Total multicast bytes received from MLD STAs associated with the
+          affiliated AP. {{bibref|EasyMesh}} source: Affiliated AP Metrics TLV.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="BroadcastBytesSent" access="readOnly">
+        <description>
+          Total broadcast bytes transmitted to MLD STAs associated with the
+          affiliated AP. {{bibref|EasyMesh}} source: Affiliated AP Metrics TLV.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="BroadcastBytesReceived" access="readOnly">
+        <description>
+          Total broadcast bytes received from MLD STAs associated with the
+          affiliated AP. {{bibref|EasyMesh}} source: Affiliated AP Metrics TLV.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="EstServiceParametersBE" access="readOnly">
+        <description>
+          Estimated Service Parameters information field for AC=BE, defined per
+          {{bibref|802.11-2020|Figure 9-637}} and referenced in
+          {{bibref|EasyMesh|Section 17.2.22}}.
+        </description>
+        <syntax>
+          <base64>
+            <size minLength="0" maxLength="3"/>
+          </base64>
+        </syntax>
+      </parameter>
+
+      <parameter name="EstServiceParametersBK" access="readOnly">
+        <description>
+          Estimated Service Parameters information field for AC=BK, defined per
+          {{bibref|802.11-2020|Figure 9-637}} and referenced in
+          {{bibref|EasyMesh|Section 17.2.22}}.
+        </description>
+        <syntax>
+          <base64>
+            <size minLength="0" maxLength="3"/>
+          </base64>
+        </syntax>
+      </parameter>
+
+      <parameter name="EstServiceParametersVI" access="readOnly">
+        <description>
+          Estimated Service Parameters information field for AC=VI, defined per
+          {{bibref|802.11-2020|Figure 9-637}} and referenced in
+          {{bibref|EasyMesh|Section 17.2.22}}.
+        </description>
+        <syntax>
+          <base64>
+            <size minLength="0" maxLength="3"/>
+          </base64>
+        </syntax>
+      </parameter>
+
+      <parameter name="EstServiceParametersVO" access="readOnly">
+        <description>
+          Estimated Service Parameters information field for AC=VO, defined per
+          {{bibref|802.11-2020|Figure 9-637}} and referenced in
+          {{bibref|EasyMesh|Section 17.2.22}}.
+        </description>
+        <syntax>
+          <base64>
+            <size minLength="0" maxLength="3"/>
+          </base64>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object
+        name="Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.STAMLD.{i}."
+        access="readOnly" numEntriesParameter="STAMLDNumberOfEntries"
+        minEntries="0" maxEntries="unbounded" version="2.17">
+      <description>
+        This object describes Multi-Link Operation (MLO) capable stations
+        (STAs), also known as client Multilink Devices (MLDs), associated to
+        this MLO capable Access Point. {{bibref|EasyMesh}} source: Associated
+        Clients TLV.
+      </description>
+      <uniqueKey functional="true">
+        <parameter ref="MLDMACAddress"/>
+      </uniqueKey>
+
+      <parameter name="MLDMACAddress" access="readOnly">
+        <description>
+          The Multi-Link Device (MLD) MAC Address of the client MLD STA.
+          {{bibref|EasyMesh}} source: Associated STA MLD Configuration Report
+          TLV.
+        </description>
+        <syntax>
+          <dataType ref="MACAddress"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Hostname" access="readOnly">
+        <description>
+          The Hostname for the client MLD STA.
+        </description>
+        <syntax>
+          <string/>
+        </syntax>
+      </parameter>
+
+      <parameter name="IPv4Address" access="readOnly">
+        <description>
+          The IPv4 address allocated to the MLD MAC Address of this device.
+        </description>
+        <syntax>
+          <dataType ref="IPv4Address"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="IPv6Address" access="readOnly">
+        <description>
+          The IPv6 address allocated to the MLD MAC Address of this device.
+        </description>
+        <syntax>
+          <dataType ref="IPv6Address"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="IsbSTA" access="readOnly">
+        <description>
+          Indicates if the client MLD STA is a backhaul MLD STA (bSTAMLD). This
+          is useful when the same AP MLD has both client MLD and bSTAMLDs
+          associated. {{bibref|EasyMesh}} source: Backhaul STA MLD
+          Configuration TLV.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="LastConnectTime" access="readOnly">
+        <description>
+          The time in {{units}} since this client MLD STA was associated.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="BytesSent" access="readOnly">
+        <description>
+          The total number of bytes transmitted to the client MLD STA.
+          {{bibref|EasyMesh}} source: Associated STA Traffic Stats TLV.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="BytesReceived" access="readOnly">
+        <description>
+          The total number of bytes received from the client MLD STA.
+          {{bibref|EasyMesh}} source: Associated STA Traffic Stats TLV.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <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.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="PacketsReceived" access="readOnly">
+        <description>
+          The total number of packets received from the client MLD STA.
+          {{bibref|EasyMesh}} source: Associated STA Traffic Stats TLV.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ErrorsSent" access="readOnly">
+        <description>
+          The number of packets which could not be transmitted to the client
+          MLD STA due to errors. {{bibref|EasyMesh}} source: Associated STA
+          Traffic Stats TLV.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ErrorsReceived" access="readOnly">
+        <description>
+          The number of packets which were received with error from the client
+          MLD STA. {{bibref|EasyMesh}} source: Associated STA Traffic Stats
+          TLV.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="RetransCount" access="readOnly">
+        <description>
+          The number of packets transmitted with the retry flag sent to the
+          client MLD STA. {{bibref|EasyMesh}} source: Associated STA Traffic
+          Stats TLV.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="STATIDLinkMapNumberOfEntries" access="readOnly">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="AffiliatedSTANumberOfEntries" access="readOnly">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object
+        name="Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.STAMLD.{i}.WiFi7Capabilities."
+        access="readOnly"
+        numEntriesParameter="WiFi7CapabilitiesNumberOfEntries" minEntries="1"
+        maxEntries="1" version="2.17">
+      <description>
+        This object describes the Wi-Fi 7 capabilities for this STAMLD
+        including Multi-Link Operation (MLO) capabilities. {{bibref|EasyMesh}}
+        Source: Wi-Fi 7 Agent Capabilities TLV.
+      </description>
+
+      <parameter name="EMLMRSupport" access="readOnly">
+        <description>
+          Indicates if the Enhanced Multi-Link Multi-Radio (EMLMR) operation is
+          supported by this STAMLD.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="EMLSRSupport" access="readOnly">
+        <description>
+          Indicates if Enhanced Multi-Link Single-Radio (EMLSR) operation is
+          supported by this STAMLD.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="STRSupport" access="readOnly">
+        <description>
+          Indicates if Simultaneous Transmit and Receive (STR) operation is
+          supported by this STAMLD.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="NSTRSupport" access="readOnly">
+        <description>
+          Indicates if Non-Simultaneous Transmit and Receive (NSTR) operation
+          is supported by this STAMLD.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="TIDLinkMapNegotiation" access="readOnly">
+        <description>
+          Indicates if Traffic Identifier (TID) to Link Mapping Negotiation is
+          supported by this STAMLD.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object
+        name="Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.STAMLD.{i}.STAMLDConfig."
+        access="readOnly" minEntries="1" maxEntries="1" version="2.17">
+      <description>
+        This object describes the Wi-Fi 7 Multi-Link Operation (MLO)
+        configuration of the Multi-Link Device (MLD) station (STA, also called
+        associated device). Note this may differ from the WiFi7 capabilities of
+        the device. {{bibref|EasyMesh}} source: Associated STA MLD
+        Configuration Report TLV.
+      </description>
+
+      <parameter name="EMLMREnabled" access="readOnly">
+        <description>
+          Indicates if the Enhanced Multi-Link Multi-Radio (EMLMR) operation is
+          enabled.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="EMLSREnabled" access="readOnly">
+        <description>
+          Indicates if Enhanced Multi-Link Single-Radio (EMLSR) operation is
+          enabled.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="STREnabled" access="readOnly">
+        <description>
+          Indicates if Simultaneous Transmit and Receive (STR) operation is
+          enabled.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="NSTREnabled" access="readOnly">
+        <description>
+          Indicates if Non-Simultaneous Transmit and Receive (NSTR) operation
+          is enabled.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="TIDLinkMapNegotiation" access="readOnly">
+        <description>
+          Indicates if Traffic Identifier (TID) to Link Mapping Negotiation is
+          enabled. {{bibref|EasyMesh}} source: TID-to-Link Mapping Policy TLV.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object
+        name="Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.STAMLD.{i}.STATIDLinkMap.{i}."
+        access="readOnly" numEntriesParameter="STATIDLinkMapNumberOfEntries"
+        minEntries="0" maxEntries="unbounded" version="2.17">
+      <description>
+        Table of Traffic Identifier (TID) to Link Mappings of the Multi-Link
+        Operation (MLO) capable station (STA). Each table entry describes the
+        mapping between a particular TID and direction and preferred link.
+        {{bibref|EasyMesh}} source: TID-to-Link Mapping Policy TLV.
+      </description>
+      <uniqueKey functional="true">
+        <parameter ref="TID"/>
+      </uniqueKey>
+
+      <parameter name="Direction" access="readOnly">
+        <description>
+          The direction of the traffic flow from the perspective of the APMLD.
+          {{enum}}
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="Up"/>
+            <enumeration value="Down"/>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="TID" access="readOnly">
+        <description>
+          The traffic identifier (TID) for this mapping.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range minInclusive="0" maxInclusive="255"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="BSSID" access="readOnly">
+        <description>
+          The BSSID of the preferred link (affiliated AP) to use for traffic
+          with matching direction and TID values.
+        </description>
+        <syntax>
+          <dataType ref="MACAddress"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="LinkID" access="readOnly">
+        <description>
+          The Link ID of the preferred link (affiliated AP) to use for traffic
+          with matching direction and TID values.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range minInclusive="0" maxInclusive="255"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object
+        name="Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.STAMLD.{i}.AffiliatedSTA.{i}."
+        access="readOnly" numEntriesParameter="AffiliatedSTANumberOfEntries"
+        minEntries="0" maxEntries="unbounded" version="2.17">
+      <description>
+        This object describes stations (STAs, also called associated devices)
+        that are affiliated to this Multi-Link Device (MLD) STA.
+        {{bibref|EasyMesh}} source: Associated STA MLD Configuration TLV.
+      </description>
+      <uniqueKey functional="true">
+        <parameter ref="MACAddress"/>
+      </uniqueKey>
+
+      <parameter name="MACAddress" access="readOnly">
+        <description>
+          The MAC address of the affiliated STA. {{bibref|EasyMesh}} source:
+          Associated STA MLD Configuration Report TLV.
+        </description>
+        <syntax>
+          <dataType ref="MACAddress"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="BSSID" access="readOnly">
+        <description>
+          The BSSID of the affiliated AP that the affiliated STA is associated
+          to. {{bibref|EasyMesh}} source: Associated STA MLD Configuration
+          Report TLV.
+        </description>
+        <syntax>
+          <dataType ref="MACAddress"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="BytesSent" access="readOnly">
+        <description>
+          The total number of bytes transmitted to the affiliated STA.
+          {{bibref|EasyMesh}} source: Associated STA Traffic Stats TLV.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="BytesReceived" access="readOnly">
+        <description>
+          The total number of bytes received from the affiliated STA.
+          {{bibref|EasyMesh}} source: Associated STA Traffic Stats TLV.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="PacketsSent" access="readOnly">
+        <description>
+           The total number of packets transmitted to the affiliated STA.
+           {{bibref|EasyMesh}} source: Associated STA Traffic Stats TLV.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="PacketsReceived" access="readOnly">
+        <description>
+          The total number of packets received from the affiliated STA.
+          {{bibref|EasyMesh}} source: Associated STA Traffic Stats TLV.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ErrorsSent" access="readOnly">
+        <description>
+          The number of packets which could not be transmitted to the
+          affiliated STA due to errors. {{bibref|EasyMesh}} source: Associated
+          STA Traffic Stats TLV.
+        </description>
+        <syntax>
+          <dataType ref="StatsCounter32"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="SignalStrength" access="readOnly">
+        <description>
+          An indicator of radio signal strength of the uplink from the
+          affiliated STA to the access point - measured in {{units}}. RCPI is
+          encoded per {{bibref|802.11-2020|Table 9-176}}, and described in
+          {{bibref|EasyMesh|Section 10.3.1}}). Reserved: 221 - 255.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range maxInclusive="255"/>
+            <units value="dBm"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="EstMACDataRateDownlink" access="readOnly">
+        <description>
+          Estimate of the MAC layer throughput in {{units}} achievable in the
+          downlink direction if 100% of channel airtime and BSS operating
+          bandwidth were available, as defined in {{bibref|EasyMesh|Section
+          10.3.1}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="Mbps"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="EstMACDataRateUplink" access="readOnly">
+        <description>
+          Estimate of the MAC layer throughput in {{units}} achievable in the
+          uplink direction if 100% of channel airtime and BSS operating
+          bandwidth were available, as defined in {{bibref|EasyMesh|Section
+          10.3.1}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="Mbps"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="LastDataDownlinkRate" access="readOnly">
+        <description>
+          The data transmit rate in {{units}} that was most recently used for
+          transmission of data from the access point to the affiliated STA.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="kbps"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="LastDataUplinkRate" access="readOnly">
+        <description>
+          The data transmit rate in {{units}} that was most recently used for
+          transmission of data from the affiliated STA to the access point.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="kbps"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="UtilizationReceive" access="readOnly">
+        <description>
+          The amount of time in {{units}} that the APMLD Radio has spent on the
+          channel receiving data from the affiliated STA.
+        </description>
+        <syntax>
+          <unsignedLong>
+            <units value="milliseconds"/>
+          </unsignedLong>
+        </syntax>
+      </parameter>
+
+      <parameter name="UtilizationTransmit" access="readOnly">
+        <description>
+          The amount of time in {{units}} that the APMLD Radio has spent on the
+          channel transmitting data to the affiliated STA.
+        </description>
+        <syntax>
+          <unsignedLong>
+            <units value="milliseconds"/>
+          </unsignedLong>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object name="Device.WiFi.DataElements.Network.Device.{i}.bSTAMLD."
+        access="readOnly" minEntries="1" maxEntries="1" version="2.17">
+      <description>
+        This object represents the Multi-Link Operation (MLO) capable backhaul
+        station (bSTA) operating on this EasyMesh Agent. Only one MLO capable
+        bSTA per EasyMesh Agent is allowed. {{bibref|EasyMesh}} source:
+        Backhaul STA MLD Configuration TLV.
+      </description>
+
+      <parameter name="MLDMACAddress" access="readOnly">
+        <description>
+          The Multi-Link Device (MLD) MAC Address of the MLO Capable bSTA.
+          {{bibref|EasyMesh}} Source: Backhaul STA MLD Configuration TLV.
+        </description>
+        <syntax>
+          <dataType ref="MACAddress"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="BSSID" access="readOnly">
+        <description>
+          The MLD MAC address of the upstream APMLD that this bSTAMLD is
+          associated to. {{bibref|EasyMesh}} source: Associated Clients TLV.
+        </description>
+        <syntax>
+          <dataType ref="MACAddress"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="AffiliatedbSTAList" access="readOnly">
+        <description>
+          {{list}} backhaul STA MAC addresses affiliated to this bSTAMLD.
+          {{bibref|EasyMesh}} source: Backhaul STA MLD Configuration TLV.
+        </description>
+        <syntax>
+          <list/>
+          <dataType ref="MACAddress"/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object
+        name="Device.WiFi.DataElements.Network.Device.{i}.bSTAMLD.bSTAMLDConfig."
+        access="readOnly" minEntries="1" maxEntries="1" version="2.17">
+      <description>
+        This object describes the Multi-Link Operation (MLO) configuration of a
+        Multi-Link Device (MLD) backhaul STA (bSTA). {{bibref|EasyMesh}}
+        source: Backhaul STA MLD Configuration TLV.
+      </description>
+
+      <parameter name="EMLMREnabled" access="readOnly">
+        <description>
+          Indicates if the Enhanced Multi-Link Multi-Radio (EMLMR) operation is
+          enabled.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="EMLSREnabled" access="readOnly">
+        <description>
+          Indicates if Enhanced Multi-Link Single-Radio (EMLSR) operation is
+          enabled.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="STREnabled" access="readOnly">
+        <description>
+          Indicates if Simultaneous Transmit and Receive (STR) operation is
+          enabled.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="NSTREnabled" access="readOnly">
+        <description>
+          Indicates if Non-Simultaneous Transmit and Receive (NSTR) operation
+          is enabled.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="TIDLinkMapNegotiation" access="readOnly">
+        <description>
+          Indicates if Traffic Identifier (TID) to Link Mapping Negotiation is
+          enabled. {{bibref|EasyMesh}} source: TID-to-Link Mapping Policy TLV.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object name="Device.WiFi.DataElements.Network.PreferredBackhauls.{i}."
+        access="readOnly"
+        numEntriesParameter="PreferredBackhaulsNumberOfEntries" minEntries="0"
+        maxEntries="unbounded" version="2.17">
+      <description>
+        This object specifies the preferred backhaul links as populated by
+        {{command|#.SetPreferredBackhauls()}}.
+      </description>
+      <uniqueKey functional="false">
+        <parameter ref="bSTAMACAddress"/>
+      </uniqueKey>
+
+      <parameter name="BackhaulMACAddress" access="readOnly">
+        <description>
+          The MAC address of the BSS, or APMLD, or similar Ethernet interface,
+          on this preferred backhaul link.
+        </description>
+        <syntax>
+          <dataType ref="MACAddress"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="bSTAMACAddress" access="readOnly">
+        <description>
+          The MAC address of the backhaul Station STA (bSTA), or bSTAMLD, or
+          similar Ethernet interface, on this preferred backhaul link.
+        </description>
+        <syntax>
+          <dataType ref="MACAddress"/>
+        </syntax>
+      </parameter>
     </object>
 
     <object name="Device.WiFi.DataElements.AssociationEvent."
@@ -38111,9 +46471,13 @@
         BSS.
       </description>
 
-      <parameter name="AssociationEventDataNumberOfEntries" access="readOnly">
+      <parameter name="AssociationEventDataNumberOfEntries" access="readOnly"
+          status="deprecated">
         <description>
           {{numentries}}
+
+          {{deprecated|2.17|because a corresponding USP event is defined
+          instead}}
         </description>
         <syntax>
           <unsignedInt/>
@@ -38320,10 +46684,20 @@
             </syntax>
           </parameter>
 
+          <parameter name="DLOFDMA">
+            <description>
+              Indicates support for Downlink (DL) Orthogonal Frequency Division
+              Multiplexing (OFDMA).
+            </description>
+            <syntax>
+              <boolean/>
+            </syntax>
+          </parameter>
+
           <parameter name="MaxDLMUMIMO">
             <description>
               Max number of users supported per DL MU-MIMO Transmitter (TX) in
-              an AP role.
+              the BSS role.
             </description>
             <syntax>
               <unsignedInt>
@@ -38334,8 +46708,8 @@
 
           <parameter name="MaxULMUMIMO">
             <description>
-              Max number of users supported per UL MU-MIMO Receiver (RX) in an
-              AP role.
+              Max number of users supported per UL MU-MIMO Receiver (RX) in the
+              BSS role.
             </description>
             <syntax>
               <unsignedInt>
@@ -38346,8 +46720,8 @@
 
           <parameter name="MaxDLOFDMA">
             <description>
-              Max number of users supported per Downlink (DL) OFDMA TX in an AP
-              role.
+              Max number of users supported per Downlink (DL) OFDMA TX in the
+              BSS role.
             </description>
             <syntax>
               <unsignedInt>
@@ -38358,7 +46732,7 @@
 
           <parameter name="MaxULOFDMA">
             <description>
-              Max number of users supported per UL OFDMA RX in an AP role.
+              Max number of users supported per UL OFDMA RX in the BSS role.
             </description>
             <syntax>
               <unsignedInt>
@@ -38449,10 +46823,13 @@
         access="readOnly"
         numEntriesParameter="AssociationEventDataNumberOfEntries"
         minEntries="0" maxEntries="unbounded" dmr:noUniqueKeys="true"
-        version="2.13">
+        version="2.13" status="deprecated">
       <description>
         The events generated when an Associated Device (STA) associates to a
         BSS.
+
+        {{deprecated|2.17|because a corresponding USP event is defined
+        instead}}
       </description>
 
       <parameter name="TimeStamp" access="readOnly">
@@ -38546,9 +46923,13 @@
 
     <object
         name="Device.WiFi.DataElements.AssociationEvent.AssociationEventData.{i}.WiFi6Capabilities."
-        access="readOnly" minEntries="1" maxEntries="1" version="2.15">
+        access="readOnly" minEntries="1" maxEntries="1" version="2.15"
+        status="deprecated">
       <description>
         Describes the Wi-Fi 6 capabilities of the Associated Device (STA).
+
+        {{deprecated|2.17|because a corresponding USP event is defined
+        instead}}
       </description>
 
       <parameter name="HE160" access="readOnly">
@@ -38650,10 +47031,20 @@
         </syntax>
       </parameter>
 
+      <parameter name="DLOFDMA" access="readOnly">
+        <description>
+          Indicates support for Downlink (DL) Orthogonal Frequency Division
+          Multiplexing (OFDMA).
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
       <parameter name="MaxDLMUMIMO" access="readOnly">
         <description>
-          Max number of users supported per DL MU-MIMO Transmitter (TX) in an
-          AP role.
+          Max number of users supported per DL MU-MIMO Transmitter (TX) in the
+          BSS role.
         </description>
         <syntax>
           <unsignedInt>
@@ -38664,7 +47055,7 @@
 
       <parameter name="MaxULMUMIMO" access="readOnly">
         <description>
-          Max number of users supported per UL MU-MIMO Receiver (RX) in an AP
+          Max number of users supported per UL MU-MIMO Receiver (RX) in the BSS
           role.
         </description>
         <syntax>
@@ -38676,7 +47067,7 @@
 
       <parameter name="MaxDLOFDMA" access="readOnly">
         <description>
-          Max number of users supported per Downlink (DL) OFDMA TX in an AP
+          Max number of users supported per Downlink (DL) OFDMA TX in the BSS
           role.
         </description>
         <syntax>
@@ -38688,7 +47079,7 @@
 
       <parameter name="MaxULOFDMA" access="readOnly">
         <description>
-          Max number of users supported per UL OFDMA RX in an AP role.
+          Max number of users supported per UL OFDMA RX in the BSS role.
         </description>
         <syntax>
           <unsignedInt>
@@ -38779,9 +47170,12 @@
       </description>
 
       <parameter name="DisassociationEventDataNumberOfEntries"
-          access="readOnly">
+          access="readOnly" status="deprecated">
         <description>
           {{numentries}}
+
+          {{deprecated|2.17|because a corresponding USP event is defined
+          instead}}
         </description>
         <syntax>
           <unsignedInt/>
@@ -38796,7 +47190,7 @@
 
         <parameter name="BSSID">
           <description>
-            The MAC Address of the logical BSS ( BSSID) which is reporting the
+            The MAC Address of the logical BSS (BSSID) which is reporting the
             Disassociation Event.
           </description>
           <syntax>
@@ -38911,6 +47305,212 @@
             <string/>
           </syntax>
         </parameter>
+
+        <parameter name="LastDataDownlinkRate">
+          <description>
+            The data transmit rate in {{units}} that was most recently used for
+            transmission of data from the access point to the Associated Device
+            (STA).
+          </description>
+          <syntax>
+            <unsignedInt>
+              <units value="kbps"/>
+            </unsignedInt>
+          </syntax>
+        </parameter>
+
+        <parameter name="LastDataUplinkRate">
+          <description>
+            The data transmit rate in {{units}} that was most recently used for
+            transmission of data from the Associated Device (STA) to the access
+            point.
+          </description>
+          <syntax>
+            <unsignedInt>
+              <units value="kbps"/>
+            </unsignedInt>
+          </syntax>
+        </parameter>
+
+        <parameter name="UtilizationReceive">
+          <description>
+            The amount of time in {{units}} that the Radio has spent on the
+            Channel receiving data from the Associated Device (STA).
+          </description>
+          <syntax>
+            <unsignedLong>
+              <units value="milliseconds"/>
+            </unsignedLong>
+          </syntax>
+        </parameter>
+
+        <parameter name="UtilizationTransmit">
+          <description>
+            The amount of time in {{units}} that the Radio has spent on the
+            Channel transmitting data to the Associated Device (STA).
+          </description>
+          <syntax>
+            <unsignedLong>
+              <units value="milliseconds"/>
+            </unsignedLong>
+          </syntax>
+        </parameter>
+
+        <parameter name="EstMACDataRateDownlink">
+          <description>
+            Estimate of the MAC layer throughput in {{units}} achievable in the
+            downlink direction to the Associated Device (STA) if 100% of
+            channel airtime and BSS operating bandwidth were available, as
+            defined in {{bibref|EasyMesh|Section 10.3.1}}.
+          </description>
+          <syntax>
+            <unsignedInt>
+              <units value="Mbps"/>
+            </unsignedInt>
+          </syntax>
+        </parameter>
+
+        <parameter name="EstMACDataRateUplink">
+          <description>
+            Estimate of the MAC layer throughput in {{units}} achievable in the
+            uplink direction from the Associated Device (STA) if 100% of
+            channel airtime and BSS operating bandwidth were available, as
+            defined in {{bibref|EasyMesh|Section 10.3.1}}.
+          </description>
+          <syntax>
+            <unsignedInt>
+              <units value="Mbps"/>
+            </unsignedInt>
+          </syntax>
+        </parameter>
+
+        <parameter name="SignalStrength">
+          <description>
+            An indicator of radio signal strength of the uplink from the
+            Associated Device (STA) to the access point - measured in
+            {{units}}. RCPI is encoded per {{bibref|802.11-2020|Table 9-176}},
+            and described in {{bibref|EasyMesh|Section 10.3.1}}). Reserved: 221
+            - 255.
+          </description>
+          <syntax>
+            <unsignedInt>
+              <range maxInclusive="255"/>
+              <units value="dBm"/>
+            </unsignedInt>
+          </syntax>
+        </parameter>
+
+        <parameter name="LastConnectTime">
+          <description>
+            The time in {{units}} since this Assocated Device (STA) was
+            associated.
+          </description>
+          <syntax>
+            <unsignedInt>
+              <units value="seconds"/>
+            </unsignedInt>
+          </syntax>
+        </parameter>
+
+        <parameter name="Noise">
+          <description>
+            An indicator of the average radio noise plus interference power at
+            the access point measured for the primary operating channel to this
+            Associated Device (STA).
+
+            Encoded as defined for ANPI in {{bibref|802.11-2020|Section
+            11.10.9.4}}.
+          </description>
+          <syntax>
+            <unsignedInt>
+              <range maxInclusive="255"/>
+            </unsignedInt>
+          </syntax>
+        </parameter>
+
+        <parameter name="InitiatedBy">
+          <description>
+            This parameter indicates the entity that initiated this
+            Disassociation Event. {{enum}}
+          </description>
+          <syntax>
+            <string>
+              <enumeration value="STA"/>
+              <enumeration value="EasyMesh_Agent"/>
+              <enumeration value="EasyMesh_Controller"/>
+              <enumeration value="DE_Collector"/>
+              <enumeration value="Unknown"/>
+            </string>
+          </syntax>
+        </parameter>
+
+        <object name="DisassociationLinkStats.{i}." minEntries="0"
+            maxEntries="unbounded" version="2.17">
+          <description>
+            This object describes the final per link stats of each affiliated
+            STA on disassociation.
+
+            Applies only to Multi-Link Device (MLD) links.
+
+            EasyMesh {{bibref|EasyMesh}} source: Affiliated STA Traffic Stats.
+          </description>
+
+          <parameter name="MACAddress">
+            <description>
+              The MAC address of the affiliated STA whose link stats are being
+              reported.
+            </description>
+            <syntax>
+              <dataType ref="MACAddress"/>
+            </syntax>
+          </parameter>
+
+          <parameter name="BytesSent">
+            <description>
+              The total number of bytes transmitted to the affiliated STA.
+            </description>
+            <syntax>
+              <dataType ref="StatsCounter64"/>
+            </syntax>
+          </parameter>
+
+          <parameter name="BytesReceived">
+            <description>
+              The total number of bytes received from the affiliated STA.
+            </description>
+            <syntax>
+              <dataType ref="StatsCounter64"/>
+            </syntax>
+          </parameter>
+
+          <parameter name="PacketsSent">
+            <description>
+              The total number of packets transmitted to the affiliated STA.
+            </description>
+            <syntax>
+              <dataType ref="StatsCounter64"/>
+            </syntax>
+          </parameter>
+
+          <parameter name="PacketsReceived">
+            <description>
+              The total number of packets received from the affiliated STA.
+            </description>
+            <syntax>
+              <dataType ref="StatsCounter64"/>
+            </syntax>
+          </parameter>
+
+          <parameter name="ErrorsSent">
+            <description>
+              The number of packets which could not be transmitted to the
+              affiliated STA because of errors.
+            </description>
+            <syntax>
+              <dataType ref="StatsCounter64"/>
+            </syntax>
+          </parameter>
+        </object>
       </event>
     </object>
 
@@ -38919,15 +47519,18 @@
         access="readOnly"
         numEntriesParameter="DisassociationEventDataNumberOfEntries"
         minEntries="0" maxEntries="unbounded" dmr:noUniqueKeys="true"
-        version="2.13">
+        version="2.13" status="deprecated">
       <description>
         The events generated when an Associated Device (STA) disassociates from
         a BSS.
+
+        {{deprecated|2.17|because a corresponding USP event is defined
+        instead}}
       </description>
 
       <parameter name="BSSID" access="readOnly">
         <description>
-          The MAC Address of the logical BSS ( BSSID) which is reporting the
+          The MAC Address of the logical BSS (BSSID) which is reporting the
           Disassociation Event.
         </description>
         <syntax>
@@ -39040,6 +47643,143 @@
           <string/>
         </syntax>
       </parameter>
+
+      <parameter name="LastDataDownlinkRate" access="readOnly">
+        <description>
+          The data transmit rate in {{units}} that was most recently used for
+          transmission of data from the access point to the Associated Device
+          (STA).
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="kbps"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="LastDataUplinkRate" access="readOnly">
+        <description>
+          The data transmit rate in {{units}} that was most recently used for
+          transmission of data from the Associated Device (STA) to the access
+          point.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="kbps"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="UtilizationReceive" access="readOnly">
+        <description>
+          The amount of time in {{units}} that the Radio has spent on the
+          Channel receiving data from the Associated Device (STA).
+        </description>
+        <syntax>
+          <unsignedLong>
+            <units value="milliseconds"/>
+          </unsignedLong>
+        </syntax>
+      </parameter>
+
+      <parameter name="UtilizationTransmit" access="readOnly">
+        <description>
+          The amount of time in {{units}} that the Radio has spent on the
+          Channel transmitting data to the Associated Device (STA).
+        </description>
+        <syntax>
+          <unsignedLong>
+            <units value="milliseconds"/>
+          </unsignedLong>
+        </syntax>
+      </parameter>
+
+      <parameter name="EstMACDataRateDownlink" access="readOnly">
+        <description>
+          Estimate of the MAC layer throughput in {{units}} achievable in the
+          downlink direction to the Associated Device (STA) if 100% of channel
+          airtime and BSS operating bandwidth were available, as defined in
+          {{bibref|EasyMesh|Section 10.3.1}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="Mbps"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="EstMACDataRateUplink" access="readOnly">
+        <description>
+          Estimate of the MAC layer throughput in {{units}} achievable in the
+          uplink direction from the Associated Device (STA) if 100% of channel
+          airtime and BSS operating bandwidth were available, as defined in
+          {{bibref|EasyMesh|Section 10.3.1}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="Mbps"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="SignalStrength" access="readOnly">
+        <description>
+          An indicator of radio signal strength of the uplink from the
+          Associated Device (STA) to the access point - measured in {{units}}.
+          RCPI is encoded per {{bibref|802.11-2020|Table 9-176}}, and described
+          in {{bibref|EasyMesh|Section 10.3.1}}). Reserved: 221 - 255.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range maxInclusive="255"/>
+            <units value="dBm"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="LastConnectTime" access="readOnly">
+        <description>
+          The time in {{units}} since this Assocated Device (STA) was
+          associated.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="Noise" access="readOnly">
+        <description>
+          An indicator of the average radio noise plus interference power at
+          the access point measured for the primary operating channel to this
+          Associated Device (STA).
+
+          Encoded as defined for ANPI in {{bibref|802.11-2020|Section
+          11.10.9.4}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range maxInclusive="255"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="InitiatedBy" access="readOnly">
+        <description>
+          This parameter indicates the entity that initiated this
+          Disassociation Event. {{enum}}
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="STA"/>
+            <enumeration value="EasyMesh_Agent"/>
+            <enumeration value="EasyMesh_Controller"/>
+            <enumeration value="DE_Collector"/>
+            <enumeration value="Unknown"/>
+          </string>
+        </syntax>
+      </parameter>
     </object>
 
     <object name="Device.WiFi.DataElements.FailedConnectionEvent."
@@ -39050,9 +47790,12 @@
       </description>
 
       <parameter name="FailedConnectionEventDataNumberOfEntries"
-          access="readOnly">
+          access="readOnly" status="deprecated">
         <description>
           {{numentries}}
+
+          {{deprecated|2.17|because a corresponding USP event is defined
+          instead}}
         </description>
         <syntax>
           <unsignedInt/>
@@ -39065,10 +47808,20 @@
           connect to a BSS.
         </description>
 
+        <parameter name="BSSID">
+          <description>
+            The MAC Address of the logical BSS (BSSID) which is reporting the
+            failed connection event.
+          </description>
+          <syntax>
+            <dataType ref="MACAddress"/>
+          </syntax>
+        </parameter>
+
         <parameter name="MACAddress">
           <description>
-            STA MAC Address identifying the client that has attempted to
-            connect.
+            MAC Address identifying the associated device (STA) that has
+            attempted to connect.
           </description>
           <syntax>
             <dataType ref="MACAddress"/>
@@ -39114,14 +47867,28 @@
         access="readOnly"
         numEntriesParameter="FailedConnectionEventDataNumberOfEntries"
         minEntries="0" maxEntries="unbounded" version="2.15"
-        dmr:noUniqueKeys="true">
+        dmr:noUniqueKeys="true" status="deprecated">
       <description>
         This object describes the data provided with a failed connection event
+
+        {{deprecated|2.17|because a corresponding USP event is defined
+        instead}}
       </description>
 
+      <parameter name="BSSID" access="readOnly">
+        <description>
+          The MAC Address of the logical BSS (BSSID) which is reporting the
+          failed connection event.
+        </description>
+        <syntax>
+          <dataType ref="MACAddress"/>
+        </syntax>
+      </parameter>
+
       <parameter name="MACAddress" access="readOnly">
         <description>
-          STA MAC Address identifying the client that has attempted to connect.
+          MAC Address identifying the associated device (STA) that has
+          attempted to connect.
         </description>
         <syntax>
           <dataType ref="MACAddress"/>
@@ -39242,7 +48009,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -39377,15 +48144,15 @@
 
           If {{param|OperatingFrequencyBand}} is set to
           {{enum|2.4GHz|OperatingFrequencyBand}}, only values {{enum|b}},
-          {{enum|g}}, {{enum|n}}, {{enum|ax}} are allowed.
+          {{enum|g}}, {{enum|n}}, {{enum|ax}}, {{enum|be}} are allowed.
 
           If {{param|OperatingFrequencyBand}} is set to
           {{enum|5GHz|OperatingFrequencyBand}}, only values {{enum|a}},
-          {{enum|n}}, {{enum|ac}}, {{enum|ax}} are allowed.
+          {{enum|n}}, {{enum|ac}}, {{enum|ax}}, {{enum|be}} are allowed.
 
           If {{param|OperatingFrequencyBand}} is set to
-          {{enum|6GHz|OperatingFrequencyBand}}, only value {{enum|ax}} is
-          allowed.
+          {{enum|6GHz|OperatingFrequencyBand}}, only values {{enum|ax}},
+          {{enum|be}} are allowed.
         </description>
         <syntax>
           <list/>
@@ -39408,6 +48175,9 @@
             <enumeration value="ax">
               <description>{{bibref|802.11ax}}</description>
             </enumeration>
+            <enumeration value="be">
+              <description>{{bibref|802.11be}}</description>
+            </enumeration>
           </string>
         </syntax>
       </parameter>
@@ -39421,15 +48191,15 @@
 
           If {{param|OperatingFrequencyBand}} is set to
           {{enum|2.4GHz|OperatingFrequencyBand}}, only values {{enum|b}},
-          {{enum|g}}, {{enum|n}}, {{enum|ax}} are allowed.
+          {{enum|g}}, {{enum|n}}, {{enum|ax}}, {{enum|be}} are allowed.
 
           If {{param|OperatingFrequencyBand}} is set to
           {{enum|5GHz|OperatingFrequencyBand}}, only values {{enum|a}},
-          {{enum|n}}, {{enum|ac}}, {{enum|ax}} are allowed.
+          {{enum|n}}, {{enum|ac}}, {{enum|ax}}, {{enum|be}} are allowed.
 
           If {{param|OperatingFrequencyBand}} is set to
-          {{enum|6GHz|OperatingFrequencyBand}}, only value {{enum|ax}} is
-          allowed.
+          {{enum|6GHz|OperatingFrequencyBand}}, only values {{enum|ax}},
+          {{enum|be}} are 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
@@ -39447,7 +48217,7 @@
       <parameter name="PossibleChannels" access="readOnly">
         <description>
           {{list}} List items represent possible radio channels for the
-          wireless standard (a, b, g, n, ac, ax) and the regulatory domain.
+          wireless standard (a, b, g, n, ac, ax, be) and the regulatory domain.
 
           Ranges in the form "n-m" are permitted.
 
@@ -39671,13 +48441,23 @@
               <description>wide mode</description>
             </enumeration>
             <enumeration value="80MHz">
-              <description>802.11ac and 802.11ax only</description>
+              <description>802.11ac, 802.11ax and 802.11be only</description>
             </enumeration>
             <enumeration value="160MHz">
-              <description>802.11ac and 802.11ax only</description>
+              <description>802.11ac, 802.11ax and 802.11be only</description>
             </enumeration>
             <enumeration value="80+80MHz">
-              <description>802.11ac and 802.11ax only</description>
+              <description>802.11ac, 802.11ax and 802.11be only</description>
+            </enumeration>
+            <enumeration value="320MHz-1">
+              <description>
+                802.11be only - channel center frequency 31, 95, 159
+              </description>
+            </enumeration>
+            <enumeration value="320MHz-2">
+              <description>
+                802.11be only - channel center frequency 63, 127, 191
+              </description>
             </enumeration>
             <enumeration value="Auto"/>
           </string>
@@ -39687,7 +48467,7 @@
       <parameter name="OperatingChannelBandwidth" access="readWrite">
         <description>
           The preferred channel bandwidth to be used (applicable to 802.11n,
-          802.11ac, and 802.11ax specifications only).
+          802.11ac, 802.11ax and 802.11be specifications only).
         </description>
         <syntax>
           <string>
@@ -39707,6 +48487,8 @@
             <enumeration value="80MHz"/>
             <enumeration value="160MHz"/>
             <enumeration value="80+80MHz"/>
+            <enumeration value="320MHz-1"/>
+            <enumeration value="320MHz-2"/>
           </string>
         </syntax>
       </parameter>
@@ -39736,42 +48518,44 @@
           <string>
             <enumeration value="400nsec">
               <description>
-                applicable to 802.11n and 802.11ac specifications only
+                applicable to 802.11n, 802.11ac and 802.11be specifications
+                only
               </description>
             </enumeration>
             <enumeration value="800nsec">
               <description>
-                applicable to 802.11n and 802.11ac specifications only
+                applicable to 802.11n, 802.11ac and 802.11be specifications
+                only
               </description>
             </enumeration>
             <enumeration value="1xLTF_0.8us">
               <description>
-                applicable to 802.11ax specification only
+                applicable to 802.11ax and 802.11be specifications only
               </description>
             </enumeration>
             <enumeration value="1xLTF_1.6us">
               <description>
-                applicable to 802.11ax specification only
+                applicable to 802.11ax and 802.11be specifications only
               </description>
             </enumeration>
             <enumeration value="2xLTF_0.8us">
               <description>
-                applicable to 802.11ax specification only
+                applicable to 802.11ax and 802.11be specifications only
               </description>
             </enumeration>
             <enumeration value="2xLTF_1.6us">
               <description>
-                applicable to 802.11ax specification only
+                applicable to 802.11ax and 802.11be specifications only
               </description>
             </enumeration>
             <enumeration value="4xLTF_0.8us">
               <description>
-                applicable to 802.11ax specification only
+                applicable to 802.11ax and 802.11be specifications only
               </description>
             </enumeration>
             <enumeration value="4xLTF_3.2us">
               <description>
-                applicable to 802.11ax specification only
+                applicable to 802.11ax and 802.11be specifications only
               </description>
             </enumeration>
             <enumeration value="Auto"/>
@@ -39780,7 +48564,7 @@
       </parameter>
 
       <parameter name="CenterFrequencySegement0" access="readWrite"
-          status="obsoleted">
+          status="deleted">
         <description>
           When operating in {{enum|80+80MHz|CurrentOperatingChannelBandwidth}},
           this parameter determines the Center Frequency Segment 0 for the
@@ -39791,6 +48575,8 @@
           {{param|CenterFrequencySegment0}} instead}}
 
           {{obsoleted|2.16}}
+
+          {{deleted|2.17}}
         </description>
         <syntax>
           <unsignedInt/>
@@ -39798,7 +48584,7 @@
       </parameter>
 
       <parameter name="CenterFrequencySegement1" access="readWrite"
-          status="obsoleted">
+          status="deleted">
         <description>
           When operating in {{enum|80+80MHz|CurrentOperatingChannelBandwidth}},
           this parameter determines the Center Frequency Segment 1 for the
@@ -39809,6 +48595,8 @@
           {{param|CenterFrequencySegment1}} instead}}
 
           {{obsoleted|2.16}}
+
+          {{deleted|2.17}}
         </description>
         <syntax>
           <unsignedInt/>
@@ -39842,10 +48630,11 @@
       <parameter name="MCS" access="readWrite">
         <description>
           The Modulation Coding Scheme index (applicable to 802.11n, 802.11ac,
-          and 802.11ax specifications only). Values from 0 to 15 MUST be
-          supported for ({{bibref|802.11n-2009}}). Values from 0 to 9 MUST be
-          supported for {{bibref|802.11ac-2013}}. Values from 0 to 11 MUST be
-          supported for {{bibref|802.11ax}}. A value of -1 indicates automatic
+          802.11ax and 802.11be specifications only). Values from 0 to 15 MUST
+          be supported for ({{bibref|802.11n-2009}}). Values from 0 to 9 MUST
+          be supported for {{bibref|802.11ac-2013}}. Values from 0 to 11 MUST
+          be supported for {{bibref|802.11ax}}. Values from 0 to 15 MUST be
+          supported for {{bibref|802.11be}}. A value of -1 indicates automatic
           selection of the MCS index.
         </description>
         <syntax>
@@ -40362,7 +49151,7 @@
 
       <command name="FullScan()" async="true">
         <description>
-          This parameter represents a request to initiate a full scan on this
+          This command represents a request to initiate a full scan on this
           radio, including all channels supported by this radio, for a specific
           {{param|DwellTime}} and {{param|HomeTime}}. This command will result
           in updating
@@ -40460,6 +49249,28 @@
                 <string/>
               </syntax>
             </parameter>
+
+            <parameter name="AggregateScanDuration">
+              <description>
+                Total time spent performing the scan of this channel in
+                {{units}}.
+              </description>
+              <syntax>
+                <unsignedInt>
+                  <units value="milliseconds"/>
+                </unsignedInt>
+              </syntax>
+            </parameter>
+
+            <parameter name="ScanType">
+              <description>
+                Indicates whether the scan was performed passively (false) or
+                with active probing (true).
+              </description>
+              <syntax>
+                <boolean/>
+              </syntax>
+            </parameter>
           </object>
 
           <object name="ScanResult.{i}.OpClassScan.{i}." minEntries="0"
@@ -40549,6 +49360,48 @@
                 </unsignedInt>
               </syntax>
             </parameter>
+
+            <parameter name="ScanStatus">
+              <description>
+                Status code to indicate whether a scan has been performed and
+                if not the reason for failure {{enum}}
+              </description>
+              <syntax>
+                <string>
+                  <enumeration value="0">
+                    <description>Success</description>
+                  </enumeration>
+                  <enumeration value="1">
+                    <description>
+                      Scan not supported on this opclass and channel
+                    </description>
+                  </enumeration>
+                  <enumeration value="2">
+                    <description>
+                      Request too soon after last scan
+                    </description>
+                  </enumeration>
+                  <enumeration value="3">
+                    <description>Radio too busy to perform scan</description>
+                  </enumeration>
+                  <enumeration value="4">
+                    <description>Scan not completed</description>
+                  </enumeration>
+                  <enumeration value="5">
+                    <description>Scan aborted</description>
+                  </enumeration>
+                  <enumeration value="6">
+                    <description>
+                      Fresh scan not supported, radio only supports on boot
+                      scans
+                    </description>
+                  </enumeration>
+                  <enumeration value="7">
+                    <description>reserved</description>
+                  </enumeration>
+                </string>
+              </syntax>
+            </parameter>
           </object>
 
           <object
@@ -40585,10 +49438,6 @@
                 Probe Response frames of the neighboring BSS as received by the
                 radio measured in {{units}}. (RSSI is encoded per
                 {{bibref|802.11-2020|Table 9-176}}). Reserved: 221 - 255.
-
-                NOTE: The underlying WFA specification is in the process of
-                being reviewed for possible clarification. Please refer to that
-                specification for more details.
               </description>
               <syntax>
                 <unsignedInt>
@@ -40633,6 +49482,63 @@
               </syntax>
             </parameter>
 
+            <parameter name="MLDMACAddress">
+              <description>
+                The Multi-Link Device (MLD) MAC address of the Multi-Link
+                Operation (MLO) capable access point this neighboring BSS is
+                affiliated to. Null if the neighboring BSS is not an affiliated
+                AP.
+              </description>
+              <syntax>
+                <dataType ref="MACAddress"/>
+              </syntax>
+            </parameter>
+
+            <parameter name="ReportingBSSID">
+              <description>
+                The BSSID of the reporting BSSID if different from
+                {{param|BSSID}}. This will be set if the NeigborBSS was
+                discovered through, for example, a Reduced Neighbor Report.
+                EasyMesh {{bibref|EasyMesh}} source: Channel Scan Result TLV.
+              </description>
+              <syntax>
+                <dataType ref="MACAddress"/>
+              </syntax>
+            </parameter>
+
+            <parameter name="MultiBSSID">
+              <description>
+                Indicates if the neighboring BSS is part of a MultiBSSID set
+                and may be a non-transmitted BSSID.
+              </description>
+              <syntax>
+                <boolean/>
+              </syntax>
+            </parameter>
+
+            <parameter name="BSSLoadElementPresent">
+              <description>
+                Set to true if the neighbour BSS Beacon/Probe Responses include
+                a BSSLoad Element as defined in {{bibref|802.11-2020|Section
+                9.4.2.28}}.
+              </description>
+              <syntax>
+                <boolean/>
+              </syntax>
+            </parameter>
+
+            <parameter name="BSSColor">
+              <description>
+                Set to the BSS Color from the BSS Color Information field in
+                the BSS's HE Operation element.
+              </description>
+              <syntax>
+                <unsignedInt>
+                  <range maxInclusive="63"/>
+                </unsignedInt>
+              </syntax>
+            </parameter>
+
             <parameter name="SecurityModeEnabled">
               <description>
                 The type of encryption the neighboring WiFi SSID advertises.
@@ -40716,6 +49622,9 @@
                   <enumeration value="ax">
                     <description>{{bibref|802.11ax}}</description>
                   </enumeration>
+                  <enumeration value="be">
+                    <description>{{bibref|802.11be}}</description>
+                  </enumeration>
                 </string>
               </syntax>
             </parameter>
@@ -40948,6 +49857,28 @@
                 <string/>
               </syntax>
             </parameter>
+
+            <parameter name="AggregateScanDuration">
+              <description>
+                Total time spent performing the scan of this channel in
+                {{units}}.
+              </description>
+              <syntax>
+                <unsignedInt>
+                  <units value="milliseconds"/>
+                </unsignedInt>
+              </syntax>
+            </parameter>
+
+            <parameter name="ScanType">
+              <description>
+                Indicates whether the scan was performed passively (false) or
+                with active probing (true).
+              </description>
+              <syntax>
+                <boolean/>
+              </syntax>
+            </parameter>
           </object>
 
           <object name="ScanResult.{i}.OpClassScan.{i}." minEntries="0"
@@ -41037,6 +49968,48 @@
                 </unsignedInt>
               </syntax>
             </parameter>
+
+            <parameter name="ScanStatus">
+              <description>
+                Status code to indicate whether a scan has been performed and
+                if not the reason for failure {{enum}}
+              </description>
+              <syntax>
+                <string>
+                  <enumeration value="0">
+                    <description>Success</description>
+                  </enumeration>
+                  <enumeration value="1">
+                    <description>
+                      Scan not supported on this opclass and channel
+                    </description>
+                  </enumeration>
+                  <enumeration value="2">
+                    <description>
+                      Request too soon after last scan
+                    </description>
+                  </enumeration>
+                  <enumeration value="3">
+                    <description>Radio too busy to perform scan</description>
+                  </enumeration>
+                  <enumeration value="4">
+                    <description>Scan not completed</description>
+                  </enumeration>
+                  <enumeration value="5">
+                    <description>Scan aborted</description>
+                  </enumeration>
+                  <enumeration value="6">
+                    <description>
+                      Fresh scan not supported, radio only supports on boot
+                      scans
+                    </description>
+                  </enumeration>
+                  <enumeration value="7">
+                    <description>reserved</description>
+                  </enumeration>
+                </string>
+              </syntax>
+            </parameter>
           </object>
 
           <object
@@ -41073,10 +50046,6 @@
                 Probe Response frames of the neighboring BSS as received by the
                 radio measured in {{units}}. (RSSI is encoded per
                 {{bibref|802.11-2020|Table 9-176}}). Reserved: 221 - 255.
-
-                NOTE: The underlying WFA specification is in the process of
-                being reviewed for possible clarification. Please refer to that
-                specification for more details.
               </description>
               <syntax>
                 <unsignedInt>
@@ -41121,6 +50090,63 @@
               </syntax>
             </parameter>
 
+            <parameter name="MLDMACAddress">
+              <description>
+                The Multi-Link Device (MLD) MAC address of the Multi-Link
+                Operation (MLO) capable access point this neighboring BSS is
+                affiliated to. Null if the neighboring BSS is not an affiliated
+                AP.
+              </description>
+              <syntax>
+                <dataType ref="MACAddress"/>
+              </syntax>
+            </parameter>
+
+            <parameter name="ReportingBSSID">
+              <description>
+                The BSSID of the reporting BSSID if different from
+                {{param|BSSID}}. This will be set if the NeigborBSS was
+                discovered through, for example, a Reduced Neighbor Report.
+                EasyMesh {{bibref|EasyMesh}} source: Channel Scan Result TLV.
+              </description>
+              <syntax>
+                <dataType ref="MACAddress"/>
+              </syntax>
+            </parameter>
+
+            <parameter name="MultiBSSID">
+              <description>
+                Indicates if the neighboring BSS is part of a MultiBSSID set
+                and may be a non-transmitted BSSID.
+              </description>
+              <syntax>
+                <boolean/>
+              </syntax>
+            </parameter>
+
+            <parameter name="BSSLoadElementPresent">
+              <description>
+                Set to true if the neighbour BSS Beacon/Probe Responses include
+                a BSSLoad Element as defined in {{bibref|802.11-2020|Section
+                9.4.2.28}}.
+              </description>
+              <syntax>
+                <boolean/>
+              </syntax>
+            </parameter>
+
+            <parameter name="BSSColor">
+              <description>
+                Set to the BSS Color from the BSS Color Information field in
+                the BSS's HE Operation element.
+              </description>
+              <syntax>
+                <unsignedInt>
+                  <range maxInclusive="63"/>
+                </unsignedInt>
+              </syntax>
+            </parameter>
+
             <parameter name="SecurityModeEnabled">
               <description>
                 The type of encryption the neighboring WiFi SSID advertises.
@@ -41204,6 +50230,9 @@
                   <enumeration value="ax">
                     <description>{{bibref|802.11ax}}</description>
                   </enumeration>
+                  <enumeration value="be">
+                    <description>{{bibref|802.11be}}</description>
+                  </enumeration>
                 </string>
               </syntax>
             </parameter>
@@ -41717,7 +50746,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -41824,6 +50853,22 @@
         </syntax>
       </parameter>
 
+      <parameter name="MLDUnit" access="readWrite">
+        <description>
+          MLD-BSS unit number specifying BSS across multiple radios that form a
+          single Multi Link Device. Assigning the same MLD unit groups Basic
+          Service Sets (BSS) across radios. A (default) value of -1 indicates
+          that the interface is not part of any MLD.
+        </description>
+        <syntax>
+          <int>
+            <range minInclusive="-1" maxInclusive="-1"/>
+            <range minInclusive="0" maxInclusive="24"/>
+          </int>
+          <default type="object" value="-1"/>
+        </syntax>
+      </parameter>
+
       <parameter name="Upstream" access="readOnly">
         <description>
           Indicates whether the interface points towards the Internet
@@ -42273,7 +51318,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -43010,6 +52055,9 @@
             <enumeration value="ax">
               <description>{{bibref|802.11ax}}</description>
             </enumeration>
+            <enumeration value="be">
+              <description>{{bibref|802.11be}}</description>
+            </enumeration>
           </string>
         </syntax>
       </parameter>
@@ -43043,6 +52091,19 @@
         </syntax>
       </parameter>
 
+      <parameter name="MaxSupportedDataDownlinkRate" access="readOnly">
+        <description>
+          Maximum supported data rate on the downlink from the associated
+          device to the access point, measured in {{units}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range minInclusive="1000"/>
+            <units value="kbps"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
       <parameter name="LastDataUplinkRate" access="readOnly"
           activeNotify="canDeny">
         <description>
@@ -43062,6 +52123,19 @@
         </syntax>
       </parameter>
 
+      <parameter name="MaxSupportedDataUplinkRate" access="readOnly">
+        <description>
+          Maximum supported data rate on the uplink from the associated device
+          to the access point, measured in {{units}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range minInclusive="1000"/>
+            <units value="kbps"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
       <parameter name="AssociationTime" access="readOnly">
         <description>
           Date and time in UTC when the device was associated
@@ -43115,6 +52189,20 @@
         </syntax>
       </parameter>
 
+      <parameter name="SNR" access="readOnly">
+        <description>
+          An indicator of signal to noise ratio, in {{units}}, 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.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="dB"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
       <parameter name="Retransmissions" access="readOnly">
         <description>
           The number of {{units}} that had to be re-transmitted, from the last
@@ -43148,6 +52236,23 @@
           <boolean/>
         </syntax>
       </parameter>
+
+      <parameter name="MaxSupportedBandwidth" access="readOnly">
+        <description>
+          Specifies the maximum supported bandwidth for the associated device
+          to the access point.
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="20MHz"/>
+            <enumeration value="40MHz"/>
+            <enumeration value="80MHz"/>
+            <enumeration value="160MHz"/>
+            <enumeration value="320MHz"/>
+            <enumeration value="Unknown"/>
+          </string>
+        </syntax>
+      </parameter>
     </object>
 
     <object name="Device.WiFi.AccessPoint.{i}.AssociatedDevice.{i}.Stats."
@@ -43341,7 +52446,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -43350,13 +52455,14 @@
         </syntax>
       </parameter>
 
-      <parameter name="AIFSN" access="readWrite" status="deprecated">
+      <parameter name="AIFSN" access="readWrite" status="obsoleted">
         <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.}}
+          {{deprecated|2.15|because it is superseded by the WMM Specification}}
+
+          {{obsoleted|2.17}}
         </description>
         <syntax>
           <unsignedInt>
@@ -43365,14 +52471,15 @@
         </syntax>
       </parameter>
 
-      <parameter name="ECWMin" access="readWrite" status="deprecated">
+      <parameter name="ECWMin" access="readWrite" status="obsoleted">
         <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.}}
+          {{deprecated|2.15|because it is superseded by the WMM Specification}}
+
+          {{obsoleted|2.17}}
         </description>
         <syntax>
           <unsignedInt>
@@ -43382,14 +52489,15 @@
         </syntax>
       </parameter>
 
-      <parameter name="ECWMax" access="readWrite" status="deprecated">
+      <parameter name="ECWMax" access="readWrite" status="obsoleted">
         <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.}}
+          {{deprecated|2.15|because it is superseded by the WMM Specification}}
+
+          {{obsoleted|2.17}}
         </description>
         <syntax>
           <unsignedInt>
@@ -43399,14 +52507,15 @@
         </syntax>
       </parameter>
 
-      <parameter name="TxOpMax" access="readWrite" status="deprecated">
+      <parameter name="TxOpMax" access="readWrite" status="obsoleted">
         <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.}}
+          {{deprecated|2.15|because it is superseded by the WMM Specification}}
+
+          {{obsoleted|2.17}}
         </description>
         <syntax>
           <unsignedInt>
@@ -43780,7 +52889,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -43979,7 +53088,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -44293,7 +53402,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -44302,13 +53411,14 @@
         </syntax>
       </parameter>
 
-      <parameter name="AIFSN" access="readWrite" status="deprecated">
+      <parameter name="AIFSN" access="readWrite" status="obsoleted">
         <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.}}
+          {{deprecated|2.15|because it is superseded by the WMM Specification}}
+
+          {{obsoleted|2.17}}
         </description>
         <syntax>
           <unsignedInt>
@@ -44317,14 +53427,15 @@
         </syntax>
       </parameter>
 
-      <parameter name="ECWMin" access="readWrite" status="deprecated">
+      <parameter name="ECWMin" access="readWrite" status="obsoleted">
         <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.}}
+          {{deprecated|2.15|because it is superseded by the WMM Specification}}
+
+          {{obsoleted|2.17}}
         </description>
         <syntax>
           <unsignedInt>
@@ -44334,14 +53445,15 @@
         </syntax>
       </parameter>
 
-      <parameter name="ECWMax" access="readWrite" status="deprecated">
+      <parameter name="ECWMax" access="readWrite" status="obsoleted">
         <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.}}
+          {{deprecated|2.15|because it is superseded by the WMM Specification}}
+
+          {{obsoleted|2.17}}
         </description>
         <syntax>
           <unsignedInt>
@@ -44351,14 +53463,15 @@
         </syntax>
       </parameter>
 
-      <parameter name="TxOpMax" access="readWrite" status="deprecated">
+      <parameter name="TxOpMax" access="readWrite" status="obsoleted">
         <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.}}
+          {{deprecated|2.15|because it is superseded by the WMM Specification}}
+
+          {{obsoleted|2.17}}
         </description>
         <syntax>
           <unsignedInt>
@@ -44653,7 +53766,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -45056,7 +54169,7 @@
         <parameter ref="NetworkAddress"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -45804,7 +54917,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -45920,7 +55033,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -45981,7 +55094,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -46170,7 +55283,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -46378,7 +55491,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -46652,7 +55765,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -47314,7 +56427,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -47380,7 +56493,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -47467,7 +56580,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -47531,27 +56644,14 @@
 
       <parameter name="Order" access="readWrite">
         <description>
-          Position of the {{object}} entry in the order of precedence. A value
-          of ''1'' indicates the first entry considered (highest precedence).
+          {{datatype|expand}}
+
           For each ingress frame on the {{param|Interface}}, the highest
           ordered entry that matches the filter criteria is applied. All lower
           order entries are ignored.
-
-          When this value is modified, if the value matches that of an existing
-          entry, the {{param}} value for the existing entry and all lower
-          {{param}} entries is 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.
-
-          The value of {{param}} on creation of a {{object}} table entry MUST
-          be one greater than the largest current value (initially assigned the
-          lowest precedence).
         </description>
         <syntax>
-          <unsignedInt>
-            <range minInclusive="1"/>
-          </unsignedInt>
+          <dataType ref="Order"/>
         </syntax>
       </parameter>
 
@@ -48442,7 +57542,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -48620,7 +57720,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -49591,7 +58691,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -49831,7 +58931,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
 
@@ -50115,7 +59215,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -50347,7 +59447,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
 
@@ -50601,7 +59701,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
 
@@ -53502,10 +62602,14 @@
             </syntax>
           </parameter>
 
-          <parameter name="Host" mandatory="true">
+          <parameter name="Host" status="deprecated">
             <description>
               The Fully Qualified Domain Name (FQDN) or IP address of the Test
               Endpoint to perform the UDP Capacity tests with.
+
+              {{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>
               <string>
@@ -53514,9 +62618,33 @@
             </syntax>
           </parameter>
 
-          <parameter name="Port" mandatory="true">
+          <parameter name="ServerList" mandatory="true">
+            <description>
+              A list of servers intended as testing partners for the client.
+              The client works through the server list attempting individual
+              test flows in a round-robin sequence. One flow is attempted to
+              each server and all flows are required for testing, unless the
+              optional {{param|FlowCount}} and {{param|MaximumFlows}}
+              parameters are specified. The list contains each server’s Fully
+              Qualified Domain Name or IP address and listening port in the
+              format ''server:port''.
+            </description>
+            <syntax>
+              <list maxItems="100"/>
+              <string>
+                <size maxLength="256"/>
+                <size/>
+              </string>
+            </syntax>
+          </parameter>
+
+          <parameter name="Port" status="deprecated">
             <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}}
             </description>
             <syntax>
               <unsignedInt>
@@ -53535,12 +62663,16 @@
             </syntax>
           </parameter>
 
-          <parameter name="NumberOfConnections">
+          <parameter name="NumberOfConnections" status="deprecated">
             <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
               {{param|{{template|IP-DIAGNOSTICS-PARENT}}IPLayerMaxConnections}}.
+
+              {{deprecated|2.17|because it is superseded by
+              {{param|ServerList}} with multi-flow and server capability and
+              related parameters. Refer to {{bibref|TR-471}} for details}}
             </description>
             <syntax>
               <unsignedInt>
@@ -53549,6 +62681,33 @@
             </syntax>
           </parameter>
 
+          <parameter name="FlowCount">
+            <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}} MUST NOT be set to a value greater than
+              {{param|{{template|IP-DIAGNOSTICS-PARENT}}IPLayerMaxConnections}}.
+            </description>
+            <syntax>
+              <unsignedInt/>
+            </syntax>
+          </parameter>
+
+          <parameter name="MaximumFlows">
+            <description>
+              Optional number of flows to attempt. MaximumFlows must be greater
+              than the size of ServerList or FlowCount.
+
+              The default SHOULD be 0 (a magic number that indicates the
+              parameter is not used). {{param}} MUST NOT be set to a value
+              greater than
+              {{param|{{template|IP-DIAGNOSTICS-PARENT}}IPLayerMaxConnections}}.
+            </description>
+            <syntax>
+              <unsignedInt/>
+            </syntax>
+          </parameter>
+
           <parameter name="EthernetPriority">
             <description>
               Ethernet priority code for marking packets transmitted in the
@@ -53880,7 +63039,7 @@
             </syntax>
           </parameter>
 
-          <parameter name="TimeoutNoTraffic" status="deprecated">
+          <parameter name="TimeoutNoTraffic" status="obsoleted">
             <description>
               Timeout value. Value specified in {{units}}. The default value
               SHOULD be 5 {{units}}.
@@ -53888,6 +63047,8 @@
               {{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>
             <syntax>
               <unsignedInt>
@@ -54848,6 +64009,17 @@
               </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>
 
@@ -56202,30 +65374,17 @@
 
       <parameter name="Order" access="readWrite">
         <description>
-          Position of the {{object}} entry in the order of precedence. A value
-          of ''1'' indicates the first entry considered (highest precedence).
+          {{datatype|expand}}
+
           For each packet, the highest ordered entry that matches the filter
           criteria is applied. All lower order entries are ignored.
-
-          When this value is modified, if the value matches that of an existing
-          entry, the {{param}} value for the existing entry and all lower
-          {{param}} entries is 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.
-
-          The value of {{param}} on creation of a {{object}} table entry MUST
-          be one greater than the largest current value (initially assigned the
-          lowest precedence).
         </description>
         <syntax>
-          <unsignedInt>
-            <range minInclusive="1"/>
-          </unsignedInt>
+          <dataType ref="Order"/>
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -56551,7 +65710,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -56949,7 +66108,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -57024,7 +66183,7 @@
         <parameter ref="TunneledInterface"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -57184,7 +66343,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -57552,7 +66711,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -57784,7 +66943,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -58075,7 +67234,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -58368,30 +67527,17 @@
 
       <parameter name="Order" access="readWrite">
         <description>
-          Position of the {{object}} entry in the order of precedence. A value
-          of ''1'' indicates the first entry considered (highest precedence).
+          {{datatype|expand}}
+
           For each packet, the highest ordered entry that matches the filter
           criteria is applied. All lower order entries are ignored.
-
-          When this value is modified, if the value matches that of an existing
-          entry, the {{param}} value for the existing entry and all lower
-          {{param}} entries is 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.
-
-          The value of {{param}} on creation of a {{object}} table entry MUST
-          be one greater than the largest current value (initially assigned the
-          lowest precedence).
         </description>
         <syntax>
-          <unsignedInt>
-            <range minInclusive="1"/>
-          </unsignedInt>
+          <dataType ref="Order"/>
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -58549,7 +67695,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -58905,7 +68051,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -59188,30 +68334,17 @@
 
       <parameter name="Order" access="readWrite">
         <description>
-          Position of the {{object}} entry in the order of precedence. A value
-          of ''1'' indicates the first entry considered (highest precedence).
+          {{datatype|expand}}
+
           For each packet, the highest ordered entry that matches the filter
           criteria is applied. All lower order entries are ignored.
-
-          When this value is modified, if the value matches that of an existing
-          entry, the {{param}} value for the existing entry and all lower
-          {{param}} entries is 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.
-
-          The value of {{param}} on creation of a {{object}} table entry MUST
-          be one greater than the largest current value (initially assigned the
-          lowest precedence).
         </description>
         <syntax>
-          <unsignedInt>
-            <range minInclusive="1"/>
-          </unsignedInt>
+          <dataType ref="Order"/>
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -59369,7 +68502,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -59697,7 +68830,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -59941,30 +69074,17 @@
 
       <parameter name="Order" access="readWrite">
         <description>
-          Position of the {{object}} entry in the order of precedence. A value
-          of ''1'' indicates the first entry considered (highest precedence).
+          {{datatype|expand}}
+
           For each packet, the highest ordered entry that matches the filter
           criteria is applied. All lower order entries are ignored.
-
-          When this value is modified, if the value matches that of an existing
-          entry, the {{param}} value for the existing entry and all lower
-          {{param}} entries is 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.
-
-          The value of {{param}} on creation of a {{object}} table entry MUST
-          be one greater than the largest current value (initially assigned the
-          lowest precedence).
         </description>
         <syntax>
-          <unsignedInt>
-            <range minInclusive="1"/>
-          </unsignedInt>
+          <dataType ref="Order"/>
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -60150,7 +69270,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -60274,7 +69394,7 @@
           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.16}}
+          {{obsoleted|2.14-2.17}}
         </description>
         <syntax>
           <unsignedInt>
@@ -60297,7 +69417,7 @@
           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.16}}
+          {{obsoleted|2.14-2.17}}
         </description>
         <syntax>
           <unsignedInt>
@@ -60324,7 +69444,7 @@
           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.16}}
+          {{obsoleted|2.14-2.17}}
         </description>
         <syntax>
           <unsignedInt>
@@ -60335,7 +69455,7 @@
       </parameter>
 
       <parameter name="IncludeSystemPorts" access="readWrite"
-          status="deprecated">
+          status="obsoleted">
         <description>
           Whether to include low-numbered (system) ports in the Port-sets.
           Normally ports in the range
@@ -60352,6 +69472,8 @@
           {{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>
         <syntax>
           <boolean/>
@@ -60415,7 +69537,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -60647,7 +69769,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -60995,8 +70117,9 @@
     <object name="Device.Routing." access="readOnly" minEntries="1"
         maxEntries="1" version="2.0">
       <description>
-        Routing object that contains the {{object|Router}} table and
-        {{object|RIP}} protocol object.
+        Routing object that contains the {{object|Router}} table, the received
+        router advertisement information {{object|RouteInformation}},
+        {{object|Babel}}, and {{object|RIP}} protocol objects.
       </description>
 
       <parameter name="RouterNumberOfEntries" access="readOnly">
@@ -61047,7 +70170,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -61157,7 +70280,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -61418,7 +70541,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -61699,7 +70822,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -61966,7 +71089,7 @@
         <parameter ref="Tag"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -62268,7 +71391,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -62831,7 +71954,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -62877,7 +72000,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -63001,7 +72124,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -63047,7 +72170,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -63181,7 +72304,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -63390,7 +72513,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -63412,6 +72535,76 @@
         </syntax>
       </parameter>
 
+      <parameter name="RDNSSMode" access="readWrite">
+        <description>
+          Describes which IPv6 address information MUST be specified in the
+          RDNSS option field specified in {{bibref|RFC8106|5.1. Recursive DNS
+          Server Option}}.
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="Static">
+              <description>
+                The DNS Servers as defined in the {{param|RDNSS}} parameter
+                should be used in the RA messages. A comma separated list of
+                IPv6 addresses must be supported.
+              </description>
+            </enumeration>
+            <enumeration value="LLA">
+              <description>
+                The link-local IPv6 address of the {{param|Interface}} is sent
+                in the RA messages.
+              </description>
+            </enumeration>
+            <enumeration value="GUA" optional="true">
+              <description>
+                The global unique IPv6 addresses of the {{param|Interface}} are
+                sent in the RA messages.
+              </description>
+            </enumeration>
+            <enumeration value="LLA_GUA" optional="true">
+              <description>
+                Both GUA and LLA of the {{param|Interface}} are sent in the RA
+                messages.
+              </description>
+            </enumeration>
+          </string>
+          <default type="object" value="Static"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="RDNSS" access="readWrite">
+        <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.
+        </description>
+        <syntax>
+          <list/>
+          <dataType ref="IPv6Address"/>
+          <default type="object" value=""/>
+        </syntax>
+      </parameter>
+
+      <parameter name="DNSSL" access="readWrite">
+        <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.
+        </description>
+        <syntax>
+          <list/>
+          <string/>
+          <default type="object" value=""/>
+        </syntax>
+      </parameter>
+
       <parameter name="ManualPrefixes" access="readWrite">
         <description>
           {{list}} {{reference}}
@@ -63660,6 +72853,58 @@
         </syntax>
       </parameter>
 
+      <parameter name="AdvRDNSSLifetime" access="readWrite">
+        <description>
+          The Lifetime field in RDNSS specifies the maximum duration, in
+          {{units}}, during which the provided RDNSS addresses can be used for
+          name resolution relative to the time the packet is received. By
+          default, the value of Lifetime is recommended to be at least 3 times
+          the MaxRtrAdvInterval. The MaxRtrAdvInterval is defined in
+          {{bibref|RFC4861}} and refers to the maximum interval between Router
+          Advertisement (RA) messages.
+
+          When the Lifetime value is set to all one bits (0xffffffff), it
+          indicates an infinite duration.
+
+          The Lifetime value of zero signifies that the RDNSS addresses must
+          not be used anymore, as specified in {{bibref|RFC8106|5.1. Recursive
+          DNS Server Option}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range maxInclusive="4294967295"/>
+            <units value="seconds"/>
+          </unsignedInt>
+          <default type="object" value="0"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="AdvDNSSLLifetime" access="readWrite">
+        <description>
+          The Lifetime field in DNSSL specifies the maximum duration, in
+          {{units}}, during which the provided DNSSL domain names can be used
+          for name resolution relative to the time the packet is received. By
+          default, the value of Lifetime is recommended to be at least 3 times
+          the MaxRtrAdvInterval. The MaxRtrAdvInterval is defined in
+          {{bibref|RFC4861}} and refers to the maximum interval between Router
+          Advertisement (RA) messages.
+
+          When the Lifetime value is set to all one bits (0xffffffff), it
+          indicates an infinite duration.
+
+          The Lifetime value of zero signifies that the DNSSL domain names must
+          not be used anymore, as specified in {{bibref|RFC8106|5.2. DNS Search
+          List Option}}.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+            <range maxInclusive="4294967295"/>
+          </unsignedInt>
+          <default type="object" value="0"/>
+        </syntax>
+      </parameter>
+
       <parameter name="OptionNumberOfEntries" access="readOnly">
         <description>
           {{numentries}}
@@ -63702,7 +72947,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -63814,7 +73059,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -64033,7 +73278,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -64540,31 +73785,18 @@
 
       <parameter name="Order" access="readWrite">
         <description>
-          Position of the {{object}} entry in the order of precedence. A value
-          of ''1'' indicates the first entry considered (highest precedence).
+          {{datatype|expand}}
+
           For each packet, the highest ordered entry that matches the
           classification criteria is applied. All lower order entries are
           ignored.
-
-          When this value is modified, if the value matches that of an existing
-          entry, the {{param}} value for the existing entry and all lower
-          {{param}} entries is 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.
-
-          The value of {{param}} on creation of a {{object}} table entry MUST
-          be one greater than the largest current value (initially assigned the
-          lowest precedence).
         </description>
         <syntax>
-          <unsignedInt>
-            <range minInclusive="1"/>
-          </unsignedInt>
+          <dataType ref="Order"/>
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -66018,7 +75250,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -66191,7 +75423,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -66388,7 +75620,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -66769,7 +76001,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -67128,7 +76360,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -67297,7 +76529,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -67417,7 +76649,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -67599,7 +76831,7 @@
         <parameter ref="PhysAddress"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite" status="deleted">
+      <parameter name="Alias" access="writeOnceReadOnly" status="deleted">
         <description>
           {{datatype|expand}}
 
@@ -68072,7 +77304,7 @@
         <parameter ref="PhysAddress"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -68081,6 +77313,35 @@
         </syntax>
       </parameter>
 
+      <parameter name="Origin" access="readOnly">
+        <description>
+          Indicates the owner of the {{object}} instance.
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="User">
+              <description>
+                Used for indicating that the access control rule was created by
+                the end-user. For example through the web user interface.
+              </description>
+            </enumeration>
+            <enumeration value="System">
+              <description>
+                Used for indicating that the access control rule was created by
+                the system itself.
+              </description>
+            </enumeration>
+            <enumeration value="Controller">
+              <description>
+                Used for indicating that the access control rule was created by
+                a Controller.
+              </description>
+            </enumeration>
+          </string>
+          <default type="object" value="Controller"/>
+        </syntax>
+      </parameter>
+
       <parameter name="PhysAddress" access="readWrite">
         <description>
           Unique physical identifier of the device. For many layer 2
@@ -68093,6 +77354,24 @@
         </syntax>
       </parameter>
 
+      <parameter name="PhysAddressMask" access="readWrite">
+        <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
+          host. Other possible values 'FF:FF:FF:00:00:00' to apply access
+          control to a specific OUI.
+
+          When {{empty}} is set, no mask will be applied and the
+          {{param|PhysAddress}} MUST be used as is.
+        </description>
+        <syntax>
+          <string>
+            <size maxLength="64"/>
+          </string>
+          <default type="object" value=""/>
+        </syntax>
+      </parameter>
+
       <parameter name="HostName" access="readWrite">
         <description>
           Any user defined name for the device.
@@ -68156,7 +77435,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -68257,6 +77536,199 @@
           </string>
         </syntax>
       </parameter>
+
+      <parameter name="ZoneNumberOfEntries" access="readOnly">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object name="Device.DNS.Zone.{i}." access="readWrite" minEntries="0"
+        numEntriesParameter="ZoneNumberOfEntries" maxEntries="unbounded"
+        version="2.17">
+      <description>
+        This object specifies Zone file configuration of the DNS server.
+      </description>
+      <uniqueKey functional="false">
+        <parameter ref="Alias"/>
+      </uniqueKey>
+
+      <parameter name="Alias" access="writeOnceReadOnly">
+        <description>
+          {{datatype|expand}}
+        </description>
+        <syntax>
+          <dataType ref="Alias"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Enable" access="readWrite">
+        <description>
+          Enables or disables the DNS zone.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Name" access="readWrite">
+        <description>
+          Domain name that is associated with the zone.
+        </description>
+        <syntax>
+          <string>
+            <size maxLength="128"/>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="Origin" access="readOnly">
+        <description>
+          The mechanism via which the Zone was created.
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="User">
+              <description>
+                Used for indicating that the entry was created by the end-user.
+                For example through the web user interface.
+              </description>
+            </enumeration>
+            <enumeration value="System">
+              <description>
+                Used for indicating that the entry was created by the system
+                itself.
+              </description>
+            </enumeration>
+            <enumeration value="Controller">
+              <description>
+                Used for indicating that the entry was created by a Controller.
+              </description>
+            </enumeration>
+          </string>
+          <default type="object" value="System"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Interface" access="readWrite">
+        <description>
+          Specifies the Layer 3 interface on which the zone should be
+          available. Example: ''Device.IP.Interface.1'' or
+          ''Device.Logical.Interface.1''.
+        </description>
+        <syntax>
+          <string>
+            <size maxLength="256"/>
+            <pathRef refType="strong" targetParent=".IP.Interface."
+                targetType="row"/>
+          </string>
+          <default type="object" value=""/>
+        </syntax>
+      </parameter>
+
+      <parameter name="HostNumberOfEntries" access="readOnly">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object name="Device.DNS.Zone.{i}.Host.{i}." access="readWrite"
+        minEntries="0" numEntriesParameter="HostNumberOfEntries"
+        maxEntries="unbounded" version="2.17">
+      <description>
+        This object specifies the resource records (RR) of the DNS zone.
+      </description>
+      <uniqueKey functional="false">
+        <parameter ref="Alias"/>
+      </uniqueKey>
+
+      <parameter name="Alias" access="writeOnceReadOnly">
+        <description>
+          {{datatype|expand}}
+        </description>
+        <syntax>
+          <dataType ref="Alias"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Enable" access="readWrite">
+        <description>
+          Enables or disables the entry in the zone file.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Name" access="readWrite">
+        <description>
+          List of hostnames that are associated with the {{object}}.
+        </description>
+        <syntax>
+          <list/>
+          <string>
+            <size maxLength="128"/>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="Origin" access="readWrite">
+        <description>
+          Indicates the owner of the {{object}} instance.
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="User">
+              <description>
+                Used for indicating that the entry was created by the end-user.
+                For example through the web user interface.
+              </description>
+            </enumeration>
+            <enumeration value="System">
+              <description>
+                Used for indicating that the entry was created by the system
+                itself.
+              </description>
+            </enumeration>
+            <enumeration value="Controller">
+              <description>
+                Used for indicating that the entry was created by a Controller.
+              </description>
+            </enumeration>
+          </string>
+          <default type="object" value="System"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Host" access="readWrite">
+        <description>
+          Host table entries associated with the device.
+        </description>
+        <syntax>
+          <string>
+            <size maxLength="256"/>
+            <pathRef refType="strong" targetParent=".Hosts.Host."
+                targetType="row"/>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="LastUpdate">
+        <description>
+          The date and time in UTC when the entry was last changed.
+        </description>
+        <syntax>
+          <dateTime/>
+        </syntax>
+      </parameter>
     </object>
 
     <object name="Device.DNS.Client." access="readOnly" minEntries="1"
@@ -68345,7 +77817,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -68454,6 +77926,16 @@
         </syntax>
       </parameter>
 
+      <parameter name="ConfigNumberOfEntries" access="readOnly"
+          dmr:customNumEntriesParameter="true">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
       <parameter name="ForwardNumberOfEntries" access="readOnly"
           dmr:customNumEntriesParameter="true">
         <description>
@@ -68465,6 +77947,111 @@
       </parameter>
     </object>
 
+    <object name="Device.DNS.Relay.Config.{i}." access="readWrite"
+        numEntriesParameter="ConfigNumberOfEntries" minEntries="0"
+        maxEntries="unbounded" version="2.17">
+      <description>
+        This object is used to specify the cache configuration for each
+        Forwarding relay.
+      </description>
+      <uniqueKey functional="false">
+        <parameter ref="Alias"/>
+      </uniqueKey>
+
+      <parameter name="Alias" access="writeOnceReadOnly">
+        <description>
+          {{datatype|expand}}
+        </description>
+        <syntax>
+          <dataType ref="Alias"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Forwarders" access="readWrite">
+        <description>
+          Specifies the list of the DNS forwarders to be used.
+        </description>
+        <syntax>
+          <list/>
+          <string>
+            <size maxLength="256"/>
+            <pathRef refType="strong" targetParent="#.Forwarding."
+                targetType="row"/>
+          </string>
+          <default type="object" value=""/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Interface" access="readWrite">
+        <description>
+          {{reference}} Specifies the IP interface over which the DNS query is
+          received. This is usually the LAN interface.
+
+          {{template|INTERFACE-ROUTING}}
+        </description>
+        <syntax>
+          <string>
+            <size maxLength="256"/>
+            <pathRef refType="strong" targetParent="###.IP.Interface."
+                targetType="row"/>
+          </string>
+          <default type="object" value=""/>
+        </syntax>
+      </parameter>
+
+      <parameter name="CacheSize" access="readOnly">
+        <description>
+          Specifies the size of cache in kilobytes.
+
+          When '0' is specified, no DNS results will be cached.
+        </description>
+        <syntax>
+          <unsignedInt/>
+          <default type="object" value="0"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="CacheMinTTL" access="readOnly">
+        <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>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+          <default type="object" value="0"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="CacheMaxTTL" access="readOnly">
+        <description>
+          Specifies the maximum TTL amount of time, in {{units}}, than 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>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+          <default type="object" value="86400"/>
+        </syntax>
+      </parameter>
+
+      <command name="FlushCache()" async="false">
+        <description>
+          This command empties the cache.
+        </description>
+      </command>
+    </object>
+
     <object name="Device.DNS.Relay.Forwarding.{i}." access="readWrite"
         numEntriesParameter="ForwardNumberOfEntries" enableParameter="Enable"
         minEntries="0" maxEntries="unbounded" version="2.0">
@@ -68511,7 +78098,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -68828,6 +78415,15 @@
         </syntax>
       </parameter>
 
+      <parameter name="AdvertiseNumberOfEntries" access="readOnly">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
       <parameter name="ServiceNumberOfEntries" access="readOnly">
         <description>
           {{numentries}}
@@ -68837,13 +78433,16 @@
         </syntax>
       </parameter>
 
-      <parameter name="AdvertisedInterfaces" access="readWrite">
+      <parameter name="AdvertisedInterfaces" access="readWrite"
+          status="deprecated">
         <description>
           {{reference|the {{object|##.IP.Interface}} object instance from which
           DNS-SD services are advertised}}
 
           If this parameter is not supported by an implementation then DNS-SD
           services are advertised on all LAN interfaces.
+
+          {{deprecated|2.17|in favor of {{param|Advertise.{i}.Interface}}}}
         </description>
         <syntax>
           <list/>
@@ -68855,6 +78454,218 @@
       </parameter>
     </object>
 
+    <object name="Device.DNS.SD.Advertise.{i}." access="readWrite"
+        numEntriesParameter="AdvertiseNumberOfEntries" enableParameter="Enable"
+        minEntries="0" maxEntries="unbounded" version="2.17">
+      <description>
+        The {{object}} table contains DNS-SD services that MUST be advertised.
+        DNS.SD service information is provided in DNS RR SRV records
+        {{bibref|RFC2782}}. The Service Instance Name {{bibref|DNS-SD|Section
+        4.1 Structured Instance Names}} further specifies information about the
+        service name (RFC2782 Service field) and domain name (RFC2782 Name
+        field) in the form:
+
+        Service Instance Name = [InstanceName] . [Service] . [Domain]
+
+        [Service] = _[ApplicationProtocol] . _[TransportProtocol]
+
+        RFC2782 Service field will always be equal to [InstanceName]. [Service]
+
+        RFC2782 Name field will always be equal to [Domain]
+
+        For example, an SSH service might have:
+
+        *{{param|InstanceName}} = "Secure Shell (SSH))"
+
+        *{{param|ApplicationProtocol}} = "ssh"
+
+        *{{param|TransportProtocol}} = "TCP"
+
+        *{{param|Port}} = 22
+      </description>
+      <uniqueKey functional="true">
+        <parameter ref="Alias"/>
+      </uniqueKey>
+
+      <parameter name="Enable" access="readWrite">
+        <description>
+          Enables or disables the advertisement of the DNS-SD service.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Alias" access="writeOnceReadOnly">
+        <description>
+          {{datatype|expand}}
+        </description>
+        <syntax>
+          <dataType ref="Alias"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Status" access="readOnly">
+        <description>
+          The status of the advertised {{object}}.
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="Disabled">
+              <description>
+                Indicates that the DNS-SD service advertisement is disabled.
+              </description>
+            </enumeration>
+            <enumeration value="Enabled">
+              <description>
+                Indicates that the DNS-SD service advertisement is enabled.
+              </description>
+            </enumeration>
+            <enumeration value="Error_Misconfigured">
+              <description>
+                Indicates that a necessary configuration value is undefined or
+                invalid.
+              </description>
+            </enumeration>
+            <enumeration value="Error" optional="true">
+              <description>
+                MAY be used to define an error condition.
+              </description>
+            </enumeration>
+          </string>
+          <default type="object" value="Disabled"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Interface" access="readWrite">
+        <description>
+          {{reference}} The layer 3 interface on which the DNS-SD service MUST
+          be advertised. Example: ''Device.IP.Interface.1'' or
+          ''Device.Logical.Interface.1''.
+
+          {{template|INTERFACE-ROUTING}}
+        </description>
+        <syntax>
+          <string>
+            <size maxLength="256"/>
+            <pathRef refType="strong" targetParent=".IP.Interface."
+                targetType="row"/>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="InstanceName" access="readOnly">
+        <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>
+        <syntax>
+          <string>
+            <size maxLength="63"/>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="ApplicationProtocol" access="readOnly">
+        <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>
+        <syntax>
+          <string>
+            <size maxLength="15"/>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="TransportProtocol" access="readOnly">
+        <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>
+        <syntax>
+          <string>
+            <enumeration value="TCP"/>
+            <enumeration value="UDP"/>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="Domain" access="readOnly">
+        <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>
+        <syntax>
+          <string>
+            <size maxLength="256"/>
+          </string>
+          <default type="object" value="local"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Port" access="readOnly">
+        <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>
+        <syntax>
+          <unsignedInt>
+            <range maxInclusive="65535"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="TextRecordNumberOfEntries" access="readOnly">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object name="Device.DNS.SD.Advertise.{i}.TextRecord.{i}."
+        access="readOnly" numEntriesParameter="TextRecordNumberOfEntries"
+        minEntries="0" maxEntries="unbounded" dmr:noUniqueKeys="true"
+        version="2.17">
+      <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.
+      </description>
+
+      <parameter name="Key" access="readWrite">
+        <description>
+          The key that identifies the text record
+        </description>
+        <syntax>
+          <string>
+            <size maxLength="255"/>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="Value" access="readWrite">
+        <description>
+          The value of the text record.
+        </description>
+        <syntax>
+          <string>
+            <size maxLength="255"/>
+          </string>
+        </syntax>
+      </parameter>
+    </object>
+
     <object name="Device.DNS.SD.Service.{i}." access="readOnly"
         numEntriesParameter="ServiceNumberOfEntries" minEntries="0"
         maxEntries="unbounded" version="2.6">
@@ -68866,16 +78677,13 @@
         service name (RFC2782 Service field) and domain name (RFC2782 Name
         field) in the form:
 
-        Service Instance Name = &lt;InstanceName&gt; . &lt;Service&gt; .
-        &lt;Domain&gt;
+        Service Instance Name = [InstanceName] . [Service] . [Domain]
 
-        &lt;Service&gt; = _&lt;ApplicationProtocol&gt; .
-        _&lt;TransportProtocol&gt;
+        [Service] = _[ApplicationProtocol] . _[TransportProtocol]
 
-        RFC2782 Service field will always be equal to &lt;InstanceName&gt;.
-        &lt;Service&gt;
+        RFC2782 Service field will always be equal to [InstanceName]. [Service]
 
-        RFC2782 Name field will always be equal to &lt;Domain&gt;
+        RFC2782 Name field will always be equal to [Domain]
 
         For example, an SSH service might have:
 
@@ -68901,8 +78709,8 @@
       <parameter name="InstanceName" access="readOnly">
         <description>
           Human-readable instance name {{bibref|DNS-SD|Section 4.1.1 Instance
-          Names}} (i.e. The "&lt;{{param}}&gt;" portion of the '"Service
-          Instance Name'").
+          Names}} (i.e. The "[{{param}}]" portion of the '"Service Instance
+          Name'").
         </description>
         <syntax>
           <string>
@@ -69146,6 +78954,18 @@
         </syntax>
       </parameter>
 
+      <parameter name="MaxNumberOfPortMappings" access="readOnly">
+        <description>
+          The maximum number of port mappings that can exist at any given time.
+
+          If the value of this parameter is 0, then it means that the device
+          doesn't have a limit to the number of port mappings that can exist.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
       <parameter name="PortTriggerNumberOfEntries" access="readOnly">
         <description>
           {{numentries}}
@@ -69154,6 +78974,18 @@
           <unsignedInt/>
         </syntax>
       </parameter>
+
+      <parameter name="MaxNumberOfPortTriggers" access="readOnly">
+        <description>
+          The maximum number of port triggers that can exist at any given time.
+
+          If the value of this parameter is 0, then it means that the device
+          doesn't have a limit to the number of port mappings that can exist.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
     </object>
 
     <object name="Device.NAT.InterfaceSetting.{i}." access="readWrite"
@@ -69229,7 +79061,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -69376,7 +79208,42 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Origin" access="readOnly">
+        <description>
+          Indicates the Origin of the {{object}} instance.
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="User">
+              <description>
+                Used for indicating that the port mapping entry was created by
+                the end-user. For example through the web user interface.
+              </description>
+            </enumeration>
+            <enumeration value="System">
+              <description>
+                Used for indicating that the port mapping entry was created by
+                the system itself.
+              </description>
+            </enumeration>
+            <enumeration value="UPnP">
+              <description>
+                Used for indicating that the port mapping entry was created by
+                a device using UPnP-IGD.
+              </description>
+            </enumeration>
+            <enumeration value="Controller">
+              <description>
+                Used for indicating that the port mapping entry was created by
+                a Controller.
+              </description>
+            </enumeration>
+          </string>
+          <default type="object" value="Controller"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
 
@@ -69629,7 +79496,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -69688,7 +79555,7 @@
             <enumeration value="User">
               <description>
                 Used for indicating that the PortTrigger entry was created by
-                the end-user. For example through the web-ui.
+                the end-user. For example through the web user interface.
               </description>
             </enumeration>
             <enumeration value="System">
@@ -69826,7 +79693,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -69981,7 +79848,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -70229,7 +80096,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -70490,7 +80357,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -70736,7 +80603,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -70878,7 +80745,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -71123,7 +80990,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -71354,7 +81221,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -71414,26 +81281,16 @@
 
       <parameter name="Order" access="readWrite">
         <description>
-          Position of the option in the DHCP client request. A value of ''1''
-          indicates the first entry.
+          {{datatype|expand}}
 
-          When this value is modified, if the value matches that of an existing
-          entry, the {{param}} value for the existing entry and all lower
-          {{param}} entries is incremented to ensure uniqueness of this value.
-          A deletion causes {{param}} values to be compacted. When a value is
-          changed, incrementing occurs before compaction.
-
-          The value of {{param}} on creation of a {{object}} table entry MUST
-          be one greater than the largest current value.
+          This indicates the position of the option in the DHCP client request.
         </description>
         <syntax>
-          <unsignedInt>
-            <range minInclusive="1"/>
-          </unsignedInt>
+          <dataType ref="Order"/>
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -71553,7 +81410,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -71564,26 +81421,13 @@
 
       <parameter name="Order" access="readWrite">
         <description>
-          Position of the {{object}} entry in the order of precedence. A value
-          of ''1'' indicates the first entry considered (highest precedence).
+          {{datatype|expand}}
+
           For each DHCP request, the highest ordered entry that matches the
           association criteria is applied. All lower order entries are ignored.
-
-          When this value is modified, if the value matches that of an existing
-          entry, the {{param}} value for the existing entry and all lower
-          {{param}} entries is 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.
-
-          The value of {{param}} on creation of a {{object}} table entry MUST
-          be one greater than the largest current value (initially assigned the
-          lowest precedence).
         </description>
         <syntax>
-          <unsignedInt>
-            <range minInclusive="1"/>
-          </unsignedInt>
+          <dataType ref="Order"/>
         </syntax>
       </parameter>
 
@@ -71999,7 +81843,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -72056,7 +81900,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -72105,7 +81949,7 @@
         <parameter ref="Chaddr"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
 
@@ -72312,7 +82156,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -72323,26 +82167,13 @@
 
       <parameter name="Order" access="readWrite">
         <description>
-          Position of the {{object}} entry in the order of precedence. A value
-          of ''1'' indicates the first entry considered (highest precedence).
+          {{datatype|expand}}
+
           For each DHCP request, the highest ordered entry that matches the
           association criteria is applied. All lower order entries are ignored.
-
-          When this value is modified, if the value matches that of an existing
-          entry, the {{param}} value for the existing entry and all lower
-          {{param}} entries is 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.
-
-          The value of {{param}} on creation of a {{object}} table entry MUST
-          be one greater than the largest current value (initially assigned the
-          lowest precedence).
         </description>
         <syntax>
-          <unsignedInt>
-            <range minInclusive="1"/>
-          </unsignedInt>
+          <dataType ref="Order"/>
         </syntax>
       </parameter>
 
@@ -72612,7 +82443,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -72906,7 +82737,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -73075,7 +82906,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -73086,26 +82917,13 @@
 
       <parameter name="Order" access="readWrite">
         <description>
-          Position of the {{object}} entry in the order of precedence. A value
-          of ''1'' indicates the first entry considered (highest precedence).
+          {{datatype|expand}}
+
           For each DHCPv6 request, the highest ordered entry that matches the
           association criteria is applied. All lower order entries are ignored.
-
-          When this value is modified, if the value matches that of an existing
-          entry, the {{param}} value for the existing entry and all lower
-          {{param}} entries is 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.
-
-          The value of {{param}} on creation of a {{object}} table entry MUST
-          be one greater than the largest current value (initially assigned the
-          lowest precedence).
         </description>
         <syntax>
-          <unsignedInt>
-            <range minInclusive="1"/>
-          </unsignedInt>
+          <dataType ref="Order"/>
         </syntax>
       </parameter>
 
@@ -73470,7 +83288,7 @@
         <parameter ref="SourceAddress"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
 
@@ -73681,7 +83499,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -73815,7 +83633,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -74309,7 +84127,7 @@
         <parameter ref="UserID"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -74468,7 +84286,7 @@
         <parameter ref="GroupID"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -74557,7 +84375,7 @@
         <parameter ref="Name"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -74604,7 +84422,7 @@
         <parameter ref="RoleID"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -74687,7 +84505,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -76479,6 +86297,15 @@
           <unsignedInt/>
         </syntax>
       </parameter>
+
+      <parameter name="InterfaceSettingNumberOfEntries" access="readOnly">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
     </object>
 
     <object name="Device.Firewall.Level.{i}." access="readWrite"
@@ -76499,7 +86326,7 @@
         <parameter ref="Name"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -76532,23 +86359,14 @@
 
       <parameter name="Order" access="readWrite">
         <description>
-          Position of the {{object}} entry for user interface display; levels
-          can be presented according to an increasing or decreasing level of
-          security.
+          {{datatype|expand}}
 
-          When this value is modified, if the value matches that of an existing
-          entry, the {{param}} value for the existing entry and all
-          greater-valued {{param}} entries is incremented to ensure uniqueness
-          of this value. A deletion causes {{param}} values to be compacted.
-          When a value is changed, incrementing occurs before compaction.
-
-          The value of {{param}} on creation of a {{object}} table entry MUST
-          be one greater than the largest current value.
+          This indicates the order of the {{object}} entry in the user
+          interface display. Levels can be presented according to increasing or
+          decreasing level of security.
         </description>
         <syntax>
-          <unsignedInt>
-            <range minInclusive="1"/>
-          </unsignedInt>
+          <dataType ref="Order"/>
         </syntax>
       </parameter>
 
@@ -76658,7 +86476,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -76871,7 +86689,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -77019,30 +86837,17 @@
 
       <parameter name="Order" access="readWrite">
         <description>
-          Position of the {{object}} entry in the order of precedence. A value
-          of ''1'' indicates the first entry considered (highest precedence).
+          {{datatype|expand}}
+
           For each packet, the highest ordered entry that matches the rule
           criteria is applied. All lower order entries are ignored.
-
-          When this value is modified, if the value matches that of an existing
-          entry, the {{param}} value for the existing entry and all lower
-          {{param}} entries is 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.
-
-          The value of {{param}} on creation of a {{object}} table entry MUST
-          be one greater than the largest current value (initially assigned the
-          lowest precedence).
         </description>
         <syntax>
-          <unsignedInt>
-            <range minInclusive="1"/>
-          </unsignedInt>
+          <dataType ref="Order"/>
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -77674,7 +87479,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -77722,16 +87527,16 @@
         </syntax>
       </parameter>
 
-      <parameter name="Origin" access="readWrite">
+      <parameter name="Origin" access="readOnly">
         <description>
-          Indicates the owner of the {{object}} instance.
+          Indicates the Origin of the {{object}} instance.
         </description>
         <syntax>
           <string>
             <enumeration value="User">
               <description>
                 Used for indicating that the pinhole rule was created by the
-                end-user. For example through the web-ui.
+                end-user. For example through the web user interface.
               </description>
             </enumeration>
             <enumeration value="System">
@@ -77740,6 +87545,12 @@
                 system itself.
               </description>
             </enumeration>
+            <enumeration value="UPnP">
+              <description>
+                Used for indicating that the pinhole rule was created by a
+                device using UPnP-IGD.
+              </description>
+            </enumeration>
             <enumeration value="Controller">
               <description>
                 Used for indicating that the pinhole rule was created by a
@@ -77776,6 +87587,43 @@
         </syntax>
       </parameter>
 
+      <parameter name="LeaseDuration" access="readWrite">
+        <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
+          expires.
+
+          A value of 0 means the pin hole is static. Support for dynamic
+          (non-static) pin hole is OPTIONAL. That is, the only value for
+          {{param}} that MUST be supported is 0.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="RemainingLeaseTime" access="readOnly"
+          activeNotify="canDeny">
+        <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
+          lease. That is, for a dynamic pin hole, the value counts down toward
+          0. When a dynamic pin hole lease expires, the device MUST
+          automatically terminate that pin hole, and MUST automatically delete
+          the corresponding {{object}} table entry.
+
+          For a static pin hole, this parameter is irrelevant and should return
+          ''0''.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
       <parameter name="SourcePort" access="readWrite">
         <description>
           Source port number of the incoming connection. A value of ''-1''
@@ -77904,7 +87752,7 @@
         <parameter ref="SourcePrefix"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -77963,7 +87811,7 @@
             <enumeration value="User">
               <description>
                 Used for indicating that the DMZ rule was created by the
-                end-user. For example through the web-ui.
+                end-user. For example through the web user interface.
               </description>
             </enumeration>
             <enumeration value="System">
@@ -78008,6 +87856,42 @@
         </syntax>
       </parameter>
 
+      <parameter name="LeaseDuration" access="readWrite">
+        <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.
+
+          A value of 0 means the DMZ rule is static. Support for dynamic
+          (non-static) DMZ rules is OPTIONAL. That is, the only value for
+          {{param}} that MUST be supported is 0.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
+      <parameter name="RemainingLeaseTime" access="readOnly"
+          activeNotify="canDeny">
+        <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
+          lease. That is, for a dynamic DMZ rule, the value counts down toward
+          0. When a dynamic DMZ rule lease expires, the device MUST
+          automatically terminate that DMZ rule, and MUST automatically delete
+          the corresponding {{object}} table entry.
+
+          For a static DMZ rule, this parameter is irrelevant and should return
+          ''0''.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+        </syntax>
+      </parameter>
+
       <parameter name="DestIP" access="readWrite">
         <description>
           The IPv4 address of a client in the DMZ network.
@@ -78057,7 +87941,7 @@
         <parameter ref="SourcePrefixes"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -78230,6 +88114,440 @@
       </parameter>
     </object>
 
+    <object name="Device.Firewall.InterfaceSetting.{i}." access="readWrite"
+        numEntriesParameter="InterfaceSettingNumberOfEntries"
+        enableParameter="Enable" minEntries="0" maxEntries="unbounded"
+        version="2.17">
+      <description>
+        Firewall settings for an associated IP Interface.
+
+        For enabled table entries, 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}}.
+
+        Note: The {{object}} includes a unique key that is a strong reference.
+        If a strongly referenced object is deleted, the device will set the
+        referencing parameter to {{empty}}. However, doing so under these
+        circumstances might cause the updated {{object}} row to then violate
+        the table's unique key constraint; if this occurs, the device MUST set
+        {{param|Status}} to {{enum|Error_Misconfigured|Status}} and disable the
+        offending {{object}} row.
+      </description>
+      <uniqueKey functional="false">
+        <parameter ref="Alias"/>
+      </uniqueKey>
+      <uniqueKey functional="true">
+        <parameter ref="Interface"/>
+      </uniqueKey>
+
+      <parameter name="Enable" access="readWrite">
+        <description>
+          Enables or disables the {{object}} entry, indicating if NAT is
+          enabled for the referenced IP Interface instance. On creation, an
+          {{object}} entry is disabled by default.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="object" value="false"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Status" access="readOnly">
+        <description>
+          The status of this entry. {{enum}}
+
+          The {{enum|Error_Misconfigured}} value indicates that a necessary
+          configuration value is undefined or invalid.
+
+          The {{enum|Error}} value MAY be used by the device to indicate a
+          locally defined error condition.
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="Disabled"/>
+            <enumeration value="Enabled"/>
+            <enumeration value="Error_Misconfigured"/>
+            <enumeration value="Error"/>
+          </string>
+          <default type="object" value="Disabled"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Alias" access="writeOnceReadOnly">
+        <description>
+          {{datatype|expand}}
+        </description>
+        <syntax>
+          <dataType ref="Alias"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Interface" access="readWrite">
+        <description>
+          {{reference}} The associated IP interface on which NAT is to be
+          enabled.
+        </description>
+        <syntax>
+          <string>
+            <size maxLength="256"/>
+            <pathRef refType="strong" targetParent="##.IP.Interface."
+                targetType="row"/>
+          </string>
+          <default type="object" value=""/>
+        </syntax>
+      </parameter>
+
+      <parameter name="IPv4SpoofingProtection" access="readWrite">
+        <description>
+          Enables or disables the IPv4 spoofing protection.
+
+          Spoofing protection prevents LAN devices from sending packets with a
+          wrong source IP address.
+
+          A number of DDoS attacks are known to modify the source IP address of
+          packets to initiate a DDoS attack. Spoofing protection checks if the
+          source IP address of packets initiated in the LAN belongs to the LAN
+          interface Address range, otherwise the packet will be dropped early
+          in the network stack.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="IPv6SpoofingProtection" access="readWrite">
+        <description>
+          Enables or disables the IPv6 spoofing protection.
+
+          Spoofing protection prevents LAN devices from sending packets with a
+          wrong source IP address.
+
+          A number of DDoS attacks are known to modify the source IP address of
+          packets to initiate a DDoS attack. Spoofing protection checks if the
+          source IP address of packets initiated in the LAN belongs to the LAN
+          interface Address range, otherwise the packet will be dropped early
+          in the network stack.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="IPv4AcceptICMPEchoRequest" access="readWrite">
+        <description>
+          When {{true}} the 'ICMPv4 echo request' packet must be answered with
+          an 'ICMPv4 echo reply'. When {{false}} the 'ICMPv4 echo request'
+          packet must be dropped.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="IPv6AcceptICMPEchoRequest" access="readWrite">
+        <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.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="StealthMode" access="readWrite">
+        <description>
+          Enables or disables the stealth mode. Stealth mode defines how the
+          firewall must treat "unwanted" packets.
+
+          Typically the feature is enabled for WAN facing interface(s). Stealth
+          mode is applicable for both IPv4 and IPv6, and UDP and TCP based
+          protocols.
+
+          If set to {{true}} all 'UDP/TCP' packets are dropped silently. This
+          prevents a possible attacker from knowing which ports are
+          opened/closed on a gateway.
+
+          When {{param}} is set to {{false}}, the firewall will reply with an
+          ICMP port unreachable.
+
+          If there are other firewall rules in effect, they will have priority
+          over this parameter. i.e: If an 'UDP' port is set to 'ACCEPT', and
+          the {{param}} is activated, then the port will be accepted and all
+          the other 'UDP' ports will be blocked.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object name="Device.Firewall.ConnectionTracking." access="readOnly"
+        version="2.17">
+      <description>
+        This Object contains the IP connection tracking related parameters.
+        Application Layer Gateway (ALG) are used to provide Network Address
+        Translation (NAT) support for various application-layer protocols.
+      </description>
+    </object>
+
+    <object name="Device.Firewall.ConnectionTracking.SIP." access="readOnly"
+        version="2.17">
+      <description>
+        SIP is an application-layer control protocol used to establish, modify,
+        and terminate multimedia sessions.
+      </description>
+
+      <parameter name="Enable" access="readWrite">
+        <description>
+          Enables or disables the connection tracking support for the SIP
+          protocol (SIP ALG).
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Ports" access="readWrite">
+        <description>
+          Port numbers of the SIP servers that need to be monitored.
+        </description>
+        <syntax>
+          <list/>
+          <int>
+            <range minInclusive="0" maxInclusive="65535"/>
+          </int>
+        </syntax>
+      </parameter>
+
+      <parameter name="DirectMedia" access="readWrite">
+        <description>
+          Allow media streams between signaling endpoints.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="implementation" value="true"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="DirectSignaling" access="readWrite">
+        <description>
+          Allow incoming calls from registrar.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="implementation" value="true"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ExternalMedia" access="readWrite">
+        <description>
+          Allow media streams that are not passing through this router.
+
+          When this feature is activated, the logic will maintain the SDP
+          payload as is when it identifies that the interface towards the
+          invited party is the same as the one towards the media endpoint.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="implementation" value="false"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="TimeOut" access="readWrite">
+        <description>
+          SIP time out session.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object name="Device.Firewall.ConnectionTracking.H323." access="readOnly"
+        version="2.17">
+      <description>
+        H.323 is a VoIP signalling protocol from ITU-T
+      </description>
+
+      <parameter name="Enable" access="readWrite">
+        <description>
+          Enables or disables the connection tracking support for the H323
+          protocol (H323 ALG).
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="RegistrationRequestTTL" access="readWrite">
+        <description>
+          When no TTL is specified in the registration request message the TTL
+          specified here will be used.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="GKRoutedOnly" access="readWrite">
+        <description>
+          Only accept calls from the gatekeeper.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="CallForwardFilter" access="readWrite">
+        <description>
+          Create call forwarding expectations only when both endpoints are on
+          different sides, as determined by routing information.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object name="Device.Firewall.ConnectionTracking.FTP." access="readOnly"
+        version="2.17">
+      <description>
+        Tracking FTP connections is difficult due to the requirement for
+        specialized helpers to handle them, along with the complexities of
+        masquerading and Network Address Translation. This involves supporting
+        FTP on Layer 3 with independent connection tracking.
+      </description>
+
+      <parameter name="Enable" access="readWrite">
+        <description>
+          Enables or disables the connection tracking support for the FTP
+          protocol (FTP ALG).
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Ports" access="readWrite">
+        <description>
+          Port numbers of the FTP servers that need to be monitored.
+        </description>
+        <syntax>
+          <list maxItems="8"/>
+          <int>
+            <range minInclusive="0" maxInclusive="65535"/>
+          </int>
+        </syntax>
+      </parameter>
+
+      <parameter name="Loose" access="readWrite">
+        <description>
+          The FTP protocol can enable a user to connect a FTP server to another
+          FTP server. This could lead to a hole in the DMZ and it is therefore
+          recommended to disable this feature.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object name="Device.Firewall.ConnectionTracking.PPTP." access="readOnly"
+        version="2.17">
+      <description>
+        PPTP Connection Tracking configuration object.
+      </description>
+
+      <parameter name="Enable" access="readWrite">
+        <description>
+          Enables or disables the connection tracking support for the PPTP
+          protocol (PPTP ALG).
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object name="Device.Firewall.ConnectionTracking.TFTP." access="readOnly"
+        version="2.17">
+      <description>
+        TFTP Connection Tracking configuration object.
+      </description>
+
+      <parameter name="Enable" access="readWrite">
+        <description>
+          Enables or disables the connection tracking support for the TFTP
+          protocol (TFTP ALG).
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Ports" access="readWrite">
+        <description>
+          Port numbers of the TFTP servers that need to be monitored.
+        </description>
+        <syntax>
+          <list maxItems="8"/>
+          <int>
+            <range minInclusive="0" maxInclusive="65535"/>
+          </int>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object name="Device.Firewall.ConnectionTracking.IRC." access="readOnly"
+        version="2.17">
+      <description>
+        IRC Connection Tracking configuration object.
+      </description>
+
+      <parameter name="Enable" access="readWrite">
+        <description>
+          Enables or disables the connection tracking support for the IRC
+          protocol (IRC ALG).
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Ports" access="readWrite">
+        <description>
+          Port numbers of the IRC servers that need to be monitored.
+        </description>
+        <syntax>
+          <list/>
+          <int>
+            <range minInclusive="0" maxInclusive="65535"/>
+          </int>
+        </syntax>
+      </parameter>
+
+      <parameter name="MAXDCCChannels" access="readWrite">
+        <description>
+          Maximum number of Direct Client-to-Client (DCC) channels allowed per
+          IRC session.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="DCCTimeout" access="readWrite">
+        <description>
+          Timeout duration for unestablished Direct Client-to-Client (DCC)
+          channels.
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+    </object>
+
     <object name="Device.PeriodicStatistics." access="readOnly" minEntries="1"
         maxEntries="1" version="2.0">
       <description>
@@ -78293,7 +88611,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -78394,6 +88712,11 @@
           The sample interval in {{units}}. Each statistic is measured over
           this sample interval.
 
+          The CPE MAY also support an internal sampling rate (implementation
+          dependent) that is faster than the {{param}} and allows the CPE to
+          support the various options available in
+          {{param|Parameter.{i}.CalculationMode}}.
+
           The CPE MAY reject a request to set {{param}} to less than
           {{param|#.MinSampleInterval}}.
 
@@ -78780,7 +89103,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -78827,7 +89150,8 @@
             </enumeration>
             <enumeration value="Change">
               <description>
-                Sampled value is change in value since start of sample interval
+                Sampled value is change in value since start of each internal
+                sample interval.
               </description>
             </enumeration>
           </string>
@@ -78838,7 +89162,7 @@
       <parameter name="CalculationMode" access="readWrite">
         <description>
           Controls how this parameter's statistic is calculated from the
-          sampled value(s). {{enum}}
+          sampled value(s) of each internal sample interval. {{enum}}
 
           Parameters of non-numeric types can only support {{enum|Latest}}. The
           value of the {{param}} MUST be ignored for such parameters.
@@ -79952,7 +90276,8 @@
 
       <parameter name="SubjectAlt" access="readOnly">
         <description>
-          {{list}} Each item is a DNS Name.
+          {{list}} Each item specifies an identity that is bound to the
+          certificate's subject, and thus bound to the Public Key.
 
           The Subject Alternative Names extension field in an X.509
           certificate, see {{bibref|RFC5280}}.
@@ -80614,7 +90939,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -81819,20 +92144,24 @@
         <syntax>
           <list/>
           <string>
-            <enumeration value="Streaming" status="deprecated">
+            <enumeration value="Streaming" status="obsoleted">
               <description>
                 IPDR Streaming Protocol {{bibref|IPDR-SP}}
 
                 {{deprecated|2.15|because IPDR Bulk Data Collection is not
                 supported in USP}}
+
+                {{obsoleted|2.17}}
               </description>
             </enumeration>
-            <enumeration value="File" status="deprecated">
+            <enumeration value="File" status="obsoleted">
               <description>
                 IPDR File Transfer Protocol {{bibref|IPDR-FTP}}
 
                 {{deprecated|2.15|because IPDR Bulk Data Collection is not
                 supported in USP}}
+
+                {{obsoleted|2.17}}
               </description>
             </enumeration>
             <enumeration value="HTTP">
@@ -81864,22 +92193,26 @@
         <syntax>
           <list/>
           <string>
-            <enumeration value="XML" status="deprecated">
+            <enumeration value="XML" status="obsoleted">
               <description>
                 Used with the IPDR Streaming and File Protocols.
                 {{bibref|IPDR-XML}}
 
                 {{deprecated|2.15|because IPDR Bulk Data Collection is not
                 supported in USP}}
+
+                {{obsoleted|2.17}}
               </description>
             </enumeration>
-            <enumeration value="XDR" status="deprecated">
+            <enumeration value="XDR" status="obsoleted">
               <description>
                 Used with the IPDR Streaming and File Protocols.
                 {{bibref|IPDR-XDR}}
 
                 {{deprecated|2.15|because IPDR Bulk Data Collection is not
                 supported in USP}}
+
+                {{obsoleted|2.17}}
               </description>
             </enumeration>
             <enumeration value="CSV">
@@ -81981,7 +92314,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -82155,7 +92488,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="StreamingHost" access="readWrite" status="deprecated">
+      <parameter name="StreamingHost" access="readWrite" status="obsoleted">
         <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
@@ -82165,6 +92498,8 @@
 
           {{deprecated|2.15|because IPDR Bulk Data Collection is not supported
           in USP}}
+
+          {{obsoleted|2.17}}
         </description>
         <syntax>
           <string>
@@ -82173,7 +92508,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="StreamingPort" access="readWrite" status="deprecated">
+      <parameter name="StreamingPort" access="readWrite" status="obsoleted">
         <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
@@ -82183,6 +92518,8 @@
 
           {{deprecated|2.15|because IPDR Bulk Data Collection is not supported
           in USP}}
+
+          {{obsoleted|2.17}}
         </description>
         <syntax>
           <unsignedInt>
@@ -82193,7 +92530,7 @@
       </parameter>
 
       <parameter name="StreamingSessionID" access="readWrite"
-          status="deprecated">
+          status="obsoleted">
         <description>
           This is the unique identification of an IPDR Session to be used when
           this collection profile is configured for the IPDR Streaming Protocol
@@ -82210,6 +92547,8 @@
 
           {{deprecated|2.15|because IPDR Bulk Data Collection is not supported
           in USP}}
+
+          {{obsoleted|2.17}}
         </description>
         <syntax>
           <unsignedInt>
@@ -82219,7 +92558,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="FileTransferURL" access="readWrite" status="deprecated">
+      <parameter name="FileTransferURL" access="readWrite" status="obsoleted">
         <description>
           This is the {{datatype}} within the CPE that is used by an IPDR
           Collector to retrieve the IPDRDocs when this collection profile is
@@ -82229,6 +92568,8 @@
 
           {{deprecated|2.15|because IPDR Bulk Data Collection is not supported
           in USP}}
+
+          {{obsoleted|2.17}}
         </description>
         <syntax>
           <dataType ref="URL"/>
@@ -82236,7 +92577,7 @@
       </parameter>
 
       <parameter name="FileTransferUsername" access="readWrite"
-          status="deprecated">
+          status="obsoleted">
         <description>
           Username used for authentication of the {{param|FileTransferURL}}.
 
@@ -82247,6 +92588,8 @@
 
           {{deprecated|2.15|because IPDR Bulk Data Collection is not supported
           in USP}}
+
+          {{obsoleted|2.17}}
         </description>
         <syntax>
           <string>
@@ -82256,7 +92599,7 @@
       </parameter>
 
       <parameter name="FileTransferPassword" access="readWrite"
-          status="deprecated">
+          status="obsoleted">
         <description>
           Password used for authentication of the {{param|FileTransferURL}}.
 
@@ -82267,6 +92610,8 @@
 
           {{deprecated|2.15|because IPDR Bulk Data Collection is not supported
           in USP}}
+
+          {{obsoleted|2.17}}
         </description>
         <syntax secured="true">
           <string>
@@ -82276,7 +92621,7 @@
       </parameter>
 
       <parameter name="ControlFileFormat" access="readWrite"
-          status="deprecated">
+          status="obsoleted">
         <description>
           If this collection profile is configured for the IPDR File Transfer
           Protocol {{bibref|IPDR-FTP}} (the {{param|Protocol}} parameter has a
@@ -82305,6 +92650,8 @@
 
           {{deprecated|2.15|because IPDR Bulk Data Collection is not supported
           in USP}}
+
+          {{obsoleted|2.17}}
         </description>
         <syntax>
           <string>
@@ -83395,6 +93742,156 @@
               </syntax>
             </parameter>
           </object>
+
+          <object name="EnvVariable.{i}." minEntries="0"
+              maxEntries="unbounded" version="2.17">
+            <description>
+              This parameter describes the
+              {{object|##.ExecutionUnit.{i}.EnvVariable}} instances which
+              should be added to any {{object|##.ExecutionUnit}} created by
+              installation of the DeploymentUnit.
+            </description>
+
+            <parameter name="Key" mandatory="true">
+              <description>
+                The Environment variable name that needs to be passed to the
+                Execution unit when the execution unit is activated.
+              </description>
+              <syntax>
+                <string>
+                  <size maxLength="2048"/>
+                </string>
+              </syntax>
+            </parameter>
+
+            <parameter name="Value" mandatory="true">
+              <description>
+                The Environment variable value associated with the name that
+                needs to be passed to the Execution unit it is activated.
+              </description>
+              <syntax>
+                <string>
+                  <size maxLength="2048"/>
+                </string>
+              </syntax>
+            </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.
+
+              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.
+            </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
+                {{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.
+
+                When this argument is absent or {{empty}} then no outgoing
+                network access is required for the ExecutionUnit to function.
+              </description>
+              <syntax>
+                <list/>
+                <string>
+                  <size maxLength="256"/>
+                </string>
+              </syntax>
+            </parameter>
+          </object>
+
+          <object name="NetworkConfig.PortMapping.{i}." minEntries="0"
+              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.
+            </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.
+              </description>
+              <syntax>
+                <string>
+                  <size maxLength="256"/>
+                </string>
+              </syntax>
+            </parameter>
+
+            <parameter name="ExternalPort" mandatory="true">
+              <description>
+                The external port that the NAT gateway would listen on for
+                traffic to a corresponding InternalPort. Inbound packets to
+                this external port on the selected interface MUST be forwarded
+                to the IP address associated with the ExecutionUnit on the
+                InternalPort.
+              </description>
+              <syntax>
+                <unsignedInt>
+                  <range minInclusive="0" maxInclusive="65535"/>
+                </unsignedInt>
+              </syntax>
+            </parameter>
+
+            <parameter name="InternalPort" mandatory="true">
+              <description>
+                The port on ExecutionUnit that the gateway MUST forward traffic
+                to.
+              </description>
+              <syntax>
+                <unsignedInt>
+                  <range minInclusive="0" maxInclusive="65535"/>
+                </unsignedInt>
+              </syntax>
+            </parameter>
+
+            <parameter name="Protocol" mandatory="true">
+              <description>
+                The protocol of the port mapping.
+              </description>
+              <syntax>
+                <string>
+                  <enumeration value="TCP"/>
+                  <enumeration value="UDP"/>
+                </string>
+              </syntax>
+            </parameter>
+          </object>
         </input>
       </command>
 
@@ -83638,30 +94135,30 @@
                SHOULD reject the operation with a 7229 (Invalid Deployment Unit
                State) fault code.
 
-               *If a requested operation attempts to Install or Update a DU and
+              *If a requested operation attempts to Install or Update a DU and
                the server specified in the URL is not currently reachable or
                the request times out, then the device SHOULD reject the
                operation with a 7033 (Server Unreachable) fault code.
 
-               *If a requested operation attempts to Install or Update a DU and
+              *If a requested operation attempts to Install or Update a DU and
                the server specified in the URL fails security checks (e.g. by
                not presenting a valid certificate), then the device SHOULD
                reject the operation with a 7034 (Server Insecure) fault code.
 
-               *If a requested operation attempts to Install or Update a DU and
+              *If a requested operation attempts to Install or Update a DU and
                the file returned by the server appears to be corrupt, then the
                device SHOULD reject the operation with a 7035 (Corrupt Data)
                fault code.
 
-               *If a requested operation attempts to Install or Update a DU and
+              *If a requested operation attempts to Install or Update a DU and
                the file returned by the server does not match the signature
                provided, or a required signature is absent, then the device
                SHOULD reject the operation with a 7036 (Bad Signature) fault
                code.
 
-               * If a requested operation attempts to Install or Update a DU
-               and includes a RequestedRole argument which contains at least
-               one Role which is not in the EE's AvailableRoles list, then the
+              *If a requested operation attempts to Install or Update a DU and
+               includes a RequestedRole argument which contains at least one
+               Role which is not in the EE's AvailableRoles list, then the
                device SHOULD reject the operation with a 7032 (Unavailable
                Role) fault code.
             </description>
@@ -83703,7 +94200,7 @@
         <parameter ref="Version"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -83995,12 +94492,12 @@
           When an Execution Environment is disabled, Deployment Units installed
           to that Execution Environment will be unaffected, but any Execution
           Units currently running on that Execution Environment will
-          automatically transition to
-          {{enum|Idle|#.ExecutionUnit.{i}.Status}}.{{np}}If an Update or
-          Uninstall operation is attempted on a {{object|#.DeploymentUnit}}
-          that is to be applied against a disabled {{object}}, that operation
-          fails and the associated event will contain a FaultStruct for that
-          operation.
+          automatically transition to {{enum|Idle|#.ExecutionUnit.{i}.Status}}.
+
+          If an Update or Uninstall operation is attempted on a
+          {{object|#.DeploymentUnit}} that is to be applied against a disabled
+          {{object}}, that operation fails and the associated event will
+          contain a FaultStruct for that operation.
 
           Disabling an Execution Environment could place the device in a
           non-manageable state. For example, if the operating system itself was
@@ -84026,7 +94523,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -84167,7 +94664,9 @@
         <description>
           The amount of disk space measured in {{units}} allocated to this
           ExecEnv. A value of -1 indicates that this parameter is not
-          applicable.{{np}}This value can be altered by executing the
+          applicable.
+
+          This value can be altered by executing the
           {{command|ModifyConstraints()}} command.
         </description>
         <syntax>
@@ -84183,7 +94682,9 @@
         <description>
           The amount of physical RAM measured in {{units}} allocated to this
           ExecEnv. A value of -1 indicates that this parameter is not
-          applicable.{{np}}This value can be altered by executing the
+          applicable.
+
+          This value can be altered by executing the
           {{command|ModifyConstraints()}} command.
         </description>
         <syntax>
@@ -84200,8 +94701,9 @@
           The percentage of CPU time allocated to this ExecEnv, i.e. the
           percentage of the whole CPU (all cores) which is available to the
           parent ExecEnv (the primary firmware "owns" 100{{units}} of CPU). A
-          value of -1 indicates that this parameter is not
-          applicable.{{np}}This value can be altered by executing the
+          value of -1 indicates that this parameter is not applicable.
+
+          This value can be altered by executing the
           {{command|ModifyConstraints()}} command.
         </description>
         <syntax>
@@ -84404,6 +94906,23 @@
         </syntax>
       </parameter>
 
+      <parameter name="AvailableAccessInterfaces" access="readOnly">
+        <description>
+          Represents the network interface through which the outgoing traffic
+          from the ExecutionUnit running in this {{object}} may be allowed.
+
+          This value can be altered by executing the
+          {{command|ModifyAvailableAccessInterfaces()}}.
+        </description>
+        <syntax>
+          <list/>
+          <string>
+            <pathRef refType="strong" targetParent=".Logical.Interface."
+                targetType="row"/>
+          </string>
+        </syntax>
+      </parameter>
+
       <command name="SetRunLevel()" async="false">
         <description>
           Provides a mechanism to remotely manipulate the run level of this
@@ -84524,6 +95043,10 @@
         <description>
           Modify the roles which are available to Deployment Units installed
           into this {{object}}.
+
+          The command will fail if the new list of roles doesn't contain a
+          required role of DeploymentUnit installed previously into the
+          {{object}}.
         </description>
         <input>
 
@@ -84548,6 +95071,38 @@
         </input>
       </command>
 
+      <command name="ModifyAvailableAccessInterfaces()" async="true">
+        <description>
+          Modify the outgoing network traffic interfaces which are available to
+          Deployment Units installed into this {{object}}.
+
+          The command will fail if the new list of access interfaces doesn't
+          contain an access interface required for a DeploymentUnit installed
+          previously into the {{object}}.
+        </description>
+        <input>
+
+          <parameter name="AccessInterfaces" mandatory="true">
+            <description>
+              The new list of access interfaces which may be assigned to any
+              DeploymentUnit installed into the {{object}} this list replaces
+              the previous value of {{param|#.AvailableAccessInterfaces}}. If
+              this parameter is an empty string then no access interface may be
+              assigned to any DeploymentUnit installed into the {{object}}.
+
+              Each entry in the list is the Name of a row in
+              {{object|.Logical.Interface}}.
+            </description>
+            <syntax>
+              <list/>
+              <string>
+                <size maxLength="256"/>
+              </string>
+            </syntax>
+          </parameter>
+        </input>
+      </command>
+
       <command name="Restart()" async="true">
         <description>
           Restart this ExecEnv.
@@ -84703,9 +95258,10 @@
         minEntries="0" maxEntries="unbounded" access="readOnly" version="2.16"
         numEntriesParameter="ApplicationDataNumberOfEntries">
       <description>
-        The ApplicationData volumes which currently exist within this
-        ExecEnv.{{np}}The entries in this table are created automatically as a
-        result of calls to {{command|##.InstallDU()}} and
+        The ApplicationData volumes which currently exist within this ExecEnv.
+
+        The entries in this table are created automatically as a result of
+        calls to {{command|##.InstallDU()}} and
         {{command|##.DeploymentUnit.{i}.Update()}}, and are removed as a result
         of calls to {{command|##.DeploymentUnit.{i}.Update()}},
         {{command|##.DeploymentUnit.{i}.Uninstall()}}, and
@@ -84732,15 +95288,6 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite" dmr:previousParameter="">
-        <description>
-          {{datatype|expand}}
-        </description>
-        <syntax>
-          <dataType ref="Alias"/>
-        </syntax>
-      </parameter>
-
       <parameter name="Capacity" access="readOnly">
         <description>
           Storage capacity of the volume, in {{units}}.
@@ -84763,9 +95310,11 @@
 
       <parameter name="Retain" access="readOnly">
         <description>
-          The level of persistency of the volume.{{np}}Note that if this
-          parameter has the value {{enum|Forever}}, it is possible that there
-          is no currently installed {{object|##.DeploymentUnit}} whose
+          The level of persistency of the volume.
+
+          Note that if this parameter has the value {{enum|Forever}}, it is
+          possible that there is no currently installed
+          {{object|##.DeploymentUnit}} whose
           {{param|##.DeploymentUnit.{i}.UUID}} matches the
           {{param|ApplicationUUID}} of this {{object|#}} table entry; this
           situation will be resolved when either a matching
@@ -84810,6 +95359,15 @@
         </syntax>
       </parameter>
 
+      <parameter name="Alias" access="writeOnceReadOnly">
+        <description>
+          {{datatype|expand}}
+        </description>
+        <syntax>
+          <dataType ref="Alias"/>
+        </syntax>
+      </parameter>
+
       <parameter name="ApplicationUUID" access="readOnly">
         <description>
           The {{param|##.DeploymentUnit.{i}.UUID}} of the
@@ -84890,7 +95448,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -85126,6 +95684,18 @@
         </syntax>
       </parameter>
 
+      <parameter name="ModuleVersion" access="readOnly">
+        <description>
+          Version of the {{object}} as optionally set by the Controller during
+          {{command|#.InstallDU()}} command or {{command|Update()}}.
+        </description>
+        <syntax>
+          <string>
+            <size maxLength="32"/>
+          </string>
+        </syntax>
+      </parameter>
+
       <command name="Update()" async="true">
         <description>
           Update the associated {{object}}.
@@ -85223,8 +95793,8 @@
               such row then the command will fail, as installation requires a
               role which is not available on the Device.
 
-              If this argument is absent or empty then no roles are required in
-              order for the application to function.
+              If this argument is empty then no roles are required in order for
+              the application to function.
             </description>
             <syntax>
               <list/>
@@ -85249,9 +95819,9 @@
               will be ignored. Some Agents may apply further filtering, for
               roles which are considered security- or privacy-sensitive.
 
-              If this argument is absent or empty then no additional roles are
-              required in order for the application to be able to provide its
-              full functionality.
+              If this argument is empty then no additional roles are required
+              in order for the application to be able to provide its full
+              functionality.
             </description>
             <syntax>
               <list/>
@@ -85523,6 +96093,159 @@
               </syntax>
             </parameter>
           </object>
+
+          <object name="EnvVariable.{i}." minEntries="0"
+              maxEntries="unbounded" version="2.17">
+            <description>
+              This parameter describes the
+              {{object|###.ExecutionUnit.{i}.EnvVariable}} instances which
+              should be present after the update in any
+              {{object|###.ExecutionUnit}} created by this DeploymentUnit. This
+              table supersedes any {{object|###.ExecutionUnit.{i}.EnvVariable}}
+              instances which may have been present before the update.
+            </description>
+
+            <parameter name="Key" mandatory="true">
+              <description>
+                The Environment variable name that needs to be passed to the
+                Execution unit when the execution unit is activated.
+              </description>
+              <syntax>
+                <string>
+                  <size maxLength="2048"/>
+                </string>
+              </syntax>
+            </parameter>
+
+            <parameter name="Value" mandatory="true">
+              <description>
+                The Environment variable value associated with the name that
+                needs to be passed to the Execution unit it is activated.
+              </description>
+              <syntax>
+                <string>
+                  <size maxLength="2048"/>
+                </string>
+              </syntax>
+            </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.
+
+              When this argument is not present in the
+              {{command|.SoftwareModules.DeploymentUnit.{i}.Update()}}, the
+              network configuration remains unaltered.
+            </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
+                {{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.
+
+                When this argument is absent or {{empty}} then no outgoing
+                network access is required for the ExecutionUnit to function.
+              </description>
+              <syntax>
+                <list/>
+                <string>
+                  <size maxLength="256"/>
+                </string>
+              </syntax>
+            </parameter>
+          </object>
+
+          <object name="NetworkConfig.PortMapping.{i}." minEntries="0"
+              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.
+            </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.
+              </description>
+              <syntax>
+                <string>
+                  <size maxLength="256"/>
+                </string>
+              </syntax>
+            </parameter>
+
+            <parameter name="ExternalPort" mandatory="true">
+              <description>
+                The external port that the NAT gateway would listen on for
+                traffic to a corresponding InternalPort. Inbound packets to
+                this external port on the selected interface MUST be forwarded
+                to the IP address associated with the ExecutionUnit on the
+                InternalPort.
+              </description>
+              <syntax>
+                <unsignedInt>
+                  <range minInclusive="0" maxInclusive="65535"/>
+                </unsignedInt>
+              </syntax>
+            </parameter>
+
+            <parameter name="InternalPort" mandatory="true">
+              <description>
+                The port on ExecutionUnit that the gateway MUST forward traffic
+                to.
+              </description>
+              <syntax>
+                <unsignedInt>
+                  <range minInclusive="0" maxInclusive="65535"/>
+                </unsignedInt>
+              </syntax>
+            </parameter>
+
+            <parameter name="Protocol" mandatory="true">
+              <description>
+                The protocol of the port mapping.
+              </description>
+              <syntax>
+                <string>
+                  <enumeration value="TCP"/>
+                  <enumeration value="UDP"/>
+                </string>
+              </syntax>
+            </parameter>
+          </object>
         </input>
       </command>
 
@@ -85606,7 +96329,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -85883,10 +96606,11 @@
         <description>
           Represents the instances of multi-instanced objects that are directly
           controlled by, and have come into existence because of, this
-          {{object}}.{{np}}NOTE: All other objects and parameters (i.e. not
-          multi-instanced objects) that this {{object}} has caused to come into
-          existence can be discovered via the GetSupportedDM and GetInstances
-          USP messages.
+          {{object}}.
+
+          NOTE: All other objects and parameters (i.e. not multi-instanced
+          objects) that this {{object}} has caused to come into existence can
+          be discovered via the GetSupportedDM and GetInstances USP messages.
         </description>
         <syntax>
           <list/>
@@ -85995,6 +96719,15 @@
         </syntax>
       </parameter>
 
+      <parameter name="EnvVariableNumberOfEntries" access="readOnly">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
       <command name="SetRequestedState()" async="false">
         <description>
           Set the state transition that the Controller is requesting for this
@@ -86071,8 +96804,7 @@
     <object name="Device.SoftwareModules.ExecutionUnit.{i}.AutoRestart."
         access="readOnly" minEntries="1" maxEntries="1" version="2.16">
       <description>
-        Configures the parameters of the auto-restart algorithm for this
-        {{object|#}}.
+        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
@@ -86098,7 +96830,7 @@
 
       <parameter name="Enable" access="readWrite">
         <description>
-          Enable the auto-restart feature for this {{object|#}}.
+          Enable the auto-restart feature for this EU.
         </description>
         <syntax>
           <boolean/>
@@ -86154,10 +96886,10 @@
 
       <parameter name="ResetPeriod" access="readWrite">
         <description>
-          If the {{object|#}} runs for this number of {{units}} without
-          terminating abnormally the Agent MAY reset the {{param|RetryCount}}
-          to zero, thereby resetting the exponential backoff algorithm. A value
-          of zero disables this behavior.
+          If the EU runs for this number of {{units}} without terminating
+          abnormally the Agent MAY reset the {{param|RetryCount}} to zero,
+          thereby resetting the exponential backoff algorithm. A value of zero
+          disables this behavior.
         </description>
         <syntax>
           <unsignedInt>
@@ -86168,11 +96900,12 @@
 
       <parameter name="RetryCount" access="readWrite">
         <description>
-          The number of restart attempts which have been initiated so far.
-          Resetting this parameter to zero has the effect of re-initialising
-          the exponential back-off algorithm.{{np}}Invoking the
-          {{command|#.Restart()}} command also has the effect of resetting this
-          parameter to zero.
+          The number times the EU has terminated abnormally and a restart has
+          been attempted. Resetting this parameter to zero has the effect of
+          re-initialising the exponential back-off algorithm.
+
+          Invoking the {{command|#.Restart()}} command also has the effect of
+          resetting this parameter to zero.
         </description>
         <syntax>
           <unsignedInt/>
@@ -86201,6 +96934,43 @@
       </parameter>
     </object>
 
+    <object name="Device.SoftwareModules.ExecutionUnit.{i}.NetworkConfig."
+        access="readOnly" version="2.17">
+      <description>
+        Parameters of the network configuration for this ExecutionUnit.
+
+        When no network configuration is provided, the EU will not have any
+        network access.
+      </description>
+
+      <parameter name="AccessInterfaceRefList" access="readOnly">
+        <description>
+          Represents the network interface through which the traffic from the
+          EU will be allowed.
+        </description>
+        <syntax>
+          <list/>
+          <string>
+            <pathRef refType="strong" targetParent=".Logical.Interface."
+                targetType="row"/>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="PortMappingRefList" access="readOnly">
+        <description>
+          Represents the list of Port mappings associated with this EU.
+        </description>
+        <syntax>
+          <list/>
+          <string>
+            <pathRef refType="strong" targetParent=".NAT.PortMapping."
+                targetType="row"/>
+          </string>
+        </syntax>
+      </parameter>
+    </object>
+
     <object name="Device.SoftwareModules.ExecutionUnit.{i}.HostObject.{i}."
         minEntries="0" maxEntries="unbounded" version="2.16" access="readOnly"
         numEntriesParameter="HostObjectNumberOfEntries">
@@ -86230,15 +97000,6 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite" dmr:previousParameter="">
-        <description>
-          {{datatype|expand}}
-        </description>
-        <syntax>
-          <dataType ref="Alias"/>
-        </syntax>
-      </parameter>
-
       <parameter name="Destination" access="readOnly">
         <description>
           The object identifier by which the object may be accessed by the
@@ -86263,6 +97024,63 @@
           </string>
         </syntax>
       </parameter>
+
+      <parameter name="Alias" access="writeOnceReadOnly">
+        <description>
+          {{datatype|expand}}
+        </description>
+        <syntax>
+          <dataType ref="Alias"/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object name="Device.SoftwareModules.ExecutionUnit.{i}.EnvVariable.{i}."
+        minEntries="0" maxEntries="unbounded" version="2.17" access="readOnly"
+        numEntriesParameter="EnvVariableNumberOfEntries">
+      <description>
+        This parameter describes the environment variables which are accessible
+        to the ExecutionUnit.
+      </description>
+      <uniqueKey functional="false">
+        <parameter ref="Alias"/>
+      </uniqueKey>
+      <uniqueKey functional="true">
+        <parameter ref="Key"/>
+      </uniqueKey>
+
+      <parameter name="Key" access="readOnly">
+        <description>
+          The Environment variable name that needs to be passed to the
+          Execution unit when the execution unit is activated.
+        </description>
+        <syntax>
+          <string>
+            <size maxLength="2048"/>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="Value" access="readOnly">
+        <description>
+          The Environment variable value associated with the name that needs to
+          be passed to the Execution unit it is activated.
+        </description>
+        <syntax>
+          <string>
+            <size maxLength="2048"/>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="Alias" access="writeOnceReadOnly">
+        <description>
+          {{datatype|expand}}
+        </description>
+        <syntax>
+          <dataType ref="Alias"/>
+        </syntax>
+      </parameter>
     </object>
 
     <object name="Device.SoftwareModules.ExecutionUnit.{i}.Extensions."
@@ -86272,12 +97090,13 @@
         to this Execution Unit, which allows multiple Execution Units to expose
         parameters without the concern of conflicting parameter names. These
         vendor extensions are related to displaying status and maintaining
-        configuration for this Execution Unit.{{np}}It is also possible for the
-        Execution Unit to expose status and configuration parameters within
-        Service objects or as embedded objects and parameters directly within
-        the root data model, in which case the combination of
-        {{param|#.References}} and use of GetSupportDM and GetInstances USP
-        messages will be used to determine their locations.
+        configuration for this Execution Unit.
+
+        It is also possible for the Execution Unit to expose status and
+        configuration parameters within Service objects or as embedded objects
+        and parameters directly within the root data model, in which case the
+        combination of {{param|#.References}} and use of GetSupportDM and
+        GetInstances USP messages will be used to determine their locations.
       </description>
     </object>
 
@@ -86377,7 +97196,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -86706,7 +97525,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -88002,7 +98821,7 @@
 
       <parameter name="AssocWiFiNetworkDeviceRef" access="readOnly">
         <description>
-          {{reference||deprecated}}{{param}} is a reference to a MultiAP.Device
+          {{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
@@ -89005,7 +99824,7 @@
         <parameter ref="Name"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -89113,14 +99932,15 @@
         </syntax>
       </parameter>
 
-      <parameter name="EnableEncryption" access="readWrite"
-          status="deprecated">
+      <parameter name="EnableEncryption" access="readWrite" status="obsoleted">
         <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>
         <syntax>
           <boolean/>
@@ -89713,7 +100533,7 @@
         <parameter ref="Topic"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -89816,7 +100636,7 @@
         <parameter ref="Name"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -90070,7 +100890,7 @@
         <parameter ref="Name"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -90198,7 +101018,7 @@
         <parameter ref="Name"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -90569,7 +101389,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -90665,7 +101485,7 @@
         <parameter ref="Direction"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -91095,7 +101915,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -91305,7 +102125,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -91465,7 +102285,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -91616,7 +102436,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -91773,7 +102593,7 @@
         <parameter ref="MeasurementAgent"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -92000,7 +102820,7 @@
         <parameter ref="Identifier"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -92394,7 +103214,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -92507,8 +103327,8 @@
           <string>
             <enumeration value="Sequential">
               <description>
-                 Actions are executed in sequence as defined by the value of
-                 the {{param|Action.{i}.Order}} parameter.
+                Actions are executed in sequence as defined by the value of the
+                {{param|Action.{i}.Order}} parameter.
 
                 The first Scheduled Action of the DestinationOutput is provided
                 the input.
@@ -92644,7 +103464,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -92897,7 +103717,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -92969,7 +103789,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -93045,7 +103865,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -93104,7 +103924,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -93181,7 +104001,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -93286,7 +104106,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -93392,7 +104212,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -93917,7 +104737,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -94363,7 +105183,7 @@
         <parameter ref="Name"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -94577,7 +105397,7 @@
         <parameter ref="Precedence"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -94626,7 +105446,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -94687,7 +105507,7 @@
         <parameter ref="Precedence"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -94837,7 +105657,7 @@
         <parameter ref="SessionID"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -95168,7 +105988,7 @@
         <parameter ref="Identifier"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -95256,7 +106076,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -95333,7 +106153,7 @@
         <parameter ref="QFI"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -95481,7 +106301,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -95836,7 +106656,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -96352,7 +107172,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -96744,7 +107564,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -97087,6 +107907,92 @@
       </parameter>
     </object>
 
+    <object name="Device.XPON.ONU.{i}.ANI.{i}.TC.Authentication."
+        access="readOnly" version="2.17">
+      <description>
+        This object shows info related to authentication of the ONU to the OLT.
+      </description>
+
+      <parameter name="Password" access="readWrite">
+        <description>
+          All ITU based PON standards specify authentication by PLOAM password
+          or registration ID.
+
+          See:
+
+          * {{bibref|G.9807.1|Section C.15.2.1}}
+
+          * {{bibref|G.984.3|Section VI.2}}
+
+          * {{bibref|G.987.3|Section 15.2.1}}
+
+          * {{bibref|G.989.3|Section 15.2.1}}
+
+          All those standards mention that a method to enter the password is
+          beyond their scope. This parameter and the parameter
+          {{param|HexadecimalPassword}} standardize a method to enter the
+          password.
+
+          In case of G-PON as PON mode, the password can be up to 10 bytes
+          long. See {{bibref|G.984.3|Section 9.2.4.2}}. For the other PON
+          modes, the password can be up to 36 bytes long. See:
+
+          * {{bibref|G.9807.1|Section C.11.3.4.2}}
+
+          * {{bibref|G.987.3|Section 11.3.4.2}}
+
+          * {{bibref|G.989.3|Section 11.3.4.2}}
+
+          If {{param|HexadecimalPassword}} is {{false}}, the password is in
+          ASCII format. Then all 95 printable characters with decimal codes in
+          the range 32 to 126 inclusive are allowed. Each character corresponds
+          with 1 byte in the password.
+
+          If {{param|HexadecimalPassword}} is {{true}}, the password is in
+          hexadecimal format. Then only the characters 0 to 9, a to f, and A to
+          F are allowed. Each character corresponds with 1 nibble in the
+          password.
+
+          Depending on the value of {{param|HexadecimalPassword}} and the PON
+          mode, a different number of characters are applicable. If
+          {{param|HexadecimalPassword}} is {{false}}:
+
+          * In case of G-PON as PON mode, only the 1st 10 characters are
+            applicable.
+
+          * In case of another PON mode, only the 1st 36 characters are
+            applicable.
+
+          If {{param|HexadecimalPassword}} is {{true}}:
+
+          * In case of G-PON as PON mode, the 1st 20 characters are all
+            relevant. The other characters are not applicable.
+
+          * In case of another PON mode, all 72 characters are relevant.
+
+          This parameter is set to {{empty}} if no authentication via a
+          password is required.
+        </description>
+        <syntax secured="true">
+          <string>
+            <size maxLength="72"/>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="HexadecimalPassword" access="readWrite">
+        <description>
+          If {{false}}, {{param|Password}} is in ASCII format. If {{true}},
+          {{param|Password}} is in hexadecimal format.
+
+          See {{param|Password}} for more info.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+    </object>
+
     <object name="Device.XPON.ONU.{i}.ANI.{i}.TC.PM." access="readOnly"
         minEntries="1" maxEntries="1" version="2.16">
       <description>
@@ -98079,7 +108985,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -98240,7 +109146,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="AutoDisableDuration" access="readOnly">
+      <parameter name="AutoDisableDuration" access="readWrite">
         <description>
           The SSH server instance will be disabled when the the {{param}}
           elapses, and configuration must be done in {{units}}. At the end, the
@@ -98287,7 +109193,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -98345,7 +109251,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -98409,7 +109315,7 @@
         <parameter ref="Path"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -98483,10 +109389,11 @@
         </syntax>
       </parameter>
 
-      <parameter name="Protocol" access="readWrite">
+      <parameter name="Protocol" access="readOnly">
         <description>
-          The Message Transport Protocol (MTP) to be used for communications by
-          a USP Endpoint.
+          The Message Transfer Protocol (MTP) to be used for communications by
+          a USP Endpoint. Note: This parameter was demoted to readOnly in the
+          Device:2.17 version.
         </description>
         <syntax>
           <string>
@@ -98547,6 +109454,862 @@
       </parameter>
     </object>
 
+    <object name="Device.Syslog." access="readOnly" version="2.17">
+      <description>
+        This object contains global parameters relating to the syslog
+        implementations that is active in the Device. Based on
+        {{bibref|YANGSYSLOG|A YANG Data Model for Syslog Configuration}}.
+      </description>
+
+      <parameter name="Enable" access="readWrite">
+        <description>
+          Enables or disables the Syslog service.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Status" access="readOnly">
+        <description>
+          Indicates the syslog service operational state.
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="Disabled">
+              <description>
+                Indicates that the Syslog service is disabled.
+              </description>
+            </enumeration>
+            <enumeration value="Enabled">
+              <description>
+                Indicates that the Syslog service is enabled.
+              </description>
+            </enumeration>
+            <enumeration value="Error" optional="true">
+              <description>
+                Indicates that the Syslog service has encountered an error.
+              </description>
+            </enumeration>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="FilterNumberOfEntries" access="readOnly">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="SourceNumberOfEntries" access="readOnly">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="TemplateNumberOfEntries" access="readOnly">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+
+      <parameter name="ActionNumberOfEntries" access="readOnly">
+        <description>
+          {{numentries}}
+        </description>
+        <syntax>
+          <unsignedInt/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object name="Device.Syslog.Filter.{i}." access="readWrite"
+        numEntriesParameter="FilterNumberOfEntries" minEntries="0"
+        maxEntries="unbounded" version="2.17">
+      <description>
+        This table defines the processing used to select log messages by
+        comparing syslog message with the provided rules.
+
+        A rule can consist either of {{param|FacilityLevel}} -
+        {{param|Severity}} and or {{param|PatternMatch}}.
+      </description>
+      <uniqueKey functional="false">
+        <parameter ref="Alias"/>
+      </uniqueKey>
+
+      <parameter name="Alias" access="writeOnceReadOnly">
+        <description>
+          {{datatype|expand}}
+        </description>
+        <syntax>
+          <dataType ref="Alias"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="FacilityLevel" access="readWrite">
+        <description>
+          Only the log messages with following Facility levels must be logged.
+        </description>
+        <syntax>
+          <list/>
+          <string>
+            <enumeration value="Kern">
+              <description>Kernel messages (0).</description>
+            </enumeration>
+            <enumeration value="User">
+              <description>User-level messages (1).</description>
+            </enumeration>
+            <enumeration value="Mail">
+              <description>Mail system messages (2).</description>
+            </enumeration>
+            <enumeration value="Daemon">
+              <description>System daemons messages (3).</description>
+            </enumeration>
+            <enumeration value="Auth">
+              <description>Security/authorization messages (4).</description>
+            </enumeration>
+            <enumeration value="Syslog">
+              <description>
+                Messages generated internally by syslogd (5).
+              </description>
+            </enumeration>
+            <enumeration value="LPR">
+              <description>Line printer subsystem messages (6).</description>
+            </enumeration>
+            <enumeration value="News">
+              <description>Network news subsystem (7).</description>
+            </enumeration>
+            <enumeration value="UUCP">
+              <description>UUCP subsystem messages (8).</description>
+            </enumeration>
+            <enumeration value="Cron">
+              <description>Clock daemon messages (9).</description>
+            </enumeration>
+            <enumeration value="AuthPriv">
+              <description>Security/authorization messages (10).</description>
+            </enumeration>
+            <enumeration value="FTP">
+              <description>FTP daemon messages (11).</description>
+            </enumeration>
+            <enumeration value="NTP">
+              <description>NTP subsystem messages (12).</description>
+            </enumeration>
+            <enumeration value="Audit">
+              <description>Log audit messages (13).</description>
+            </enumeration>
+            <enumeration value="Console">
+              <description>Log alert messages (14).</description>
+            </enumeration>
+            <enumeration value="Cron2">
+              <description>Second clock daemon messages (15).</description>
+            </enumeration>
+            <enumeration value="Local0">
+              <description>Local use 0 messages (16).</description>
+            </enumeration>
+            <enumeration value="Local1">
+              <description>Local use 1 messages (17).</description>
+            </enumeration>
+            <enumeration value="Local2">
+              <description>local use 2 messages (18).</description>
+            </enumeration>
+            <enumeration value="Local3">
+              <description>local use 3 messages (19).</description>
+            </enumeration>
+            <enumeration value="Local4">
+              <description>local use 4 messages (20).</description>
+            </enumeration>
+            <enumeration value="Local5">
+              <description>local use 5 messages (21).</description>
+            </enumeration>
+            <enumeration value="Local6">
+              <description>local use 6 messages (22).</description>
+            </enumeration>
+            <enumeration value="Local7">
+              <description>local use 7 messages (23).</description>
+            </enumeration>
+            <enumeration value="All">
+              <description>All facilities are selected.</description>
+            </enumeration>
+          </string>
+          <default type="object" value="All"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Severity" access="readWrite">
+        <description>
+          Specifies the Severity level filter rules.
+
+          Defines the processing used to select log messages by comparing
+          syslog message severity using the following processing rules: - if
+          'none', do not match. - if 'all', match. - else compare message
+          severity with the specified severity according to the default compare
+          rule (all messages of the specified severity and greater match).
+
+          This must be used inconjuction with {{param|SeverityCompare}} and
+          {{param|SeverityCompareAction}}.
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="Emergency">
+              <description>Indicates that the system is unusable.</description>
+            </enumeration>
+            <enumeration value="Alert">
+              <description>
+                Indicating that an action must be taken immediately.
+              </description>
+            </enumeration>
+            <enumeration value="Critical">
+              <description>Indicates a critical condition.</description>
+            </enumeration>
+            <enumeration value="Error">
+              <description>Indicates a errors condition.</description>
+            </enumeration>
+            <enumeration value="Warning">
+              <description>Indicates a warning condition.</description>
+            </enumeration>
+            <enumeration value="Notice">
+              <description>Indicates a informational message.</description>
+            </enumeration>
+            <enumeration value="Debug">
+              <description>Indicates a debug-level message.</description>
+            </enumeration>
+            <enumeration value="All">
+              <description>All severities are selected.</description>
+            </enumeration>
+            <enumeration value="None">
+              <description>No filtering will be applied.</description>
+            </enumeration>
+          </string>
+          <default type="object" value="All"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="SeverityCompare" access="readWrite">
+        <description>
+          Describes the comparison method that must be applied when a syslog
+          message is received. Not applicable when severity
+          {{enum|All|Severity}} and {{enum|None|Severity}} is configured.
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="Equal">
+              <description>
+                Specifies that the severity comparison operation will be
+                equals.
+              </description>
+            </enumeration>
+            <enumeration value="EqualOrHigher">
+              <description>
+                Specifies that the severity comparison operation will be equals
+                or higher."
+              </description>
+            </enumeration>
+          </string>
+          <default type="object" value="EqualOrHigher"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="SeverityCompareAction" access="readWrite">
+        <description>
+          Specifies the process of handling a syslog message based on specified
+          conditions. It defines the action that will be taken when the
+          criteria of both {{param|Severity}} and {{param|SeverityCompare}} are
+          met, determining the response to the syslog message.
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="Log">
+              <description>
+                When the selected comparison is true the syslog message will be
+                logged.
+              </description>
+            </enumeration>
+            <enumeration value="Block">
+              <description>
+                When the selected comparison is true the syslog message will
+                not be logged.
+              </description>
+            </enumeration>
+            <enumeration value="Stop">
+              <description>
+                When the select comparison is true the syslog message will not
+                be logged and no further processing will occur."
+              </description>
+            </enumeration>
+          </string>
+          <default type="object" value="Log"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="PatternMatch" access="readWrite">
+        <description>
+          Regular expression pattern designed to match a syslog message that
+          must be logged. The format is implementation specific.
+        </description>
+        <syntax>
+          <string/>
+          <default type="object" value=""/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object name="Device.Syslog.Source.{i}." access="readWrite"
+        numEntriesParameter="SourceNumberOfEntries" minEntries="0"
+        maxEntries="unbounded" version="2.17">
+      <description>
+        This table describes where and how the syslog service receives log
+        messages.
+      </description>
+      <uniqueKey functional="false">
+        <parameter ref="Alias"/>
+      </uniqueKey>
+
+      <parameter name="Alias" access="writeOnceReadOnly">
+        <description>
+          {{datatype|expand}}
+        </description>
+        <syntax>
+          <dataType ref="Alias"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="KernelMessages" access="readWrite">
+        <description>
+          This option enables the collection of kernel log messages that are
+          specific to the Device.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="object" value="true"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="SystemMessages" access="readWrite">
+        <description>
+          This option enables the collection of the system log messages that
+          are specific to the Device.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="object" value="true"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Severity" access="readWrite">
+        <description>
+          Specifies the default Severity. When an incoming message lacks a
+          valid syslog header, this parameter can be used to configure the
+          required Severity level.
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="Emergency">
+              <description>Indicates that the system is unusable.</description>
+            </enumeration>
+            <enumeration value="Alert">
+              <description>
+                Indicating that an action must be taken immediately.
+              </description>
+            </enumeration>
+            <enumeration value="Critical">
+              <description>Indicates a critical condition.</description>
+            </enumeration>
+            <enumeration value="Error">
+              <description>Indicates a errors condition.</description>
+            </enumeration>
+            <enumeration value="Warning">
+              <description>Indicates a warning condition.</description>
+            </enumeration>
+            <enumeration value="Notice">
+              <description>Indicates a informational message.</description>
+            </enumeration>
+            <enumeration value="Debug">
+              <description>Indicates a debug-level message.</description>
+            </enumeration>
+            <enumeration value="All">
+              <description>All severities are selected.</description>
+            </enumeration>
+            <enumeration value="None">
+              <description>No filtering will be applied.</description>
+            </enumeration>
+          </string>
+          <default type="object" value="All"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="FacilityLevel" access="readWrite">
+        <description>
+          Specifies the default Facility Level. When an incoming message lacks
+          a valid syslog header, this parameter can be used to configure the
+          required Facility level.
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="Kern">
+              <description>Kernel messages (0).</description>
+            </enumeration>
+            <enumeration value="User">
+              <description>User-level messages (1).</description>
+            </enumeration>
+            <enumeration value="Mail">
+              <description>Mail system messages (2).</description>
+            </enumeration>
+            <enumeration value="Daemon">
+              <description>System daemons messages (3).</description>
+            </enumeration>
+            <enumeration value="Auth">
+              <description>Security/authorization messages (4).</description>
+            </enumeration>
+            <enumeration value="Syslog">
+              <description>
+                Messages generated internally by syslogd (5).
+              </description>
+            </enumeration>
+            <enumeration value="LPR">
+              <description>Line printer subsystem messages (6).</description>
+            </enumeration>
+            <enumeration value="News">
+              <description>Network news subsystem (7).</description>
+            </enumeration>
+            <enumeration value="UUCP">
+              <description>UUCP subsystem messages (8).</description>
+            </enumeration>
+            <enumeration value="Cron">
+              <description>Clock daemon messages (9).</description>
+            </enumeration>
+            <enumeration value="AuthPriv">
+              <description>Security/authorization messages (10).</description>
+            </enumeration>
+            <enumeration value="FTP">
+              <description>FTP daemon messages (11).</description>
+            </enumeration>
+            <enumeration value="NTP">
+              <description>NTP subsystem messages (12).</description>
+            </enumeration>
+            <enumeration value="Audit">
+              <description>Log audit messages (13).</description>
+            </enumeration>
+            <enumeration value="Console">
+              <description>Log alert messages (14).</description>
+            </enumeration>
+            <enumeration value="Cron2">
+              <description>Second clock daemon messages (15).</description>
+            </enumeration>
+            <enumeration value="Local0">
+              <description>Local use 0 messages (16).</description>
+            </enumeration>
+            <enumeration value="Local1">
+              <description>Local use 1 messages (17).</description>
+            </enumeration>
+            <enumeration value="Local2">
+              <description>local use 2 messages (18).</description>
+            </enumeration>
+            <enumeration value="Local3">
+              <description>local use 3 messages (19).</description>
+            </enumeration>
+            <enumeration value="Local4">
+              <description>local use 4 messages (20).</description>
+            </enumeration>
+            <enumeration value="Local5">
+              <description>local use 5 messages (21).</description>
+            </enumeration>
+            <enumeration value="Local6">
+              <description>local use 6 messages (22).</description>
+            </enumeration>
+            <enumeration value="Local7">
+              <description>local use 7 messages (23).</description>
+            </enumeration>
+            <enumeration value="All">
+              <description>All facilities are selected.</description>
+            </enumeration>
+          </string>
+          <default type="object" value="All"/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object name="Device.Syslog.Source.{i}.Network." access="readOnly"
+        version="2.17">
+      <description>
+        This object describes the configuration parameters for receiving syslog
+        information on a network socket.
+      </description>
+
+      <parameter name="Enable" access="readWrite">
+        <description>
+          Enables or disables the functionality to receive syslog information
+          on a network socket.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Interface" access="readWrite">
+        <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>
+        <syntax>
+          <string>
+            <size maxLength="256"/>
+            <pathRef refType="strong" targetType="row"/>
+          </string>
+          <default type="object" value=""/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Port" access="readWrite">
+        <description>
+          Specifies the port number on which the syslog information will be
+          received.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range minInclusive="1" maxInclusive="65535"/>
+          </unsignedInt>
+          <default type="object" value="1099"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Protocol" access="readWrite">
+        <description>
+          The protocol to be used for receiving syslog information.
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="TCP">
+              <description>
+                {{bibref|RFC6587|Transmission of Syslog Messages over TCP}}.
+              </description>
+            </enumeration>
+            <enumeration value="UDP">
+              <description>
+                {{bibref|RFC5426|Transmission of Syslog Messages over UDP}}.
+              </description>
+            </enumeration>
+            <enumeration value="TLS">
+              <description>
+                {{bibref|RFC5425|Transport Layer Security (TLS) Transport
+                Mapping for Syslog}}.
+              </description>
+            </enumeration>
+          </string>
+          <default type="object" value="UDP"/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object name="Device.Syslog.Template.{i}." access="readWrite"
+        numEntriesParameter="TemplateNumberOfEntries" minEntries="0"
+        maxEntries="unbounded" version="2.17">
+      <description>
+        This table the describes the templates that can be referenced by
+        objects that can use the template syntax. With templates, you have the
+        flexibility to establish uniform message formats or even define
+        standard filenames for different objects.
+      </description>
+      <uniqueKey functional="false">
+        <parameter ref="Alias"/>
+      </uniqueKey>
+
+      <parameter name="Alias" access="writeOnceReadOnly">
+        <description>
+          {{datatype|expand}}
+        </description>
+        <syntax>
+          <dataType ref="Alias"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Expression" access="readWrite">
+        <description>
+          Describes the template syntax used for transforming the syslog
+          message. The format is implementation specific and can consist of
+          strings, macros, and template functions.
+        </description>
+        <syntax>
+          <string/>
+          <default type="object" value=""/>
+        </syntax>
+      </parameter>
+
+      <parameter name="EscapeMessage" access="readWrite">
+        <description>
+          Enabling this option will cause the following characters to be
+          escaped ', " and \. in the syslog message.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="object" value="false"/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object name="Device.Syslog.Action.{i}." access="readWrite"
+        numEntriesParameter="ActionNumberOfEntries" minEntries="0"
+        maxEntries="unbounded" version="2.17">
+      <description>
+        This object describes the log action parameters for syslog.
+      </description>
+      <uniqueKey functional="false">
+        <parameter ref="Alias"/>
+      </uniqueKey>
+
+      <parameter name="Alias" access="writeOnceReadOnly">
+        <description>
+          {{datatype|expand}}
+        </description>
+        <syntax>
+          <dataType ref="Alias"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="SourceRef" access="readWrite">
+        <description>
+          Mandatory parameter. Specifies one or multiple sources from where the
+          log messages originate.
+        </description>
+        <syntax>
+          <list/>
+          <string>
+            <size maxLength="256"/>
+            <pathRef refType="strong" targetParent="#.Source."
+                targetType="row"/>
+          </string>
+          <default type="object" value=""/>
+        </syntax>
+      </parameter>
+
+      <parameter name="FilterRef" access="readWrite">
+        <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.
+        </description>
+        <syntax>
+          <list/>
+          <string>
+            <size maxLength="256"/>
+            <pathRef refType="strong" targetParent="#.Filter."
+                targetType="row"/>
+          </string>
+          <default type="object" value=""/>
+        </syntax>
+      </parameter>
+
+      <parameter name="TemplateRef" access="readWrite">
+        <description>
+          The Template associated with the {{object}} entry.
+
+          When no Template is specified the log message will not be altered by
+          the template system.
+        </description>
+        <syntax>
+          <string>
+            <size maxLength="256"/>
+            <pathRef refType="strong" targetParent="#.Template."
+                targetType="row"/>
+          </string>
+          <default type="object" value=""/>
+        </syntax>
+      </parameter>
+
+      <parameter name="StructuredData" access="readWrite">
+        <description>
+          This feature represents the ability to log messages in
+          structured-data format. Reference {{bibref|RFC5424|The Syslog
+          Protocol}}.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="object" value="false"/>
+        </syntax>
+      </parameter>
+
+      <event name="LogEvent!">
+        <description>
+          Syslog event
+        </description>
+
+        <parameter name="LogLine">
+          <description>
+            Contains the complete syslog message.
+          </description>
+          <syntax>
+            <string/>
+          </syntax>
+        </parameter>
+      </event>
+    </object>
+
+    <object name="Device.Syslog.Action.{i}.LogFile." access="readOnly"
+        version="2.17">
+      <description>
+        This object describes the configuration parameters for file logging. If
+        file-archive limits are not supplied, it is assumed that the local
+        implementation defined limits will be used.
+      </description>
+
+      <parameter name="Enable" access="readWrite">
+        <description>
+          Enables or disables the LogFile functionality.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="VendorLogFileRef" access="readOnly">
+        <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">
+        <description>
+          Destination path and filename of where to create and keep the
+          logfiles. Which MUST use the uri scheme file {{bibref|RFC8089|The
+          file URI Scheme}}.
+        </description>
+        <syntax>
+          <string/>
+        </syntax>
+      </parameter>
+    </object>
+
+    <object name="Device.Syslog.Action.{i}.LogRemote." access="readOnly"
+        version="2.17">
+      <description>
+        This object describes the configuration parameters for forwarding
+        syslog messages to remote relays or collectors.
+      </description>
+
+      <parameter name="Enable" access="readWrite">
+        <description>
+          Enables or disables the LogRemote functionality.
+        </description>
+        <syntax>
+          <boolean/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Address" access="readWrite">
+        <description>
+          Host name or IP address of the remote server.
+        </description>
+        <syntax>
+          <string/>
+          <default type="object" value=""/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Protocol" access="readOnly">
+        <description>
+          Protocol to be used to deliver the syslog messages to the remote
+          server.
+        </description>
+        <syntax>
+          <string>
+            <enumeration value="TCP">
+              <description>
+                {{bibref|RFC6587|Transmission of Syslog Messages over TCP}}.
+              </description>
+            </enumeration>
+            <enumeration value="UDP">
+              <description>
+                {{bibref|RFC5426|Transmission of Syslog Messages over UDP}}.
+              </description>
+            </enumeration>
+            <enumeration value="TLS">
+              <description>
+                {{bibref|RFC5425|Transport Layer Security (TLS) Transport
+                Mapping for Syslog}}.
+              </description>
+            </enumeration>
+          </string>
+        </syntax>
+      </parameter>
+
+      <parameter name="Port" access="readWrite">
+        <description>
+          Port number of the remote server.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <range minInclusive="1" maxInclusive="65535"/>
+          </unsignedInt>
+          <default type="object" value="514"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="Certificate" access="readWrite">
+        <description>
+          Certificate that must be used by the syslog service.
+        </description>
+        <syntax>
+          <string>
+            <pathRef refType="strong" targetParent=".Security.Certificate."
+                targetType="row"/>
+          </string>
+          <default type="object" value=""/>
+        </syntax>
+      </parameter>
+
+      <parameter name="PeerVerify" access="readWrite">
+        <description>
+          Ensures authentic and secure connections by validating entity
+          credentials such as certificates or tokens. Only applicable when
+          {{enum|TLS|Protocol}}
+
+          In order to validate a certificate, the entire certificate chain,
+          including the CA certificate, must be valid. If any certificate in
+          the chain is found to be invalid, the syslog service must reject the
+          connection.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="object" value="false"/>
+        </syntax>
+      </parameter>
+    </object>
+
     <object name="Device.LocalAgent." access="readOnly" minEntries="1"
         maxEntries="1" version="2.12">
       <description>
@@ -98613,12 +110376,14 @@
         <syntax>
           <list minItems="1"/>
           <string>
-            <enumeration value="CoAP" status="deprecated">
+            <enumeration value="CoAP" status="obsoleted">
               <description>
                 See {{bibref|RFC7252}}.
 
                 {{deprecated|2.15|because the CoAP MTP was deprecated in USP
                 1.2}}
+
+                {{obsoleted|2.17}}
               </description>
             </enumeration>
             <enumeration value="WebSocket">
@@ -98641,7 +110406,7 @@
 
       <parameter name="SupportedFingerprintAlgorithms" access="readOnly">
         <description>
-          {{list|each entry is an algorithm for calculating firgerprints that
+          {{list|each entry is an algorithm for calculating fingerprints that
           is supported by the Agent}}
         </description>
         <syntax>
@@ -98921,6 +110686,53 @@
             <default type="parameter" value=""/>
           </syntax>
         </parameter>
+
+        <parameter name="CheckSumAlgorithm">
+          <description>
+            The hash algorithm that was used to generate the checksum for the
+            transferred file.
+          </description>
+          <syntax>
+            <string>
+              <enumeration value="SHA-1">
+                <description>As specified in {{bibref|RFC3174}}.</description>
+              </enumeration>
+              <enumeration value="SHA-224">
+                <description>As specified in {{bibref|RFC6234}}.</description>
+              </enumeration>
+              <enumeration value="SHA-256">
+                <description>As specified in {{bibref|RFC6234}}.</description>
+              </enumeration>
+              <enumeration value="SHA-384">
+                <description>As specified in {{bibref|RFC6234}}.</description>
+              </enumeration>
+              <enumeration value="SHA-512">
+                <description>As specified in {{bibref|RFC6234}}.</description>
+              </enumeration>
+              <enumeration value="Unknown">
+                <description>
+                  There was no algorithm specified for the transferred file.
+                </description>
+              </enumeration>
+            </string>
+          </syntax>
+        </parameter>
+
+        <parameter name="CheckSum">
+          <description>
+            The hash value that was used for the transferred file. This hash
+            value was generated using transferred file content and the
+            {{param|CheckSumAlgorithm}}.
+
+            If the argument is {{empty}}, not present, or the
+            {{param|CheckSumAlgorithm}} is {{enum|Unknown|CheckSumAlgorithm}},
+            then the Controller can assume that the checksum is not applicable
+            or was not generated for this transfer.
+          </description>
+          <syntax>
+            <hexBinary/>
+          </syntax>
+        </parameter>
       </event>
 
       <command name="AddCertificate()" async="false">
@@ -99023,7 +110835,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -99070,7 +110882,7 @@
 
       <parameter name="Protocol" access="readWrite">
         <description>
-          The Message Transport Protocol (MTP) to be used for communications by
+          The Message Transfer Protocol (MTP) to be used for communications by
           a USP Endpoint.
         </description>
         <syntax>
@@ -99096,7 +110908,7 @@
           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.AdvertisedInterfaces}} parameter.
+          {{param|.DNS.SD.Advertise.{i}.Interface}} parameter.
         </description>
         <syntax>
           <boolean/>
@@ -99107,12 +110919,14 @@
 
     <object name="Device.LocalAgent.MTP.{i}.CoAP." access="readOnly"
         minEntries="0" maxEntries="1" discriminatorParameter="Protocol"
-        status="deprecated" version="2.12">
+        status="obsoleted" version="2.12">
       <description>
-        If the USP Endpoint uses the CoAP Message Transport Protocol (MTP),
-        then this object contains CoAP specific configuration parameters.
+        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>
 
       <parameter name="Interfaces" access="readWrite">
@@ -99153,7 +110967,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="IsEncrypted" status="obsoleted" access="readOnly">
+      <parameter name="IsEncrypted" status="deleted" access="readOnly">
         <description>
           This parameter represents whether or not communications that utilize
           this {{object}} object instance are encrypted.
@@ -99163,6 +110977,8 @@
           or are not encrypted}}
 
           {{obsoleted|2.16}}
+
+          {{deleted|2.17}}
         </description>
         <syntax>
           <boolean/>
@@ -99184,7 +111000,7 @@
         minEntries="0" maxEntries="1" discriminatorParameter="Protocol"
         version="2.12">
       <description>
-        If the USP Endpoint uses the STOMP Message Transport Protocol (MTP),
+        If the USP Endpoint uses the STOMP Message Transfer Protocol (MTP),
         then this object contains STOMP Client specific configuration
         parameters related to how the Agent communicates with the STOMP Server.
       </description>
@@ -99239,7 +111055,7 @@
         minEntries="0" maxEntries="1" discriminatorParameter="Protocol"
         version="2.12">
       <description>
-        If the USP Endpoint uses the WebSocket Message Transport Protocol (MTP)
+        If the USP Endpoint uses the WebSocket Message Transfer Protocol (MTP)
         as a WebSocket server, then this object contains WebSocket specific
         configuration parameters.
       </description>
@@ -99268,7 +111084,7 @@
           <unsignedInt>
             <range minInclusive="1" maxInclusive="65535"/>
           </unsignedInt>
-          <default type="object" value="5683"/>
+          <default type="object" value="8443"/>
         </syntax>
       </parameter>
 
@@ -99314,8 +111130,8 @@
         minEntries="0" maxEntries="1" discriminatorParameter="Protocol"
         version="2.13">
       <description>
-        If the USP Endpoint uses the MQTT Message Transport Protocol (MTP),
-        then this object contains MQTT Client specific configuration parameters
+        If the USP Endpoint uses the MQTT Message Transfer Protocol (MTP), then
+        this object contains MQTT Client specific configuration parameters
         related to how the Agent communicates with the MQTT broker.
       </description>
 
@@ -99390,10 +111206,39 @@
       </parameter>
     </object>
 
+    <object name="Device.LocalAgent.MTP.{i}.UDS." access="readOnly"
+        minEntries="0" maxEntries="1" discriminatorParameter="Protocol"
+        version="2.16">
+      <description>
+        If the USP Endpoint uses the Unix Domain Socket (UDS) Message Transfer
+        Protocol (MTP), then this object contains UDS specific configuration
+        parameters related to how this Agent communicates with a Controller on
+        another USP Endpoint.
+
+        An example of how to set up this MTP can be found in {{bibref|TR-369|
+        Section "Example Data Models for a USP Broker and USP Services"}}.
+      </description>
+
+      <parameter name="UnixDomainSocketRef" access="readWrite">
+        <description>
+          A reference to the Unix Domain Socket used by this Agent when
+          communicating via the UDS MTP.
+        </description>
+        <syntax>
+          <string>
+            <pathRef refType="strong"
+                targetParent=".UnixDomainSockets.UnixDomainSocket."
+                targetType="row"/>
+          </string>
+          <default type="object" value=""/>
+        </syntax>
+      </parameter>
+    </object>
+
     <object name="Device.LocalAgent.Threshold.{i}." access="readWrite"
         minEntries="0" maxEntries="unbounded"
         numEntriesParameter="ThresholdNumberOfEntries" enableParameter="Enable"
-        dmr:previousObject="Device.LocalAgent.MTP.{i}.MQTT." version="2.13">
+        dmr:previousObject="Device.LocalAgent.MTP.{i}.UDS." version="2.13">
       <description>
         Each {{object}} instance of this table represents a Threshold Event.
 
@@ -99403,14 +111248,14 @@
         {{param|ThresholdParam}} may only reference integer parameters and
         {{param|ThresholdValue}} only uses integer values. For example:
 
-           {{param|ReferencePath}}:
-           Device.Ethernet.Interface.[Enable=="1"].Stats.
+            {{param|ReferencePath}}:
+            Device.Ethernet.Interface.[Enable=="1"].Stats.
 
-           {{param|ThresholdParam}}: BytesSent
+            {{param|ThresholdParam}}: BytesSent
 
-           {{param|ThresholdOperator}}: Rise
+            {{param|ThresholdOperator}}: Rise
 
-           {{param|ThresholdValue}}: 100000
+            {{param|ThresholdValue}}: 100000
 
         This would trigger a {{event|Triggered!}} Event whenever a value of a
         parameter matching
@@ -99430,7 +111275,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -99604,7 +111449,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -99696,8 +111541,9 @@
 
             When a parameter of an already included object changes multiple
             times within in the configured {{param|##.Interval}}. The parameter
-            must be included in the previously used {{object}} instance and a
-            new {{object|Parameter.{i}}} instance MUST be created.
+            must be included in the {{object}} instance, where the
+            {{param|ObjectPath}} was previously used, and a new
+            {{object|Parameter.{i}}} instance MUST be created.
           </description>
           <uniqueKey functional="true">
             <parameter ref="ObjectPath"/>
@@ -99724,6 +111570,7 @@
           </description>
           <uniqueKey functional="true">
             <parameter ref="Name"/>
+            <parameter ref="ChangeTime"/>
           </uniqueKey>
 
           <parameter name="Name">
@@ -99773,32 +111620,6 @@
       </event>
     </object>
 
-    <object name="Device.LocalAgent.MTP.{i}.UDS." access="readOnly"
-        minEntries="0" maxEntries="1" discriminatorParameter="Protocol"
-        version="2.16">
-      <description>
-        If the USP Endpoint uses the Unix Domain Socket (UDS) Message Transfer
-        Protocol (MTP), then this object contains UDS Client specific
-        configuration parameters related to how the Agent communicates with the
-        UDS Server.
-      </description>
-
-      <parameter name="UnixDomainSocketRef" access="readWrite">
-        <description>
-          A reference to the Unix Domain Socket used by this Agent when
-          communicating via the UDS MTP.
-        </description>
-        <syntax>
-          <string>
-            <pathRef refType="strong"
-                targetParent=".UnixDomainSockets.UnixDomainSocket."
-                targetType="row"/>
-          </string>
-          <default type="object" value=""/>
-        </syntax>
-      </parameter>
-    </object>
-
     <object name="Device.LocalAgent.Controller.{i}." access="readWrite"
         minEntries="0" maxEntries="unbounded"
         numEntriesParameter="ControllerNumberOfEntries"
@@ -99819,7 +111640,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -100042,7 +111863,7 @@
         </syntax>
       </parameter>
 
-      <command name="ScheduleTimer()" status="obsoleted" async="false"
+      <command name="ScheduleTimer()" status="deleted" async="false"
           dmr:previousParameter="USPNotifRetryIntervalMultiplier">
         <description>
           Schedule a ''Timer!'' event on the associated {{object}}.
@@ -100051,6 +111872,8 @@
           asynchronous {{command|##.ScheduleTimer()}}}}
 
           {{obsoleted|2.16}}
+
+          {{deleted|2.17}}
         </description>
         <input>
 
@@ -100079,7 +111902,7 @@
         </syntax>
       </parameter>
 
-      <event name="Timer!" status="obsoleted">
+      <event name="Timer!" status="deleted">
         <description>
           Timer event requested via a ScheduleTimer() command invoked on the
           same Controller instance via an Operate USP message.
@@ -100089,6 +111912,8 @@
           {{command|##.ScheduleTimer()}}}}
 
           {{obsoleted|2.16}}
+
+          {{deleted|2.17}}
         </description>
 
         <parameter name="CommandKey">
@@ -100155,7 +111980,8 @@
       <command name="SendOnBoardRequest()" async="false">
         <description>
           Requests the Agent to send an ''OnBoardRequest'' notification to this
-          Controller.
+          Controller. This sets the value of {{param|OnBoardingComplete}} to
+          {{false}}.
         </description>
       </command>
 
@@ -100167,6 +111993,64 @@
           <unsignedInt/>
         </syntax>
       </parameter>
+
+      <parameter name="OnBoardingComplete" access="readWrite">
+        <description>
+          Signifies whether the onboarding is completed for this Controller.
+
+          When set to {{false}}, the Controller hasn't completed its onboarding
+          procedure and the agent MUST send it an OnBoardRequest USP
+          Notification when the Controller's {{param|Enable}} parameter is
+          {{true}}. This OnBoardRequest MUST be retried until the Controller
+          confirms it has received the request as required by
+          {{bibref|TR-369|R-NOT.5}} and {{bibref|TR-369|R-NOT.6}}.
+
+          The value of this parameter SHOULD be set to {{true}} by the
+          Controller when it is done with its onboarding procedure or it can be
+          set by the Agent itself when it knows the onboarding has been
+          completed.
+
+          While the value of this parameter is {{false}} it will also restart
+          the OnBoardRequest procedure according to the
+          {{param|OnBoardingRestartTime}} parameter.
+        </description>
+        <syntax>
+          <boolean/>
+          <default type="object" value="false"/>
+        </syntax>
+      </parameter>
+
+      <parameter name="OnBoardingRestartTime" access="readWrite">
+        <description>
+          This parameter is used to configure a linear retry mechanism for the
+          OnBoardRequest. It represents the time in {{units}} before the
+          OnBoardRequest is retried.
+
+          The OnBoardRequest notification is a USP notification that requires a
+          NotifyResponse message like any other notification that needs to be
+          retried. OnBoardRequest notifications must follow the default retry
+          mechanism as required by {{bibref|TR-369|R-NOT.6}} until the
+          Controller has confirmed the notification with a NotifyResponse
+          message. However, the onboarding procedure typically requires several
+          actions from the Controller before it can be considered as complete
+          and things can go wrong during this procedure. The value of this
+          parameter can be set to configure how long the Agent should wait
+          before it sends another OnBoardRequest. This timer kicks in as soon
+          as the Agent receives the NotifyResponse message for the previous
+          OnBoardRequest. The timer is cancelled when the
+          {{param|OnBoardingComplete}} parameter is set to {{true}}.
+
+          When the value of this parameter is set to 0, the OnBoardRequest is
+          not retried after the notification retry mechanism has been
+          completed.
+        </description>
+        <syntax>
+          <unsignedInt>
+            <units value="seconds"/>
+          </unsignedInt>
+          <default type="object" value="0"/>
+        </syntax>
+      </parameter>
     </object>
 
     <object name="Device.LocalAgent.Controller.{i}.MTP.{i}."
@@ -100183,7 +112067,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -100208,7 +112092,7 @@
 
       <parameter name="Protocol" access="readWrite">
         <description>
-          The Message Transport Protocol (MTP) to be used for communications by
+          The Message Transfer Protocol (MTP) to be used for communications by
           a USP Endpoint.
         </description>
         <syntax>
@@ -100244,12 +112128,14 @@
 
     <object name="Device.LocalAgent.Controller.{i}.MTP.{i}.CoAP."
         access="readOnly" minEntries="0" maxEntries="1"
-        discriminatorParameter="Protocol" status="deprecated" version="2.12">
+        discriminatorParameter="Protocol" status="obsoleted" version="2.12">
       <description>
-        If the USP Endpoint uses the CoAP Message Transport Protocol (MTP),
-        then this object contains CoAP specific configuration parameters.
+        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>
 
       <parameter name="Host" access="readWrite">
@@ -100301,7 +112187,7 @@
         access="readOnly" minEntries="0" maxEntries="1"
         discriminatorParameter="Protocol" version="2.12">
       <description>
-        If the USP Endpoint uses the STOMP Message Transport Protocol (MTP),
+        If the USP Endpoint uses the STOMP Message Transfer Protocol (MTP),
         then this object contains STOMP Client specific configuration
         parameters related to how this Controller communicates with the STOMP
         Server.
@@ -100351,7 +112237,7 @@
         access="readOnly" minEntries="0" maxEntries="1"
         discriminatorParameter="Protocol" version="2.12">
       <description>
-        If the USP Endpoint uses the WebSocket Message Transport Protocol (MTP)
+        If the USP Endpoint uses the WebSocket Message Transfer Protocol (MTP)
         as a WebSocket client, then this object contains WebSocket specific
         configuration parameters.
       </description>
@@ -100390,7 +112276,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="IsEncrypted" status="obsoleted" access="readOnly">
+      <parameter name="IsEncrypted" status="deleted" access="readOnly">
         <description>
           This parameter represents whether or not communications that utilize
           this {{object}} object instance are encrypted.
@@ -100399,6 +112285,8 @@
           will dictate whether this {{object}} is or is not encrypted}}
 
           {{obsoleted|2.16}}
+
+          {{deleted|2.17}}
         </description>
         <syntax>
           <boolean/>
@@ -100506,8 +112394,8 @@
         access="readOnly" minEntries="0" maxEntries="1"
         discriminatorParameter="Protocol" version="2.13">
       <description>
-        If the USP Endpoint uses the MQTT Message Transport Protocol (MTP),
-        then this object contains MQTT Client specific configuration parameters
+        If the USP Endpoint uses the MQTT Message Transfer Protocol (MTP), then
+        this object contains MQTT Client specific configuration parameters
         related to how this Controller communicates with the MQTT broker.
       </description>
 
@@ -100598,10 +112486,13 @@
         access="readOnly" minEntries="0" maxEntries="1"
         discriminatorParameter="Protocol" version="2.16">
       <description>
-        If the USP Endpoint uses the Unix Domain Socket (UDS) Message Transport
-        Protocol (MTP), then this object contains UDS Client specific
-        configuration parameters related to how the Controller communicates
-        with the UDS Server.
+        If the USP Endpoint uses the Unix Domain Socket (UDS) Message Transfer
+        Protocol (MTP), then this object contains UDS specific configuration
+        parameters related to how this Agent communicates with a Controller on
+        another USP Endpoint.
+
+        An example of how to set up this MTP can be found in {{bibref|TR-369|
+        Section "Example Data Models for a USP Broker and USP Services"}}.
       </description>
 
       <parameter name="UnixDomainSocketRef" access="readWrite">
@@ -100692,7 +112583,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -100739,7 +112630,7 @@
         functionality for this {{object|##.Controller.{i}}} object instance.
       </description>
 
-      <parameter name="Enable" access="readWrite" status="deprecated">
+      <parameter name="Enable" access="readWrite" status="obsoleted">
         <description>
           Enable/Disable this {{object}} instance.
 
@@ -100752,6 +112643,8 @@
           {{object|##.Controller.{i}}} object instance.
 
           {{deprecated|2.15|because it is replaced by {{param|SessionMode}}}}
+
+          {{obsoleted|2.17}}
         </description>
         <syntax>
           <boolean/>
@@ -101014,7 +112907,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -101406,7 +113299,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -101463,7 +113356,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -101686,7 +113579,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -101812,7 +113705,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -101989,7 +113882,7 @@
         <parameter ref="ID"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -102321,7 +114214,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -102460,7 +114353,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -102698,7 +114591,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -102905,7 +114798,7 @@
         <parameter ref="Alias"/>
       </uniqueKey>
 
-      <parameter name="Alias" access="readWrite">
+      <parameter name="Alias" access="writeOnceReadOnly">
         <description>
           {{datatype|expand}}
         </description>
@@ -103151,7 +115044,7 @@
         </syntax>
       </parameter>
 
-      <parameter name="IsEncrypted" status="obsoleted" access="readOnly">
+      <parameter name="IsEncrypted" status="deleted" access="readOnly">
         <description>
           This parameter represents whether or not communications that utilize
           this {{object}} object instance are encrypted.
@@ -103161,6 +115054,8 @@
           are not encrypted}}
 
           {{obsoleted|2.16}}
+
+          {{deleted|2.17}}
         </description>
         <syntax>
           <boolean/>
@@ -104200,7 +116095,7 @@
       <object ref="Device.DSL.Line.{i}." requirement="present">
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Status" requirement="readOnly"/>
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Name" requirement="readOnly"/>
         <parameter ref="LastChange" requirement="readOnly"/>
         <parameter ref="Upstream" requirement="readOnly"/>
@@ -104238,7 +116133,7 @@
       <object ref="Device.DSL.Channel.{i}." requirement="present">
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Status" requirement="readOnly"/>
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Name" requirement="readOnly"/>
         <parameter ref="LastChange" requirement="readOnly"/>
         <parameter ref="UpstreamCurrRate" requirement="readOnly"/>
@@ -104286,7 +116181,7 @@
       <object ref="Device.DSL.Line.{i}." requirement="present">
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Status" requirement="readOnly"/>
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Name" requirement="readOnly"/>
         <parameter ref="LastChange" requirement="readOnly"/>
         <parameter ref="Upstream" requirement="readOnly"/>
@@ -104337,7 +116232,7 @@
       <object ref="Device.DSL.Channel.{i}." requirement="present">
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Status" requirement="readOnly"/>
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Name" requirement="readOnly"/>
         <parameter ref="LastChange" requirement="readOnly"/>
         <parameter ref="LinkEncapsulationSupported" requirement="readOnly"/>
@@ -104376,7 +116271,7 @@
       <object ref="Device.DSL.Line.{i}." requirement="present">
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Status" requirement="readOnly"/>
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Name" requirement="readOnly"/>
         <parameter ref="LastChange" requirement="readOnly"/>
         <parameter ref="Upstream" requirement="readOnly"/>
@@ -104418,7 +116313,7 @@
       <object ref="Device.DSL.Channel.{i}." requirement="present">
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Status" requirement="readOnly"/>
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Name" requirement="readOnly"/>
         <parameter ref="LastChange" requirement="readOnly"/>
         <parameter ref="LinkEncapsulationSupported" requirement="readOnly"/>
@@ -104445,7 +116340,7 @@
       <object ref="Device.DSL.Line.{i}." requirement="present">
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Status" requirement="readOnly"/>
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Name" requirement="readOnly"/>
         <parameter ref="LastChange" requirement="readOnly"/>
         <parameter ref="Upstream" requirement="readOnly"/>
@@ -104514,7 +116409,7 @@
       <object ref="Device.DSL.Channel.{i}." requirement="present">
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Status" requirement="readOnly"/>
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Name" requirement="readOnly"/>
         <parameter ref="LastChange" requirement="readOnly"/>
         <parameter ref="LinkEncapsulationSupported" requirement="readOnly"/>
@@ -104575,7 +116470,7 @@
       <object ref="Device.DSL.Line.{i}." requirement="present">
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Status" requirement="readOnly"/>
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Name" requirement="readOnly"/>
         <parameter ref="LastChange" requirement="readOnly"/>
         <parameter ref="Upstream" requirement="readOnly"/>
@@ -104643,7 +116538,7 @@
       <object ref="Device.DSL.Channel.{i}." requirement="present">
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Status" requirement="readOnly"/>
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Name" requirement="readOnly"/>
         <parameter ref="LastChange" requirement="readOnly"/>
         <parameter ref="LinkEncapsulationSupported" requirement="readOnly"/>
@@ -104669,7 +116564,7 @@
       <object ref="Device.DSL.BondingGroup.{i}." requirement="present">
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Status" requirement="readOnly"/>
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Name" requirement="readOnly"/>
         <parameter ref="LastChange" requirement="readOnly"/>
         <parameter ref="LowerLayers" requirement="readOnly"/>
@@ -104775,7 +116670,7 @@
       <object ref="Device.FAST.Line.{i}." requirement="present">
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Status" requirement="readOnly"/>
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Name" requirement="readOnly"/>
         <parameter ref="LastChange" requirement="readOnly"/>
         <parameter ref="Upstream" requirement="readOnly"/>
@@ -104825,7 +116720,7 @@
       <object ref="Device.Optical.Interface.{i}." requirement="present">
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Status" requirement="readOnly"/>
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Name" requirement="readOnly"/>
         <parameter ref="LastChange" requirement="readOnly"/>
         <parameter ref="Upstream" requirement="readOnly"/>
@@ -104872,7 +116767,7 @@
         <parameter ref="RoamingStatus" requirement="readOnly"/>
       </object>
       <object ref="Device.Cellular.Interface.{i}." requirement="present">
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Name" requirement="readOnly"/>
         <parameter ref="LastChange" requirement="readOnly"/>
         <parameter ref="IMEI" requirement="readOnly"/>
@@ -104905,7 +116800,7 @@
       <object ref="Device.ATM.Link.{i}." requirement="createDelete">
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Status" requirement="readOnly"/>
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Name" requirement="readOnly"/>
         <parameter ref="LastChange" requirement="readOnly"/>
         <parameter ref="LowerLayers" requirement="readWrite"/>
@@ -104946,7 +116841,7 @@
       <object ref="Device.PTM.Link.{i}." requirement="createDelete">
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Status" requirement="readOnly"/>
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Name" requirement="readOnly"/>
         <parameter ref="LastChange" requirement="readOnly"/>
         <parameter ref="LowerLayers" requirement="readWrite"/>
@@ -104993,7 +116888,7 @@
           requirement="createDelete">
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Status" requirement="readOnly"/>
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Name" requirement="readOnly"/>
         <parameter ref="LastChange" requirement="readOnly"/>
         <parameter ref="LowerLayers" requirement="readWrite"/>
@@ -105026,7 +116921,7 @@
       <object ref="Device.Ethernet.Link.{i}." requirement="createDelete">
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Status" requirement="readOnly"/>
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Name" requirement="readOnly"/>
         <parameter ref="LastChange" requirement="readOnly"/>
         <parameter ref="LowerLayers" requirement="readWrite"/>
@@ -105058,7 +116953,7 @@
       <object ref="Device.Ethernet.Interface.{i}." requirement="present">
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Status" requirement="readOnly"/>
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Name" requirement="readOnly"/>
         <parameter ref="LastChange" requirement="readOnly"/>
         <parameter ref="Upstream" requirement="readOnly"/>
@@ -105157,7 +117052,7 @@
       <object ref="Device.USB.Interface.{i}." requirement="present">
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Status" requirement="readOnly"/>
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Name" requirement="readOnly"/>
         <parameter ref="LastChange" requirement="readOnly"/>
         <parameter ref="Upstream" requirement="readOnly"/>
@@ -105205,7 +117100,7 @@
       <object ref="Device.HPNA.Interface.{i}." requirement="present">
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Status" requirement="readOnly"/>
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Name" requirement="readOnly"/>
         <parameter ref="LastChange" requirement="readOnly"/>
         <parameter ref="Upstream" requirement="readOnly"/>
@@ -105263,14 +117158,14 @@
       </object>
     </profile>
 
-    <profile name="MoCA:1" version="2.0">
+    <profile name="MoCA:1" version="2.0" status="deprecated">
       <object ref="Device.MoCA." requirement="present">
         <parameter ref="InterfaceNumberOfEntries" requirement="readOnly"/>
       </object>
       <object ref="Device.MoCA.Interface.{i}." requirement="present">
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Status" requirement="readOnly"/>
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Name" requirement="readOnly"/>
         <parameter ref="LastChange" requirement="readOnly"/>
         <parameter ref="Upstream" requirement="readOnly"/>
@@ -105281,7 +117176,8 @@
         <parameter ref="CurrentVersion" requirement="readOnly"/>
         <parameter ref="NetworkCoordinator" requirement="readOnly"/>
         <parameter ref="PrivacyEnabledSetting" requirement="readWrite"/>
-        <parameter ref="PrivacyEnabled" requirement="readOnly"/>
+        <parameter ref="PrivacyEnabled" requirement="readOnly"
+            status="deprecated"/>
         <parameter ref="FreqCapabilityMask" requirement="readOnly"/>
         <parameter ref="FreqCurrentMaskSetting" requirement="readWrite"/>
         <parameter ref="FreqCurrentMask" requirement="readOnly"/>
@@ -105299,6 +117195,310 @@
       </object>
     </profile>
 
+    <profile name="MoCA_Status:1" version="2.17"
+        id="mocaIfStatusGroup/1.3.6.1.4.1.31621.1.2.2.2.7">
+      <description>
+        Parameters to monitor the status of the MoCA interface.
+      </description>
+      <object ref="Device.MoCA." requirement="present">
+        <parameter ref="InterfaceNumberOfEntries" requirement="readOnly"/>
+      </object>
+      <object ref="Device.MoCA.Interface.{i}." requirement="present">
+        <parameter ref="Status" requirement="readOnly"/>
+        <parameter ref="LastChange" requirement="readOnly"/>
+        <parameter ref="FirmwareVersion" requirement="readOnly"/>
+        <parameter ref="HighestVersion" requirement="readOnly"/>
+        <parameter ref="CurrentVersion" requirement="readOnly"/>
+        <parameter ref="MACAddress" requirement="readOnly"/>
+        <parameter ref="NodeID" requirement="readOnly"/>
+        <parameter ref="Name" requirement="readOnly"/>
+        <parameter ref="NumNodes" requirement="readOnly"/>
+        <parameter ref="NetworkCoordinator" requirement="readOnly"/>
+        <parameter ref="BackupNC" requirement="readOnly"/>
+        <parameter ref="CurrentOperFreq" requirement="readOnly"/>
+        <parameter ref="NetworkTabooMask" requirement="readOnly"/>
+        <parameter ref="NodeTabooMask" requirement="readOnly"/>
+        <parameter ref="SupportedBands" requirement="readOnly"/>
+        <parameter ref="PacketAggregationCapability" requirement="readOnly"/>
+        <parameter ref="TxBcastRate" requirement="readOnly"/>
+        <parameter ref="NcVersion" requirement="readOnly"/>
+        <parameter ref="LinkState" requirement="readOnly"/>
+        <parameter ref="ConnectedNodesInfo" requirement="readOnly"/>
+        <parameter ref="MgntEntityNetIePayloadRx" requirement="readOnly"/>
+        <parameter ref="Moca25PhyCapable" requirement="readOnly"/>
+        <parameter ref="MpsInitScanPayload" requirement="readOnly"/>
+        <parameter ref="MpsState" requirement="readOnly"/>
+        <parameter ref="NetworkNamePayload" requirement="readOnly"/>
+        <parameter ref="PrivacyNc" requirement="readOnly"/>
+        <parameter ref="PowerStateResp" requirement="readOnly"/>
+        <parameter ref="PowerStateStatus" requirement="readOnly"/>
+        <parameter ref="ConnectedNodesDropReason" requirement="readOnly"/>
+      </object>
+    </profile>
+
+    <profile name="MoCA_Stats:1" version="2.17"
+        id="mocaIfStatsGroup/1.3.6.1.4.1.31621.1.2.2.2.9">
+      <description>
+        Parameters to monitor the packet statistics and the number of flows in
+        the MoCA interface.
+      </description>
+      <object ref="Device.MoCA.Interface.{i}.Stats." requirement="present">
+        <parameter ref="PacketsSent" requirement="readOnly"/>
+        <parameter ref="PacketsReceived" requirement="readOnly"/>
+      </object>
+      <object ref="Device.MoCA.Interface.{i}.QoS." requirement="present">
+        <parameter ref="EgressNumFlows" requirement="readOnly"/>
+        <parameter ref="IngressNumFlows" requirement="readOnly"/>
+      </object>
+    </profile>
+
+    <profile name="MoCA_FlowStats:1" version="2.17"
+        id="mocaIfFlowStatsGroup/1.3.6.1.4.1.31621.1.2.2.2.11">
+      <description>
+        Parameters to monitor the PQoS flow information of the MoCA interface.
+      </description>
+      <object ref="Device.MoCA.Interface.{i}.QoS." requirement="present">
+        <parameter ref="FlowStatsNumberOfEntries" requirement="readOnly"/>
+      </object>
+      <object ref="Device.MoCA.Interface.{i}.QoS.FlowStats.{i}."
+          requirement="present">
+        <parameter ref="FlowID" requirement="readOnly"/>
+        <parameter ref="PacketDA" requirement="readOnly"/>
+        <parameter ref="MaxRate" requirement="readOnly"/>
+        <parameter ref="MaxBurstSize" requirement="readOnly"/>
+        <parameter ref="LeaseTime" requirement="readOnly"/>
+        <parameter ref="Tag" requirement="readOnly"/>
+      </object>
+    </profile>
+
+    <profile name="MoCA_Node:1" version="2.17"
+        id="mocaNodeGroup/1.3.6.1.4.1.31621.1.2.2.2.14">
+      <description>
+        Parameters to monitor the status of other MoCA Nodes in the MoCA
+        network.
+      </description>
+      <object ref="Device.MoCA.Interface.{i}." requirement="present">
+        <parameter ref="AssociatedDeviceNumberOfEntries"
+            requirement="readOnly"/>
+      </object>
+      <object ref="Device.MoCA.Interface.{i}.AssociatedDevice.{i}."
+          requirement="present">
+        <parameter ref="HighestVersion" requirement="readOnly"/>
+        <parameter ref="MACAddress" requirement="readOnly"/>
+        <parameter ref="TxBcastRate" requirement="readOnly"/>
+        <parameter ref="PreferredNC" requirement="readOnly"/>
+        <parameter ref="BondingCapable" requirement="readOnly"/>
+        <parameter ref="PacketAggregationCapability" requirement="readOnly"/>
+      </object>
+    </profile>
+
+    <profile name="MoCA_Mesh:1" version="2.17"
+        id="mocaMeshGroup/1.3.6.1.4.1.31621.1.2.2.2.16">
+      <object ref="Device.MoCA.Interface.{i}." requirement="present">
+        <parameter ref="MeshNumberOfEntries" requirement="readOnly"/>
+      </object>
+      <object ref="Device.MoCA.Interface.{i}.Mesh.{i}." requirement="present">
+        <description>
+          Parameters to monitor the PHY rate of each link in the MoCA network.
+        </description>
+        <parameter ref="TxNodeIndex" requirement="readOnly"/>
+        <parameter ref="RxNodeIndex" requirement="readOnly"/>
+        <parameter ref="TxRate" requirement="readOnly"/>
+        <parameter ref="TxRateNper" requirement="readOnly"/>
+        <parameter ref="TxRateVlper" requirement="readOnly"/>
+      </object>
+    </profile>
+
+    <profile name="MoCA_AccessControl:1" version="2.17"
+        id="mocaIfAccessOptionalGroup/1.3.6.1.4.1.31621.1.2.2.2.2">
+      <description>
+        Parameters to configure the MAC address access control list for the
+        MoCA interface.
+      </description>
+      <object ref="Device.MoCA.Interface.{i}." requirement="present">
+        <parameter ref="AccessControlNumberOfEntries" requirement="readOnly"/>
+      </object>
+      <object ref="Device.MoCA.Interface.{i}.AccessControl.{i}."
+          requirement="present">
+        <parameter ref="MACAddress" requirement="readWrite"/>
+      </object>
+    </profile>
+
+    <profile name="MoCA_Rlapm:1" version="2.17"
+        id="mocaIfRlapmOptionalGroup/1.3.6.1.4.1.31621.1.2.2.2.3">
+      <description>
+        Parameters to configure RLAPM (Receive Level Added PHY Margin) for the
+        MoCA interface.
+      </description>
+      <object ref="Device.MoCA.Interface.{i}." requirement="present">
+        <parameter ref="RlapmNumberOfEntries" requirement="readOnly"/>
+      </object>
+      <object ref="Device.MoCA.Interface.{i}.Rlapm.{i}."
+          requirement="createDelete">
+        <parameter ref="Profile" requirement="readWrite"/>
+        <parameter ref="Frequency" requirement="readWrite"/>
+        <parameter ref="GlobalAggrRxPwrLevel" requirement="readWrite"/>
+        <parameter ref="PhyMargin" requirement="readWrite"/>
+        <parameter ref="Status" requirement="readOnly"/>
+      </object>
+    </profile>
+
+    <profile name="MoCA_Sapm:1" version="2.17"
+        id="mocaIfSapmOptionalGroup/1.3.6.1.4.1.31621.1.2.2.2.4">
+      <description>
+        Parameters to configure SAPM (Subcarrier Added PHY Margin) for the MoCA
+        interface.
+      </description>
+      <object ref="Device.MoCA.Interface.{i}." requirement="present">
+        <parameter ref="SapmNumberOfEntries" requirement="readOnly"/>
+      </object>
+      <object ref="Device.MoCA.Interface.{i}.Sapm.{i}."
+          requirement="createDelete">
+        <parameter ref="Profile" requirement="readWrite"/>
+        <parameter ref="Frequency" requirement="readWrite"/>
+        <parameter ref="AggrRxPwrLevelThreshold" requirement="readWrite"/>
+        <parameter ref="PhyMargin" requirement="readWrite"/>
+        <parameter ref="Status" requirement="readOnly"/>
+      </object>
+    </profile>
+
+    <profile name="MoCA_Reset:1" version="2.17"
+        id="mocaIfMrOptionalGroup/1.3.6.1.4.1.31621.1.2.2.2.6">
+      <description>
+        Parameters to control Moca Reset for the MoCA interface.
+      </description>
+      <object ref="Device.MoCA.Interface.{i}.Reset." requirement="present">
+        <parameter ref="NodeMask" requirement="readWrite"/>
+        <parameter ref="StartTime" requirement="readWrite"/>
+        <parameter ref="StatusTrapEnable" requirement="readWrite"/>
+        <parameter ref="NetworkTrapEnable" requirement="readWrite"/>
+      </object>
+    </profile>
+
+    <profile name="MoCA_StatusAdv:1" version="2.17"
+        id="mocaIfStatusOptionalGroup/1.3.6.1.4.1.31621.1.2.2.2.8">
+      <description>
+        Parameters to monitor the bandwidth of the MoCA interface.
+      </description>
+      <object ref="Device.MoCA.Interface.{i}." requirement="present">
+        <parameter ref="TxBcastPowerReduction" requirement="readOnly"/>
+        <parameter ref="MaxIngressBW" requirement="readOnly"/>
+        <parameter ref="FreqCapabilityMask" requirement="readOnly"/>
+        <parameter ref="PasswordHash" requirement="readOnly"/>
+        <parameter ref="AggregationSize" requirement="readOnly"/>
+        <parameter ref="AeNumber" requirement="readOnly"/>
+        <parameter ref="SupportedIngressPqosFlows" requirement="readOnly"/>
+        <parameter ref="AvbSupport" requirement="readOnly"/>
+        <parameter ref="ResetCount" requirement="readOnly"/>
+        <parameter ref="LinkDownCount" requirement="readOnly"/>
+        <parameter ref="LmoNodeID" requirement="readOnly"/>
+        <parameter ref="NetworkState" requirement="readOnly"/>
+        <parameter ref="PrimaryChannelOffset" requirement="readOnly"/>
+        <parameter ref="SecondaryChannelOffset" requirement="readOnly"/>
+      </object>
+    </profile>
+
+    <profile name="MoCA_StatsAdv:1" version="2.17"
+        id="mocaIfStatsOptionalGroup/1.3.6.1.4.1.31621.1.2.2.2.10">
+      <description>
+        Parameters to monitor the packet drop statistics of the MoCA interface.
+      </description>
+      <object ref="Device.MoCA.Interface.{i}.Stats." requirement="present">
+        <parameter ref="DiscardPacketsSent" requirement="readOnly"/>
+        <parameter ref="RxCorrectedErrors" requirement="readOnly"/>
+        <parameter ref="DiscardPacketsReceived" requirement="readOnly"/>
+        <parameter ref="BytesSent" requirement="readOnly"/>
+        <parameter ref="BytesReceived" requirement="readOnly"/>
+        <parameter ref="UnicastPacketsSent" requirement="readOnly"/>
+        <parameter ref="UnicastPacketsReceived" requirement="readOnly"/>
+        <parameter ref="MulticastPacketsSent" requirement="readOnly"/>
+        <parameter ref="MulticastPacketsReceived" requirement="readOnly"/>
+        <parameter ref="BroadcastPacketsSent" requirement="readOnly"/>
+        <parameter ref="BroadcastPacketsReceived" requirement="readOnly"/>
+      </object>
+    </profile>
+
+    <profile name="MoCA_FlowStatsAdv:1" version="2.17"
+        id="mocaIfFlowStatsOptionalGroup/1.3.6.1.4.1.31621.1.2.2.2.12">
+      <description>
+        Parameters to monitor the PQoS flow statistics of the MoCA interface.
+      </description>
+      <object ref="Device.MoCA.Interface.{i}.QoS.FlowStats.{i}."
+          requirement="present">
+        <parameter ref="LeaseTimeLeft" requirement="readOnly"/>
+        <parameter ref="FlowPackets" requirement="readOnly"/>
+        <parameter ref="IngressGuid" requirement="readOnly"/>
+        <parameter ref="EgressGuid" requirement="readOnly"/>
+        <parameter ref="MaximumLatency" requirement="readOnly"/>
+        <parameter ref="ShortTermAvgRatio" requirement="readOnly"/>
+        <parameter ref="FlowPer" requirement="readOnly"/>
+        <parameter ref="IngressClassify" requirement="readOnly"/>
+        <parameter ref="VlanTag" requirement="readOnly"/>
+        <parameter ref="DscpMoca" requirement="readOnly"/>
+        <parameter ref="Dfid" requirement="readOnly"/>
+      </object>
+    </profile>
+
+    <profile name="MoCA_LinkStats:1" version="2.17"
+        id="mocaLinkStatsOptionalGroup/1.3.6.1.4.1.31621.1.2.2.2.13">
+      <description>
+        Parameter to monitor the packet drop statistics per link of the MoCA
+        interface.
+      </description>
+      <object ref="Device.MoCA.Interface.{i}.AssociatedDevice.{i}."
+          requirement="present">
+        <parameter ref="TxPackets" requirement="readOnly"/>
+        <parameter ref="TxDrops" requirement="readOnly"/>
+        <parameter ref="EgressNodeNumFlows" requirement="readOnly"/>
+        <parameter ref="IngressNodeNumFlows" requirement="readOnly"/>
+      </object>
+    </profile>
+
+    <profile name="MoCA_NodeAdv:1" version="2.17"
+        id="mocaNodeOptionalGroup/1.3.6.1.4.1.31621.1.2.2.2.15">
+      <description>
+        Parameters to monitor Power Level to or from MoCA Nodes in the MoCA
+        network.
+      </description>
+      <object ref="Device.MoCA.Interface.{i}.AssociatedDevice.{i}."
+          requirement="present">
+        <parameter ref="RxBcastPowerLevel" requirement="readOnly"/>
+        <parameter ref="RxPackets" requirement="readOnly"/>
+        <parameter ref="RxCorrected" requirement="readOnly"/>
+        <parameter ref="RxErroredAndMissedPackets" requirement="readOnly"/>
+        <parameter ref="SupportedIngressPqosFlows" requirement="readOnly"/>
+        <parameter ref="SupportedEgressPqosFlows" requirement="readOnly"/>
+        <parameter ref="AggregationSize" requirement="readOnly"/>
+        <parameter ref="AeNumber" requirement="readOnly"/>
+        <parameter ref="PowerState" requirement="readOnly"/>
+        <parameter ref="PowerStateCapability" requirement="readOnly"/>
+        <parameter ref="PDelay" requirement="readOnly"/>
+        <parameter ref="EnhancedPrivacyCapable" requirement="readOnly"/>
+        <parameter ref="LinkType" requirement="readOnly"/>
+        <parameter ref="Moca25PhyCapable" requirement="readOnly"/>
+        <parameter ref="RxPwrList" requirement="readOnly"/>
+        <parameter ref="RxSNRList" requirement="readOnly"/>
+        <parameter ref="TxPwrList" requirement="readOnly"/>
+        <parameter ref="TxPwrReductionList" requirement="readOnly"/>
+      </object>
+    </profile>
+
+    <profile name="MoCA_Bridge:1" version="2.17"
+        id="mocaBridgeOptionalGroup/1.3.6.1.4.1.31621.1.2.2.2.17">
+      <description>
+        Parameters to monitor the MoCA bridge table of each MoCA Node in the
+        MoCA network.
+      </description>
+      <object ref="Device.MoCA.Interface.{i}." requirement="present">
+        <parameter ref="BridgeNumberOfEntries" requirement="readOnly"/>
+      </object>
+      <object ref="Device.MoCA.Interface.{i}.Bridge.{i}."
+          requirement="present">
+        <parameter ref="NodeIndex" requirement="readOnly"/>
+        <parameter ref="MACAddresses" requirement="readOnly"/>
+      </object>
+    </profile>
+
     <profile name="Ghn:1" version="2.4">
       <object ref="Device.Ghn." requirement="present">
         <parameter ref="InterfaceNumberOfEntries" requirement="readOnly"/>
@@ -105306,7 +117506,7 @@
       <object ref="Device.Ghn.Interface.{i}." requirement="present">
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Status" requirement="readOnly"/>
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Name" requirement="readOnly"/>
         <parameter ref="LastChange" requirement="readOnly"/>
         <parameter ref="Upstream" requirement="readOnly"/>
@@ -105349,7 +117549,7 @@
       <object ref="Device.HomePlug.Interface.{i}." requirement="present">
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Status" requirement="readOnly"/>
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Name" requirement="readOnly"/>
         <parameter ref="LastChange" requirement="readOnly"/>
         <parameter ref="Upstream" requirement="readOnly"/>
@@ -105394,7 +117594,7 @@
       <object ref="Device.UPA.Interface.{i}." requirement="present">
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Status" requirement="readOnly"/>
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Name" requirement="readOnly"/>
         <parameter ref="LastChange" requirement="readOnly"/>
         <parameter ref="Upstream" requirement="readOnly"/>
@@ -105445,7 +117645,7 @@
       <object ref="Device.WiFi.Radio.{i}." requirement="present">
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Status" requirement="readOnly"/>
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Name" requirement="readOnly"/>
         <parameter ref="Upstream" requirement="readOnly"/>
         <parameter ref="MaxBitRate" requirement="readOnly"/>
@@ -105484,7 +117684,7 @@
       <object ref="Device.WiFi.SSID.{i}." requirement="createDelete">
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Status" requirement="readOnly"/>
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Name" requirement="readOnly"/>
         <parameter ref="LowerLayers" requirement="readWrite"/>
         <parameter ref="BSSID" requirement="readOnly"/>
@@ -105501,6 +117701,12 @@
       </object>
     </profile>
 
+    <profile name="WiFiSSID:2" base="WiFiSSID:1" version="2.17">
+      <object ref="Device.WiFi.SSID.{i}." requirement="createDelete">
+        <parameter ref="MLDUnit" requirement="readWrite"/>
+      </object>
+    </profile>
+
     <profile name="WiFiAccessPoint:1" version="2.0">
       <object ref="Device.WiFi." requirement="present">
         <parameter ref="AccessPointNumberOfEntries" requirement="readOnly"/>
@@ -105544,7 +117750,7 @@
     </profile>
 
     <profile name="WiFiAccessPoint:2" base="WiFiAccessPoint:1" version="2.9">
-      <object ref="Device.WiFi.AccessPoint.{i}." requirement="present">
+      <object ref="Device.WiFi.AccessPoint.{i}." requirement="createDelete">
         <parameter ref="MACAddressControlEnabled" requirement="readWrite"/>
         <parameter ref="AllowedMACAddress" requirement="readWrite"/>
       </object>
@@ -105597,7 +117803,7 @@
       <object ref="Device.ZigBee.Interface.{i}." requirement="present">
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Status" requirement="readOnly"/>
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Name" requirement="readOnly"/>
         <parameter ref="LastChange" requirement="readOnly"/>
         <parameter ref="LowerLayers" requirement="readWrite"/>
@@ -105788,7 +117994,7 @@
           requirement="createDelete">
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Status" requirement="readOnly"/>
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Name" requirement="readOnly"/>
         <parameter ref="LastChange" requirement="readOnly"/>
         <parameter ref="LowerLayers" requirement="readWrite"/>
@@ -105835,7 +118041,7 @@
           requirement="createDelete">
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Status" requirement="readOnly"/>
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Name" requirement="readOnly"/>
         <parameter ref="LastChange" requirement="readOnly"/>
         <parameter ref="LowerLayers" requirement="readWrite"/>
@@ -106473,7 +118679,7 @@
         <parameter ref="PSIDLength" requirement="readWrite" status="obsoleted"/>
         <parameter ref="PSID" requirement="readWrite" status="obsoleted"/>
         <parameter ref="IncludeSystemPorts" requirement="readWrite"
-            status="deprecated"/>
+            status="obsoleted"/>
       </object>
       <object ref="Device.MAP.Domain.{i}.Rule.{i}." requirement="createDelete">
         <parameter ref="EABitsLength" requirement="readWrite"/>
@@ -106599,7 +118805,7 @@
       <object ref="Device.IP.Interface.{i}." requirement="createDelete">
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Status" requirement="readOnly"/>
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Name" requirement="readOnly"/>
         <parameter ref="LastChange" requirement="readOnly"/>
         <parameter ref="LowerLayers" requirement="readWrite"/>
@@ -106664,7 +118870,7 @@
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="IPv6Enable" requirement="readWrite"/>
         <parameter ref="Status" requirement="readOnly"/>
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Name" requirement="readOnly"/>
         <parameter ref="LastChange" requirement="readOnly"/>
         <parameter ref="LowerLayers" requirement="readWrite"/>
@@ -106684,7 +118890,7 @@
       <object ref="Device.PPP.Interface.{i}." requirement="createDelete">
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Status" requirement="readOnly"/>
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Name" requirement="readOnly"/>
         <parameter ref="LastChange" requirement="readOnly"/>
         <parameter ref="LowerLayers" requirement="readWrite"/>
@@ -107211,7 +119417,7 @@
       </object>
       <object ref="Device.Hosts.AccessControl.{i}.Schedule.{i}."
           requirement="present">
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Day" requirement="readWrite"/>
         <parameter ref="StartTime" requirement="readWrite"/>
@@ -107354,7 +119560,7 @@
       </object>
       <object ref="Device.DHCPv4.Server.Pool.{i}.Client.{i}."
           requirement="present">
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Chaddr" requirement="readOnly"/>
         <parameter ref="Active" requirement="readOnly"/>
         <parameter ref="IPv4AddressNumberOfEntries" requirement="readOnly"/>
@@ -107543,7 +119749,8 @@
 
     <profile name="IEEE8021xAuthentication:2" base="IEEE8021xAuthentication:1"
         version="2.7">
-      <object ref="Device.IEEE8021x.Supplicant.{i}." requirement="present">
+      <object ref="Device.IEEE8021x.Supplicant.{i}."
+          requirement="createDelete">
         <parameter ref="Interface" requirement="readWrite"/>
       </object>
     </profile>
@@ -107702,7 +119909,7 @@
         <parameter ref="ChainNumberOfEntries" requirement="readOnly"/>
       </object>
       <object ref="Device.Firewall.Level.{i}." requirement="createDelete">
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Name" requirement="readOnly"/>
         <parameter ref="Order" requirement="readWrite"/>
         <parameter ref="Chain" requirement="readOnly"/>
@@ -107716,7 +119923,7 @@
       </object>
       <object ref="Device.Firewall.Chain.{i}." requirement="createDelete">
         <parameter ref="Enable" requirement="readWrite"/>
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Name" requirement="readWrite"/>
         <parameter ref="Creator" requirement="readOnly"/>
         <parameter ref="RuleNumberOfEntries" requirement="readOnly"/>
@@ -107726,7 +119933,7 @@
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Status" requirement="readOnly"/>
         <parameter ref="Order" requirement="readWrite"/>
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Target" requirement="readWrite"/>
         <parameter ref="TargetChain" requirement="readWrite"/>
         <parameter ref="SourceInterface" requirement="readWrite"/>
@@ -107972,7 +120179,7 @@
       </object>
       <object ref="Device.BulkData.Profile.{i}." requirement="createDelete">
         <parameter ref="Enable" requirement="readWrite"/>
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Protocol" requirement="readWrite"/>
         <parameter ref="EncodingType" requirement="readWrite"/>
         <parameter ref="ReportingInterval" requirement="readWrite"/>
@@ -108614,7 +120821,7 @@
       </object>
       <object ref="Device.BASAPM.MeasurementEndpoint.{i}."
           requirement="createDelete">
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="MeasurementAgent" requirement="readWrite"/>
         <parameter ref="DeviceOwnership" requirement="readWrite"/>
         <parameter ref="OperationalDomain" requirement="readWrite"/>
@@ -108641,7 +120848,7 @@
       </object>
       <object ref="Device.LMAP.MeasurementAgent.{i}."
           requirement="createDelete">
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Version" requirement="readOnly"/>
         <parameter ref="CapabilityTags" requirement="readOnly"/>
@@ -108677,7 +120884,7 @@
       </object>
       <object ref="Device.LMAP.MeasurementAgent.{i}.Schedule.{i}."
           requirement="createDelete">
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Name" requirement="readWrite"/>
         <parameter ref="Start" requirement="readWrite"/>
@@ -108690,7 +120897,7 @@
       </object>
       <object ref="Device.LMAP.MeasurementAgent.{i}.Schedule.{i}.Action.{i}."
           requirement="createDelete">
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Order" requirement="readWrite"/>
         <parameter ref="Task" requirement="readWrite"/>
@@ -108700,7 +120907,7 @@
       <object
           ref="Device.LMAP.MeasurementAgent.{i}.Schedule.{i}.Action.{i}.Option.{i}."
           requirement="createDelete">
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Order" requirement="readWrite"/>
         <parameter ref="Name" requirement="readWrite"/>
@@ -108708,7 +120915,7 @@
       </object>
       <object ref="Device.LMAP.MeasurementAgent.{i}.Task.{i}."
           requirement="createDelete">
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Name" requirement="readWrite"/>
         <parameter ref="Tags" requirement="readWrite"/>
@@ -108717,14 +120924,14 @@
       </object>
       <object ref="Device.LMAP.MeasurementAgent.{i}.Task.{i}.Registry.{i}."
           requirement="createDelete">
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="RegistryEntry" requirement="readWrite"/>
         <parameter ref="Roles" requirement="readWrite"/>
       </object>
       <object ref="Device.LMAP.MeasurementAgent.{i}.Task.{i}.Option.{i}."
           requirement="createDelete">
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Order" requirement="readWrite"/>
         <parameter ref="Name" requirement="readWrite"/>
@@ -108732,7 +120939,7 @@
       </object>
       <object ref="Device.LMAP.MeasurementAgent.{i}.CommunicationChannel.{i}."
           requirement="createDelete">
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Name" requirement="readWrite"/>
         <parameter ref="UseBulkDataProfile" requirement="readWrite"/>
@@ -108741,7 +120948,7 @@
         <parameter ref="Interface" requirement="readWrite"/>
       </object>
       <object ref="Device.LMAP.Event.{i}." requirement="createDelete">
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Name" requirement="readWrite"/>
         <parameter ref="Type" requirement="readWrite"/>
@@ -108820,7 +121027,7 @@
       </object>
       <object ref="Device.LMAP.MeasurementAgent.{i}.Instruction.{i}."
           requirement="createDelete">
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="LastChange" requirement="readOnly"/>
         <parameter ref="InstructionSchedules" requirement="readWrite"/>
@@ -108832,7 +121039,7 @@
       <object
           ref="Device.LMAP.MeasurementAgent.{i}.Instruction.{i}.MeasurementSuppression.{i}."
           requirement="createDelete">
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Name" requirement="readWrite"/>
         <parameter ref="State" requirement="readOnly"/>
@@ -108905,7 +121112,7 @@
       <object ref="Device.Logical.Interface.{i}." requirement="present">
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Status" requirement="readOnly"/>
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Name" requirement="readOnly"/>
         <parameter ref="LastChange" requirement="readOnly"/>
         <parameter ref="LowerLayers" requirement="readWrite"/>
@@ -109162,6 +121369,77 @@
       </object>
     </profile>
 
+    <profile name="MoCA_Aca:1" version="2.17">
+      <description>
+        Parameters to control ACA (Alternate Channel Assessment) for the MoCA
+        interface.
+      </description>
+      <object ref="Device.MoCA.Interface.{i}.Aca." requirement="present">
+        <command ref="Aca()">
+          <input>
+            <parameter ref="NodeID"/>
+            <parameter ref="Type"/>
+            <parameter ref="Channel"/>
+            <parameter ref="ReportNodeMask"/>
+          </input>
+          <output>
+            <parameter ref="Status"/>
+            <parameter ref="TotalRxPower"/>
+            <parameter ref="PowerProfile"/>
+          </output>
+        </command>
+      </object>
+    </profile>
+
+    <profile name="MoCA_Trap:1" version="2.17">
+      <description>
+        Notifications for bandwidth threshold in the MoCA network.
+      </description>
+      <object ref="Device.MoCA.Interface.{i}." requirement="present">
+        <event ref="BelowPhyThresholdTrap!"/>
+        <event ref="AbovePhyThresholdTrap!"/>
+        <event ref="MrRstSuccessTrap!"/>
+        <event ref="StatusChangeTrap!"/>
+        <event ref="NumNodesChangeTrap!"/>
+        <event ref="MrNetworkSuccessTrap!"/>
+        <event ref="MrNetworkFailTrap!"/>
+        <event ref="PowerStateBcstRecTrap!"/>
+        <event ref="PowerStateM0NcTrap!"/>
+        <event ref="PowerStateNc1xTrap!"/>
+        <event ref="PowerStateRespTrap!"/>
+        <event ref="PowerStateUcstPenTrap!"/>
+        <event ref="PowerStateTrnsReqTrap!"/>
+        <event ref="PowerStateWupUrTrap!"/>
+        <event ref="LmoStatusTrap!"/>
+        <event ref="LinkFailureTrap!"/>
+        <event ref="ConnectedNodesChangeTrap!"/>
+        <event ref="MgntEntityNetwIePayloadRecTrap!"/>
+        <event ref="MpsInitScanRecTrap!"/>
+        <event ref="MpsPairFailTrap!"/>
+        <event ref="MpsPrivacyChangedTrap!"/>
+        <event ref="NcPrivacySupportedRecTrap!"/>
+        <event ref="NetworkNameRecTrap!"/>
+        <event ref="NodeDropAdmFailureTrap!"/>
+        <event ref="NodeDropNcTrap!"/>
+        <event ref="NodeDropMpsTriggeredTrap!"/>
+        <event ref="NodeDropNcChgTrap!"/>
+      </object>
+    </profile>
+
+    <profile
+        name="MoCA_Mandatory:1"
+        version="2.17"
+        extends="
+          MoCA_Status:1
+          MoCA_Stats:1
+          MoCA_FlowStats:1
+          MoCA_Node:1
+          MoCA_Mesh:1">
+      <description>
+        The compliance statement for the mandatory groups.
+      </description>
+    </profile>
+
     <profile name="Download:1" version="2.12">
       <object ref="Device.IP.Diagnostics." requirement="present">
         <parameter ref="IPv4DownloadDiagnosticsSupported"
@@ -109188,7 +121466,7 @@
       </object>
     </profile>
 
-    <profile name="IPLayerCapacity:1" version="2.14" status="deprecated">
+    <profile name="IPLayerCapacity:1" version="2.14" status="obsoleted">
       <object ref="Device.IP.Diagnostics." requirement="present">
         <parameter ref="IPLayerCapacitySupported" requirement="readOnly"/>
         <parameter ref="IPLayerMaxConnections" requirement="readOnly"/>
@@ -109198,10 +121476,10 @@
           <input>
             <parameter ref="Interface"/>
             <parameter ref="Role"/>
-            <parameter ref="Host"/>
-            <parameter ref="Port"/>
+            <parameter ref="Host" status="obsoleted"/>
+            <parameter ref="Port" status="obsoleted"/>
             <parameter ref="JumboFramesPermitted"/>
-            <parameter ref="NumberOfConnections"/>
+            <parameter ref="NumberOfConnections" status="obsoleted"/>
             <parameter ref="EthernetPriority"/>
             <parameter ref="DSCP"/>
             <parameter ref="ProtocolVersion"/>
@@ -109215,7 +121493,7 @@
             <parameter ref="NumberTestSubIntervals"/>
             <parameter ref="TestSubInterval"/>
             <parameter ref="StatusFeedbackInterval"/>
-            <parameter ref="TimeoutNoTraffic" status="deprecated"/>
+            <parameter ref="TimeoutNoTraffic" status="obsoleted"/>
             <parameter ref="Tmax"/>
             <parameter ref="TmaxRTT"/>
             <parameter ref="TimestampResolution"/>
@@ -109251,7 +121529,7 @@
       </object>
     </profile>
 
-    <profile name="IPLayerCapacityTest:1" version="2.15">
+    <profile name="IPLayerCapacityTest:1" version="2.15" status="deprecated">
       <object ref="Device.IP.Diagnostics." requirement="present">
         <parameter ref="IPLayerCapacitySupported" requirement="readOnly"/>
         <parameter ref="IPLayerCapSupportedSoftwareVersion"
@@ -109262,7 +121540,7 @@
         <command ref="IPLayerCapacity()">
           <input>
             <parameter ref="Role"/>
-            <parameter ref="Host"/>
+            <parameter ref="Host" status="deprecated"/>
             <parameter ref="JumboFramesPermitted"/>
             <parameter ref="DSCP"/>
             <parameter ref="TestType"/>
@@ -109294,6 +121572,50 @@
       </object>
     </profile>
 
+    <profile name="IPLayerCapacityTest:2" version="2.17">
+      <object ref="Device.IP.Diagnostics." requirement="present">
+        <parameter ref="IPLayerCapacitySupported" requirement="readOnly"/>
+        <parameter ref="IPLayerCapSupportedSoftwareVersion"
+            requirement="readOnly"/>
+        <parameter ref="IPLayerCapSupportedControlProtocolVersion"
+            requirement="readOnly"/>
+        <parameter ref="IPLayerCapSupportedMetrics" requirement="readOnly"/>
+        <command ref="IPLayerCapacity()">
+          <input>
+            <parameter ref="Role"/>
+            <parameter ref="ServerList"/>
+            <parameter ref="JumboFramesPermitted"/>
+            <parameter ref="DSCP"/>
+            <parameter ref="TestType"/>
+            <parameter ref="IPDVEnable"/>
+            <parameter ref="TestSubInterval"/>
+            <parameter ref="StatusFeedbackInterval"/>
+            <parameter ref="SeqErrThresh"/>
+            <parameter ref="ReordDupIgnoreEnable"/>
+            <parameter ref="LowerThresh"/>
+            <parameter ref="UpperThresh"/>
+            <parameter ref="HighSpeedDelta"/>
+            <parameter ref="SlowAdjThresh"/>
+          </input>
+          <output>
+            <parameter ref="BOMTime"/>
+            <parameter ref="MaxIPLayerCapacity"/>
+            <parameter ref="TimeOfMax"/>
+            <parameter ref="LossRatioAtMax"/>
+            <parameter ref="RTTRangeAtMax"/>
+            <parameter ref="PDVRangeAtMax"/>
+            <parameter ref="MaxETHCapacityNoFCS"/>
+            <parameter ref="MaxETHCapacityWithFCS"/>
+            <parameter ref="MaxETHCapacityWithFCSVLAN"/>
+            <parameter ref="IPLayerCapacitySummary"/>
+            <parameter ref="LossRatioSummary"/>
+            <parameter ref="MinRTTSummary"/>
+            <parameter ref="ActiveFlows"/>
+          </output>
+        </command>
+      </object>
+    </profile>
+
     <profile name="DownloadTCP:1" version="2.12">
       <object ref="Device.IP.Diagnostics." requirement="present">
         <command ref="DownloadDiagnostics()">
@@ -109781,7 +122103,7 @@
         <parameter ref="ConnectionNumberOfEntries" requirement="readOnly"/>
       </object>
       <object ref="Device.STOMP.Connection.{i}." requirement="createDelete">
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Status" requirement="readOnly"/>
         <parameter ref="Host" requirement="readWrite"/>
@@ -109849,7 +122171,7 @@
         <parameter ref="FirmwareImageNumberOfEntries" requirement="readOnly"/>
       </object>
       <object ref="Device.DeviceInfo.FirmwareImage.{i}." requirement="present">
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Name" requirement="readOnly"/>
         <parameter ref="Version" requirement="readOnly"/>
         <parameter ref="Available" requirement="readWrite"/>
@@ -109876,9 +122198,9 @@
     </profile>
 
     <profile name="CoAPAgent:1" extends="LocalAgent:1" version="2.13"
-        status="deprecated">
+        status="obsoleted">
       <object ref="Device.LocalAgent.MTP.{i}.CoAP." requirement="present"
-          status="deprecated">
+          status="obsoleted">
         <parameter ref="Port" requirement="readOnly"/>
         <parameter ref="Path" requirement="readOnly"/>
       </object>
@@ -109931,9 +122253,9 @@
     </profile>
 
     <profile name="CoAPController:1" extends="Controllers:1" version="2.13"
-        status="deprecated">
+        status="obsoleted">
       <object ref="Device.LocalAgent.Controller.{i}.MTP.{i}.CoAP."
-          requirement="present" status="deprecated">
+          requirement="present" status="obsoleted">
         <parameter ref="Host" requirement="readOnly"/>
         <parameter ref="Port" requirement="readOnly"/>
         <parameter ref="Path" requirement="readOnly"/>
@@ -109990,7 +122312,7 @@
       <object ref="Device.LocalAgent.Subscription.{i}."
           requirement="createDelete">
         <parameter ref="Enable" requirement="readWrite"/>
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="ID" requirement="readWrite"/>
         <parameter ref="Recipient" requirement="readOnly"/>
         <parameter ref="CreationDate" requirement="readOnly"/>
@@ -110024,14 +122346,14 @@
       </object>
       <object ref="Device.LocalAgent.ControllerTrust.Role.{i}."
           requirement="present">
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Name" requirement="readWrite"/>
         <parameter ref="PermissionNumberOfEntries" requirement="readOnly"/>
       </object>
       <object ref="Device.LocalAgent.ControllerTrust.Role.{i}.Permission.{i}."
           requirement="present">
-        <parameter ref="Alias" requirement="readWrite"/>
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
         <parameter ref="Enable" requirement="readWrite"/>
         <parameter ref="Targets" requirement="readOnly"/>
         <parameter ref="Param" requirement="readOnly"/>
@@ -110048,6 +122370,40 @@
       </object>
     </profile>
 
+    <profile name="UDSAgent:1" extends="LocalAgent:1" version="2.17">
+      <object ref="Device.LocalAgent.MTP.{i}.UDS." requirement="present">
+        <parameter ref="UnixDomainSocketRef" requirement="readOnly"/>
+      </object>
+      <object ref="Device.UnixDomainSockets." requirement="present">
+        <parameter ref="UnixDomainSocketNumberOfEntries"
+            requirement="readOnly"/>
+      </object>
+      <object ref="Device.UnixDomainSockets.UnixDomainSocket.{i}."
+          requirement="present">
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
+        <parameter ref="Mode" requirement="readOnly"/>
+        <parameter ref="Path" requirement="readOnly"/>
+      </object>
+    </profile>
+
+    <profile name="UDSController:1" extends="Controllers:1" version="2.17">
+      <object ref="Device.LocalAgent.Controller.{i}.MTP.{i}.UDS."
+          requirement="present">
+        <parameter ref="UnixDomainSocketRef" requirement="readOnly"/>
+        <parameter ref="USPServiceRef" requirement="readOnly"/>
+      </object>
+      <object ref="Device.UnixDomainSockets." requirement="present">
+        <parameter ref="UnixDomainSocketNumberOfEntries"
+            requirement="readOnly"/>
+      </object>
+      <object ref="Device.UnixDomainSockets.UnixDomainSocket.{i}."
+          requirement="present">
+        <parameter ref="Alias" requirement="writeOnceReadOnly"/>
+        <parameter ref="Mode" requirement="readOnly"/>
+        <parameter ref="Path" requirement="readOnly"/>
+      </object>
+    </profile>
+
     <profile
         name="USPAgent:1"
         extends="
diff --git a/tools/convert_dm_xml_to_json.py b/tools/convert_dm_xml_to_json.py
index a2e7f99a..7dd09cb3 100755
--- a/tools/convert_dm_xml_to_json.py
+++ b/tools/convert_dm_xml_to_json.py
@@ -993,6 +993,8 @@ def getParamDesc(dmparam, key):
     text = text.replace("\'", "")
     text = text.replace("\"", "")
     text = text.replace("\n", "")
+    text = text.replace("\\d", "\\\\d")
+    text = text.replace("\\.", "\\\\.")
     desc = ' '.join(text.split())
     return desc
 
diff --git a/tools/generate_dm_xml.py b/tools/generate_dm_xml.py
index 4da7e65f..b01acf4a 100755
--- a/tools/generate_dm_xml.py
+++ b/tools/generate_dm_xml.py
@@ -146,10 +146,10 @@ def generate_bbf_xml_file(output_file, dm_json_files=None):
     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-16-0-cwmp-full.xml")
+    root.set("file", "tr-181-2-17-0-cwmp-full.xml")
 
     model = ET.SubElement(root, "model")
-    model.set("name", "Device:2.16")
+    model.set("name", "Device:2.17")
 
     for entry in LIST_SUPPORTED_DM:
         name = entry.get("param")