diff --git a/deps/ua-nodeset b/deps/ua-nodeset
index 5bbf784e937..d955958edbf 160000
--- a/deps/ua-nodeset
+++ b/deps/ua-nodeset
@@ -1 +1 @@
-Subproject commit 5bbf784e9376f7230098149dc0218f318a48d630
+Subproject commit d955958edbfcb518cafb1f40d7695f167b11fe97
diff --git a/src/pubsub/ua_pubsub.c b/src/pubsub/ua_pubsub.c
index 49326a3cd3d..d67a10cabb6 100644
--- a/src/pubsub/ua_pubsub.c
+++ b/src/pubsub/ua_pubsub.c
@@ -960,7 +960,7 @@ UA_DataSetWriter_generateDataSetMessage(UA_Server *server, UA_DataSetMessage *da
 
     /* The field encoding depends on the flags inside the writer config.
      * TODO: This can be moved to the encoding layer. */
-    if((u64)dataSetWriter->config.dataSetFieldContentMask & (u64)UA_DATASETFIELDCONTENTMASK_RAWDATAENCODING) {
+    if(dataSetWriter->config.dataSetFieldContentMask & (u64)UA_DATASETFIELDCONTENTMASK_RAWDATA) {
         dataSetMessage->header.fieldEncoding = UA_FIELDENCODING_RAWDATA;
     } else if((u64)dataSetWriter->config.dataSetFieldContentMask &
               ((u64)UA_DATASETFIELDCONTENTMASK_SOURCETIMESTAMP | (u64)UA_DATASETFIELDCONTENTMASK_SERVERPICOSECONDS |
diff --git a/src/server/ua_nodes.c b/src/server/ua_nodes.c
index 42f71ac4ff8..563b58d6148 100644
--- a/src/server/ua_nodes.c
+++ b/src/server/ua_nodes.c
@@ -282,9 +282,20 @@ static UA_StatusCode
 copyStandardAttributes(UA_Node *node, const UA_NodeAttributes *attr) {
     /* retval  = UA_NodeId_copy(&item->requestedNewNodeId.nodeId, &node->nodeId); */
     /* retval |= UA_QualifiedName_copy(&item->browseName, &node->browseName); */
-    UA_StatusCode retval = UA_LocalizedText_copy(&attr->displayName,
-                                                 &node->displayName);
-    retval |= UA_LocalizedText_copy(&attr->description, &node->description);
+
+	UA_StatusCode retval;
+    /* The new nodeset format has optional display name.
+     * See https://github.com/open62541/open62541/issues/2627
+     * If display name is NULL, then we take the name part of the browse name */
+    if (attr->displayName.text.length == 0) {
+		retval = UA_String_copy(&node->browseName.name,
+									   &node->displayName.text);
+    } else {
+		retval = UA_LocalizedText_copy(&attr->displayName,
+													 &node->displayName);
+		retval |= UA_LocalizedText_copy(&attr->description, &node->description);
+    }
+
     node->writeMask = attr->writeMask;
     return retval;
 }
diff --git a/tools/nodeset_compiler/backend_open62541_nodes.py b/tools/nodeset_compiler/backend_open62541_nodes.py
index 900f44173d6..f9cf130f2ad 100644
--- a/tools/nodeset_compiler/backend_open62541_nodes.py
+++ b/tools/nodeset_compiler/backend_open62541_nodes.py
@@ -430,12 +430,16 @@ def generateNodeCode_begin(node, nodeset, generate_ns0, parentref, encode_binary
         code.extend(generateDataTypeNodeCode(node))
     elif isinstance(node, ViewNode):
         code.extend(generateViewNodeCode(node))
-    code.append("attr.displayName = " + generateLocalizedTextCode(node.displayName, alloc=False) + ";")
-    code.append("#ifdef UA_ENABLE_NODESET_COMPILER_DESCRIPTIONS")
-    code.append("attr.description = " + generateLocalizedTextCode(node.description, alloc=False) + ";")
-    code.append("#endif")
-    code.append("attr.writeMask = %d;" % node.writeMask)
-    code.append("attr.userWriteMask = %d;" % node.userWriteMask)
+    if node.displayName is not None:
+        code.append("attr.displayName = " + generateLocalizedTextCode(node.displayName, alloc=False) + ";")
+    if node.description is not None:
+        code.append("#ifdef UA_ENABLE_NODESET_COMPILER_DESCRIPTIONS")
+        code.append("attr.description = " + generateLocalizedTextCode(node.description, alloc=False) + ";")
+        code.append("#endif")
+    if node.writeMask is not None:
+        code.append("attr.writeMask = %d;" % node.writeMask)
+    if node.userWriteMask is not None:
+        code.append("attr.userWriteMask = %d;" % node.userWriteMask)
 
     # AddNodes call
     code.append("retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_{},".
diff --git a/tools/nodeset_compiler/nodes.py b/tools/nodeset_compiler/nodes.py
index 3df23f8a766..a077e537d17 100644
--- a/tools/nodeset_compiler/nodes.py
+++ b/tools/nodeset_compiler/nodes.py
@@ -68,13 +68,13 @@ def RefOrAlias(s):
 
 class Node(object):
     def __init__(self):
-        self.id = NodeId()
-        self.browseName = QualifiedName()
-        self.displayName = LocalizedText()
-        self.description = LocalizedText()
-        self.symbolicName = String()
-        self.writeMask = 0
-        self.userWriteMask = 0
+        self.id = None
+        self.browseName = None
+        self.displayName = None
+        self.description = None
+        self.symbolicName = None
+        self.writeMask = None
+        self.userWriteMask = None
         self.references = set()
         self.hidden = False
         self.modelUri = None
diff --git a/tools/schema/NodeIds.csv b/tools/schema/NodeIds.csv
index 165dee9f1d7..760f0c1fa48 100644
--- a/tools/schema/NodeIds.csv
+++ b/tools/schema/NodeIds.csv
@@ -103,6 +103,8 @@ DataTypeDescription_Encoding_DefaultBinary,125,Object
 StructureDescription_Encoding_DefaultBinary,126,Object
 EnumDescription_Encoding_DefaultBinary,127,Object
 RolePermissionType_Encoding_DefaultBinary,128,Object
+HasArgumentDescription,129,ReferenceType
+HasOptionalInputArgumentDescription,131,ReferenceType
 IdType,256,DataType
 NodeClass,257,DataType
 Node,258,DataType
@@ -1036,7 +1038,7 @@ ProgramStateMachineType_RecycleCount,2395,Variable
 ProgramStateMachineType_InstanceCount,2396,Variable
 ProgramStateMachineType_MaxInstanceCount,2397,Variable
 ProgramStateMachineType_MaxRecycleCount,2398,Variable
-ProgramStateMachineType_ProgramDiagnostics,2399,Variable
+ProgramStateMachineType_ProgramDiagnostic,2399,Variable
 ProgramStateMachineType_Ready,2400,Object
 ProgramStateMachineType_Ready_StateNumber,2401,Variable
 ProgramStateMachineType_Running,2402,Object
@@ -1944,16 +1946,16 @@ ProgramStateMachineType_LastTransition_Id,3836,Variable
 ProgramStateMachineType_LastTransition_Name,3837,Variable
 ProgramStateMachineType_LastTransition_Number,3838,Variable
 ProgramStateMachineType_LastTransition_TransitionTime,3839,Variable
-ProgramStateMachineType_ProgramDiagnostics_CreateSessionId,3840,Variable
-ProgramStateMachineType_ProgramDiagnostics_CreateClientName,3841,Variable
-ProgramStateMachineType_ProgramDiagnostics_InvocationCreationTime,3842,Variable
-ProgramStateMachineType_ProgramDiagnostics_LastTransitionTime,3843,Variable
-ProgramStateMachineType_ProgramDiagnostics_LastMethodCall,3844,Variable
-ProgramStateMachineType_ProgramDiagnostics_LastMethodSessionId,3845,Variable
-ProgramStateMachineType_ProgramDiagnostics_LastMethodInputArguments,3846,Variable
-ProgramStateMachineType_ProgramDiagnostics_LastMethodOutputArguments,3847,Variable
-ProgramStateMachineType_ProgramDiagnostics_LastMethodCallTime,3848,Variable
-ProgramStateMachineType_ProgramDiagnostics_LastMethodReturnStatus,3849,Variable
+ProgramStateMachineType_ProgramDiagnostic_CreateSessionId,3840,Variable
+ProgramStateMachineType_ProgramDiagnostic_CreateClientName,3841,Variable
+ProgramStateMachineType_ProgramDiagnostic_InvocationCreationTime,3842,Variable
+ProgramStateMachineType_ProgramDiagnostic_LastTransitionTime,3843,Variable
+ProgramStateMachineType_ProgramDiagnostic_LastMethodCall,3844,Variable
+ProgramStateMachineType_ProgramDiagnostic_LastMethodSessionId,3845,Variable
+ProgramStateMachineType_ProgramDiagnostic_LastMethodInputArguments,3846,Variable
+ProgramStateMachineType_ProgramDiagnostic_LastMethodOutputArguments,3847,Variable
+ProgramStateMachineType_ProgramDiagnostic_LastMethodCallTime,3848,Variable
+ProgramStateMachineType_ProgramDiagnostic_LastMethodReturnStatus,3849,Variable
 ProgramStateMachineType_FinalResultData,3850,Object
 AddCommentMethodType,3863,Method
 AddCommentMethodType_InputArguments,3864,Variable
@@ -5871,9 +5873,9 @@ EventNotifierType_OptionSetValues,15034,Variable
 AccessRestrictionType_OptionSetValues,15035,Variable
 AttributeWriteMask_OptionSetValues,15036,Variable
 OpcUa_BinarySchema_Deprecated,15037,Variable
-ProgramStateMachineType_ProgramDiagnostics_LastMethodInputValues,15038,Variable
+ProgramStateMachineType_ProgramDiagnostic_LastMethodInputValues,15038,Variable
 OpcUa_XmlSchema_Deprecated,15039,Variable
-ProgramStateMachineType_ProgramDiagnostics_LastMethodOutputValues,15040,Variable
+ProgramStateMachineType_ProgramDiagnostic_LastMethodOutputValues,15040,Variable
 KeyValuePair_Encoding_DefaultJson,15041,Object
 IdentityMappingRuleType_Encoding_DefaultJson,15042,Object
 SecurityGroupFolderType_SecurityGroupName_Placeholder_MaxPastKeyCount,15043,Variable
@@ -5942,11 +5944,11 @@ DiscoveryConfiguration_Encoding_DefaultJson,15105,Object
 MdnsDiscoveryConfiguration_Encoding_DefaultJson,15106,Object
 RegisterServer2Request_Encoding_DefaultJson,15107,Object
 SubscribedDataSetType,15108,ObjectType
-SubscribedDataSetType_DataSetMetaData,15109,Variable
-SubscribedDataSetType_MessageReceiveTimeout,15110,Variable
+ChoiceStateType,15109,ObjectType
+ChoiceStateType_StateNumber,15110,Variable
 TargetVariablesType,15111,ObjectType
-TargetVariablesType_DataSetMetaData,15112,Variable
-TargetVariablesType_MessageReceiveTimeout,15113,Variable
+HasGuard,15112,ReferenceType
+GuardVariableType,15113,VariableType
 TargetVariablesType_TargetVariables,15114,Variable
 TargetVariablesType_AddTargetVariables,15115,Method
 TargetVariablesType_AddTargetVariables_InputArguments,15116,Variable
@@ -5961,8 +5963,8 @@ TargetVariablesTypeRemoveTargetVariablesMethodType,15124,Method
 TargetVariablesTypeRemoveTargetVariablesMethodType_InputArguments,15125,Variable
 TargetVariablesTypeRemoveTargetVariablesMethodType_OutputArguments,15126,Variable
 SubscribedDataSetMirrorType,15127,ObjectType
-SubscribedDataSetMirrorType_DataSetMetaData,15128,Variable
-SubscribedDataSetMirrorType_MessageReceiveTimeout,15129,Variable
+ExpressionGuardVariableType,15128,VariableType
+ExpressionGuardVariableType_Expression,15129,Variable
 RegisterServer2Response_Encoding_DefaultJson,15130,Object
 ChannelSecurityToken_Encoding_DefaultJson,15131,Object
 OpenSecureChannelRequest_Encoding_DefaultJson,15132,Object
@@ -6081,10 +6083,12 @@ QueryFirstRequest_Encoding_DefaultJson,15244,Object
 PublishedEventsType_DataSetMetaData,15245,Variable
 BrokerWriterGroupTransportType_ResourceUri,15246,Variable
 BrokerWriterGroupTransportType_AuthenticationProfileUri,15247,Variable
+CreateCredentialMethodType,15248,Method
 BrokerWriterGroupTransportType_RequestedDeliveryGuarantee,15249,Variable
 BrokerDataSetWriterTransportType_ResourceUri,15250,Variable
 BrokerDataSetWriterTransportType_AuthenticationProfileUri,15251,Variable
 QueryFirstResponse_Encoding_DefaultJson,15252,Object
+CreateCredentialMethodType_InputArguments,15253,Variable
 QueryNextRequest_Encoding_DefaultJson,15254,Object
 QueryNextResponse_Encoding_DefaultJson,15255,Object
 ReadValueId_Encoding_DefaultJson,15256,Object
@@ -6148,8 +6152,8 @@ MonitoringFilterResult_Encoding_DefaultJson,15313,Object
 EventFilterResult_Encoding_DefaultJson,15314,Object
 AggregateFilterResult_Encoding_DefaultJson,15315,Object
 DataSetReaderType_SubscribedDataSet,15316,Object
-DataSetReaderType_SubscribedDataSet_DataSetMetaData,15317,Variable
-DataSetReaderType_SubscribedDataSet_MessageReceiveTimeout,15318,Variable
+ElseGuardVariableType,15317,VariableType
+BaseAnalogType,15318,VariableType
 DataSetReaderTransportType,15319,ObjectType
 MonitoringParameters_Encoding_DefaultJson,15320,Object
 MonitoredItemCreateRequest_Encoding_DefaultJson,15321,Object
@@ -6437,7 +6441,7 @@ OpcUa_BinarySchema_EnumDescription,15602,Variable
 OpcUa_BinarySchema_EnumDescription_DataTypeVersion,15603,Variable
 OpcUa_BinarySchema_EnumDescription_DictionaryFragment,15604,Variable
 DataSetWriterMessageDataType,15605,DataType
-Server_ServerCapabilities_Roles,15606,Object
+Server_ServerCapabilities_RoleSet,15606,Object
 RoleSetType,15607,ObjectType
 RoleSetType_RoleName_Placeholder,15608,Object
 PubSubGroupDataType,15609,DataType
@@ -7120,23 +7124,23 @@ ReaderGroupMessageDataType_Encoding_DefaultJson,16285,Object
 DataSetReaderDataType_Encoding_DefaultJson,16286,Object
 DataSetReaderTransportDataType_Encoding_DefaultJson,16287,Object
 DataSetReaderMessageDataType_Encoding_DefaultJson,16288,Object
-ServerType_ServerCapabilities_Roles,16289,Object
-ServerType_ServerCapabilities_Roles_AddRole,16290,Method
-ServerType_ServerCapabilities_Roles_AddRole_InputArguments,16291,Variable
-ServerType_ServerCapabilities_Roles_AddRole_OutputArguments,16292,Variable
-ServerType_ServerCapabilities_Roles_RemoveRole,16293,Method
-ServerType_ServerCapabilities_Roles_RemoveRole_InputArguments,16294,Variable
-ServerCapabilitiesType_Roles,16295,Object
-ServerCapabilitiesType_Roles_AddRole,16296,Method
-ServerCapabilitiesType_Roles_AddRole_InputArguments,16297,Variable
-ServerCapabilitiesType_Roles_AddRole_OutputArguments,16298,Variable
-ServerCapabilitiesType_Roles_RemoveRole,16299,Method
-ServerCapabilitiesType_Roles_RemoveRole_InputArguments,16300,Variable
-Server_ServerCapabilities_Roles_AddRole,16301,Method
-Server_ServerCapabilities_Roles_AddRole_InputArguments,16302,Variable
-Server_ServerCapabilities_Roles_AddRole_OutputArguments,16303,Variable
-Server_ServerCapabilities_Roles_RemoveRole,16304,Method
-Server_ServerCapabilities_Roles_RemoveRole_InputArguments,16305,Variable
+ServerType_ServerCapabilities_RoleSet,16289,Object
+ServerType_ServerCapabilities_RoleSet_AddRole,16290,Method
+ServerType_ServerCapabilities_RoleSet_AddRole_InputArguments,16291,Variable
+ServerType_ServerCapabilities_RoleSet_AddRole_OutputArguments,16292,Variable
+ServerType_ServerCapabilities_RoleSet_RemoveRole,16293,Method
+ServerType_ServerCapabilities_RoleSet_RemoveRole_InputArguments,16294,Variable
+ServerCapabilitiesType_RoleSet,16295,Object
+ServerCapabilitiesType_RoleSet_AddRole,16296,Method
+ServerCapabilitiesType_RoleSet_AddRole_InputArguments,16297,Variable
+ServerCapabilitiesType_RoleSet_AddRole_OutputArguments,16298,Variable
+ServerCapabilitiesType_RoleSet_RemoveRole,16299,Method
+ServerCapabilitiesType_RoleSet_RemoveRole_InputArguments,16300,Variable
+Server_ServerCapabilities_RoleSet_AddRole,16301,Method
+Server_ServerCapabilities_RoleSet_AddRole_InputArguments,16302,Variable
+Server_ServerCapabilities_RoleSet_AddRole_OutputArguments,16303,Variable
+Server_ServerCapabilities_RoleSet_RemoveRole,16304,Method
+Server_ServerCapabilities_RoleSet_RemoveRole_InputArguments,16305,Variable
 DefaultInputValues,16306,Variable
 AudioDataType,16307,DataType
 SubscribedDataSetDataType_Encoding_DefaultJson,16308,Object
@@ -7144,7 +7148,7 @@ SelectionListType,16309,VariableType
 TargetVariablesDataType_Encoding_DefaultJson,16310,Object
 SubscribedDataSetMirrorDataType_Encoding_DefaultJson,16311,Object
 SelectionListType_RestrictToList,16312,Variable
-Server_CurrentTimeZone,16313,Variable
+AdditionalParametersType,16313,DataType
 FileSystem,16314,Object
 FileSystem_FileDirectoryName_Placeholder,16315,Object
 FileSystem_FileDirectoryName_Placeholder_CreateDirectory,16316,Method
@@ -8052,27 +8056,27 @@ DiscrepancyAlarmType_Tolerance,17217,Variable
 SafetyConditionClassType,17218,ObjectType
 HighlyManagedAlarmConditionClassType,17219,ObjectType
 TrainingConditionClassType,17220,ObjectType
-TestingConditionClassType,17221,ObjectType
+TestingConditionSubClassType,17221,ObjectType
 AuditConditionCommentEventType_ConditionEventId,17222,Variable
 AuditConditionAcknowledgeEventType_ConditionEventId,17223,Variable
 AuditConditionConfirmEventType_ConditionEventId,17224,Variable
-AuditConditionSuppressEventType,17225,ObjectType
-AuditConditionSuppressEventType_EventId,17226,Variable
-AuditConditionSuppressEventType_EventType,17227,Variable
-AuditConditionSuppressEventType_SourceNode,17228,Variable
-AuditConditionSuppressEventType_SourceName,17229,Variable
-AuditConditionSuppressEventType_Time,17230,Variable
-AuditConditionSuppressEventType_ReceiveTime,17231,Variable
-AuditConditionSuppressEventType_LocalTime,17232,Variable
-AuditConditionSuppressEventType_Message,17233,Variable
-AuditConditionSuppressEventType_Severity,17234,Variable
-AuditConditionSuppressEventType_ActionTimeStamp,17235,Variable
-AuditConditionSuppressEventType_Status,17236,Variable
-AuditConditionSuppressEventType_ServerId,17237,Variable
-AuditConditionSuppressEventType_ClientAuditEntryId,17238,Variable
-AuditConditionSuppressEventType_ClientUserId,17239,Variable
-AuditConditionSuppressEventType_MethodId,17240,Variable
-AuditConditionSuppressEventType_InputArguments,17241,Variable
+AuditConditionSuppressionEventType,17225,ObjectType
+AuditConditionSuppressionEventType_EventId,17226,Variable
+AuditConditionSuppressionEventType_EventType,17227,Variable
+AuditConditionSuppressionEventType_SourceNode,17228,Variable
+AuditConditionSuppressionEventType_SourceName,17229,Variable
+AuditConditionSuppressionEventType_Time,17230,Variable
+AuditConditionSuppressionEventType_ReceiveTime,17231,Variable
+AuditConditionSuppressionEventType_LocalTime,17232,Variable
+AuditConditionSuppressionEventType_Message,17233,Variable
+AuditConditionSuppressionEventType_Severity,17234,Variable
+AuditConditionSuppressionEventType_ActionTimeStamp,17235,Variable
+AuditConditionSuppressionEventType_Status,17236,Variable
+AuditConditionSuppressionEventType_ServerId,17237,Variable
+AuditConditionSuppressionEventType_ClientAuditEntryId,17238,Variable
+AuditConditionSuppressionEventType_ClientUserId,17239,Variable
+AuditConditionSuppressionEventType_MethodId,17240,Variable
+AuditConditionSuppressionEventType_InputArguments,17241,Variable
 AuditConditionSilenceEventType,17242,ObjectType
 AuditConditionSilenceEventType_EventId,17243,Variable
 AuditConditionSilenceEventType_EventType,17244,Variable
@@ -8326,9 +8330,117 @@ ReaderGroupType_GroupProperties,17491,Variable
 ReaderGroupType_DataSetReaderName_Placeholder_DataSetReaderProperties,17492,Variable
 DataSetWriterType_DataSetWriterProperties,17493,Variable
 DataSetReaderType_DataSetReaderProperties,17494,Variable
+CreateCredentialMethodType_OutputArguments,17495,Variable
+KeyCredentialConfigurationFolderType,17496,ObjectType
+AnalogUnitType,17497,VariableType
+AnalogUnitType_Definition,17498,Variable
+AnalogUnitType_ValuePrecision,17499,Variable
+AnalogUnitType_InstrumentRange,17500,Variable
+AnalogUnitType_EURange,17501,Variable
+AnalogUnitType_EngineeringUnits,17502,Variable
+PublishSubscribeType_ConnectionName_Placeholder_Address_NetworkInterface_Selections,17503,Variable
+PublishSubscribeType_ConnectionName_Placeholder_Address_NetworkInterface_SelectionDescriptions,17504,Variable
+PublishSubscribeType_ConnectionName_Placeholder_Address_NetworkInterface_RestrictToList,17505,Variable
+PublishSubscribe_ConnectionName_Placeholder_Address_NetworkInterface_Selections,17506,Variable
 PubSubConnectionType_AddReaderGroup_InputArguments,17507,Variable
 PubSubConnectionType_AddReaderGroup_OutputArguments,17508,Variable
+PublishSubscribe_ConnectionName_Placeholder_Address_NetworkInterface_SelectionDescriptions,17509,Variable
+PublishSubscribe_ConnectionName_Placeholder_Address_NetworkInterface_RestrictToList,17510,Variable
+KeyCredentialConfigurationFolderType_ServiceName_Placeholder,17511,Object
+KeyCredentialConfigurationFolderType_ServiceName_Placeholder_ResourceUri,17512,Variable
+KeyCredentialConfigurationFolderType_ServiceName_Placeholder_ProfileUri,17513,Variable
+KeyCredentialConfigurationFolderType_ServiceName_Placeholder_EndpointUrls,17514,Variable
+KeyCredentialConfigurationFolderType_ServiceName_Placeholder_ServiceStatus,17515,Variable
+KeyCredentialConfigurationFolderType_ServiceName_Placeholder_GetEncryptingKey,17516,Method
+KeyCredentialConfigurationFolderType_ServiceName_Placeholder_GetEncryptingKey_InputArguments,17517,Variable
+KeyCredentialConfigurationFolderType_ServiceName_Placeholder_GetEncryptingKey_OutputArguments,17518,Variable
+KeyCredentialConfigurationFolderType_ServiceName_Placeholder_UpdateCredential,17519,Method
+KeyCredentialConfigurationFolderType_ServiceName_Placeholder_UpdateCredential_InputArguments,17520,Variable
+KeyCredentialConfigurationFolderType_ServiceName_Placeholder_DeleteCredential,17521,Method
+KeyCredentialConfigurationFolderType_CreateCredential,17522,Method
+KeyCredentialConfigurationFolderType_CreateCredential_InputArguments,17523,Variable
+KeyCredentialConfigurationFolderType_CreateCredential_OutputArguments,17524,Variable
+KeyCredentialConfiguration_ServiceName_Placeholder_GetEncryptingKey,17525,Method
+KeyCredentialConfiguration_ServiceName_Placeholder_GetEncryptingKey_InputArguments,17526,Variable
+KeyCredentialConfiguration_ServiceName_Placeholder_GetEncryptingKey_OutputArguments,17527,Variable
+KeyCredentialConfiguration_CreateCredential,17528,Method
+KeyCredentialConfiguration_CreateCredential_InputArguments,17529,Variable
+KeyCredentialConfiguration_CreateCredential_OutputArguments,17530,Variable
+GetEncryptingKeyMethodType,17531,Method
+GetEncryptingKeyMethodType_InputArguments,17532,Variable
+GetEncryptingKeyMethodType_OutputArguments,17533,Variable
+KeyCredentialConfigurationType_GetEncryptingKey,17534,Method
+KeyCredentialConfigurationType_GetEncryptingKey_InputArguments,17535,Variable
+KeyCredentialConfigurationType_GetEncryptingKey_OutputArguments,17536,Variable
+AdditionalParametersType_Encoding_DefaultBinary,17537,Object
+OpcUa_BinarySchema_AdditionalParametersType,17538,Variable
+OpcUa_BinarySchema_AdditionalParametersType_DataTypeVersion,17539,Variable
+OpcUa_BinarySchema_AdditionalParametersType_DictionaryFragment,17540,Variable
+AdditionalParametersType_Encoding_DefaultXml,17541,Object
+OpcUa_XmlSchema_AdditionalParametersType,17542,Variable
+OpcUa_XmlSchema_AdditionalParametersType_DataTypeVersion,17543,Variable
+OpcUa_XmlSchema_AdditionalParametersType_DictionaryFragment,17544,Variable
+RsaEncryptedSecret,17545,DataType
+EccEncryptedSecret,17546,DataType
+AdditionalParametersType_Encoding_DefaultJson,17547,Object
+EphemeralKeyType,17548,DataType
+EphemeralKeyType_Encoding_DefaultBinary,17549,Object
+OpcUa_BinarySchema_EphemeralKeyType,17550,Variable
+OpcUa_BinarySchema_EphemeralKeyType_DataTypeVersion,17551,Variable
+OpcUa_BinarySchema_EphemeralKeyType_DictionaryFragment,17552,Variable
+EphemeralKeyType_Encoding_DefaultXml,17553,Object
+OpcUa_XmlSchema_EphemeralKeyType,17554,Variable
+OpcUa_XmlSchema_EphemeralKeyType_DataTypeVersion,17555,Variable
+OpcUa_XmlSchema_EphemeralKeyType_DictionaryFragment,17556,Variable
+EphemeralKeyType_Encoding_DefaultJson,17557,Object
+PubSubConnectionType_WriterGroupName_Placeholder_HeaderLayoutUri,17558,Variable
+WriterGroupType_HeaderLayoutUri,17559,Variable
+ReaderGroupType_DataSetReaderName_Placeholder_KeyFrameCount,17560,Variable
 PubSubConnectionTypeAddWriterGroupMethodType,17561,Method
+ReaderGroupType_DataSetReaderName_Placeholder_HeaderLayoutUri,17562,Variable
+DataSetReaderType_KeyFrameCount,17563,Variable
+DataSetReaderType_HeaderLayoutUri,17564,Variable
+BaseAnalogType_Definition,17565,Variable
+BaseAnalogType_ValuePrecision,17566,Variable
+BaseAnalogType_InstrumentRange,17567,Variable
+BaseAnalogType_EURange,17568,Variable
+BaseAnalogType_EngineeringUnits,17569,Variable
+AnalogUnitRangeType,17570,VariableType
+AnalogUnitRangeType_Definition,17571,Variable
+AnalogUnitRangeType_ValuePrecision,17572,Variable
+AnalogUnitRangeType_InstrumentRange,17573,Variable
+AnalogUnitRangeType_EURange,17574,Variable
+AnalogUnitRangeType_EngineeringUnits,17575,Variable
+PubSubConnectionType_Address_NetworkInterface_Selections,17576,Variable
+PubSubConnectionType_Address_NetworkInterface_SelectionDescriptions,17577,Variable
+PubSubConnectionType_Address_NetworkInterface_RestrictToList,17578,Variable
+DatagramConnectionTransportType_DiscoveryAddress_NetworkInterface_Selections,17579,Variable
+DatagramConnectionTransportType_DiscoveryAddress_NetworkInterface_SelectionDescriptions,17580,Variable
+DatagramConnectionTransportType_DiscoveryAddress_NetworkInterface_RestrictToList,17581,Variable
+NetworkAddressType_NetworkInterface_Selections,17582,Variable
+NetworkAddressType_NetworkInterface_SelectionDescriptions,17583,Variable
+NetworkAddressType_NetworkInterface_RestrictToList,17584,Variable
+NetworkAddressUrlType_NetworkInterface_Selections,17585,Variable
+NetworkAddressUrlType_NetworkInterface_SelectionDescriptions,17586,Variable
+NetworkAddressUrlType_NetworkInterface_RestrictToList,17587,Variable
+Index,17588,DataType
+DictionaryEntryType,17589,ObjectType
+DictionaryEntryType_DictionaryEntryName_Placeholder,17590,Object
+DictionaryFolderType,17591,ObjectType
+DictionaryFolderType_DictionaryFolderName_Placeholder,17592,Object
+DictionaryFolderType_DictionaryEntryName_Placeholder,17593,Object
+Dictionaries,17594,Object
+Dictionaries_DictionaryFolderName_Placeholder,17595,Object
+Dictionaries_DictionaryEntryName_Placeholder,17596,Object
+HasDictionaryEntry,17597,ReferenceType
+IrdiDictionaryEntryType,17598,ObjectType
+IrdiDictionaryEntryType_DictionaryEntryName_Placeholder,17599,Object
+UriDictionaryEntryType,17600,ObjectType
+UriDictionaryEntryType_DictionaryEntryName_Placeholder,17601,Object
+BaseInterfaceType,17602,ObjectType
+HasInterface,17603,ReferenceType
+HasAddIn,17604,ReferenceType
+DefaultInstanceBrowseName,17605,Variable
 GenericAttributeValue,17606,DataType
 GenericAttributes,17607,DataType
 GenericAttributeValue_Encoding_DefaultXml,17608,Object
@@ -10399,8 +10511,6 @@ ReaderGroupType_DataSetReaderName_Placeholder_Diagnostics_LiveValues_SecurityTok
 ReaderGroupType_DataSetReaderName_Placeholder_Diagnostics_LiveValues_TimeToNextTokenID,21004,Variable
 ReaderGroupType_DataSetReaderName_Placeholder_Diagnostics_LiveValues_TimeToNextTokenID_DiagnosticsLevel,21005,Variable
 ReaderGroupType_DataSetReaderName_Placeholder_SubscribedDataSet,21006,Object
-ReaderGroupType_DataSetReaderName_Placeholder_SubscribedDataSet_DataSetMetaData,21007,Variable
-ReaderGroupType_DataSetReaderName_Placeholder_SubscribedDataSet_MessageReceiveTimeout,21008,Variable
 ReaderGroupType_DataSetReaderName_Placeholder_CreateTargetVariables,21009,Method
 ReaderGroupType_DataSetReaderName_Placeholder_CreateTargetVariables_InputArguments,21010,Variable
 ReaderGroupType_DataSetReaderName_Placeholder_CreateTargetVariables_OutputArguments,21011,Variable
@@ -10510,7 +10620,6 @@ UadpDataSetWriterMessageType_NetworkMessageNumber,21114,Variable
 UadpDataSetWriterMessageType_DataSetOffset,21115,Variable
 UadpDataSetReaderMessageType,21116,ObjectType
 UadpDataSetReaderMessageType_GroupVersion,21117,Variable
-UadpDataSetReaderMessageType_DataSetOrdering,21118,Variable
 UadpDataSetReaderMessageType_NetworkMessageNumber,21119,Variable
 UadpDataSetReaderMessageType_DataSetClassId,21120,Variable
 UadpDataSetReaderMessageType_NetworkMessageContentMask,21121,Variable
diff --git a/tools/schema/Opc.Ua.NodeSet2.Minimal.xml b/tools/schema/Opc.Ua.NodeSet2.Minimal.xml
index 85a66a5c59c..07973d09ea5 100644
--- a/tools/schema/Opc.Ua.NodeSet2.Minimal.xml
+++ b/tools/schema/Opc.Ua.NodeSet2.Minimal.xml
@@ -1,7 +1,36 @@
-<?xml version="1.0" encoding="utf-8"?>
-<UANodeSet xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" LastModified="2016-12-31T00:00:00Z" xmlns="http://opcfoundation.org/UA/2011/03/UANodeSet.xsd">
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+ * Copyright (c) 2005-2018 The OPC Foundation, Inc. All rights reserved.
+ *
+ * OPC Foundation MIT License 1.00
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * The complete license agreement can be found here:
+ * http://opcfoundation.org/License/MIT/1.00/
+-->
+
+<UANodeSet xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" LastModified="2019-01-31T00:00:00Z" xmlns="http://opcfoundation.org/UA/2011/03/UANodeSet.xsd">
   <Models>
-    <Model ModelUri="http://opcfoundation.org/UA/" Version="1.04" PublicationDate="2016-12-31T00:00:00Z" />
+    <Model ModelUri="http://opcfoundation.org/UA/" Version="1.04" PublicationDate="2019-01-31T00:00:00Z" />
   </Models>
   <Aliases>
     <Alias Alias="Boolean">i=1</Alias>
@@ -274,13 +303,12 @@
     <Description>The abstract base type for all references.</Description>
     <References />
   </UAReferenceType>
-  <UAReferenceType NodeId="i=32" BrowseName="NonHierarchicalReferences" IsAbstract="true">
+  <UAReferenceType NodeId="i=32" BrowseName="NonHierarchicalReferences" IsAbstract="true" Symmetric="true">
     <DisplayName>NonHierarchicalReferences</DisplayName>
     <Description>The abstract base type for all non-hierarchical references.</Description>
     <References>
       <Reference ReferenceType="HasSubtype" IsForward="false">i=31</Reference>
     </References>
-    <InverseName>NonHierarchicalReferences</InverseName>
   </UAReferenceType>
   <UAReferenceType NodeId="i=33" BrowseName="HierarchicalReferences" IsAbstract="true">
     <DisplayName>HierarchicalReferences</DisplayName>
@@ -340,7 +368,7 @@
   </UAReferenceType>
   <UAReferenceType NodeId="i=40" BrowseName="HasTypeDefinition">
     <DisplayName>HasTypeDefinition</DisplayName>
-    <Description>The type for references from a instance node its type definition node.</Description>
+    <Description>The type for references from a instance node its type defintion node.</Description>
     <References>
       <Reference ReferenceType="HasSubtype" IsForward="false">i=32</Reference>
     </References>
@@ -656,7 +684,6 @@
     <References>
       <Reference ReferenceType="HasProperty">i=112</Reference>
       <Reference ReferenceType="HasTypeDefinition">i=77</Reference>
-      <Reference ReferenceType="Organizes" IsForward="false">i=2996</Reference>
     </References>
   </UAObject>
   <UAVariable NodeId="i=112" BrowseName="NamingRule" ParentNodeId="i=78" DataType="i=120">
@@ -676,7 +703,6 @@
     <References>
       <Reference ReferenceType="HasProperty">i=113</Reference>
       <Reference ReferenceType="HasTypeDefinition">i=77</Reference>
-      <Reference ReferenceType="Organizes" IsForward="false">i=2996</Reference>
     </References>
   </UAObject>
   <UAVariable NodeId="i=113" BrowseName="NamingRule" ParentNodeId="i=80" DataType="i=120">
@@ -772,13 +798,6 @@
       <Reference ReferenceType="HasSubtype" IsForward="false">i=58</Reference>
     </References>
   </UAObjectType>
-  <UAObjectType NodeId="i=2033" BrowseName="VendorServerInfoType">
-    <DisplayName>VendorServerInfoType</DisplayName>
-    <Description>A base type for vendor specific server information.</Description>
-    <References>
-      <Reference ReferenceType="HasSubtype" IsForward="false">i=58</Reference>
-    </References>
-  </UAObjectType>
   <UAObject NodeId="i=2011" BrowseName="VendorServerInfo" ParentNodeId="i=2004">
     <DisplayName>VendorServerInfo</DisplayName>
     <Description>Server information provided by the vendor.</Description>
@@ -811,6 +830,13 @@
       <Reference ReferenceType="HasSubtype" IsForward="false">i=58</Reference>
     </References>
   </UAObjectType>
+  <UAObjectType NodeId="i=2033" BrowseName="VendorServerInfoType">
+    <DisplayName>VendorServerInfoType</DisplayName>
+    <Description>A base type for vendor specific server information.</Description>
+    <References>
+      <Reference ReferenceType="HasSubtype" IsForward="false">i=58</Reference>
+    </References>
+  </UAObjectType>
   <UAObjectType NodeId="i=2034" BrowseName="ServerRedundancyType">
     <DisplayName>ServerRedundancyType</DisplayName>
     <Description>A base type for an object that describe how a server supports redundancy.</Description>
@@ -1204,7 +1230,6 @@
       <Reference ReferenceType="HasProperty">i=3704</Reference>
       <Reference ReferenceType="HasComponent">i=2996</Reference>
       <Reference ReferenceType="HasComponent">i=2997</Reference>
-      <Reference ReferenceType="HasComponent">i=11192</Reference>
       <Reference ReferenceType="HasTypeDefinition">i=2013</Reference>
       <Reference ReferenceType="HasComponent" IsForward="false">i=2253</Reference>
     </References>
@@ -1588,133 +1613,6 @@
       </ListOfExtensionObject>
     </Value>
   </UAVariable>
-  <UAObject NodeId="i=11192" BrowseName="HistoryServerCapabilities">
-    <DisplayName>HistoryServerCapabilities</DisplayName>
-    <References>
-      <Reference ReferenceType="HasProperty">i=11193</Reference>
-      <Reference ReferenceType="HasProperty">i=11242</Reference>
-      <Reference ReferenceType="HasProperty">i=11273</Reference>
-      <Reference ReferenceType="HasProperty">i=11274</Reference>
-      <Reference ReferenceType="HasProperty">i=11196</Reference>
-      <Reference ReferenceType="HasProperty">i=11197</Reference>
-      <Reference ReferenceType="HasProperty">i=11198</Reference>
-      <Reference ReferenceType="HasProperty">i=11199</Reference>
-      <Reference ReferenceType="HasProperty">i=11200</Reference>
-      <Reference ReferenceType="HasProperty">i=11281</Reference>
-      <Reference ReferenceType="HasProperty">i=11282</Reference>
-      <Reference ReferenceType="HasProperty">i=11283</Reference>
-      <Reference ReferenceType="HasProperty">i=11502</Reference>
-      <Reference ReferenceType="HasProperty">i=11275</Reference>
-      <Reference ReferenceType="HasComponent">i=11201</Reference>
-      <Reference ReferenceType="HasComponent" IsForward="false">i=2268</Reference>
-      <Reference ReferenceType="HasTypeDefinition">i=2330</Reference>
-    </References>
-  </UAObject>
-  <UAVariable NodeId="i=11193" BrowseName="AccessHistoryDataCapability" ParentNodeId="i=11192" DataType="Boolean">
-    <DisplayName>AccessHistoryDataCapability</DisplayName>
-    <References>
-      <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
-      <Reference ReferenceType="HasProperty" IsForward="false">i=11192</Reference>
-    </References>
-  </UAVariable>
-  <UAVariable NodeId="i=11242" BrowseName="AccessHistoryEventsCapability" ParentNodeId="i=11192" DataType="Boolean">
-    <DisplayName>AccessHistoryEventsCapability</DisplayName>
-    <References>
-      <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
-      <Reference ReferenceType="HasProperty" IsForward="false">i=11192</Reference>
-    </References>
-  </UAVariable>
-  <UAVariable NodeId="i=11273" BrowseName="MaxReturnDataValues" ParentNodeId="i=11192" DataType="UInt32">
-    <DisplayName>MaxReturnDataValues</DisplayName>
-    <References>
-      <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
-      <Reference ReferenceType="HasProperty" IsForward="false">i=11192</Reference>
-    </References>
-  </UAVariable>
-  <UAVariable NodeId="i=11274" BrowseName="MaxReturnEventValues" ParentNodeId="i=11192" DataType="UInt32">
-    <DisplayName>MaxReturnEventValues</DisplayName>
-    <References>
-      <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
-      <Reference ReferenceType="HasProperty" IsForward="false">i=11192</Reference>
-    </References>
-  </UAVariable>
-  <UAVariable NodeId="i=11196" BrowseName="InsertDataCapability" ParentNodeId="i=11192" DataType="Boolean">
-    <DisplayName>InsertDataCapability</DisplayName>
-    <References>
-      <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
-      <Reference ReferenceType="HasProperty" IsForward="false">i=11192</Reference>
-    </References>
-  </UAVariable>
-  <UAVariable NodeId="i=11197" BrowseName="ReplaceDataCapability" ParentNodeId="i=11192" DataType="Boolean">
-    <DisplayName>ReplaceDataCapability</DisplayName>
-    <References>
-      <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
-      <Reference ReferenceType="HasProperty" IsForward="false">i=11192</Reference>
-    </References>
-  </UAVariable>
-  <UAVariable NodeId="i=11198" BrowseName="UpdateDataCapability" ParentNodeId="i=11192" DataType="Boolean">
-    <DisplayName>UpdateDataCapability</DisplayName>
-    <References>
-      <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
-      <Reference ReferenceType="HasProperty" IsForward="false">i=11192</Reference>
-    </References>
-  </UAVariable>
-  <UAVariable NodeId="i=11199" BrowseName="DeleteRawCapability" ParentNodeId="i=11192" DataType="Boolean">
-    <DisplayName>DeleteRawCapability</DisplayName>
-    <References>
-      <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
-      <Reference ReferenceType="HasProperty" IsForward="false">i=11192</Reference>
-    </References>
-  </UAVariable>
-  <UAVariable NodeId="i=11200" BrowseName="DeleteAtTimeCapability" ParentNodeId="i=11192" DataType="Boolean">
-    <DisplayName>DeleteAtTimeCapability</DisplayName>
-    <References>
-      <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
-      <Reference ReferenceType="HasProperty" IsForward="false">i=11192</Reference>
-    </References>
-  </UAVariable>
-  <UAVariable NodeId="i=11281" BrowseName="InsertEventCapability" ParentNodeId="i=11192" DataType="Boolean">
-    <DisplayName>InsertEventCapability</DisplayName>
-    <References>
-      <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
-      <Reference ReferenceType="HasProperty" IsForward="false">i=11192</Reference>
-    </References>
-  </UAVariable>
-  <UAVariable NodeId="i=11282" BrowseName="ReplaceEventCapability" ParentNodeId="i=11192" DataType="Boolean">
-    <DisplayName>ReplaceEventCapability</DisplayName>
-    <References>
-      <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
-      <Reference ReferenceType="HasProperty" IsForward="false">i=11192</Reference>
-    </References>
-  </UAVariable>
-  <UAVariable NodeId="i=11283" BrowseName="UpdateEventCapability" ParentNodeId="i=11192" DataType="Boolean">
-    <DisplayName>UpdateEventCapability</DisplayName>
-    <References>
-      <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
-      <Reference ReferenceType="HasProperty" IsForward="false">i=11192</Reference>
-    </References>
-  </UAVariable>
-  <UAVariable NodeId="i=11502" BrowseName="DeleteEventCapability" ParentNodeId="i=11192" DataType="Boolean">
-    <DisplayName>DeleteEventCapability</DisplayName>
-    <References>
-      <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
-      <Reference ReferenceType="HasProperty" IsForward="false">i=11192</Reference>
-    </References>
-  </UAVariable>
-  <UAVariable NodeId="i=11275" BrowseName="InsertAnnotationCapability" ParentNodeId="i=11192" DataType="Boolean">
-    <DisplayName>InsertAnnotationCapability</DisplayName>
-    <References>
-      <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
-      <Reference ReferenceType="HasProperty" IsForward="false">i=11192</Reference>
-    </References>
-  </UAVariable>
-  <UAObject NodeId="i=11201" BrowseName="AggregateFunctions" ParentNodeId="i=11192">
-    <DisplayName>AggregateFunctions</DisplayName>
-    <References>
-      <Reference ReferenceType="HasTypeDefinition">i=61</Reference>
-      <Reference ReferenceType="HasComponent" IsForward="false">i=11192</Reference>
-    </References>
-  </UAObject>
   <UAObjectType NodeId="i=2330" BrowseName="HistoryServerCapabilitiesType">
     <DisplayName>HistoryServerCapabilitiesType</DisplayName>
     <References>
@@ -1966,5 +1864,5 @@
     <Value>
       <String xmlns="http://opcfoundation.org/UA/2008/02/Types.xsd">EnumValueType</String>
     </Value>
-  </UAVariable>  
+  </UAVariable>
 </UANodeSet>
diff --git a/tools/schema/Opc.Ua.NodeSet2.PubSubMinimal.xml b/tools/schema/Opc.Ua.NodeSet2.PubSubMinimal.xml
index f04ebd6adc6..efdae09f1e9 100644
--- a/tools/schema/Opc.Ua.NodeSet2.PubSubMinimal.xml
+++ b/tools/schema/Opc.Ua.NodeSet2.PubSubMinimal.xml
@@ -1,7 +1,36 @@
-<?xml version="1.0" encoding="utf-8"?>
-<UANodeSet xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" LastModified="2016-12-31T00:00:00Z" xmlns="http://opcfoundation.org/UA/2011/03/UANodeSet.xsd">
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+ * Copyright (c) 2005-2018 The OPC Foundation, Inc. All rights reserved.
+ *
+ * OPC Foundation MIT License 1.00
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * The complete license agreement can be found here:
+ * http://opcfoundation.org/License/MIT/1.00/
+-->
+
+<UANodeSet xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" LastModified="2019-01-31T00:00:00Z" xmlns="http://opcfoundation.org/UA/2011/03/UANodeSet.xsd">
   <Models>
-    <Model ModelUri="http://opcfoundation.org/UA/" Version="1.04" PublicationDate="2016-12-31T00:00:00Z" />
+    <Model ModelUri="http://opcfoundation.org/UA/" Version="1.04" PublicationDate="2019-01-31T00:00:00Z" />
   </Models>
   <UAObjectType NodeId="i=15906" BrowseName="PubSubKeyServiceType">
     <DisplayName>PubSubKeyServiceType</DisplayName>
diff --git a/tools/schema/Opc.Ua.Types.bsd b/tools/schema/Opc.Ua.Types.bsd
index 546d9acccfa..3de0aae880f 100644
--- a/tools/schema/Opc.Ua.Types.bsd
+++ b/tools/schema/Opc.Ua.Types.bsd
@@ -1,3 +1,33 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+ * Copyright (c) 2005-2018 The OPC Foundation, Inc. All rights reserved.
+ *
+ * OPC Foundation MIT License 1.00
+ * 
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ * 
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * The complete license agreement can be found here:
+ * http://opcfoundation.org/License/MIT/1.00/
+-->
+
 <opc:TypeDictionary
   xmlns:opc="http://opcfoundation.org/BinarySchema/"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -106,7 +136,7 @@
 
   <opc:StructuredType Name="QualifiedName">
     <opc:Documentation>A string qualified with a namespace index.</opc:Documentation>
-    <opc:Field Name="NamespaceIndex" TypeName="opc:Int32" />
+    <opc:Field Name="NamespaceIndex" TypeName="opc:UInt16" />
     <opc:Field Name="Name" TypeName="opc:CharArray" />
   </opc:StructuredType>
 
@@ -362,7 +392,8 @@
     <opc:Field Name="Properties" TypeName="tns:KeyValuePair" LengthField="NoOfProperties" />
   </opc:StructuredType>
 
-  <opc:EnumeratedType Name="DataSetFieldFlags" LengthInBits="32">
+  <opc:EnumeratedType Name="DataSetFieldFlags" LengthInBits="16" IsOptionSet="true">
+    <opc:EnumeratedValue Name="None" Value="0" />
     <opc:EnumeratedValue Name="PromotedField" Value="1" />
   </opc:EnumeratedType>
 
@@ -408,13 +439,14 @@
     <opc:Field Name="Filter" TypeName="tns:ContentFilter" />
   </opc:StructuredType>
 
-  <opc:EnumeratedType Name="DataSetFieldContentMask" LengthInBits="32">
+  <opc:EnumeratedType Name="DataSetFieldContentMask" LengthInBits="32" IsOptionSet="true">
+    <opc:EnumeratedValue Name="None" Value="0" />
     <opc:EnumeratedValue Name="StatusCode" Value="1" />
     <opc:EnumeratedValue Name="SourceTimestamp" Value="2" />
     <opc:EnumeratedValue Name="ServerTimestamp" Value="4" />
     <opc:EnumeratedValue Name="SourcePicoSeconds" Value="8" />
     <opc:EnumeratedValue Name="ServerPicoSeconds" Value="16" />
-    <opc:EnumeratedValue Name="RawDataEncoding" Value="32" />
+    <opc:EnumeratedValue Name="RawData" Value="32" />
   </opc:EnumeratedType>
 
   <opc:StructuredType Name="DataSetWriterDataType" BaseType="ua:ExtensionObject">
@@ -464,6 +496,7 @@
     <opc:Field Name="Priority" TypeName="opc:Byte" />
     <opc:Field Name="NoOfLocaleIds" TypeName="opc:Int32" />
     <opc:Field Name="LocaleIds" TypeName="opc:String" LengthField="NoOfLocaleIds" />
+    <opc:Field Name="HeaderLayoutUri" TypeName="opc:String" />
     <opc:Field Name="TransportSettings" TypeName="ua:ExtensionObject" />
     <opc:Field Name="MessageSettings" TypeName="ua:ExtensionObject" />
     <opc:Field Name="NoOfDataSetWriters" TypeName="opc:Int32" />
@@ -534,6 +567,8 @@
     <opc:Field Name="DataSetMetaData" TypeName="tns:DataSetMetaDataType" />
     <opc:Field Name="DataSetFieldContentMask" TypeName="tns:DataSetFieldContentMask" />
     <opc:Field Name="MessageReceiveTimeout" TypeName="opc:Double" />
+    <opc:Field Name="KeyFrameCount" TypeName="opc:UInt32" />
+    <opc:Field Name="HeaderLayoutUri" TypeName="opc:String" />
     <opc:Field Name="SecurityMode" TypeName="tns:MessageSecurityMode" />
     <opc:Field Name="SecurityGroupId" TypeName="opc:String" />
     <opc:Field Name="NoOfSecurityKeyServices" TypeName="opc:Int32" />
@@ -571,7 +606,7 @@
 
   <opc:EnumeratedType Name="OverrideValueHandling" LengthInBits="32">
     <opc:EnumeratedValue Name="Disabled" Value="0" />
-    <opc:EnumeratedValue Name="LastUseableValue" Value="1" />
+    <opc:EnumeratedValue Name="LastUsableValue" Value="1" />
     <opc:EnumeratedValue Name="OverrideValue" Value="2" />
   </opc:EnumeratedType>
 
@@ -595,7 +630,8 @@
     <opc:EnumeratedValue Name="AscendingWriterIdSingle" Value="2" />
   </opc:EnumeratedType>
 
-  <opc:EnumeratedType Name="UadpNetworkMessageContentMask" LengthInBits="32">
+  <opc:EnumeratedType Name="UadpNetworkMessageContentMask" LengthInBits="32" IsOptionSet="true">
+    <opc:EnumeratedValue Name="None" Value="0" />
     <opc:EnumeratedValue Name="PublisherId" Value="1" />
     <opc:EnumeratedValue Name="GroupHeader" Value="2" />
     <opc:EnumeratedValue Name="WriterGroupId" Value="4" />
@@ -604,7 +640,7 @@
     <opc:EnumeratedValue Name="SequenceNumber" Value="32" />
     <opc:EnumeratedValue Name="PayloadHeader" Value="64" />
     <opc:EnumeratedValue Name="Timestamp" Value="128" />
-    <opc:EnumeratedValue Name="Picoseconds" Value="256" />
+    <opc:EnumeratedValue Name="PicoSeconds" Value="256" />
     <opc:EnumeratedValue Name="DataSetClassId" Value="512" />
     <opc:EnumeratedValue Name="PromotedFields" Value="1024" />
   </opc:EnumeratedType>
@@ -618,7 +654,8 @@
     <opc:Field Name="PublishingOffset" TypeName="opc:Double" LengthField="NoOfPublishingOffset" />
   </opc:StructuredType>
 
-  <opc:EnumeratedType Name="UadpDataSetMessageContentMask" LengthInBits="32">
+  <opc:EnumeratedType Name="UadpDataSetMessageContentMask" LengthInBits="32" IsOptionSet="true">
+    <opc:EnumeratedValue Name="None" Value="0" />
     <opc:EnumeratedValue Name="Timestamp" Value="1" />
     <opc:EnumeratedValue Name="PicoSeconds" Value="2" />
     <opc:EnumeratedValue Name="Status" Value="4" />
@@ -646,7 +683,8 @@
     <opc:Field Name="ProcessingOffset" TypeName="opc:Double" />
   </opc:StructuredType>
 
-  <opc:EnumeratedType Name="JsonNetworkMessageContentMask" LengthInBits="32">
+  <opc:EnumeratedType Name="JsonNetworkMessageContentMask" LengthInBits="32" IsOptionSet="true">
+    <opc:EnumeratedValue Name="None" Value="0" />
     <opc:EnumeratedValue Name="NetworkMessageHeader" Value="1" />
     <opc:EnumeratedValue Name="DataSetMessageHeader" Value="2" />
     <opc:EnumeratedValue Name="SingleDataSetMessage" Value="4" />
@@ -659,7 +697,8 @@
     <opc:Field Name="NetworkMessageContentMask" TypeName="tns:JsonNetworkMessageContentMask" />
   </opc:StructuredType>
 
-  <opc:EnumeratedType Name="JsonDataSetMessageContentMask" LengthInBits="32">
+  <opc:EnumeratedType Name="JsonDataSetMessageContentMask" LengthInBits="32" IsOptionSet="true">
+    <opc:EnumeratedValue Name="None" Value="0" />
     <opc:EnumeratedValue Name="DataSetWriterId" Value="1" />
     <opc:EnumeratedValue Name="MetaDataVersion" Value="2" />
     <opc:EnumeratedValue Name="SequenceNumber" Value="4" />
@@ -709,6 +748,7 @@
     <opc:Field Name="QueueName" TypeName="opc:String" />
     <opc:Field Name="ResourceUri" TypeName="opc:String" />
     <opc:Field Name="AuthenticationProfileUri" TypeName="opc:String" />
+    <opc:Field Name="RequestedDeliveryGuarantee" TypeName="tns:BrokerTransportQualityOfService" />
     <opc:Field Name="MetaDataQueueName" TypeName="opc:String" />
     <opc:Field Name="MetaDataUpdateTime" TypeName="opc:Double" />
   </opc:StructuredType>
@@ -755,30 +795,53 @@
     <opc:EnumeratedValue Name="View" Value="128" />
   </opc:EnumeratedType>
 
-  <opc:EnumeratedType Name="AccessLevelType" LengthInBits="32">
+  <opc:EnumeratedType Name="PermissionType" LengthInBits="32" IsOptionSet="true">
+    <opc:EnumeratedValue Name="None" Value="0" />
+    <opc:EnumeratedValue Name="Browse" Value="1" />
+    <opc:EnumeratedValue Name="ReadRolePermissions" Value="2" />
+    <opc:EnumeratedValue Name="WriteAttribute" Value="4" />
+    <opc:EnumeratedValue Name="WriteRolePermissions" Value="8" />
+    <opc:EnumeratedValue Name="WriteHistorizing" Value="16" />
+    <opc:EnumeratedValue Name="Read" Value="32" />
+    <opc:EnumeratedValue Name="Write" Value="64" />
+    <opc:EnumeratedValue Name="ReadHistory" Value="128" />
+    <opc:EnumeratedValue Name="InsertHistory" Value="256" />
+    <opc:EnumeratedValue Name="ModifyHistory" Value="512" />
+    <opc:EnumeratedValue Name="DeleteHistory" Value="1024" />
+    <opc:EnumeratedValue Name="ReceiveEvents" Value="2048" />
+    <opc:EnumeratedValue Name="Call" Value="4096" />
+    <opc:EnumeratedValue Name="AddReference" Value="8192" />
+    <opc:EnumeratedValue Name="RemoveReference" Value="16384" />
+    <opc:EnumeratedValue Name="DeleteNode" Value="32768" />
+    <opc:EnumeratedValue Name="AddNode" Value="65536" />
+  </opc:EnumeratedType>
+
+  <opc:EnumeratedType Name="AccessLevelType" LengthInBits="8" IsOptionSet="true">
     <opc:EnumeratedValue Name="None" Value="0" />
     <opc:EnumeratedValue Name="CurrentRead" Value="1" />
     <opc:EnumeratedValue Name="CurrentWrite" Value="2" />
     <opc:EnumeratedValue Name="HistoryRead" Value="4" />
-    <opc:EnumeratedValue Name="HistoryWrite" Value="16" />
+    <opc:EnumeratedValue Name="HistoryWrite" Value="8" />
+    <opc:EnumeratedValue Name="SemanticChange" Value="16" />
     <opc:EnumeratedValue Name="StatusWrite" Value="32" />
     <opc:EnumeratedValue Name="TimestampWrite" Value="64" />
   </opc:EnumeratedType>
 
-  <opc:EnumeratedType Name="AccessLevelExType" LengthInBits="32">
+  <opc:EnumeratedType Name="AccessLevelExType" LengthInBits="32" IsOptionSet="true">
     <opc:EnumeratedValue Name="None" Value="0" />
     <opc:EnumeratedValue Name="CurrentRead" Value="1" />
     <opc:EnumeratedValue Name="CurrentWrite" Value="2" />
     <opc:EnumeratedValue Name="HistoryRead" Value="4" />
-    <opc:EnumeratedValue Name="HistoryWrite" Value="16" />
+    <opc:EnumeratedValue Name="HistoryWrite" Value="8" />
+    <opc:EnumeratedValue Name="SemanticChange" Value="16" />
     <opc:EnumeratedValue Name="StatusWrite" Value="32" />
     <opc:EnumeratedValue Name="TimestampWrite" Value="64" />
-    <opc:EnumeratedValue Name="NonatomicRead" Value="65536" />
-    <opc:EnumeratedValue Name="NonatomicWrite" Value="131072" />
-    <opc:EnumeratedValue Name="WriteFullArrayOnly" Value="262144" />
+    <opc:EnumeratedValue Name="NonatomicRead" Value="256" />
+    <opc:EnumeratedValue Name="NonatomicWrite" Value="512" />
+    <opc:EnumeratedValue Name="WriteFullArrayOnly" Value="1024" />
   </opc:EnumeratedType>
 
-  <opc:EnumeratedType Name="EventNotifierType" LengthInBits="32">
+  <opc:EnumeratedType Name="EventNotifierType" LengthInBits="8" IsOptionSet="true">
     <opc:EnumeratedValue Name="None" Value="0" />
     <opc:EnumeratedValue Name="SubscribeToEvents" Value="1" />
     <opc:EnumeratedValue Name="HistoryRead" Value="4" />
@@ -787,9 +850,15 @@
 
   <opc:StructuredType Name="RolePermissionType" BaseType="ua:ExtensionObject">
     <opc:Field Name="RoleId" TypeName="ua:NodeId" />
-    <opc:Field Name="Permissions" TypeName="opc:UInt32" />
+    <opc:Field Name="Permissions" TypeName="tns:PermissionType" />
   </opc:StructuredType>
 
+  <opc:EnumeratedType Name="AccessRestrictionType" LengthInBits="32">
+    <opc:EnumeratedValue Name="SigningRequired" Value="0" />
+    <opc:EnumeratedValue Name="EncryptionRequired" Value="1" />
+    <opc:EnumeratedValue Name="SessionRequired" Value="2" />
+  </opc:EnumeratedType>
+
   <opc:EnumeratedType Name="StructureType" LengthInBits="32">
     <opc:EnumeratedValue Name="Structure" Value="0" />
     <opc:EnumeratedValue Name="StructureWithOptionalFields" Value="1" />
@@ -1119,6 +1188,10 @@
     <opc:Field Name="DaylightSavingInOffset" TypeName="opc:Boolean" />
   </opc:StructuredType>
 
+  <opc:OpaqueType Name="Index">
+    <opc:Documentation>This primitive data type is a UInt32 that identifies an element of an array.</opc:Documentation>
+  </opc:OpaqueType>
+
   <opc:OpaqueType Name="IntegerId">
     <opc:Documentation>A numeric identifier for an object.</opc:Documentation>
   </opc:OpaqueType>
@@ -1461,6 +1534,9 @@
     <opc:Field Name="EncryptionAlgorithm" TypeName="opc:String" />
   </opc:StructuredType>
 
+  <opc:OpaqueType Name="RsaEncryptedSecret">
+  </opc:OpaqueType>
+
   <opc:StructuredType Name="ActivateSessionRequest" BaseType="ua:ExtensionObject">
     <opc:Documentation>Activates a session with the server.</opc:Documentation>
     <opc:Field Name="RequestHeader" TypeName="tns:RequestHeader" />
@@ -1772,7 +1848,7 @@
     <opc:Field Name="DiagnosticInfos" TypeName="ua:DiagnosticInfo" LengthField="NoOfDiagnosticInfos" />
   </opc:StructuredType>
 
-  <opc:EnumeratedType Name="AttributeWriteMask" LengthInBits="32">
+  <opc:EnumeratedType Name="AttributeWriteMask" LengthInBits="32" IsOptionSet="true">
     <opc:Documentation>Define bits used to indicate which attributes are writable.</opc:Documentation>
     <opc:EnumeratedValue Name="None" Value="0" />
     <opc:EnumeratedValue Name="AccessLevel" Value="1" />
@@ -3035,4 +3111,4 @@
     <opc:EnumeratedValue Name="Unknown" Value="4" />
   </opc:EnumeratedType>
 
-</opc:TypeDictionary>
\ No newline at end of file
+</opc:TypeDictionary>
diff --git a/tools/schema/StatusCode.csv b/tools/schema/StatusCode.csv
index 57c38df9029..350b96e470e 100644
--- a/tools/schema/StatusCode.csv
+++ b/tools/schema/StatusCode.csv
@@ -78,7 +78,7 @@ BadFilterNotAllowed,0x80450000,A monitoring filter cannot be used in combination
 BadStructureMissing,0x80460000,A mandatory structured parameter was missing or null.
 BadEventFilterInvalid,0x80470000,The event filter is not valid.
 BadContentFilterInvalid,0x80480000,The content filter is not valid.
-BadFilterOperatorInvalid,0x80C10000,An unregognized operator was provided in a filter.
+BadFilterOperatorInvalid,0x80C10000,An unrecognized operator was provided in a filter.
 BadFilterOperatorUnsupported,0x80C20000,A valid operator was provided, but the server does not provide support for this filter operator.
 BadFilterOperandCountMismatch,0x80C30000,The number of operands provided for the filter operator was less then expected for the operand provided.
 BadFilterOperandInvalid,0x80490000,The operand used in a content filter is not valid.
@@ -86,7 +86,7 @@ BadFilterElementInvalid,0x80C40000,The referenced element is not a valid element
 BadFilterLiteralInvalid,0x80C50000,The referenced literal is not a valid value.
 BadContinuationPointInvalid,0x804A0000,The continuation point provide is longer valid.
 BadNoContinuationPoints,0x804B0000,The operation could not be processed because all continuation points have been allocated.
-BadReferenceTypeIdInvalid,0x804C0000,The operation could not be processed because all continuation points have been allocated.
+BadReferenceTypeIdInvalid,0x804C0000,The reference type id does not refer to a valid reference type node.
 BadBrowseDirectionInvalid,0x804D0000,The browse direction is not valid.
 BadNodeNotInView,0x804E0000,The node is not part of the view.
 BadNumericOverflow,0x81120000,The number was not accepted because of a numeric overflow.
@@ -141,7 +141,7 @@ BadTypeMismatch,0x80740000,The value supplied for the attribute is not of the sa
 BadMethodInvalid,0x80750000,The method id does not refer to a method for the specified object.
 BadArgumentsMissing,0x80760000,The client did not specify all of the input arguments for the method.
 BadNotExecutable,0x81110000,The executable attribute does not allow the execution of the method.
-BadTooManySubscriptions,0x80770000,The server has reached its  maximum number of subscriptions.
+BadTooManySubscriptions,0x80770000,The server has reached its maximum number of subscriptions.
 BadTooManyPublishRequests,0x80780000,The server has reached the maximum number of queued publish requests.
 BadNoSubscription,0x80790000,There is no subscription available for this session.
 BadSequenceNumberUnknown,0x807A0000,The sequence number is unknown to the server.
@@ -206,7 +206,7 @@ BadAggregateListMismatch,0x80D40000,The requested number of Aggregates does not
 BadAggregateNotSupported,0x80D50000,The requested Aggregate is not support by the server.
 BadAggregateInvalidInputs,0x80D60000,The aggregate value could not be derived due to invalid data inputs.
 BadAggregateConfigurationRejected,0x80DA0000,The aggregate configuration is not valid for specified node.
-GoodDataIgnored,0x00D90000,The request pecifies fields which are not valid for the EventType or cannot be saved by the historian.
+GoodDataIgnored,0x00D90000,The request specifies fields which are not valid for the EventType or cannot be saved by the historian.
 BadRequestNotAllowed,0x80E40000,The request was rejected by the server because it did not meet the criteria set by the server.
 BadRequestNotComplete,0x81130000,The request has not been processed by the server yet.
 GoodEdited,0x00DC0000,The value does not come from the real source and has been edited by the server.