From 9e0e9153ea5913e7d257ab6db82a40b2d0d036dd Mon Sep 17 00:00:00 2001
From: "U-ERICSSON\\ETHBLL" <balazs.lengyel@ericsson.com>
Date: Tue, 2 Jan 2024 09:46:07 +0100
Subject: [PATCH] Adding all YANG changes from SA5-151 and SA5-152 ; SA-102

---
 yang-models/_3gpp-5g-common-yang-types.yang   |  22 +-
 yang-models/_3gpp-5gc-ecmconnectioninfo.yang  | 253 ++++++++++++++++++
 .../_3gpp-5gc-nrm-FiveQiDscpMappingSet.yang   |   5 +-
 ...-5gc-nrm-GtpUPathQoSMonitoringControl.yang |   5 +-
 .../_3gpp-5gc-nrm-QFQoSMonitoringControl.yang |   5 +-
 yang-models/_3gpp-5gc-nrm-affunction.yang     |   5 +-
 yang-models/_3gpp-5gc-nrm-amffunction.yang    |   5 +-
 yang-models/_3gpp-5gc-nrm-amfregion.yang      |   5 +-
 yang-models/_3gpp-5gc-nrm-amfset.yang         |   5 +-
 yang-models/_3gpp-5gc-nrm-anlffunction.yang   |  45 ++++
 yang-models/_3gpp-5gc-nrm-ausffunction.yang   | 101 +++++--
 .../_3gpp-5gc-nrm-configurable5qiset.yang     |   6 +-
 yang-models/_3gpp-5gc-nrm-dnfunction.yang     |   5 +-
 yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang  |   5 +-
 yang-models/_3gpp-5gc-nrm-ep.yang             |   5 +-
 .../_3gpp-5gc-nrm-externalnrffunction.yang    |   6 +-
 .../_3gpp-5gc-nrm-externalnssffunction.yang   |   6 +-
 .../_3gpp-5gc-nrm-externalseppfunction.yang   |   8 +-
 yang-models/_3gpp-5gc-nrm-lmffunction.yang    |   5 +-
 yang-models/_3gpp-5gc-nrm-n3iwffunction.yang  |   5 +-
 yang-models/_3gpp-5gc-nrm-neffunction.yang    | 246 ++++++++++++++++-
 yang-models/_3gpp-5gc-nrm-nfprofile.yang      | 146 +++-------
 yang-models/_3gpp-5gc-nrm-nfservice.yang      |   5 +-
 yang-models/_3gpp-5gc-nrm-ngeirfunction.yang  |   5 +-
 yang-models/_3gpp-5gc-nrm-nrffunction.yang    |   5 +-
 yang-models/_3gpp-5gc-nrm-nssffunction.yang   |   5 +-
 yang-models/_3gpp-5gc-nrm-nwdaffunction.yang  |   5 +-
 yang-models/_3gpp-5gc-nrm-pcffunction.yang    |   5 +-
 .../_3gpp-5gc-nrm-predefinedpccruleset.yang   |   5 +-
 yang-models/_3gpp-5gc-nrm-scpfunction.yang    |   5 +-
 yang-models/_3gpp-5gc-nrm-seppfunction.yang   |  78 +++++-
 yang-models/_3gpp-5gc-nrm-smffunction.yang    |   5 +-
 yang-models/_3gpp-5gc-nrm-smsffunction.yang   |   5 +-
 yang-models/_3gpp-5gc-nrm-udmfunction.yang    |   5 +-
 yang-models/_3gpp-5gc-nrm-udrfunction.yang    |   5 +-
 yang-models/_3gpp-5gc-nrm-udsffunction.yang   |   5 +-
 yang-models/_3gpp-5gc-nrm-upffunction.yang    |   5 +-
 yang-models/_3gpp-common-ep-rp.yang           |   5 +-
 yang-models/_3gpp-common-filemanagement.yang  |   7 +-
 yang-models/_3gpp-common-files.yang           |  17 +-
 yang-models/_3gpp-common-fm.yang              |  11 +-
 yang-models/_3gpp-common-managed-element.yang |  19 +-
 .../_3gpp-common-managed-function.yang        |   8 +-
 yang-models/_3gpp-common-management-node.yang |   5 +-
 ..._3gpp-common-managementdatacollection.yang |  65 ++---
 yang-models/_3gpp-common-measurements.yang    |  44 ++-
 yang-models/_3gpp-common-mnsagent.yang        |   5 +-
 yang-models/_3gpp-common-mnsregistry.yang     |  11 +-
 yang-models/_3gpp-common-qmcjob.yang          |   9 +-
 yang-models/_3gpp-common-subnetwork.yang      |  16 +-
 .../_3gpp-common-subscription-control.yang    |   5 +-
 yang-models/_3gpp-common-top.yang             |   5 +-
 yang-models/_3gpp-common-trace.yang           |  90 ++++++-
 yang-models/_3gpp-common-yang-extensions.yang |  21 +-
 yang-models/_3gpp-common-yang-types.yang      |  82 +++++-
 yang-models/_3gpp-nr-nrm-beam.yang            |   5 +-
 yang-models/_3gpp-nr-nrm-bwp.yang             |   5 +-
 yang-models/_3gpp-nr-nrm-bwpset.yang          |   5 +-
 .../_3gpp-nr-nrm-cesmanagementfunction.yang   |   5 +-
 ...3gpp-nr-nrm-commonbeamformingfunction.yang |   5 +-
 ...3gpp-nr-nrm-cpciconfigurationfunction.yang |   5 +-
 .../_3gpp-nr-nrm-danrmanagementfunction.yang  |   5 +-
 .../_3gpp-nr-nrm-desmanagementfunction.yang   |   5 +-
 yang-models/_3gpp-nr-nrm-dlbofunction.yang    |   5 +-
 yang-models/_3gpp-nr-nrm-dmrofunction.yang    |   5 +-
 ...3gpp-nr-nrm-dpciconfigurationfunction.yang |   5 +-
 ...3gpp-nr-nrm-drachoptimizationfunction.yang |   5 +-
 yang-models/_3gpp-nr-nrm-ep.yang              |   5 +-
 .../_3gpp-nr-nrm-eutrancellrelation.yang      |   5 +-
 yang-models/_3gpp-nr-nrm-eutranetwork.yang    |   5 +-
 .../_3gpp-nr-nrm-eutranfreqrelation.yang      |   5 +-
 yang-models/_3gpp-nr-nrm-eutranfrequency.yang |   5 +-
 .../_3gpp-nr-nrm-externalamffunction.yang     |   5 +-
 .../_3gpp-nr-nrm-externalenbfunction.yang     |   5 +-
 .../_3gpp-nr-nrm-externaleutrancell.yang      |   5 +-
 .../_3gpp-nr-nrm-externalgnbcucpfunction.yang |   5 +-
 .../_3gpp-nr-nrm-externalgnbcuupfunction.yang |   5 +-
 .../_3gpp-nr-nrm-externalgnbdufunction.yang   |   7 +-
 .../_3gpp-nr-nrm-externalnrcellcu.yang        |   5 +-
 ...3gpp-nr-nrm-externalservinggwfunction.yang |   5 +-
 .../_3gpp-nr-nrm-externalupffunction.yang     |   5 +-
 yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang |  13 +-
 yang-models/_3gpp-nr-nrm-gnbcuupfunction.yang |   7 +-
 yang-models/_3gpp-nr-nrm-gnbdufunction.yang   |   7 +-
 yang-models/_3gpp-nr-nrm-nrcellcu.yang        |   5 +-
 yang-models/_3gpp-nr-nrm-nrcelldu.yang        |   5 +-
 yang-models/_3gpp-nr-nrm-nrcellrelation.yang  |   5 +-
 yang-models/_3gpp-nr-nrm-nrfreqrelation.yang  |   5 +-
 yang-models/_3gpp-nr-nrm-nrfrequency.yang     |   5 +-
 yang-models/_3gpp-nr-nrm-nrnetwork.yang       |   5 +-
 .../_3gpp-nr-nrm-nroperatorcelldu.yang        |   5 +-
 yang-models/_3gpp-nr-nrm-nrsectorcarrier.yang |   5 +-
 yang-models/_3gpp-nr-nrm-operatordu.yang      |  35 ++-
 yang-models/_3gpp-nr-nrm-rimrsset.yang        |   5 +-
 yang-models/_3gpp-nr-nrm-rrmpolicy.yang       |   5 +-
 yang-models/_3gpp-ns-nrm-common.yang          |   5 +-
 yang-models/_3gpp-ns-nrm-networkslice.yang    |   5 +-
 .../_3gpp-ns-nrm-networkslicesubnet.yang      |   5 +-
 yang-models/_3gpp-ns-nrm-serviceprofile.yang  |   5 +-
 yang-models/_3gpp-ns-nrm-sliceprofile.yang    |  40 +--
 100 files changed, 1433 insertions(+), 343 deletions(-)
 create mode 100644 yang-models/_3gpp-5gc-ecmconnectioninfo.yang
 create mode 100644 yang-models/_3gpp-5gc-nrm-anlffunction.yang

diff --git a/yang-models/_3gpp-5g-common-yang-types.yang b/yang-models/_3gpp-5g-common-yang-types.yang
index 3fa436021..3e1870c6e 100755
--- a/yang-models/_3gpp-5g-common-yang-types.yang
+++ b/yang-models/_3gpp-5g-common-yang-types.yang
@@ -10,9 +10,12 @@ module _3gpp-5g-common-yang-types {
   organization "3GPP SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "The model defines common types for 5G networks and 
-    network slicing.";
+    network slicing.
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541";
 
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2023-05-10 { reference CR-0916; }
   revision 2021-08-05 { reference S5-214053/CR-0518; }
   revision 2020-11-05 { reference CR-0412 ; }
@@ -25,9 +28,9 @@ module _3gpp-5g-common-yang-types {
   
     leaf sd {
       description "Slice Differentiator
-        If not needed, the value can be set to FFFFFF.";
+        If not needed, the value can be set to ff:ff:ff.";
       type yang:hex-string {
-        length 6;
+        length 8;
       }
       reference "3GPP TS 23.003";
     }
@@ -40,6 +43,19 @@ module _3gpp-5g-common-yang-types {
     }
   }
     
+  grouping PlmnIdNid {
+    description "Represents the SCP domain specific information as defined 
+      in TS 29.510 ";
+    uses types3gpp:PLMNId;
+    
+    leaf nid {
+      type string;
+      description "This attribute represents network Identity; 
+        Shall be present if PlmnIdNid identifies an SNPN. 
+        (see clauses 5.30.2.3, 5.30.2.9, 6.3.4, and 6.3.8 in TS 23.501";
+    }
+  }
+
   grouping PLMNInfo {
     description "The PLMNInfo data type define a S-NSSAI member in a specific 
       PLMNId, and it have two attributes PLMNId and S-NSSAI (PLMNId, S-NSSAI). 
diff --git a/yang-models/_3gpp-5gc-ecmconnectioninfo.yang b/yang-models/_3gpp-5gc-ecmconnectioninfo.yang
new file mode 100644
index 000000000..a5f590d5a
--- /dev/null
+++ b/yang-models/_3gpp-5gc-ecmconnectioninfo.yang
@@ -0,0 +1,253 @@
+module _3gpp-5gc-ecmconnectioninfo {
+  yang-version 1.1;
+  namespace "urn:3gpp:sa5:_3gpp-5gc-ecmconnectioninfo";
+  prefix "econn3gpp";
+
+  import ietf-inet-types { prefix inet; }
+  import _3gpp-common-top { prefix top3gpp; }
+  import _3gpp-common-yang-types { prefix types3gpp; }
+
+  organization "3GPP SA5";
+  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
+  description "Defines the YANG mapping of the EcmConnectionInfo Information 
+    Object Class (IOC) that is part of the NR Network Resource Model (NRM).
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
+  reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
+
+  revision 2023-11-14 { reference CR-1136 ; } 
+  
+  grouping GeoLocGrp {
+    description "This datatype represent the geographical location.";
+    reference "3GPP 28.538 clause 6.3.4";
+    
+    list geographicalCoordinates {
+      description "This refers to the Topological Service Area, 
+        (see clause 7.3.3.2 in TS 23.558) that is defined as a datatype 
+        (see clause 6.3.8).";
+      key latitude;
+      max-elements 1;
+      uses types3gpp:GeographicalCoordinates;
+    }
+    
+    leaf civicLocations {
+      type string;
+    }
+  }
+
+  grouping TopologicalServiceAreaGrp {
+    description "This datatype represents the topological service area.";
+    reference "3GPP TS 28.538 clause 6.3.7";
+    
+    leaf-list cellIDList {
+      description "It represents the list of NR cells. 
+
+        The cell ID, together with the gNB Identifier (using gNBId of the 
+        parent GNBCUCPFunction or GNBDUFunction or ExternalCUCPFunction), 
+        identifies a NR cell within a PLMN. This is the NR Cell Identity(NCI). 
+        See subclause 8.2 of TS 38.300";
+      type int32;
+    }
+    
+    list trackingAreaIdList {
+      description "It represents the list of tracking areas within a PLMN.";
+      min-elements 1;
+      key idx;
+      
+      leaf idx { type uint32; }
+      uses types3gpp:TaiGrp;
+    }
+    
+    list servingPLMN {
+      description "It specifies the PLMN to be served.";
+      max-elements 1;
+      key idx;
+      
+      leaf idx { type uint32; }
+      uses types3gpp:PLMNId;
+    }
+  }
+  
+  grouping ServingLocationGrp {
+    description "This datatype represents the location which is to be served 
+      by the node.";
+    reference "3GPP TS 28.536 clause 6.3.3";
+      
+    list geographicalLocation {
+      description "This refers to the Geographical Service Area, 
+        (see clause 7.3.3.3 in TS 23.558 that is defined as a datatype 
+        (see clause 6.3.4).";
+      max-elements 1;
+      key idx;
+      
+      leaf idx { type uint32; }
+      uses GeoLocGrp;
+    }
+    
+    list topologicalLocation { 
+      description "This refers to the Topological Service Area, 
+        (see clause 7.3.3.2 in TS 23.558) that is defined as a datatype 
+        (see clause 6.3.7). ";
+      max-elements 1;
+      key idx;
+      
+      leaf idx { type uint32; }
+      uses TopologicalServiceAreaGrp;
+    }
+  }
+  
+  grouping _5GCNfConnEcmInfoGrp {
+    description "This data type specifies the 5GC NF connection information.";
+    
+    leaf _5GCNFType {
+      type enumeration {
+        enum PCF;
+        enum NEF;
+        enum SCEF;
+      }
+      description "It indicates the type of a NF instance.";
+    }
+    
+    leaf _5GCNFIpAddress {
+      type inet:host;
+      mandatory true;
+      description "This parameter defines address of a NF instance, 
+      It can be IP address (either IPv4 address (See RFC 791) or 
+      IPv6 address (See RFC 2373) or FQDN (See TS 23.003). ";
+    }
+    
+
+    leaf _5GCNFRef {
+      type types3gpp:DistinguishedName;
+      description "This attribute holds the DN of a NF instance.";
+    }
+  }
+
+  grouping UPFConnInfoGrp {
+    description "This data type specifies the UPF connection information.";
+    
+    leaf uPFIpAddress {
+      type inet:host;
+      description "This parameter defines address of an UPF instance, 
+        It can be IP address (either IPv4 address (See RFC 791) or 
+        IPv6 address (See RFC 2373) or FQDN (See TS 23.003). ";
+    }
+    
+    leaf uPFRef {
+      type types3gpp:DistinguishedName;
+      description "This attribute holds the DN of an UPF instance.";
+    }
+  }
+  
+  grouping EcmConnectionInfoGrp {
+    description "Represents the EcmConnectionInfo IOC.";
+
+    list eASServiceArea { 
+      description "This parameter defines the EAS service area 
+        (see clause 7.3.3.6 in TS 23.558).";
+      min-elements 1;
+      max-elements 1;
+      key idx;
+      leaf idx { type uint32 ; }
+      uses ServingLocationGrp;
+    }
+    
+    list eESServiceArea {
+      description "This parameter defines the EES service area 
+        (see clause 7.3.3.5 in TS 23.558).";
+      min-elements 1;
+      max-elements 1;
+      key idx;
+      leaf idx { type uint32 ; }
+      uses ServingLocationGrp;
+    }
+    
+    list eDNServiceArea {
+      description "This parameter defines the EDN service area 
+        (see clause 7.3.3.4 in TS 23.558)";
+      min-elements 1;
+      max-elements 1;
+      key idx;
+      leaf idx { type uint32 ; }
+      uses ServingLocationGrp;
+    }
+    
+    leaf eASIpAddress {
+      type inet:ip-address;
+      mandatory true;
+      description "This parameter defines address of an EAS instance. 
+        It can be IP address (either IPv4 address (See RFC 791) or IPv6 
+        address (See RFC 2373).";
+    }
+    
+    leaf eESIpAddress {
+      type inet:ip-address;
+      mandatory true;
+      description "This parameter defines address of an EES instance. 
+        It can be IP address (either IPv4 address (See RFC 791) or IPv6 
+        address (See RFC 2373). ";
+    }
+    
+    leaf eCSIpAddress {
+      type inet:ip-address;
+      mandatory true;
+      description "This parameter defines address of an ECS instance. 
+        It can be IP address (either IPv4 address (See RFC 791) or IPv6 
+        address (See RFC 2373).";
+    }
+    
+    leaf ednIdentifier {
+      type string; 
+      description "The identifier of the edge data network (See TS 23.558).";
+    }
+    
+    leaf ecmConnectionType {
+      type enumeration {
+        enum USERPLANE;
+        enum CONTROLPLANE;
+        enum BOTH;
+      }
+      description "It indicates the type of ECM connection (i.e., user plane 
+        connection via UPF, control plane connection via PCF or NEF.";
+    }
+    
+    list _5GCNfConnEcmInfoList {
+      description "The attribute specifies a list of 5GCNfConnInfo which is 
+        defined as a datatype (see clause 5.3.120). It is used to 
+        provide 5GC NFs, such as PCF, NEF, SCEF, that are connected EDN NFs, 
+        such as EAS, EES, and ECS.";
+      config false;
+      min-elements 1;
+      key idx;
+      leaf idx { type uint32 ; }
+      uses _5GCNfConnEcmInfoGrp;
+    }
+    
+    list uPFConnectionInfo {
+      description "The attribute is defined as a datatype UPFConnInfo 
+        (see clause 5.3.121). It is used to provide the UPF IP address and 
+        UPF DN. ";
+      config false;
+      min-elements 1;
+      max-elements 1;
+      key idx;
+      leaf idx { type uint32 ; }
+      uses UPFConnInfoGrp;
+    }    
+  }
+
+  grouping EcmConnectionInfoSubtree {
+    description "Subtree containing EcmConnectionInfo.";
+    
+    list EcmConnectionInfo {
+      description "This IOC contains attributes to enable ECSP management 
+        system to connect EDN NFs (i.e., EAS, ECS, and EES) to 5GC NFs 
+        (i.e. UPF, PCF, NEF, SCEF) (See clause 7.4.3 and 7.4.4 in TS 28.538). ";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses EcmConnectionInfoGrp;
+      }
+    }
+  }
+}
diff --git a/yang-models/_3gpp-5gc-nrm-FiveQiDscpMappingSet.yang b/yang-models/_3gpp-5gc-nrm-FiveQiDscpMappingSet.yang
index c3ebfe7a3..10e0ee414 100755
--- a/yang-models/_3gpp-5gc-nrm-FiveQiDscpMappingSet.yang
+++ b/yang-models/_3gpp-5gc-nrm-FiveQiDscpMappingSet.yang
@@ -10,9 +10,12 @@ module _3gpp-5gc-nrm-FiveQiDscpMappingSet {
   
   organization "3gpp SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
-  description " This IOC represents the set of mapping between 5QIs and DSCP.";
+  description " This IOC represents the set of mapping between 5QIs and DSCP.
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541";
 
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2020-08-03 { reference "CR-0321"; }
   revision 2020-05-27 { reference "CR-0287"; }
 
diff --git a/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang b/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang
index d29d6d21a..b649d0bb0 100755
--- a/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang
+++ b/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang
@@ -12,9 +12,12 @@ module _3gpp-5gc-nrm-GtpUPathQoSMonitoringControl {
   organization "3gpp SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "This IOC represents the capabilities and properties for control 
-    of GTP-U path QoS monitoring defined in 3GPP TS 23.501.";
+    of GTP-U path QoS monitoring defined in 3GPP TS 23.501.
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541";
 
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2020-11-05 { reference CR-0412 ; }
   revision 2020-09-30 { reference "CR-0393"; }
   revision 2020-08-03 { reference "CR-0321"; }
diff --git a/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang b/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang
index 6f3ae3526..3294c01f8 100755
--- a/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang
+++ b/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang
@@ -14,9 +14,12 @@ module _3gpp-5gc-nrm-QFQoSMonitoringControl {
   description "This IOC represents the capabilities and properties for control 
     of QoS monitoring per QoS flow per UE for URLLC service defined 
     
-in 3GPP TS 23.501.";
+in 3GPP TS 23.501.
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541";
 
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2023-04-26 { reference CR-0916; }
   revision 2020-11-08 { reference CR-0412 ; }
   revision 2020-08-03 { reference "CR-0321"; }
diff --git a/yang-models/_3gpp-5gc-nrm-affunction.yang b/yang-models/_3gpp-5gc-nrm-affunction.yang
index c40025f72..f3ec73762 100755
--- a/yang-models/_3gpp-5gc-nrm-affunction.yang
+++ b/yang-models/_3gpp-5gc-nrm-affunction.yang
@@ -12,9 +12,12 @@ module _3gpp-5gc-nrm-affunction {
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "This IOC is defined only to describe the IOCs representing
                its interaction interface with 5GC (i.e. EP_Rx and EP_N5).
-               It has no attributes defined.";
+               It has no attributes defined.
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541";
   
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2023-04-26 { reference CR-0916; }
   revision 2019-10-28 { reference S5-193518 ; }
   revision 2019-05-15 {reference "initial revision"; }
diff --git a/yang-models/_3gpp-5gc-nrm-amffunction.yang b/yang-models/_3gpp-5gc-nrm-amffunction.yang
index ef7b462fa..7db030b64 100755
--- a/yang-models/_3gpp-5gc-nrm-amffunction.yang
+++ b/yang-models/_3gpp-5gc-nrm-amffunction.yang
@@ -12,9 +12,12 @@ module _3gpp-5gc-nrm-amffunction {
 
   organization "3gpp SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
-  description "AMFFunction derived from basic ManagedFunction.";
+  description "AMFFunction derived from basic ManagedFunction.
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
   
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2022-01-07 { reference CR-0643; }
   revision 2020-11-06 { reference CR-0412 ; }
   revision 2019-10-25 { reference "S5-194457 S5-193518"; }
diff --git a/yang-models/_3gpp-5gc-nrm-amfregion.yang b/yang-models/_3gpp-5gc-nrm-amfregion.yang
index 5a9d98914..a2afbe9d6 100755
--- a/yang-models/_3gpp-5gc-nrm-amfregion.yang
+++ b/yang-models/_3gpp-5gc-nrm-amfregion.yang
@@ -12,9 +12,12 @@ module _3gpp-5gc-nrm-amfregion {
   organization "3gpp SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "This IOC represents the AMF Region which consists one or
-    multiple AMF Sets.";
+    multiple AMF Sets.
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2022-01-07 { reference CR-0643; }
   revision 2020-11-06 { reference CR-0412 ; }
   revision 2019-10-28 { reference S5-193518 ; }
diff --git a/yang-models/_3gpp-5gc-nrm-amfset.yang b/yang-models/_3gpp-5gc-nrm-amfset.yang
index 9394f45e4..31f76519f 100755
--- a/yang-models/_3gpp-5gc-nrm-amfset.yang
+++ b/yang-models/_3gpp-5gc-nrm-amfset.yang
@@ -12,9 +12,12 @@ module _3gpp-5gc-nrm-amfset {
   organization "3gpp SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "This IOC represents the AMF Set which consists of some AMFs 
-    that serve a given area and Network Slice.";
+    that serve a given area and Network Slice.
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2022-01-07 { reference CR-0643; }
   revision 2020-11-06 { reference CR-0412 ; }
   revision 2019-10-28 { reference S5-193518 ; }
diff --git a/yang-models/_3gpp-5gc-nrm-anlffunction.yang b/yang-models/_3gpp-5gc-nrm-anlffunction.yang
new file mode 100644
index 000000000..85673a4c7
--- /dev/null
+++ b/yang-models/_3gpp-5gc-nrm-anlffunction.yang
@@ -0,0 +1,45 @@
+module _3gpp-5gc-nrm-anlffunction {
+  yang-version 1.1;
+  
+  namespace urn:3gpp:sa5:_3gpp-5gc-nrm-anlffunction;
+  prefix anlf3gpp;
+  
+  import _3gpp-common-managed-element { prefix me3gpp; }
+  import _3gpp-common-top { prefix top3gpp; }
+  import _3gpp-5gc-nrm-nwdaffunction { prefix nwdaf3gpp; }
+  
+  organization "3gpp SA5";
+  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
+  description "This IOC represents the AnLF function in 5GC.
+               For more information about the AnLF, see 3GPP TS 23.288.
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
+  reference "3GPP TS 28.541";
+  
+  revision 2023-11-03 { reference "initial revision"; }
+  
+  grouping AnLFFunctionGrp {
+    description "Represents the AnLFFunction IOC";
+    uses top3gpp:Top_Grp;    
+    leaf activationStatus {
+      type enumeration {
+        enum ACTIVATED;
+        enum DEACTIVATED;
+      }
+      config false;
+      description "It indicates the activation status of the AnLF";
+    }
+  }
+    
+  augment "/me3gpp:ManagedElement/nwdaf3gpp:NWDAFFunction" {
+    list AnLFFunction {
+      description "5G Core AnLF contained by NWDAF";
+      reference "3GPP TS 28.541";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses AnLFFunctionGrp;
+      }
+    }
+  }
+}
diff --git a/yang-models/_3gpp-5gc-nrm-ausffunction.yang b/yang-models/_3gpp-5gc-nrm-ausffunction.yang
index 526aaf86f..e2648cdd3 100755
--- a/yang-models/_3gpp-5gc-nrm-ausffunction.yang
+++ b/yang-models/_3gpp-5gc-nrm-ausffunction.yang
@@ -9,34 +9,103 @@ module _3gpp-5gc-nrm-ausffunction {
   import ietf-inet-types { prefix inet; }
   import _3gpp-5g-common-yang-types { prefix types5g3gpp; }
   import _3gpp-common-yang-types { prefix types3gpp; }
+  import _3gpp-common-yang-extensions { prefix yext3gpp; }
   import _3gpp-common-top { prefix top3gpp; }
+  import _3gpp-5gc-nrm-nfprofile { prefix nfp3gpp; }
   
   organization "3gpp SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "This IOC represents the AUSF function in 5GC. For more 
-    information about the AUSF, see 3GPP TS 23.501.";
+    information about the AUSF, see 3GPP TS 23.501.
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541";
   
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2022-01-07 { reference CR-0643; }
   revision 2020-11-06 { reference CR-0412 ; }
   revision 2019-10-25 { reference "S5-194457 S5-193518"; }
 
   revision 2019-05-22 {reference "initial revision"; }
   
+  grouping AusfInfoGrp {
+    description "Represents the information of an AUSF NF Instance 
+      (see TS 29.510).";
+
+    grouping SuciInfoGrp {
+      description "This data type represents SUCI information containing 
+        Routing Indicator and Home Network Public Key ID. (See TS 29.510)";
+        
+      leaf-list routingInds {
+        type string;
+        min-elements 1;
+        description "It indicates served Routing Indicator (see TS 23.003, 
+          clause 2.2B). If not provided, the AUSF/UDM 
+          can serve any Routing Indicator.";
+      }
+      
+      leaf-list hNwPubKeyIds  {
+        type int64;
+        min-elements 1;
+        description "It indicating served Home Network Public Key 
+          (see TS 23.003, clause 2.2B). If not provided, the AUSF/UDM 
+          can serve any public key.";
+      }
+    }
+      
+    leaf nFSrvGroupId {
+      type string;
+      mandatory false;
+      config false;
+      yext3gpp:inVariant;
+      yext3gpp:notNotifyable;
+      description "This parameter defines identity of the group that is 
+        served by the NF instance (See TS 29.510).";
+    }
+    
+    list supiRanges { 
+      description "It represents list of ranges of SUPIs that can be served 
+        by the PCF instance.";
+      key idx;
+      leaf idx { type uint32 ; }
+      uses nfp3gpp:SupiRange;
+    }
+    
+      leaf-list routingIndicators {
+        description "This attribute represents a list of Routing Indicator 
+          information that allows to route network signalling with SUCI 
+          (see TS 23.003 [13]) to the AUSF instance.
+          If not provided, the AUSF can serve any Routing Indicator.";
+        type string {
+          pattern "[0-9]{1,4}";
+        }
+      }
+    
+    list suciInfos {
+      description "This attribute represents a list of SuciInfo. A SUCI 
+        that matches this information can be served by the AUSF. 
+        A SUCI that matches all attributes of at least one entry in this 
+        array shall be considered as a match of this information.";
+      key idx;
+      leaf idx { type uint32 ; }
+      uses SuciInfoGrp;
+    }    
+  }
+  
   grouping AUSFFuntionGrp {
     description "Represents the AUSFFuntion IOC";
     uses mf3gpp:ManagedFunctionGrp;
     
-    list pLMNIdList {
+    list pLMNInfoList {
       description "List of at most six entries of PLMN Identifiers, but at 
         least one (the primary PLMN Id).
         The PLMN Identifier is composed of a Mobile Country Code (MCC) and 
         a Mobile Network Code (MNC).";
 
       min-elements 1;
-      max-elements 6;
-      key "mcc mnc";
-      uses types3gpp:PLMNId;
+      key idx;
+      leaf idx { type uint32 ; }
+      uses types5g3gpp:PLMNInfo;
     }
     
     leaf sBIFQDN {
@@ -45,17 +114,6 @@ module _3gpp-5gc-nrm-ausffunction {
       type inet:domain-name;
     }
     
-    list  sNSSAIList {
-      description "List of S-NSSAIs the managed object is capable of supporting.
-        (Single Network Slice Selection Assistance Information)
-        An S-NSSAI has an SST (Slice/Service type) and an optional SD
-        (Slice Differentiator) field.";
-      //optional support
-      reference "3GPP TS 23.003";
-      key "sd sst";
-      uses types5g3gpp:SNssai;
-    }
-    
     list managedNFProfile {
       key idx;
       min-elements 1;
@@ -63,7 +121,6 @@ module _3gpp-5gc-nrm-ausffunction {
       uses types3gpp:ManagedNFProfile;
     }
   
-
     list commModelList {
       min-elements 1;
       key "groupId";
@@ -72,6 +129,16 @@ module _3gpp-5gc-nrm-ausffunction {
       reference "3GPP TS 23.501";
       uses types5g3gpp:CommModel;
     }
+    
+    list ausfInfo {
+      description "It represents the information of an AUSF NF Instance 
+        (see TS 29.510)";
+      key idx;
+      min-elements 1;
+      max-elements 1;
+      leaf idx { type uint32 ; }
+      uses AusfInfoGrp;
+    }
   }
   
   augment "/me3gpp:ManagedElement" {
diff --git a/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang b/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang
index fd5d1a32a..26f68b810 100755
--- a/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang
+++ b/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang
@@ -15,10 +15,12 @@ module _3gpp-5gc-nrm-configurable5qiset {
     be name contained by SubNetwork ManagedElement, GNBDUFunction,
     GNBCUUPFunction and GNBCUCPFunction.  Sets are then referenced by attribute
     (configurable5QISetRef) in applicable MOIs.  For consistency it is 
-    recommended that referenced 5QI sets be defined within the same subtree.";
-
+    recommended that referenced 5QI sets be defined within the same subtree.
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541";
 
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2022-11-02 { reference "CR-0753" ; }
   revision 2022-07-28 { reference "CR-0770"; }
   revision 2022-04-29 { reference "CR-0729"; }
diff --git a/yang-models/_3gpp-5gc-nrm-dnfunction.yang b/yang-models/_3gpp-5gc-nrm-dnfunction.yang
index 675c3b1aa..fb3a27d25 100755
--- a/yang-models/_3gpp-5gc-nrm-dnfunction.yang
+++ b/yang-models/_3gpp-5gc-nrm-dnfunction.yang
@@ -11,9 +11,12 @@ module _3gpp-5gc-nrm-dnfunction {
   organization "3gpp SA5";
   description "This IOC is defined only to describe the IOCs representing
                Data Network (DN) interaction interface with 5GC (i.e. EP_N6).
-               It has no attributes defined.";
+               It has no attributes defined.
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541";
   
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2019-10-28 { reference S5-193518 ; }
 
   revision 2019-05-15 {
diff --git a/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang b/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang
index 583e6a2bf..12ef3c65c 100755
--- a/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang
+++ b/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang
@@ -11,9 +11,12 @@ module _3gpp-5gc-nrm-dynamic5qiset {
   organization "3gpp SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "This IOC represents the dynamic 5QIs including their QoS 
-    characteristics.";
+    characteristics.
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541";
 
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2022-07-28 { reference "CR-0770"; }
   revision 2022-01-07 { reference CR-0643; }
   revision 2020-10-01 { reference "CR-0393"; }
diff --git a/yang-models/_3gpp-5gc-nrm-ep.yang b/yang-models/_3gpp-5gc-nrm-ep.yang
index fdd210297..803d3b134 100755
--- a/yang-models/_3gpp-5gc-nrm-ep.yang
+++ b/yang-models/_3gpp-5gc-nrm-ep.yang
@@ -27,9 +27,12 @@ module _3gpp-5gc-nrm-ep {
   organization "3GPP SA5";
   description "Defines the YANG mapping of the 5GC related endpoint
                Information Object Classes (IOCs) that are part of the 5G Core 
-               Network Resource Model.";
+               Network Resource Model.
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541";
   
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2019-11-18 {
     description "Ericsson refactoring.";
   }
diff --git a/yang-models/_3gpp-5gc-nrm-externalnrffunction.yang b/yang-models/_3gpp-5gc-nrm-externalnrffunction.yang
index 95f1cea5e..3268b7717 100755
--- a/yang-models/_3gpp-5gc-nrm-externalnrffunction.yang
+++ b/yang-models/_3gpp-5gc-nrm-externalnrffunction.yang
@@ -8,8 +8,12 @@ module _3gpp-5gc-nrm-externalnrffunction {
   import _3gpp-common-top { prefix top3gpp; }
   import _3gpp-common-managed-function { prefix mf3gpp; }
   
-  description "This IOC represents external NRF function controlled by another management domain.";
+  description "This IOC represents external NRF function controlled 
+    by another management domain.
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
 
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2019-10-28 { reference S5-193518 ; }
   revision 2019-06-11 {
     description "Ericsson refactoring.";
diff --git a/yang-models/_3gpp-5gc-nrm-externalnssffunction.yang b/yang-models/_3gpp-5gc-nrm-externalnssffunction.yang
index 665977805..5378bc0a7 100755
--- a/yang-models/_3gpp-5gc-nrm-externalnssffunction.yang
+++ b/yang-models/_3gpp-5gc-nrm-externalnssffunction.yang
@@ -8,8 +8,12 @@ module _3gpp-5gc-nrm-externalnssffunction {
   import _3gpp-common-top { prefix top3gpp; }
   import _3gpp-common-managed-function { prefix mf3gpp; }
   
-  description "This IOC represents external NSSF function controlled by another management domain.";
+  description "This IOC represents external NSSF function controlled 
+    by another management domain.
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
 
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2019-10-28 { reference S5-193518 ; }
   revision 2019-06-11 {
     description "Ericsson refactoring.";
diff --git a/yang-models/_3gpp-5gc-nrm-externalseppfunction.yang b/yang-models/_3gpp-5gc-nrm-externalseppfunction.yang
index b7080fc3a..828cecc36 100755
--- a/yang-models/_3gpp-5gc-nrm-externalseppfunction.yang
+++ b/yang-models/_3gpp-5gc-nrm-externalseppfunction.yang
@@ -7,6 +7,7 @@ module _3gpp-5gc-nrm-externalseppfunction {
   import _3gpp-common-managed-function { prefix mf3gpp; }
   import _3gpp-common-managed-element { prefix me3gpp; }
   import _3gpp-common-yang-types { prefix types3gpp; }
+  import _3gpp-common-yang-extensions { prefix yext3gpp; }
   import _3gpp-common-top { prefix top3gpp; }
   import ietf-inet-types { prefix inet; }
   
@@ -14,9 +15,12 @@ module _3gpp-5gc-nrm-externalseppfunction {
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "This IOC represents the external SEPP function which support 
     message filtering and policing on inter-PLMN control plane interface. 
-    For more information about the SEPP, see 3GPP TS 23.501.";
+    For more information about the SEPP, see 3GPP TS 23.501.
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541";
   
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2023-04-26 { reference CR-0916; }
   revision 2019-11-17 {reference "initial revision"; }
 
@@ -27,11 +31,13 @@ module _3gpp-5gc-nrm-externalseppfunction {
       description "PLMN Identifiers of the sepp.
         The PLMN Identifier is composed of a Mobile Country Code (MCC) and a 
         Mobile Network Code (MNC).";
+      yext3gpp:inVariant;
       uses types3gpp:PLMNId;
     }
 
     leaf sEPPId {
       type uint16;
+      yext3gpp:inVariant;
     }    
 
     leaf fqdn {
diff --git a/yang-models/_3gpp-5gc-nrm-lmffunction.yang b/yang-models/_3gpp-5gc-nrm-lmffunction.yang
index ee9ec056a..6069ae513 100755
--- a/yang-models/_3gpp-5gc-nrm-lmffunction.yang
+++ b/yang-models/_3gpp-5gc-nrm-lmffunction.yang
@@ -11,9 +11,12 @@ module _3gpp-5gc-nrm-lmffunction {
   import _3gpp-common-top { prefix top3gpp; }
   
   organization "3gpp SA5";
-  description "This IOC represents the LMF function defined in 3GPP TS 23.501.";
+  description "This IOC represents the LMF function defined in 3GPP TS 23.501.
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541";
   
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2019-10-25 { reference "S5-194457 S5193518"; }
 
   revision 2019-05-15 {
diff --git a/yang-models/_3gpp-5gc-nrm-n3iwffunction.yang b/yang-models/_3gpp-5gc-nrm-n3iwffunction.yang
index 05ca146ca..25dc78827 100755
--- a/yang-models/_3gpp-5gc-nrm-n3iwffunction.yang
+++ b/yang-models/_3gpp-5gc-nrm-n3iwffunction.yang
@@ -12,9 +12,12 @@ module _3gpp-5gc-nrm-n3iwffunction {
   
   organization "3gpp SA5";
   description "This IOC represents the N3IWF function which is used to enable non-3GPP
-               access networks connected to the 5GC. For more information about the N3IWF, see 3GPP TS 23.501.";
+               access networks connected to the 5GC. For more information about the N3IWF, see 3GPP TS 23.501.
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541";
   
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2019-10-28 { reference S5-193518 ; }
   revision 2019-05-22 {
     description "initial revision";
diff --git a/yang-models/_3gpp-5gc-nrm-neffunction.yang b/yang-models/_3gpp-5gc-nrm-neffunction.yang
index 2509f23b9..f2b6f26f9 100755
--- a/yang-models/_3gpp-5gc-nrm-neffunction.yang
+++ b/yang-models/_3gpp-5gc-nrm-neffunction.yang
@@ -7,20 +7,247 @@ module _3gpp-5gc-nrm-neffunction {
   import _3gpp-common-managed-function { prefix mf3gpp; }
   import _3gpp-common-managed-element { prefix me3gpp; }
   import ietf-inet-types { prefix inet; }
+  import _3gpp-common-yang-types { prefix types3gpp; }
+  import _3gpp-common-yang-extensions { prefix yext3gpp; }
   import _3gpp-common-top { prefix top3gpp; }
   import _3gpp-5g-common-yang-types { prefix types5g3gpp; }
+  import _3gpp-5gc-nrm-nfprofile { prefix nfp3gpp; }
   
   organization "3gpp SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "This IOC represents the NEF function in 5GC. For more 
-    information about the NEF, see 3GPP TS 23.501.";
+    information about the NEF, see 3GPP TS 23.501.
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541";
   
+  revision 2023-09-18 { reference CR-1103 ; }
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2023-04-26 { reference CR-0916; }
   revision 2022-01-07 { reference CR-0643; }
   revision 2020-11-06 { reference CR-0412 ; }
   revision 2019-10-20 { reference "initial revision"; }
   
+  grouping DnnInfoItemGrp {
+    description "This data type represents set of parameters supported by NF 
+      for a given S-NSSAI. (See clause 6.1.6.2.97 of TS 29.510)";
+    
+    leaf dnn {
+      type string;
+      mandatory true;
+      description "It represents supported DNN or Wildcard DNN if the NF 
+        supports all DNNs for the related S-NSSAI. The DNN shall contain the 
+        Network Identifier and it may additionally contain an Operator 
+        Identifier. If the Operator Identifier is not included, the DNN is 
+        supported for all the PLMNs in the plmnList of the NF Profile.";
+    }
+  }
+  
+  grouping SnssaiInfoItemGrp {
+    description "This data type represents set of parameters supported by NF 
+      for a given S-NSSAI. (See clause 6.1.6.2.97 of TS 29.510)";
+      
+    list sNssai {
+      description "It represents the S-NSSAI the NetworkSlice managed object 
+        is supporting. The S-NSSAI is defined in TS 23.003.";        
+      min-elements 1;
+      key idx;
+      leaf idx { type uint32 ; }
+      uses types5g3gpp:SNssai;
+    }
+    
+    list dnnInfoList{
+      description "It represents list of parameters supported by the 
+        NF per DNN.";
+      min-elements 1;
+      key idx;
+      leaf idx { type uint32 ; }
+      uses DnnInfoItemGrp;
+    }
+  }
+  
+  grouping AfEventExposureDataGrp {
+    description "This data type represents the AF Event Exposure data managed 
+      by a given NEF Instance. (See clause 6.1.6.2.50 TS 29.510";
+    
+    leaf-list afEvents {  // stage 2 double defined
+      type string;
+      min-elements 1;
+      description "It represents AF Event(s) exposed by the NEF after 
+        registration of the AF(s) at the NEF.";
+    }
+    
+    leaf-list afIds {
+      type string;
+      min-elements 1;
+      description "It represents list of application function identifiers of 
+        the managed PFDs.";
+    }
+    
+    leaf-list appIds {  // stage 2 shaky
+      type string;
+      min-elements 1;
+      description "It represents list of internal application identifiers.";
+    }
+  }
+  
+  grouping PfdDataGrp {
+    description "This data type represents the list of Application IDs 
+      and/or AF IDs managed by a given NEF Instance. 
+      (See clause 6.1.6.2.49 TS 29.510)";
+    
+    leaf-list appIds {  // stage 2 shaky
+      type string;
+      min-elements 1;
+      description "It represents list of internal application identifiers.";
+    }
+      
+    leaf-list afIds {
+      type string;
+      min-elements 1;
+      description "It represents list of application function identifiers of 
+        the managed PFDs.";
+    }
+  }
+  
+  grouping UnTrustAfInfoGrp {
+    description "This data type represents information of an untrusted AF 
+      Instance. (See clause 6.1.6.2.95 TS 29.510)";
+    
+    leaf afId {
+      type string;
+      mandatory true;
+      description "It represents associated AF id.";
+    }
+      
+    list sNssaiInfoList {
+      description "It represents S-NSSAIs and DNNs supported by the AF.";
+      min-elements 1;
+      key idx;
+      leaf idx { type uint32 ; }
+      uses SnssaiInfoItemGrp;
+    }
+      
+    leaf mappingInd {
+      type boolean;
+      yext3gpp:initial-value false;
+      description "When present, this attribute indicates whether the 
+        AF supports mapping between UE IP address (IPv4 address or IPv6 prefix) 
+        and UE ID (i.e. GPSI).
+        True: the AF supports mapping between UE IP address and UE ID;
+        False: the AF does not support mapping between UE IP address 
+        and UE ID.";
+    }
+  }
+  
+  grouping NefInfoGrp {
+    description "This data type represents information of an NEF Instance. 
+      (See clause 6.1.6.2.48 TS 29.510).";
+
+    list taiList {
+      config false;
+      description "List of TAIs";
+      yext3gpp:inVariant;
+      yext3gpp:notNotifyable;
+      key idx;
+      leaf idx { type uint32 ; }
+      uses types3gpp:TaiGrp;
+    }
+
+    list taiRangelist {
+      config false;
+      description "Range of TAIs";
+      yext3gpp:inVariant;
+      yext3gpp:notNotifyable;
+      key idx;
+      leaf idx { type uint32 ; }
+      uses nfp3gpp:TaiRange;
+    }
+             
+    leaf nefId {
+      type string;
+      mandatory true;
+      description "It represents the NEF ID. 
+        (see clause 6.1.6.3.2 of TS 29.510)";
+    }
+    
+    list pfdData {
+      config false;
+      description "It represents PFD data, containing the list of internal 
+        application identifiers and/or the list of application function 
+        identifiers for which the PFDs can be provided.
+
+        Absence of this attribute indicates that the PFDs for any internal 
+        application identifier and for any application function identifier 
+        can be provided.";
+      min-elements 1;
+      key idx;
+      leaf idx { type uint32 ; }
+      uses PfdDataGrp;
+    }
+    
+    list afEeData {
+      config false;
+      description "It represents the AF provided event exposure data. The NEF 
+        registers such information in the NRF on behalf of the AF.";
+      min-elements 1;
+      key idx;
+      leaf idx { type uint32 ; }
+      uses AfEventExposureDataGrp;
+    }
+    
+    list gpsiRanges {
+      description "It represents list of ranges of GPSIs whose profile data 
+        is available.";
+      min-elements 1;
+      key idx;
+      leaf idx { type uint32 ; }
+      uses nfp3gpp:IdentityRange;
+    }
+    
+    list externalGroupIdentifiersRanges { 
+      description "It represents list of ranges of external groups whose 
+        profile data is available.";  // stage 2 definition is shaky
+      min-elements 1;
+      key idx;
+      leaf idx { type uint32 ; }
+      uses nfp3gpp:IdentityRange;
+    }
+    
+    leaf-list servedFqdnList {
+      type string;
+      min-elements 1;
+      description "It represents pattern (regular expression according to 
+        the ECMA-262 dialect [75]) representing the Domain names served by 
+        the NEF.";
+    }
+    
+    leaf-list dnaiList {
+      type string;
+      min-elements 1;
+      description "It represents list of Data network access identifiers 
+        supported by the NEF. The absence of this attribute indicates that 
+        the NEF can be selected for any DNAI.";
+    }
+    
+    list unTrustAfInfoList {
+      description "It represents list of information corresponding to the AFs.";
+      min-elements 1;
+      key idx;
+      leaf idx { type uint32 ; }
+      uses UnTrustAfInfoGrp;
+    }
+    
+    leaf uasNfFunctionalityInd {
+      type boolean;
+      yext3gpp:initial-value false;
+      description "When present, this attribute shall indicate whether the ,
+        NEF supports UAS NF functionality:
+        - True: UAS NF functionality is supported by the NEF.
+        - False (default): UAS NF functionality is not supported by the NEF";
+    }
+  }
+  
   grouping NEFFunctionGrp {
     description "Represents the NEFFunction IOC";
     uses mf3gpp:ManagedFunctionGrp;
@@ -40,6 +267,14 @@ module _3gpp-5gc-nrm-neffunction {
       uses types5g3gpp:SNssai;
     }
 
+    list managedNFProfile {
+      description "This parameter defines profile for managed NF(See TS 23.501)";
+      min-elements 1;
+      max-elements 1;
+      key idx;
+      uses types3gpp:ManagedNFProfile;
+    }
+    
     leaf-list capabilityList {
       description "List of supported capabilities of the NEF.";
       reference "3GPP TS 23.003";
@@ -48,8 +283,15 @@ module _3gpp-5gc-nrm-neffunction {
     
     leaf isCAPIFSup {
       type boolean;
+      yext3gpp:inVariant;
     }
     
+    list nefInfo {
+      description "This attribute represents information of an NEF NF Instance.";
+      key idx;
+      leaf idx { type uint32 ; }
+      uses NefInfoGrp;
+    }
   }
   
   augment "/me3gpp:ManagedElement" {
@@ -64,4 +306,4 @@ module _3gpp-5gc-nrm-neffunction {
       uses mf3gpp:ManagedFunctionContainedClasses;
     }
   }
-}
\ No newline at end of file
+}
diff --git a/yang-models/_3gpp-5gc-nrm-nfprofile.yang b/yang-models/_3gpp-5gc-nrm-nfprofile.yang
index 819c612ac..8f6155866 100755
--- a/yang-models/_3gpp-5gc-nrm-nfprofile.yang
+++ b/yang-models/_3gpp-5gc-nrm-nfprofile.yang
@@ -10,9 +10,13 @@ module _3gpp-5gc-nrm-nfprofile {
   import _3gpp-5gc-nrm-nfservice { prefix nfs3gpp; }
   
   organization "3gpp SA5";
-  description "NF profile class.";
+  description "NF profile class.
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 29.510";
   
+  revision 2023-11-18 { reference CR-1103 ; }
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2023-02-14 { reference CR-0891; }
   revision 2019-06-17 { reference "initial revision"; }
   
@@ -39,7 +43,6 @@ module _3gpp-5gc-nrm-nfprofile {
       description "Time in seconds expected between 2 consecutive heart-beat messages from
                    an NF Instance to the NRF. It may be included in the registration request.
                    When present in the request it shall contain the heartbeat time proposed by the NF service consumer.";
-      //conditional support
       type uint16;
     }
     
@@ -48,17 +51,15 @@ module _3gpp-5gc-nrm-nfprofile {
         This IE shall be present if this information is available for the NF.
                  If not provided, PLMN ID(s) of the PLMN of the NRF are assumed for the NF.";
       
-      //conditional support
       min-elements 1;
       key "mcc mnc";
       uses types3gpp:PLMNId;
     }
     
-    list sNssais { //is the key unique
+    list sNssais { 
       description "S-NSSAIs of the Network Function. If not provided, the NF can serve any S-NSSAI.
                    When present this IE represents the list of S-NSSAIs supported in all the PLMNs listed in the plmnList IE.";
       min-elements 1;
-      //optional support
       key "sst sd";
       uses Snssai;
     }
@@ -68,8 +69,7 @@ module _3gpp-5gc-nrm-nfprofile {
                    When present, this IE shall include the S-NSSAIs supported by the Network Function
                    for each PLMN supported by the Network Function. When present, this IE shall override sNssais IE.";
       min-elements 1;
-      //optional support
-      key idx; //no obvious leaf to use as a key
+      key idx; 
       leaf idx { type uint32; }
       uses PlmnSnssai;
     }
@@ -77,7 +77,6 @@ module _3gpp-5gc-nrm-nfprofile {
     leaf-list nsiList {
       description "NSI identities of the Network Function.
                    If not provided, the NF can serve any NSI.";
-      //optional support
                    min-elements 1;
       type string;
     }
@@ -85,28 +84,24 @@ module _3gpp-5gc-nrm-nfprofile {
     leaf fqdn {
       description "FQDN of the Network Function. For AMF, the FQDN registered with the NRF
                    shall be that of the AMF Name.";
-      //conditional support
         type inet:domain-name;
     }
     
     leaf interPlmnFqdn {
       description "If the NF needs to be discoverable by other NFs in a different PLMN,
                    then an FQDN that is used for inter-PLMN routing is specified.";
-      //conditional support
       type inet:domain-name;
     }
     
     leaf-list ipv4Addresses {
       description "IPv4 address(es) of the Network Function.";
       min-elements 1;
-      //conditional support
       type inet:ipv4-address;
     }
     
     leaf-list ipv6Addresses {
       description "IPv6 address(es) of the Network Function.";
       min-elements 1;
-      //conditional support
       type inet:ipv6-address;
     }
     
@@ -115,7 +110,6 @@ module _3gpp-5gc-nrm-nfprofile {
                    If not provided, any PLMN is allowed to access the NF.";
       
       min-elements 1;
-      //optional support
       key "mcc mnc";
       uses types3gpp:PLMNId;
     }
@@ -124,7 +118,6 @@ module _3gpp-5gc-nrm-nfprofile {
       description "Type of the NFs allowed to access the NF instance.
                    If not provided, any NF type is allowed to access the NF.";
       min-elements 1;
-      //optional support
       type types3gpp:NfType;
     }
     
@@ -132,15 +125,13 @@ module _3gpp-5gc-nrm-nfprofile {
       description "Pattern representing the NF domain names allowed to access the NF instance.
                    If not provided, any NF domain is allowed to access the NF.";
       min-elements 1;
-      //optional support
       type string;
     }
     
-    list allowedNssais { //is the key unique
+    list allowedNssais { 
       description "S-NSSAI of the allowed slices to access the NF instance.
                    If not provided, any slice is allowed to access the NF.";
       min-elements 1;
-      //optional support
       key "sst sd";
       uses Snssai;
     }
@@ -150,7 +141,6 @@ module _3gpp-5gc-nrm-nfprofile {
                    lower values indicate a higher priority. If priority is also present in the nfServiceList parameters,
                    those will have precedence over this value. The NRF may overwrite the received priority value when exposing
                    an NFProfile with the Nnrf_NFDiscovery service.";
-      //optional support
       type uint16;
     }
     
@@ -158,29 +148,24 @@ module _3gpp-5gc-nrm-nfprofile {
       description "Static capacity information in the range of 0-65535, expressed as a weight
                    relative to other NF instances of the same type; if capacity is also present
                    in the nfServiceList parameters, those will have precedence over this value.";
-      //optional support
       type uint16;
     }
     
     leaf load {
       description "Dynamic load information, ranged from 0 to 100, indicates the current load percentage of the NF.";
-      //optional support
       type types3gpp:Load;
     }
     
     leaf locality {
       description "Operator defined information about the location of the NF instance (e.g. geographic location, data center).";
-      //optional support
       type string;
     }
     
     grouping udrInfo {
-      //optional support
       
       leaf groupId {
         description "Identity of the UDR group that is served by the UDR instance.
           If not provided, the UDR instance does not pertain to any UDR group.";
-        //optional support
         type string;
       }
       
@@ -188,7 +173,6 @@ module _3gpp-5gc-nrm-nfprofile {
         description "List of ranges of SUPI's whose profile data is available in the UDR instance.";
         key "start end pattern";
         min-elements 1;
-        //optional support
         uses SupiRange;
       }
       
@@ -196,7 +180,6 @@ module _3gpp-5gc-nrm-nfprofile {
         description "List of ranges of GPSIs whose profile data is available in the UDR instance.";
         key "start end pattern";
         min-elements 1;
-        //optional support
         uses IdentityRange;
       }
       
@@ -204,7 +187,6 @@ module _3gpp-5gc-nrm-nfprofile {
         description "List of ranges of external groups whose profile data is available in the UDR instance.";
         key "start end pattern";
         min-elements 1;
-        //optional support
         uses IdentityRange;
       }
       
@@ -212,18 +194,15 @@ module _3gpp-5gc-nrm-nfprofile {
         description "List of supported data sets in the UDR instance.
                      If not provided, the UDR supports all data sets.";
         min-elements 1;
-        //optional support
         type DataSetId;
       }
     }
     
     grouping udmInfo {
-      //optional support
       
       leaf groupId {
         description "Identity of the UDM group that is served by the UDM instance.
                      If not provided, the UDM instance does not pertain to any UDM group.";
-        //optional support
         type string;
       }
       
@@ -231,7 +210,6 @@ module _3gpp-5gc-nrm-nfprofile {
         description "List of ranges of SUPI's whose profile data is available in the UDM instance.";
         key "start end pattern";
         min-elements 1;
-        //optional support
         uses SupiRange;
       }
       
@@ -239,7 +217,6 @@ module _3gpp-5gc-nrm-nfprofile {
         description "List of ranges of GPSIs whose profile data is available in the UDM instance.";
         key "start end pattern";
         min-elements 1;
-        //optional support
         uses IdentityRange;
       }
       
@@ -247,7 +224,6 @@ module _3gpp-5gc-nrm-nfprofile {
         description "List of ranges of external groups whose profile data is available in the UDM instance.";
         key "start end pattern";
         min-elements 1;
-        //optional support
         uses IdentityRange;
       }
       
@@ -255,18 +231,15 @@ module _3gpp-5gc-nrm-nfprofile {
         description "List of Routing Indicator information that allows to route network signalling with SUCI
                      to the UDM instance. If not provided, the UDM can serve any Routing Indicator.
                      Pattern: '^[0-9]{1,4}$'.";
-        //optional support
         min-elements 1;
         type string;
       }
     }
     
     grouping ausfInfo {
-      //optional support
       
       leaf groupId {
         description "Identity of the AUSF group. If not provided, the AUSF instance does not pertain to any AUSF group.";
-        //optional support
         type string;
       }
       
@@ -274,7 +247,6 @@ module _3gpp-5gc-nrm-nfprofile {
         description "List of ranges of SUPIs that can be served by the AUSF instance. If not provided, the AUSF can serve any SUPI.";
         key "start end pattern";
         min-elements 1;
-        //optional support
         uses SupiRange;
       }
       
@@ -282,14 +254,12 @@ module _3gpp-5gc-nrm-nfprofile {
         description "List of Routing Indicator information that allows to route network signalling with SUCI
                      to the AUSF instance. If not provided, the AUSF can serve any Routing Indicator.
                      Pattern: '^[0-9]{1,4}$'.";
-        //optional support
         min-elements 1;
         type string;
       }
     }
     
     grouping amfInfo {
-      //optional support
       
       leaf amfRegionId {
         description "AMF region identifier";
@@ -304,7 +274,7 @@ module _3gpp-5gc-nrm-nfprofile {
       list guamiList {
         description "List of supported GUAMIs.";
         
-        key idx; //no obvious leaf to use as a key
+        key idx; 
         leaf idx { type uint32; }
         
         min-elements 1;
@@ -316,10 +286,9 @@ module _3gpp-5gc-nrm-nfprofile {
                      The absence of this attribute and the taiRangeList attribute indicate that
                      the AMF can be selected for any TAI in the serving network.";
         
-        key idx; //no obvious leaf to use as a key
+        key idx; 
         leaf idx { type uint32; }
         
-        //optional support
         min-elements 1;
         uses types3gpp:TaiGrp;
       }
@@ -327,9 +296,8 @@ module _3gpp-5gc-nrm-nfprofile {
       list taiRangeList {
         description "The range of TAIs the AMF can serve. The absence of this attribute and the taiList
                      attribute indicate that the AMF can be selected for any TAI in the serving network.";
-        //optional support
         min-elements 1;
-        key idx; //no obvious leaf to use as a key
+        key idx; 
         leaf idx { type uint32; }
         uses TaiRange;
       }
@@ -337,10 +305,9 @@ module _3gpp-5gc-nrm-nfprofile {
       list backupInfoAmfFailure {
         description "List of GUAMIs for which the AMF acts as a backup for AMF failure.";
         
-        key idx; //no obvious leaf to use as a key
+        key idx; 
         leaf idx { type uint32; }
         
-        //optional support
         min-elements 1;
         uses Guami;
       }
@@ -348,10 +315,9 @@ module _3gpp-5gc-nrm-nfprofile {
       list backupInfoAmfRemoval {
         description "List of GUAMIs for which the AMF acts as a backup for planned AMF removal.";
         
-        key idx; //no obvious leaf to use as a key
+        key idx; 
         leaf idx { type uint32; }
         
-        //optional support
         min-elements 1;
         uses Guami;
       }
@@ -360,21 +326,19 @@ module _3gpp-5gc-nrm-nfprofile {
         description "N2 interface information of the AMF. This information needs not be sent in NF Discovery responses.
                      It may be used by the NRF to update the DNS for AMF discovery by the 5G Access Network.";
         
-        //optional support
         max-elements 1;
-        key idx; //no obvious leaf to use as a key
+        key idx; 
         leaf idx { type uint32; }
         uses N2InterfaceAmfInfo;
       }
     }
     
     grouping smfInfo {
-      //optional support
       
       list sNssaiSmfInfoList {
         description "List of parameters supported by the SMF per S-NSSAI.";
         min-elements 1;
-        key idx; //no obvious leaf to use as a key
+        key idx; 
         leaf idx { type uint32; }
         uses sNssaiSmfInfoItem;
       }
@@ -384,10 +348,9 @@ module _3gpp-5gc-nrm-nfprofile {
                      The absence of this attribute and the taiRangeList attribute indicate that
                      the SMF can be selected for any TAI in the serving network.";
         
-        key idx; //no obvious leaf to use as a key
+        key idx; 
         leaf idx { type uint32; }
         
-        //optional support
         min-elements 1;
         uses types3gpp:TaiGrp;
       }
@@ -395,16 +358,14 @@ module _3gpp-5gc-nrm-nfprofile {
       list taiRangeList {
         description "The range of TAIs the SMF can serve. The absence of this attribute and the taiList
                      attribute indicate that the SMF can be selected for any TAI in the serving network.";
-        //optional support
         min-elements 1;
-        key idx; //no obvious leaf to use as a key
+        key idx; 
         leaf idx { type uint32; }
         uses TaiRange;
       }
       
       leaf pgwFqdn {
         description "The FQDN of the PGW if the SMF is a combined SMF/PGW-C.";
-        //optional support
         type inet:domain-name;
       }
       
@@ -412,7 +373,6 @@ module _3gpp-5gc-nrm-nfprofile {
         description "If included, this IE shall contain the access type (3GPP_ACCESS and/or NON_3GPP_ACCESS) supported by the SMF.
                      If not included, it shall be assumed the both access types are supported.";
         
-        //conditional support
         min-elements 1;
         max-elements 2;
         type AccessType;
@@ -420,12 +380,11 @@ module _3gpp-5gc-nrm-nfprofile {
     }
     
     grouping upfInfo {
-      //optional support
       
       list sNssaiUpfInfoList {
         description "List of parameters supported by the UPF per S-NSSAI.";
         min-elements 1;
-        key idx; //no obvious leaf to use as a key
+        key idx; 
         leaf idx { type uint32; }
         uses SnssaiUpfInfoItem;
       }
@@ -434,7 +393,6 @@ module _3gpp-5gc-nrm-nfprofile {
         description "The SMF service area(s) the UPF can serve.
                      If not provided, the UPF can serve any SMF service area.";
         
-        //optional support
         min-elements 1;
         type string;
       }
@@ -443,10 +401,9 @@ module _3gpp-5gc-nrm-nfprofile {
         description "List of User Plane interfaces configured on the UPF. When this IE is provided in the NF Discovery response,
                      the NF Service Consumer (e.g. SMF) may use this information for UPF selection.";
         
-        key idx; //no obvious leaf to use as a key
+        key idx; 
         leaf idx { type uint32; }
         
-        //optional support
         min-elements 1;
         uses InterfaceUpfInfoItem;
       }
@@ -456,7 +413,6 @@ module _3gpp-5gc-nrm-nfprofile {
                      true: Supported
                      false (default): Not Supported";
         
-        //optional support
         type boolean;
       }
       
@@ -464,20 +420,17 @@ module _3gpp-5gc-nrm-nfprofile {
         description "List of PDU session type(s) supported by the UPF. The absence of this attribute indicates that the UPF can be selected
                      for any PDU session type.";
         
-        //optional support
         min-elements 1;
         type PduSessionType;
       }
     }
     
     grouping pcfInfo {
-      //optional support
       
       leaf-list dnnList {
         description "DNNs supported by the PCF.
                      If not provided, the PCF can serve any DNN.";
         
-        //optional support
         min-elements 1;
         type string;
       }
@@ -486,7 +439,6 @@ module _3gpp-5gc-nrm-nfprofile {
         description "List of ranges of SUPIs that can be served by the PCF instance. If not provided, the PCF can serve any SUPI.";
         key "start end pattern";
         min-elements 1;
-        //optional support
         uses SupiRange;
       }
       
@@ -495,7 +447,6 @@ module _3gpp-5gc-nrm-nfprofile {
                      When present, this IE shall indicate the Diameter host of the Rx interface for the PCF.
                      Pattern: '^([A-Za-z0-9]+(-[A-Za-z0-9]+).)+[a-z]{2,}$'.";
         
-        //conditional support
         type string;
       }
       
@@ -504,18 +455,15 @@ module _3gpp-5gc-nrm-nfprofile {
                      When present, this IE shall indicate the Diameter realm of the Rx interface for the PCF.
                      Pattern: '^([A-Za-z0-9]+(-[A-Za-z0-9]+).)+[a-z]{2,}$'.";
         
-        //conditional support
         type string;
       }
     }
     
     grouping bsfInfo {
-      //optional support
       
       list ipv4AddressRanges {
         description "List of ranges of IPv4 addresses handled by BSF.
                      If not provided, the BSF can serve any IPv4 address.";
-        //optional support
         key "start end";
         uses types3gpp:Ipv4AddressRange;
       }
@@ -524,7 +472,6 @@ module _3gpp-5gc-nrm-nfprofile {
         description "List of DNNs handled by the BSF
                      If not provided, the BSF can serve any DNN.";
         
-        //optional support
         min-elements 1;
         type string;
       }
@@ -532,7 +479,6 @@ module _3gpp-5gc-nrm-nfprofile {
       leaf-list ipDomainList {
         description "List of IPv4 address domains, as described in subclause 6.2 of 3GPP TS 29.513, handled by the BSF.
                      If not provided, the BSF can serve any IP domain.";
-        //optional support
         min-elements 1;
         type string;
       }
@@ -540,20 +486,17 @@ module _3gpp-5gc-nrm-nfprofile {
       list ipv6PrefixRanges {
         description "List of ranges of IPv6 prefixes handled by the BSF.
                      If not provided, the BSF can serve any IPv6 prefix.";
-        //optional support
         key "start end";
         uses types3gpp:Ipv6PrefixRange;
       }
     }
     
     grouping chfInfo {
-      //optional support
       
       list supiRangeList {
         description "List of ranges of SUPIs that can be served by the CHF instance. If not provided, the CHF can serve any SUPI.";
         key "start end pattern";
         min-elements 1;
-        //optional support
         uses SupiRange;
       }
       
@@ -561,7 +504,6 @@ module _3gpp-5gc-nrm-nfprofile {
         description "List of ranges of GPSI that can be served by the CHF instance. If not provided, the CHF can serve any GPSI.";
         key "start end pattern";
         min-elements 1;
-        //optional support
         uses IdentityRange;
       }
       
@@ -570,18 +512,15 @@ module _3gpp-5gc-nrm-nfprofile {
                      If not provided, the CHF can serve any PLMN.";
         
         min-elements 1;
-        //optional support
         key "mcc mnc";
         uses types3gpp:PLMNId;
       }
     }
     
     grouping nrfInfoGrp {
-      //optional support
       
       list servedUdrInfo {
         description "This attribute contains all the udrInfo attributes locally configured in the NRF or the NRF received during NF registration.";
-        //optional support
         
         key nfInstanceID;
         leaf nfInstanceID {
@@ -595,7 +534,6 @@ module _3gpp-5gc-nrm-nfprofile {
       
       list servedUdmInfo {
         description "This attribute contains all the udmInfo attributes locally configured in the NRF or the NRF received during NF registration.";
-        //optional support
         
         key nfInstanceID;
         leaf nfInstanceID {
@@ -609,7 +547,6 @@ module _3gpp-5gc-nrm-nfprofile {
       
       list servedAusfInfo {
         description "This attribute contains all the ausfInfo attributes locally configured in the NRF or the NRF received during NF registration.";
-        //optional support
         
         key nfInstanceID;
         leaf nfInstanceID {
@@ -623,7 +560,6 @@ module _3gpp-5gc-nrm-nfprofile {
       
       list servedAmfInfo {
         description "This attribute contains all the amfInfo attributes locally configured in the NRF or the NRF received during NF registration.";
-        //optional support
         
         key nfInstanceID;
         leaf nfInstanceID {
@@ -637,7 +573,6 @@ module _3gpp-5gc-nrm-nfprofile {
       
       list servedSmfInfo {
         description "This attribute contains all the smfInfo attributes locally configured in the NRF or the NRF received during NF registration.";
-        //optional support
         
         key nfInstanceID;
         leaf nfInstanceID {
@@ -651,7 +586,6 @@ module _3gpp-5gc-nrm-nfprofile {
       
       list servedUpfInfo {
         description "This attribute contains all the upfInfo attributes locally configured in the NRF or the NRF received during NF registration.";
-        //optional support
         
         key nfInstanceID;
         leaf nfInstanceID {
@@ -665,7 +599,6 @@ module _3gpp-5gc-nrm-nfprofile {
       
       list servedPcfInfo {
        description "This attribute contains all the pcfInfo attributes locally configured in the NRF or the NRF received during NF registration.";
-        //optional support
         
         key nfInstanceID;
         leaf nfInstanceID {
@@ -679,7 +612,6 @@ module _3gpp-5gc-nrm-nfprofile {
       
       list servedBsfInfo {
        description "This attribute contains all the bsfInfo attributes locally configured in the NRF or the NRF received during NF registration.";
-        //optional support
         
         key nfInstanceID;
         leaf nfInstanceID {
@@ -693,7 +625,6 @@ module _3gpp-5gc-nrm-nfprofile {
       
       list servedChfInfo {
         description "This attribute contains all the bsfInfo attributes locally configured in the NRF or the NRF received during NF registration.";
-        //optional support
         
         key nfInstanceID;
         leaf nfInstanceID {
@@ -707,7 +638,7 @@ module _3gpp-5gc-nrm-nfprofile {
     }
     
     list nrfInfo {
-      key idx; //no obvious leaf to use as a key
+      key idx; 
       leaf idx { type uint32; }
       max-elements 1;
       uses nrfInfoGrp;
@@ -720,7 +651,6 @@ module _3gpp-5gc-nrm-nfprofile {
     
     leaf recoveryTime {
       description "Timestamp when the NF was (re)started.";
-      //optional support
       type yang:date-and-time;
     }
     
@@ -730,14 +660,12 @@ module _3gpp-5gc-nrm-nfprofile {
                    are available after a new NF service instance supporting the same API version is selected by a NF Service Consumer (see 3GPP TS 23.527).
                    Otherwise, it indicates that the NF Service Instances of a same NF Service are not capable to share resource state inside the NF Instance.";
       
-      //optional support
       type boolean;
     }
     
     list nfServices {
       description "List of NF Service Instances. It shall include the services produced by the NF that can be discovered by other NFs.";
       key serviceInstanceID;
-      //optional support
       min-elements 1;
       uses nfs3gpp:NFServiceGrp;
     }
@@ -747,7 +675,6 @@ module _3gpp-5gc-nrm-nfprofile {
                    true: the NF Service Consumer supports receiving NF Profile Changes in the response.
                    false (default): the NF Service Consumer does not support receiving NF Profile Changes in the response.";
       
-      //optional support
       type boolean;
     }
     
@@ -756,14 +683,12 @@ module _3gpp-5gc-nrm-nfprofile {
                    true: the NF Profile contains NF Profile changes.
                    false (default): complete NF Profile.";
       
-      //optional support
       type boolean;
     }
     
     list defaultNotificationSubscriptions {
       description "Notification endpoints for different notification types.";
       key notificationType;
-      //optional support
       min-elements 1;
       uses types3gpp:DefaultNotificationSubscription;
     }
@@ -844,14 +769,17 @@ module _3gpp-5gc-nrm-nfprofile {
       }
     }
     
-    leaf pattern {
-      description "Pattern representing the set of TAC's belonging to this range.";
+    leaf nRTACpattern {
+      description "Pattern (regular expression according to the ECMA-262) 
+        representing the set of TAC's belonging to this range. 
+        A TAC value is considered part of the range if and only if the 
+        TAC string fully matches the regular expression.";
       type string;
     }
   }
   
   grouping SnssaiUpfInfoItem {
-    list sNssai { //is the key unique
+    list sNssai { 
       description "Supported S-NSSAI.";
       min-elements 1;
       max-elements 1;
@@ -898,7 +826,6 @@ module _3gpp-5gc-nrm-nfprofile {
     
     leaf sd {
       description "3-octet string, representing the Slice Differentiator, in hexadecimal representation.";
-      //optional
       type string {
         pattern '^[A-Fa-f0-9]{6}$';
       }
@@ -942,12 +869,10 @@ module _3gpp-5gc-nrm-nfprofile {
       type UPInterfaceType;
     }
     
-    ////At least one of the addressing parameters (ipv4address, ipv6adress or endpointFqdn) shall be included in the InterfaceUpfInfoItem.
     choice address {
       case ipv4EndpointAddresses {
         leaf-list ipv4EndpointAddresses {
           description "Available endpoint IPv4 address(es) of the User Plane interface.";
-          //conditional support
           min-elements 1;
           type inet:ipv4-address;
         }
@@ -956,7 +881,6 @@ module _3gpp-5gc-nrm-nfprofile {
       case ipv6EndpointAddresses {
         leaf-list ipv6EndpointAddresses {
           description "Available endpoint IPv6 address(es) of the User Plane interface.";
-          //conditional support
           min-elements 1;
           type inet:ipv6-address;
         }
@@ -965,7 +889,6 @@ module _3gpp-5gc-nrm-nfprofile {
       case endpointFqdn {
         leaf endpointFqdn {
           description "FQDN of available endpoint of the User Plane interface.";
-          //conditional support
           type inet:domain-name;
         }
       }
@@ -973,7 +896,6 @@ module _3gpp-5gc-nrm-nfprofile {
     
     leaf networkInstance {
       description "Network Instance associated to the User Plane interface.";
-      //optional support
       type string;
     }
   }
@@ -995,7 +917,7 @@ module _3gpp-5gc-nrm-nfprofile {
       uses types3gpp:PLMNId;
     }
     
-    list tacRangeList { //is this key unique
+    list tacRangeList { 
       description "The range of the TACs.";
       min-elements 1;
       key "start end";
@@ -1011,12 +933,10 @@ module _3gpp-5gc-nrm-nfprofile {
   }
   
   grouping N2InterfaceAmfInfo {
-    //At least one of the addressing parameters (ipv4address or ipv6adress) shall be included.
     choice address {
       case ipv4EndpointAddress {
         leaf-list ipv4EndpointAddress {
           description "Available AMF endpoint IPv4 address(es) for N2.";
-          //conditional support
           min-elements 1;
           type inet:ipv4-address;
         }
@@ -1025,7 +945,6 @@ module _3gpp-5gc-nrm-nfprofile {
       case ipv6EndpointAddress {
         leaf-list ipv6EndpointAddress {
           description "Available AMF endpoint IPv6 address(es) for N2.";
-          //conditional support
           min-elements 1;
           type inet:ipv6-address;
         }
@@ -1039,7 +958,7 @@ module _3gpp-5gc-nrm-nfprofile {
   }
   
   grouping sNssaiSmfInfoItem {
-    list sNssai { //is the key unique
+    list sNssai { 
       description "Supported S-NSSAI.";
       min-elements 1;
       max-elements 1;
@@ -1047,8 +966,9 @@ module _3gpp-5gc-nrm-nfprofile {
       uses Snssai;
     }
     
-    list dnnSmfInfoList { //is the key unique
-      description "List of parameters supported by the SMF per DNN.";
+    list dnnSmfInfoList { 
+      description "List of parameters supported by the SMF per DNN.
+      The absence indicates the DNN can be selected for any DNAI.";
       min-elements 1;
       key dnn;
       uses DnnSmfInfoItem;
@@ -1072,11 +992,11 @@ module _3gpp-5gc-nrm-nfprofile {
       uses types3gpp:PLMNId;
     }
   
-    list sNssaiList { //is the key unique
+    list sNssaiList { 
       description "The specific list of S-NSSAIs supported by the given PLMN.";
       min-elements 1;
       key "sst sd";
       uses Snssai;
     }
   }
-}
\ No newline at end of file
+}
diff --git a/yang-models/_3gpp-5gc-nrm-nfservice.yang b/yang-models/_3gpp-5gc-nrm-nfservice.yang
index 3d3856931..82cf61e87 100755
--- a/yang-models/_3gpp-5gc-nrm-nfservice.yang
+++ b/yang-models/_3gpp-5gc-nrm-nfservice.yang
@@ -11,9 +11,12 @@ module _3gpp-5gc-nrm-nfservice {
   
   organization "3gpp SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
-  description "NF service class.";
+  description "NF service class.
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 29.510";
   
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2021-01-25 { reference CR-0454 ; }
   revision 2020-11-05 { reference CR-0412 ; }
   revision 2019-06-17 { reference "initial revision"; }
diff --git a/yang-models/_3gpp-5gc-nrm-ngeirfunction.yang b/yang-models/_3gpp-5gc-nrm-ngeirfunction.yang
index f9b7638ea..2c8c1a4fb 100755
--- a/yang-models/_3gpp-5gc-nrm-ngeirfunction.yang
+++ b/yang-models/_3gpp-5gc-nrm-ngeirfunction.yang
@@ -13,9 +13,12 @@ module _3gpp-5gc-nrm-ngeirfunction {
   organization "3gpp SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "This IOC represents the 5G-EIR function in 5GC. For more 
-    information about the 5G-EIR, see 3GPP TS 23.501.";
+    information about the 5G-EIR, see 3GPP TS 23.501.
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541";
   
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2022-01-07 { reference CR-0643; }
   revision 2020-11-06 { reference CR-0412 ; }
   revision 2019-10-25 { reference "S5-194457 S5-195427 S5-193518"; }  
diff --git a/yang-models/_3gpp-5gc-nrm-nrffunction.yang b/yang-models/_3gpp-5gc-nrm-nrffunction.yang
index 8da30c339..25507c96a 100755
--- a/yang-models/_3gpp-5gc-nrm-nrffunction.yang
+++ b/yang-models/_3gpp-5gc-nrm-nrffunction.yang
@@ -15,9 +15,12 @@ module _3gpp-5gc-nrm-nrffunction {
   organization "3gpp SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "This IOC represents the NRF function in 5GC.
-               For more information about the NRF, see 3GPP TS 23.501 [2].";
+               For more information about the NRF, see 3GPP TS 23.501 [2].
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541";
   
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2023-04-26 { reference CR-0916; }
   revision 2020-11-08 { reference CR-0412 ; }
   revision 2020-08-03 { reference "CR-0321"; }
diff --git a/yang-models/_3gpp-5gc-nrm-nssffunction.yang b/yang-models/_3gpp-5gc-nrm-nssffunction.yang
index 3a65b8272..315ae9ebc 100755
--- a/yang-models/_3gpp-5gc-nrm-nssffunction.yang
+++ b/yang-models/_3gpp-5gc-nrm-nssffunction.yang
@@ -14,9 +14,12 @@ module _3gpp-5gc-nrm-nssffunction {
   organization "3gpp SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "This IOC represents the NSSF function in 5GC. For more 
-    information about the NSSF, see 3GPP TS 23.501.";
+    information about the NSSF, see 3GPP TS 23.501.
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541";
   
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2023-04-26 { reference CR-0916; }
   revision 2020-11-08 { reference CR-0412 ; }
   revision 2020-08-03 { reference "CR-0321"; }
diff --git a/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang b/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang
index 41fae36b7..81e85cbfa 100755
--- a/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang
+++ b/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang
@@ -14,9 +14,12 @@ module _3gpp-5gc-nrm-nwdaffunction {
   organization "3gpp SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "This IOC represents the NWDAF function in 5GC. For more 
-    information about the NWDAF, see 3GPP TS 23.501.";
+    information about the NWDAF, see 3GPP TS 23.501.
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541";
   
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2023-04-26 { reference CR-0916; }
   revision 2020-11-08 { reference CR-0412 ; }
   revision 2019-10-25 { reference "S5-194457 S5-195427 S5-193518"; }
diff --git a/yang-models/_3gpp-5gc-nrm-pcffunction.yang b/yang-models/_3gpp-5gc-nrm-pcffunction.yang
index ed91be052..b60f25f21 100755
--- a/yang-models/_3gpp-5gc-nrm-pcffunction.yang
+++ b/yang-models/_3gpp-5gc-nrm-pcffunction.yang
@@ -14,9 +14,12 @@ module _3gpp-5gc-nrm-pcffunction {
   organization "3gpp SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "This IOC represents the PCF function in 5GC. For more 
-    information about the PCF, see 3GPP TS 23.501.";
+    information about the PCF, see 3GPP TS 23.501.
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541";
   
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2023-04-26 { reference CR-0916; }
   revision 2020-11-08 { reference CR-0412 ; }
   revision 2020-08-06 { reference "CR-0333"; }
diff --git a/yang-models/_3gpp-5gc-nrm-predefinedpccruleset.yang b/yang-models/_3gpp-5gc-nrm-predefinedpccruleset.yang
index 04ff3a0b6..ca2dc8cbc 100755
--- a/yang-models/_3gpp-5gc-nrm-predefinedpccruleset.yang
+++ b/yang-models/_3gpp-5gc-nrm-predefinedpccruleset.yang
@@ -13,9 +13,12 @@ module _3gpp-5gc-nrm-predefinedpccruleset {
   organization "3gpp SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "This IOC represents the predefined PCC rules, which are 
-    configured to SMF and referenced by PCF.";
+    configured to SMF and referenced by PCF.
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541";
 
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2023-04-26 { reference CR-0916; }
   revision 2020-10-04 { reference "CR-0393"; }
   revision 2020-08-21 { reference "CR-0330"; }
diff --git a/yang-models/_3gpp-5gc-nrm-scpfunction.yang b/yang-models/_3gpp-5gc-nrm-scpfunction.yang
index aecd4a48c..f52d2f078 100755
--- a/yang-models/_3gpp-5gc-nrm-scpfunction.yang
+++ b/yang-models/_3gpp-5gc-nrm-scpfunction.yang
@@ -13,9 +13,12 @@ module _3gpp-5gc-nrm-scpfunction {
   organization "3gpp SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "This IOC represents the SCP function in 5GC. For more 
-    information about the SCP, see 3GPP TS 23.501.";
+    information about the SCP, see 3GPP TS 23.501.
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541";
   
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2023-04-26 { reference CR-0916; }
   revision 2019-10-24 { reference "initial revision"; }
   
diff --git a/yang-models/_3gpp-5gc-nrm-seppfunction.yang b/yang-models/_3gpp-5gc-nrm-seppfunction.yang
index e4793dd3f..b85cdb7aa 100755
--- a/yang-models/_3gpp-5gc-nrm-seppfunction.yang
+++ b/yang-models/_3gpp-5gc-nrm-seppfunction.yang
@@ -6,15 +6,20 @@ module _3gpp-5gc-nrm-seppfunction {
   
   import _3gpp-common-managed-function { prefix mf3gpp; }
   import _3gpp-common-managed-element { prefix me3gpp; }
+  import _3gpp-5g-common-yang-types { prefix types5g3gpp; }
   import _3gpp-common-yang-types { prefix types3gpp; }
+  import _3gpp-common-yang-extensions { prefix yext3gpp; }
   import _3gpp-common-top { prefix top3gpp; }
   import ietf-inet-types { prefix inet; }
   
   organization "3gpp SA5";
   description "This IOC represents the SEPP function which support message filtering
-               and policing on inter-PLMN control plane interface. For more information about the SEPP, see 3GPP TS 23.501.";
+               and policing on inter-PLMN control plane interface. For more information about the SEPP, see 3GPP TS 23.501.
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541";
   
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2020-08-03 { reference "CR-0321"; }
   revision 2019-10-28 { reference S5-193518 ; }
     
@@ -32,6 +37,47 @@ module _3gpp-5gc-nrm-seppfunction {
       }
     }
   }
+  
+  grouping SeppInfoGrp {
+    leaf seppPrefix {
+      type string ;
+      description "This attributes represents optional deployment specific 
+        string used to construct the apiRoot of the next hop SEPP, as described 
+        in clause 6.10 of TS 29.500";
+    }
+    
+    leaf-list seppPorts {
+      type uint16 ;
+      description "This attributes represents SEPP port number(s) for HTTP 
+        and/or HTTPS.
+        This attribute shall be present if the SEPP uses non-default HTTP 
+        and/or HTTPS ports. When present, it shall contain the HTTP and/or 
+        HTTPS ports.
+        The key of the map shall be 'http' or 'https'.
+        The value shall indicate the port number for HTTP or 
+        HTTPS respectively.";
+    }
+    
+    list remotePlmnList {
+      description "It represents a list of remote PLMNs reachable through the 
+        SEPP.
+        The absence of this attribute indicates that any PLMN is reachable 
+        through the SEPP.";
+      key idx;
+      leaf idx { type uint32 ; }
+      uses types3gpp:PLMNId;
+    }
+    
+    list remoteSnpnList {
+      description "This attributes represents list of remote SNPNs reachable 
+        through the SEPP.
+        The absence of this attribute indicates that no SNPN is reachable 
+        through the SEPP.";
+      key idx;
+      leaf idx { type uint32 ; }
+      uses types5g3gpp:PlmnIdNid;
+    }
+  }
 
   grouping SEPPFunctionGrp {
     uses mf3gpp:ManagedFunctionGrp;
@@ -39,21 +85,33 @@ module _3gpp-5gc-nrm-seppfunction {
     container pLMNId {
       description "PLMN Identifiers of the sepp.
                    The PLMN Identifier is composed of a Mobile Country Code (MCC) and a Mobile Network Code (MNC).";
+      yext3gpp:inVariant;
       uses types3gpp:PLMNId;
     }
 	
-	leaf sEPPType {
-      type sepp3gpp:SEPPType;
-    }
-
-	leaf sEPPId {
-      type uint16;
-    }    
-
-	leaf fqdn {
+    leaf sEPPType {
+        type sepp3gpp:SEPPType;
+        yext3gpp:inVariant;
+      }
+  
+    leaf sEPPId {
+        type uint16;
+        yext3gpp:inVariant;
+      }    
+  
+    leaf fqdn {
       description "The domain name of the SEPP.";
       type inet:domain-name;
     }
+    
+    list seppInfo {
+      max-elements 1;
+      key idx;
+      description "This attributes represents information of a SEPP Instance, 
+        as described in clause 6.1.6.2.72 of TS 29.510 ";
+      leaf idx { type uint32 ; }
+      uses SeppInfoGrp;
+    }
   }
   
   augment "/me3gpp:ManagedElement" {
diff --git a/yang-models/_3gpp-5gc-nrm-smffunction.yang b/yang-models/_3gpp-5gc-nrm-smffunction.yang
index 93d224ffb..1bc7ce5eb 100755
--- a/yang-models/_3gpp-5gc-nrm-smffunction.yang
+++ b/yang-models/_3gpp-5gc-nrm-smffunction.yang
@@ -12,9 +12,12 @@ module _3gpp-5gc-nrm-smffunction {
 
   organization "3gpp SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
-  description "SMFFunction derived from basic ManagedFunction.";
+  description "SMFFunction derived from basic ManagedFunction.
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541";
 
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2023-04-26 { reference CR-0916; }
   revision 2020-11-08 { reference CR-0412 ; }
   revision 2020-08-06 { reference "CR-0333"; }
diff --git a/yang-models/_3gpp-5gc-nrm-smsffunction.yang b/yang-models/_3gpp-5gc-nrm-smsffunction.yang
index 720d90417..61c7d1242 100755
--- a/yang-models/_3gpp-5gc-nrm-smsffunction.yang
+++ b/yang-models/_3gpp-5gc-nrm-smsffunction.yang
@@ -11,9 +11,12 @@ module _3gpp-5gc-nrm-smsffunction {
   import _3gpp-common-top { prefix top3gpp; }
   
   organization "3gpp SA5";
-  description "This IOC represents the SMSF function defined in 3GPP TS 23.501.";
+  description "This IOC represents the SMSF function defined in 3GPP TS 23.501.
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541";
   
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2019-10-25 { reference "S5-194457 S5-195427 S5-193518"; }
     
   revision 2019-05-15 {
diff --git a/yang-models/_3gpp-5gc-nrm-udmfunction.yang b/yang-models/_3gpp-5gc-nrm-udmfunction.yang
index 9bf8971d3..b799b2cbb 100755
--- a/yang-models/_3gpp-5gc-nrm-udmfunction.yang
+++ b/yang-models/_3gpp-5gc-nrm-udmfunction.yang
@@ -14,9 +14,12 @@ module _3gpp-5gc-nrm-udmfunction {
   organization "3gpp SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "This IOC represents the UDM function in 5GC. For more 
-    information about the UDM, see 3GPP TS 23.501.";
+    information about the UDM, see 3GPP TS 23.501.
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541";
   
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2023-04-26 { reference CR-0916; }
   revision 2020-11-08 { reference CR-0412 ; }
   revision 2019-10-25 { reference "S5-194457 S5-195427 S5-193518"; }
diff --git a/yang-models/_3gpp-5gc-nrm-udrfunction.yang b/yang-models/_3gpp-5gc-nrm-udrfunction.yang
index 4815c6e29..1118fd143 100755
--- a/yang-models/_3gpp-5gc-nrm-udrfunction.yang
+++ b/yang-models/_3gpp-5gc-nrm-udrfunction.yang
@@ -14,9 +14,12 @@ module _3gpp-5gc-nrm-udrfunction {
   organization "3gpp SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "This IOC represents the UDR function in 5GC. For more information 
-    about the UDR, see 3GPP TS 23.501.";
+    about the UDR, see 3GPP TS 23.501.
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541";
   
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2023-04-26 { reference CR-0916; }
   revision 2020-11-08 { reference CR-0412 ; }
   revision 2019-10-25 { reference "S5-194457 S5-195427 S5-193518"; }
diff --git a/yang-models/_3gpp-5gc-nrm-udsffunction.yang b/yang-models/_3gpp-5gc-nrm-udsffunction.yang
index 533c10979..553ca7d5a 100755
--- a/yang-models/_3gpp-5gc-nrm-udsffunction.yang
+++ b/yang-models/_3gpp-5gc-nrm-udsffunction.yang
@@ -14,9 +14,12 @@ module _3gpp-5gc-nrm-udsffunction {
   organization "3gpp SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "This IOC represents the UDSF function which can be interacted 
-    with any other 5GC NF defined in 3GPP TS 23.501.";
+    with any other 5GC NF defined in 3GPP TS 23.501.
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541";
   
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2023-04-26 { reference CR-0916; }
   revision 2020-11-08 { reference CR-0412 ; }
   revision 2019-10-25 { reference "S5-194457 S5-195427 S5-193518"; }  
diff --git a/yang-models/_3gpp-5gc-nrm-upffunction.yang b/yang-models/_3gpp-5gc-nrm-upffunction.yang
index cdb1487d4..ca74a06c7 100755
--- a/yang-models/_3gpp-5gc-nrm-upffunction.yang
+++ b/yang-models/_3gpp-5gc-nrm-upffunction.yang
@@ -11,9 +11,12 @@ module _3gpp-5gc-nrm-upffunction {
 
   organization "3GPP SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
-  description "UPFFunction derived from basic ManagedFunction.";
+  description "UPFFunction derived from basic ManagedFunction.
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2023-04-26 { reference CR-0916; }
   revision 2020-11-08 { reference CR-0412 ; }
   revision 2019-10-25 { reference "S5-194457 S5-193518"; }
diff --git a/yang-models/_3gpp-common-ep-rp.yang b/yang-models/_3gpp-common-ep-rp.yang
index 0dc1ddc30..0005480f3 100755
--- a/yang-models/_3gpp-common-ep-rp.yang
+++ b/yang-models/_3gpp-common-ep-rp.yang
@@ -11,7 +11,9 @@ module _3gpp-common-ep-rp {
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";    
   description "Common/basic class/grouping to be inherited/reused. 
     This IOC represents an end point of a link used across a reference 
-    point between two network entities.";
+    point between two network entities.
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference 
     "3GPP TS 28.622 
     Generic Network Resource Model (NRM)
@@ -21,6 +23,7 @@ module _3gpp-common-ep-rp {
     3GPP TS 28.620 
     Umbrella Information Model (UIM)";
 
+  revision 2023-09-18 { reference CR-0271 ; } 
   revision 2020-06-08 { reference "CR-0092"; }  
 
   revision 2019-06-17 {
diff --git a/yang-models/_3gpp-common-filemanagement.yang b/yang-models/_3gpp-common-filemanagement.yang
index 884b0332e..1e03291af 100644
--- a/yang-models/_3gpp-common-filemanagement.yang
+++ b/yang-models/_3gpp-common-filemanagement.yang
@@ -12,9 +12,12 @@ module _3gpp-common-filemanagement {
   organization "3GPP SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "Defines the YANG mapping of the FileDownloadJob Information Object
-    Class (IOC) that is part of the Generic Network Resource Model (NRM).";
+    Class (IOC) that is part of the Generic Network Resource Model (NRM).
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.623 Generic Network Resource Model (NRM)";
 
+  revision 2023-09-18 { reference CR-0271 ; } 
   revision 2023-02-14 { reference CR-0234; }
   revision 2022-10-24 { reference CR-0196;  }
   revision 2022-02-10 { reference "Initial revision, S5-221757"; }
@@ -54,12 +57,14 @@ module _3gpp-common-filemanagement {
       mandatory true;
       type string;
       yext3gpp:notNotifyable;
+      yext3gpp:inVariant;
     }
     
     leaf notificationRecipientAddress {
       description "Address of the notification recipient.";
       type string;
       yext3gpp:notNotifyable;
+      yext3gpp:inVariant;
     }
 
     leaf cancelJob {
diff --git a/yang-models/_3gpp-common-files.yang b/yang-models/_3gpp-common-files.yang
index 313386e9d..22e573959 100644
--- a/yang-models/_3gpp-common-files.yang
+++ b/yang-models/_3gpp-common-files.yang
@@ -12,7 +12,9 @@ module _3gpp-common-files {
   organization "3GPP SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "Defines the YANG mapping of File retrieval NRM fragment 
-    including the IOCs File and Files.";
+    including the IOCs File and Files.
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.623
       Generic Network Resource Model (NRM)
       Integration Reference Point (IRP);
@@ -23,6 +25,7 @@ module _3gpp-common-files {
       Integration Reference Point (IRP);
       Information Service (IS)";
 
+  revision 2023-09-18 { reference CR-0271 ; } 
   revision 2022-09-28 { reference CR-0191; }
   
   grouping FileGrp {
@@ -32,6 +35,7 @@ module _3gpp-common-files {
       type inet:uri ;
       mandatory true;
       yext3gpp:notNotifyable ;
+      yext3gpp:inVariant ;
       description "Location of the file incl. the file transfer protocol, 
         and the file name for the case the file content cannot be retrieved 
         by reading the 'fileContent' attribute.
@@ -51,6 +55,7 @@ module _3gpp-common-files {
       type string ;
       mandatory true;
       yext3gpp:notNotifyable ;
+      yext3gpp:inVariant ;
       description "Name of the algorithm used for compressing the file. 
         An empty or absent 'fileCompression' parameter indicates the file is 
         not compressed. The MnS producer selects the compression algorithm. 
@@ -62,6 +67,7 @@ module _3gpp-common-files {
       mandatory true;
       units bytes;
       yext3gpp:notNotifyable ;
+      yext3gpp:inVariant ;
       description "Size of the file";
     }
     
@@ -76,6 +82,7 @@ module _3gpp-common-files {
       }
       mandatory true;
       yext3gpp:notNotifyable ;
+      yext3gpp:inVariant ;
       description "Type of the management data stored in the file.";
     }
     
@@ -83,6 +90,7 @@ module _3gpp-common-files {
       type string ;
       mandatory true;
       yext3gpp:notNotifyable ;
+      yext3gpp:inVariant ;
       description "Identifier of the XML or ASN.1 schema (incl. its version) 
         used to produce the file content.";
     }
@@ -91,6 +99,7 @@ module _3gpp-common-files {
       type yang:date-and-time ;
       mandatory true;
       yext3gpp:notNotifyable ;
+      yext3gpp:inVariant ;
       description "Date and time, when the file was closed (the last time) 
         and made available on the MnS producer. 
         The file content will not be changed anymore.";
@@ -100,6 +109,7 @@ module _3gpp-common-files {
       type yang:date-and-time ;
       mandatory true;
       yext3gpp:notNotifyable ;
+      yext3gpp:inVariant ;
       description "Date and time after which the file may be deleted.";
     }
     
@@ -107,12 +117,14 @@ module _3gpp-common-files {
       type string ; // String is very restrictive
       mandatory true;
       yext3gpp:notNotifyable ;
+      yext3gpp:inVariant ;
       description "File content";  
     }
 
     leaf-list jobRef {
       type types3gpp:DistinguishedName ;
       yext3gpp:notNotifyable ;
+      yext3gpp:inVariant ;
       description "Object instance of the 'PerfMetricJob' or 'TraceJob' 
         that produced the file.";
     }
@@ -120,6 +132,7 @@ module _3gpp-common-files {
     leaf jobId {
       type string ;
       yext3gpp:notNotifyable ;
+      yext3gpp:inVariant ;
       description "Identifier of a PerfMetricJob job or a TraceJob.";
     }
   }
@@ -135,6 +148,7 @@ module _3gpp-common-files {
     leaf-list jobRef {
       type types3gpp:DistinguishedName ;
       yext3gpp:notNotifyable ;
+      yext3gpp:inVariant ;
       description "Object instance of the 'PerfMetricJob' or 'TraceJob' 
         that produced the file.";
     }
@@ -142,6 +156,7 @@ module _3gpp-common-files {
     leaf jobId {
       type string ;
       yext3gpp:notNotifyable ;
+      yext3gpp:inVariant ;
       description "Identifier of a PerfMetricJob job or a TraceJob.";
     }
   }
diff --git a/yang-models/_3gpp-common-fm.yang b/yang-models/_3gpp-common-fm.yang
index 4b2e13704..2fa8fa914 100755
--- a/yang-models/_3gpp-common-fm.yang
+++ b/yang-models/_3gpp-common-fm.yang
@@ -11,8 +11,9 @@ module _3gpp-common-fm {
   organization "3GPP SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
 
-  description "Defines a Fault Management model";
-
+  description "Defines a Fault Management model
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.623
       Generic Network Resource Model (NRM)
       Integration Reference Point (IRP);
@@ -23,6 +24,7 @@ module _3gpp-common-fm {
       Integration Reference Point (IRP);
       Information Service (IS)";
 
+  revision 2023-09-18 { reference CR-0271 ; } 
   revision 2023-05-10 { reference CR-0250; }
   revision 2022-10-24 { reference CR-0196;   }
   revision 2021-08-08 { reference "CR-0132"; }
@@ -113,6 +115,7 @@ module _3gpp-common-fm {
       mandatory true;
       description "Identifies the alarmRecord";
       yext3gpp:notNotifyable;
+      yext3gpp:inVariant;
     }
 
     leaf objectInstance {
@@ -120,6 +123,7 @@ module _3gpp-common-fm {
       config false ;
       mandatory true;
       yext3gpp:notNotifyable;
+      yext3gpp:inVariant;
     }
 
     leaf notificationId {
@@ -157,6 +161,7 @@ module _3gpp-common-fm {
       mandatory true;
       description "General category for the alarm.";
       yext3gpp:notNotifyable;
+      yext3gpp:inVariant;
     }
 
     leaf probableCause {
@@ -167,6 +172,7 @@ module _3gpp-common-fm {
       config false ;
       mandatory true;
       yext3gpp:notNotifyable;
+      yext3gpp:inVariant;
     }
 
     leaf specificProblem {
@@ -177,6 +183,7 @@ module _3gpp-common-fm {
       config false ;
       reference "ITU-T Recommendation X.733 clause 8.1.2.2.";
       yext3gpp:notNotifyable;
+      yext3gpp:inVariant;
     }
 
     leaf perceivedSeverity {
diff --git a/yang-models/_3gpp-common-managed-element.yang b/yang-models/_3gpp-common-managed-element.yang
index ac3e25ed9..153510be9 100755
--- a/yang-models/_3gpp-common-managed-element.yang
+++ b/yang-models/_3gpp-common-managed-element.yang
@@ -11,12 +11,15 @@ module _3gpp-common-managed-element {
   import _3gpp-common-trace { prefix trace3gpp; }
   import _3gpp-common-files { prefix files3gpp; }
   import _3gpp-5gc-nrm-configurable5qiset { prefix fiveqi3gpp; }
+  import _3gpp-5gc-ecmconnectioninfo { prefix econn3gpp ; }
 
   organization "3GPP SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
 
   description "Defines ManagedElement which will be augmented 
-      by other IOCs";
+      by other IOCs
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.623
       Generic Network Resource Model (NRM)
       Integration Reference Point (IRP);
@@ -29,7 +32,9 @@ module _3gpp-common-managed-element {
       
       3GPP TS 28.620 
       Umbrella Information Model (UIM)";
-
+      
+  revision 2023-11-14 { reference CR-0305 ; }
+  revision 2023-09-18 { reference CR-0271 ; } 
   revision 2023-08-10 { reference CR-0257;   }
   revision 2023-04-26 { reference CR-0250; }
   revision 2023-02-14 { reference "CR-0234"; }
@@ -43,6 +48,10 @@ module _3gpp-common-managed-element {
   revision 2019-06-17 { reference " S5-203316"; }
   revision 2019-05-08 { reference "Initial revision"; }
   
+  feature EcmConnectionInfoUnderManagedElement  {
+    description "The EcmConnectionInfo shall be contained under
+    ManagedElement";
+  }  
   feature Configurable5QISetUnderManagedElement {
     description "The Configurable5QISet shall be contained under
     ManagedElement";
@@ -290,5 +299,9 @@ module _3gpp-common-managed-element {
     uses fiveqi3gpp:Configurable5QISetSubtree {
       if-feature Configurable5QISetUnderManagedElement;
     }
+
+    uses econn3gpp:EcmConnectionInfoSubtree {
+      if-feature EcmConnectionInfoUnderManagedElement;
+    }
   }    
-}
\ No newline at end of file
+}
diff --git a/yang-models/_3gpp-common-managed-function.yang b/yang-models/_3gpp-common-managed-function.yang
index cf63a5bfc..11131766d 100755
--- a/yang-models/_3gpp-common-managed-function.yang
+++ b/yang-models/_3gpp-common-managed-function.yang
@@ -12,7 +12,9 @@ module _3gpp-common-managed-function {
   organization "3GPP SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "The module defines a base class/grouping for major 3GPP 
-    functions.";
+    functions.
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference 
     "3GPP TS 28.622 
     Generic Network Resource Model (NRM)
@@ -22,6 +24,7 @@ module _3gpp-common-managed-function {
     3GPP TS 28.620 
     Umbrella Information Model (UIM)";
 
+  revision 2023-09-18 { reference CR-0271 ; } 
   revision 2023-04-26 { reference CR-0250; }
   revision 2023-02-14 { reference "CR-0234"; }
   revision 2022-11-02 { reference "CR-0753"; }
@@ -53,6 +56,7 @@ module _3gpp-common-managed-function {
       type string;
       mandatory true;
       yext3gpp:notNotifyable;
+      yext3gpp:inVariant;
     }
     
     leaf-list allowedNFTypes {
@@ -70,6 +74,7 @@ module _3gpp-common-managed-function {
       }
       config false;
       mandatory true;
+      yext3gpp:inVariant;
       description "Semantics type of the operation.";
       reference "3GPP TS 23.502";
     }
@@ -91,6 +96,7 @@ module _3gpp-common-managed-function {
       description "The type of the managed NF service instance
         The specifc values allowed are described in clause 7.2 of TS 23.501";
       yext3gpp:notNotifyable;
+      yext3gpp:inVariant;
     }
  
     list sAP {
diff --git a/yang-models/_3gpp-common-management-node.yang b/yang-models/_3gpp-common-management-node.yang
index 7cfcdd577..44a92e78d 100644
--- a/yang-models/_3gpp-common-management-node.yang
+++ b/yang-models/_3gpp-common-management-node.yang
@@ -10,7 +10,9 @@ module _3gpp-common-management-node {
   organization "3GPP SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
 
-  description "Defines ManagementNode IOCs";
+  description "Defines ManagementNode IOCs
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.623
       Generic Network Resource Model (NRM)
       Integration Reference Point (IRP);
@@ -24,6 +26,7 @@ module _3gpp-common-management-node {
       3GPP TS 28.620 
       Umbrella Information Model (UIM)";
 
+  revision 2023-09-18 { reference CR-0271 ; } 
   revision 2023-02-14 { reference "CR-0234"; }
 
   grouping ManagementSystem_Grp {
diff --git a/yang-models/_3gpp-common-managementdatacollection.yang b/yang-models/_3gpp-common-managementdatacollection.yang
index 11448f08c..7b5c30180 100644
--- a/yang-models/_3gpp-common-managementdatacollection.yang
+++ b/yang-models/_3gpp-common-managementdatacollection.yang
@@ -13,8 +13,9 @@ module _3gpp-common-managementdatacollection {
   organization "3GPP SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
  
-  description "Handling management data collection";
-
+  description "Handling management data collection
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.623
       Generic Network Resource Model (NRM)
       Integration Reference Point (IRP);
@@ -25,51 +26,12 @@ module _3gpp-common-managementdatacollection {
       Integration Reference Point (IRP);
       Information Service (IS)";
 
+  revision 2023-11-18 { reference CR-0299 ; }
+  revision 2023-11-06 { reference "CR-0305"; }
+  revision 2023-09-18 { reference CR-0271 ; } 
   revision 2023-02-14 { reference "CR-0234"; }
   revision 2022-11-04 { reference "CR-0194"; }
   
-  grouping GeoCoordinateGrp {
-    description "Geographical location on earth";
-    
-    leaf latitude {
-      type decimal64 {
-         fraction-digits 4;
-         range -90..90 ;
-      }
-      mandatory true;
-      description "Latitude based on World Geodetic System (1984 version) 
-        global reference frame (WGS 84). Positive values correspond to the 
-        northern hemisphere.";
-    }
-      
-    leaf longitude {
-      type decimal64 {
-        fraction-digits 4;
-        range -180..180 ;
-      }
-      mandatory true;
-      description "Longitude based on World Geodetic System (1984 version) 
-        global reference frame (WGS 84). Positive values correspond to 
-        degrees east of 0 degrees longitude.";
-    }
-  }
-  
-  grouping GeoAreaGrp {
-    description "This data type defines a geographical area. 
-    The geo-area is defined using a convex polygon in the attribute 
-    'convexGeoPolygon'.";
-    
-    list convexGeoPolygon {
-      description "Specifies the geographical area with a convex polygon. 
-        The convex polygon is specified by its corners.";
-      key "latitude longitude";
-      min-elements 3;
-      ordered-by user;
-      
-      uses GeoCoordinateGrp;
-    }
-  }
-  
   grouping GeoAreaToCellMappingGrp {
     description "Represents the GeoAreaToCellMapping data type. 
       
@@ -84,7 +46,7 @@ module _3gpp-common-managementdatacollection {
       leaf idx {
         type string;
       }
-      uses GeoAreaGrp;
+      uses types3gpp:GeoAreaGrp;
     }
     
     leaf associationThreshold {
@@ -209,9 +171,11 @@ module _3gpp-common-managementdatacollection {
   grouping TimeWindowGrp {
     leaf startTime {
       type yang:date-and-time;
+      yext3gpp:inVariant;
     }
     leaf endTime {
       type yang:date-and-time;
+      yext3gpp:inVariant;
     }
   }
 
@@ -255,7 +219,9 @@ module _3gpp-common-managementdatacollection {
         leaf-list name {
           type string;
           min-elements 1;
-          description "The list may include metrics or set of metrics defined
+          description "List of management data identified by name.
+
+          The list may include metrics or set of metrics defined
             in TS 28.552, TS 28.554 and TS 32.422.
 
             The metrics are identified with their names/identifiers.
@@ -273,7 +239,10 @@ module _3gpp-common-managementdatacollection {
             For trace metrics (including trace messages, MDT measurements
             (Immediate MDT, Logged MDT, Logged MBSFN MDT), RLF and RCEF
             reports) defined in TS 32.422, the name (metric identifier) is
-            defined in clause 10 of TS 32.422.";
+            defined in clause 10 of TS 32.422.
+            
+            For non-3GPP specified managment data the name is defined 
+            elsewhere.";
           }
       }
       mandatory true;
@@ -372,4 +341,4 @@ module _3gpp-common-managementdatacollection {
     }
   }
 
-}
\ No newline at end of file
+}
diff --git a/yang-models/_3gpp-common-measurements.yang b/yang-models/_3gpp-common-measurements.yang
index 2a669aa3f..6bb0d0796 100755
--- a/yang-models/_3gpp-common-measurements.yang
+++ b/yang-models/_3gpp-common-measurements.yang
@@ -43,8 +43,9 @@ module _3gpp-common-measurements {
 
     Measurements can be contained under ManagedElement, SubNetwork, or
     any list representing a class inheriting from Subnetwork or
-    ManagedFunction. Note: KPIs will only be supported under SubNetwork";
-
+    ManagedFunction. Note: KPIs will only be supported under SubNetwork
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.623
       Generic Network Resource Model (NRM)
       Integration Reference Point (IRP);
@@ -55,6 +56,8 @@ module _3gpp-common-measurements {
       Integration Reference Point (IRP);
       Information Service (IS)";
 
+  revision 2023-11-18 { reference "CR-0299 CR-0305"; }
+  revision 2023-09-18 { reference CR-0271 ; } 
   revision 2023-04-26 { reference CR-0250; }
   revision 2023-02-18 { reference "CR-0240"; }
   revision 2023-02-14 { reference "CR-0234"; }
@@ -78,11 +81,25 @@ module _3gpp-common-measurements {
   grouping ThresholdInfoGrp {
     description "Defines a single threshold level.";
 
-    leaf-list measurementTypes {
+    leaf-list performanceMetrics {
       type string;
-      description "The Measurement type can be those specified in TS 28.552,
-        TS 32.404 and can be those specified by other SDOs or can be
-        vendor-specific.";
+      min-elements 1;
+      description "List of performance metrics.
+        Performance metrics include measurements defined in TS 28.552 and KPIs 
+        defined in TS 28.554 [28]. Performance metrics can also be specified 
+        by other SDOs, or be vendor specific. Performance metrics are 
+        identified with their names.
+
+        For measurements defined in TS 28.552 the name is constructed as follows:
+        - 'family.measurementName.subcounter' for measurement types with 
+        subcounters
+        - 'family.measurementName' for measurement types without subcounters
+        `- 'family' for measurement families
+        For KPIs defined in TS 28.554 [28] the name is defined in the KPI 
+        definitions template as the component designated with e).
+
+        A name can also identify a vendor specific performance metric or a 
+        group of vendor specific performance metrics.";
     }
 
     leaf thresholdLevel {
@@ -145,6 +162,7 @@ module _3gpp-common-measurements {
           range "0..max";
         }
       }
+      must '. >= 0';      
       description "Hysteresis of a threshold. If this attribute is present
         the monitored performance metric is not compared against the
         threshold value as specified by the thresholdValue attribute but
@@ -179,9 +197,9 @@ module _3gpp-common-measurements {
         type string;
         min-elements 1;
         description "Performance metrics include measurements defined in
-          TS 28.552 and KPIs defined in TS 28.554. Performance metrics can
-          also be specified by other SDOs or be vendor specific.
-          Performance metrics are identfied with their names.
+          TS 28.552 and KPIs defined in TS 28.554.
+
+          Measurements are identified by name.
 
           For measurements defined in TS 28.552 the name is constructed as
           follows:
@@ -193,8 +211,8 @@ module _3gpp-common-measurements {
           For KPIs defined in TS 28.554 the name is defined in the KPI
           definitions template as the component designated with e).
 
-          A name can also identify a vendor specific performance metric or a
-          group of vendor specific performance metrics.";
+          For non-3GPP specified measurements the name is defined
+          elsewhere.";
       }
 
       leaf-list granularityPeriods {
@@ -245,6 +263,7 @@ module _3gpp-common-measurements {
     leaf jobId {
       type string;
       description "Id for a PerfMetricJob job.";
+      yext3gpp:inVariant;
     }
 
     leaf-list performanceMetrics {
@@ -302,6 +321,7 @@ module _3gpp-common-measurements {
       mandatory true;
       yext3gpp:notNotifyable ; 
       description "Link to a 'Files' object.";
+      yext3gpp:inVariant;
     }
   }
 
@@ -544,4 +564,4 @@ module _3gpp-common-measurements {
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/yang-models/_3gpp-common-mnsagent.yang b/yang-models/_3gpp-common-mnsagent.yang
index c9967fd33..4cbddecca 100644
--- a/yang-models/_3gpp-common-mnsagent.yang
+++ b/yang-models/_3gpp-common-mnsagent.yang
@@ -12,7 +12,9 @@ module _3gpp-common-mnsagent {
   organization "3GPP SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
 
-  description "Defines MnsAgent IOCs";
+  description "Defines MnsAgent IOCs
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.623
       Generic Network Resource Model (NRM)
       Integration Reference Point (IRP);
@@ -26,6 +28,7 @@ module _3gpp-common-mnsagent {
       3GPP TS 28.620 
       Umbrella Information Model (UIM)";
 
+  revision 2023-09-18 { reference CR-0271 ; } 
   revision 2023-02-14 { reference "CR-0234"; }
   
   feature MnsAgentUnderManagedElement {
diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang
index 872c972be..4e9ae225e 100755
--- a/yang-models/_3gpp-common-mnsregistry.yang
+++ b/yang-models/_3gpp-common-mnsregistry.yang
@@ -10,9 +10,13 @@ module _3gpp-common-mnsregistry {
   organization "3GPP SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "Defines the YANG mapping of the MNSRegistry Information Object
-    Class (IOC) that is part of the Generic Network Resource Model (NRM).";
+    Class (IOC) that is part of the Generic Network Resource Model (NRM).
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.623 Generic Network Resource Model (NRM)";
 
+  revision 2023-09-30 { reference CR-0278; }
+  revision 2023-09-18 { reference CR-0271 ; } 
   revision 2023-05-10 { reference CR-0243; }
   revision 2023-02-14 { reference CR-0234; }
   revision 2021-11-23 { reference "S5-216090"; }
@@ -52,7 +56,10 @@ module _3gpp-common-mnsregistry {
       description "List of the managed object instances that can be accessed
         using the MnS. If a complete SubNetwork can be accessed using the MnS,
         this attribute may contain the DN of the SubNetwork instead of the
-        DNs of the individual managed entities within the SubNetwork.";
+        DNs of the individual managed entities within the SubNetwork.  If a 
+        complete ManagedElement can be accessed using the MnS,
+        this attribute may contain the DN of the ManagedElement instead of the
+        DNs of the individual managed entities within the ManagedElement.";
       min-elements 1;
       type types3gpp:DistinguishedName;
     }
diff --git a/yang-models/_3gpp-common-qmcjob.yang b/yang-models/_3gpp-common-qmcjob.yang
index cab2127d0..bd46a0360 100644
--- a/yang-models/_3gpp-common-qmcjob.yang
+++ b/yang-models/_3gpp-common-qmcjob.yang
@@ -6,6 +6,7 @@ module _3gpp-common-qmcjob {
   import _3gpp-common-top { prefix top3gpp; }
   import _3gpp-common-subnetwork { prefix subnet3gpp; }
   import _3gpp-common-yang-types { prefix types3gpp; }
+  import _3gpp-common-yang-extensions { prefix yext3gpp; }
   import _3gpp-5g-common-yang-types { prefix types5g3gpp; }
   import _3gpp-common-managed-element { prefix me3gpp; }
   import _3gpp-common-trace { prefix trace3gpp; }
@@ -13,9 +14,9 @@ module _3gpp-common-qmcjob {
 
   organization "3GPP SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
-
-  description "Quality of Experience Measurement Collection Job handling";
-
+  description "Quality of Experience Measurement Collection Job handling
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.623
       Generic Network Resource Model (NRM)
       Integration Reference Point (IRP);
@@ -26,6 +27,7 @@ module _3gpp-common-qmcjob {
       Integration Reference Point (IRP);
       Information Service (IS)";
 
+  revision 2023-09-18 { reference CR-0271 ; } 
   revision 2023-02-14 { reference "CR-0234"; }
   revision 2022-11-04 { reference "CR-0215"; }
   revision 2022-08-17 { reference "CR-0185"; }
@@ -98,6 +100,7 @@ module _3gpp-common-qmcjob {
 
     leaf jobId {
       type string;
+      yext3gpp:inVariant;
       description "The jobId attribute presents the job identifier of a 
         QMCJob instance. The jobId can be used to associate  multiple QMCJob 
         instances. For example, it is possible to configure the same jobId 
diff --git a/yang-models/_3gpp-common-subnetwork.yang b/yang-models/_3gpp-common-subnetwork.yang
index 1ef0aba2e..7bca2e5de 100755
--- a/yang-models/_3gpp-common-subnetwork.yang
+++ b/yang-models/_3gpp-common-subnetwork.yang
@@ -12,11 +12,14 @@ module _3gpp-common-subnetwork {
   import ietf-yang-schema-mount { prefix yangmnt; }
   import _3gpp-common-files { prefix files3gpp; }
   import _3gpp-5gc-nrm-configurable5qiset { prefix fiveqi3gpp; }
+  import _3gpp-5gc-ecmconnectioninfo { prefix econn3gpp ; }
 
   organization "3GPP SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
     
-  description "Defines basic SubNetwork which will be augmented by other IOCs";
+  description "Defines basic SubNetwork which will be augmented by other IOCs
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.623
       Generic Network Resource Model (NRM)
       Integration Reference Point (IRP);
@@ -30,6 +33,8 @@ module _3gpp-common-subnetwork {
       3GPP TS 28.620 
       Umbrella Information Model (UIM)";
   
+  revision 2023-11-14 { reference CR-0305 ; } 
+  revision 2023-09-18 { reference CR-0271 ; } 
   revision 2023-08-10 { reference CR-0257;   }
   revision 2023-04-26 { reference CR-0250; }
   revision 2023-02-14 { reference CR-0234; }
@@ -55,6 +60,11 @@ module _3gpp-common-subnetwork {
     reference "Initial revision";
   }
 
+  feature EcmConnectionInfoUnderSubNetwork {
+    description "The EcmConnectionInfo shall be contained under
+    Subnetwork";
+  }
+
   feature Configurable5QISetUnderSubNetwork {
     description "The Configurable5QISet shall be contained under
     Subnetwork";
@@ -249,6 +259,10 @@ module _3gpp-common-subnetwork {
       if-feature Configurable5QISetUnderSubNetwork;
     }
 
+    uses econn3gpp:EcmConnectionInfoSubtree {
+      if-feature EcmConnectionInfoUnderSubNetwork;
+    }
+
     yangmnt:mount-point children-of-SubNetwork {
       description "Mountpoint for ManagedElement";
       reference "RFC8528 YANG Schema Mount";
diff --git a/yang-models/_3gpp-common-subscription-control.yang b/yang-models/_3gpp-common-subscription-control.yang
index 264c23f6a..e037ff83c 100755
--- a/yang-models/_3gpp-common-subscription-control.yang
+++ b/yang-models/_3gpp-common-subscription-control.yang
@@ -9,13 +9,16 @@ module _3gpp-common-subscription-control {
   organization "3GPP SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
     
-  description "Defines IOCs for subscription and heartbeat control.";
+  description "Defines IOCs for subscription and heartbeat control.
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.623
       Generic Network Resource Model (NRM)
       Integration Reference Point (IRP);
       Solution Set (SS) definitions
       3GPP TS 28.623";
   
+  revision 2023-09-18 { reference CR-0271 ; } 
   revision 2023-08-10 { reference "CR0257 CR0260"; }
   revision 2022-10-20 { reference CR-0196;   }
   revision 2021-01-16 { reference "CR-0120"; }  
diff --git a/yang-models/_3gpp-common-top.yang b/yang-models/_3gpp-common-top.yang
index c58adbea7..69c76b843 100755
--- a/yang-models/_3gpp-common-top.yang
+++ b/yang-models/_3gpp-common-top.yang
@@ -7,7 +7,9 @@ module _3gpp-common-top {
   organization "3gpp SA5";
   description "The model defines a YANG mapping of the top level 
     information classes used for management of 5G networks and 
-    network slicing.";
+    network slicing.
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference 
     "3GPP TS 28.622 
     Generic Network Resource Model (NRM)
@@ -17,6 +19,7 @@ module _3gpp-common-top {
     3GPP TS 28.620 
     Umbrella Information Model (UIM)";
 
+  revision 2023-09-18 { reference CR-0271 ; } 
   revision 2019-06-17 {
     description "Initial revision";
   }
diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang
index 46d7d2c01..a17cdbf98 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -12,8 +12,9 @@ module _3gpp-common-trace {
   organization "3GPP SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
 
-  description "Trace handling";
-
+  description "Trace handling
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.623
       Generic Network Resource Model (NRM)
       Integration Reference Point (IRP);
@@ -24,6 +25,9 @@ module _3gpp-common-trace {
       Integration Reference Point (IRP);
       Information Service (IS)" ;
 
+  revision 2023-11-06 { reference "CR-0290 CR-0294"; }
+  revision 2023-11-03 { reference CR-0302 ; } 
+  revision 2023-09-18 { reference CR-0271 ; } 
   revision 2023-08-10 { reference CR-0261; }
   revision 2023-04-26 { reference CR-0250; }
   revision 2023-02-18 { reference "CR-0234"; }
@@ -105,8 +109,13 @@ module _3gpp-common-trace {
       Maximum of 8 TAC can be defined. 
       - list of Tracking Area Identity, identified by TAC with 
       associated plmn-Identity perTAC-List containing the 
-      PLMN identity for each TAC. Maximum of 8 TAI can be defined.";
-      
+      PLMN identity for each TAC. Maximum of 8 TAI can be defined.
+      The Area Scope parameter in NR can also contain:
+      - list of NPN-IDs in NR. It is either a list of PNI-NPNs 
+      identified by CAG ID with associated plmn-Identity or a  
+      list of SNPNs identified by Network ID with associated 
+      plmn-Identity .";    
+
     choice AreaScopeChoice {
       leaf-list eutraCellIdList {
         type string;
@@ -138,8 +147,43 @@ module _3gpp-common-trace {
         uses types3gpp:TaiGrp;
       }
     }
+
+    list nPNIdentityList {
+      description "list of NPN IDs of in NR. It is either a list of PNI-NPNs 
+        identified by CAG ID with associated plmn-Identity or a list of SNPN 
+        identified by Network ID with associated plmn-Identity";
+      key idx;
+      min-elements 1;
+      uses NpnIdGrp;
+      leaf idx { type string; }
+    }
   }
   
+  grouping NpnIdGrp {
+    description "Represents the NpnId dataType."; 
+
+    list plmnId {
+      key "mcc mnc";
+      description "It specifies the PLMN Id of the NPN network.";
+      uses types3gpp:PLMNId;
+      max-elements 1;
+    }
+
+    list cAGIdList {
+      key idx;
+      max-elements 256;
+      description "It specifies the PNI-NPN identified by CAG ID ";
+      leaf idx { type string; }
+    }
+
+    list nIDList {
+      key idx;
+      max-elements 16;
+      description "It specifies the SNPN identified by Network ID";
+      leaf idx { type string; }
+    }
+  }
+
   grouping ExcessPacketDelayThresholdsGrp {
     description "Represents the ExcessPacketDelayThresholds dataType.
       This <<dataType>> defines a excess packet delay threshold information 
@@ -203,6 +247,16 @@ module _3gpp-common-trace {
       mandatory true;
       description "Carrier Frequency";
     }
+
+    list nPNIdentityList {
+       description "list of NPN IDs of in NR. It is either a list of PNI-NPNs 
+        identified by CAG ID with associated plmn-Identity or a list of SNPN 
+        identified by Network ID with associated plmn-Identity";
+      key idx;
+      min-elements 1;  
+      uses NpnIdGrp;
+      leaf idx { type string; }
+    }
   }
   
   grouping TraceConfigGrp {
@@ -468,6 +522,9 @@ module _3gpp-common-trace {
           enum N10 ;
           enum N11 ;
           enum S5-C ;
+          enum N38 ;
+          enum N16 ;
+          enum N16a ;
         }
       }
       leaf-list SMSFInterfaces {
@@ -643,7 +700,7 @@ module _3gpp-common-trace {
         period is configured for M5 in UMTS, all available measurements are
         logged according to RRM configuration.";
         
-  leaf listOfMeasurements {
+   leaf listOfMeasurements {
       when 'jobType = "IMMEDIATE_MDT_ONLY"';
       type enumeration {
         enum M1;
@@ -667,7 +724,7 @@ module _3gpp-common-trace {
       reference "3GPP TS 32.422 clause 5.10.3";
     }
 
- leaf reportingTrigger {
+   leaf reportingTrigger {
       when 'jobType = "IMMEDIATE_MDT_ONLY"';
       type enumeration {
         enum PERIODICAL;
@@ -858,7 +915,7 @@ module _3gpp-common-trace {
       reference "Clause 5.10.21 of 3GPP TS 32.422";
     }
 
-leaf measurementPeriodLTE {
+   leaf measurementPeriodLTE {
           when 'jobType = "IMMEDIATE_MDT_ONLY"'
             +  ' or jobType = "IMMEDIATE_MDT_AND_TRACE"';
       type uint32 {
@@ -1130,7 +1187,7 @@ leaf measurementPeriodLTE {
      immediateMdtConfig is applicable. In case of LOGGED_MDT_ONLY or 
      LOGGED_MBSFN_MDT the attribute loggedMdtConfig is applicable.";
 
-  leaf anonymizationOfMDTData {
+   leaf anonymizationOfMDTData {
       when ../areaScope ;
       type enumeration {
         enum NO_IDENTITY;
@@ -1141,7 +1198,7 @@ leaf measurementPeriodLTE {
       reference "3GPP TS 32.422 clause 5.10.12.";
     }
 
-  list areaScope {
+   list areaScope {
       key "idx";
       leaf idx { type uint32 ; }
       description "It specifies the area where data shall be collected. 
@@ -1151,6 +1208,8 @@ leaf measurementPeriodLTE {
         based Logged MDT.
   
         List of cells for management based Immediate MDT.
+
+        List of NPN IDs for management based MDT.
   
         Cell, TA, LA, RA are mutually exclusive.
          
@@ -1160,7 +1219,7 @@ leaf measurementPeriodLTE {
       uses AreaScopeGrp;      
     }
 
-  leaf-list sensorInformation {
+   leaf-list sensorInformation {
       type enumeration {
         enum BAROMETRIC_PRESSURE;
         enum UE_SPEED;
@@ -1245,6 +1304,7 @@ leaf measurementPeriodLTE {
       type string;
       yext3gpp:inVariant;
       description "Identifier of a TraceJob";
+      yext3gpp:inVariant;
     }
 
     leaf traceReportingFormat {
@@ -1348,6 +1408,16 @@ leaf measurementPeriodLTE {
      uses MdtConfigGrp;
      leaf idx { type string; }    
     }
+
+    list nPNTarget {
+      description "applicable only for NR and shall be present in case of NPN 
+        either a PNI-NPN or a SNPN) and for management-based activation when 
+        several NPNs are supported in the RAN.";
+      key idx;
+      max-elements 1;  
+      uses NpnIdGrp;
+      leaf idx { type string;}
+    }
   }
 
   grouping TraceSubtree {
diff --git a/yang-models/_3gpp-common-yang-extensions.yang b/yang-models/_3gpp-common-yang-extensions.yang
index bc5abe1b6..e07880128 100755
--- a/yang-models/_3gpp-common-yang-extensions.yang
+++ b/yang-models/_3gpp-common-yang-extensions.yang
@@ -39,14 +39,16 @@ module _3gpp-common-yang-extensions {
     implementations MAY or MAY NOT support.
     If support for an extension is missing the extension statement needs
     individual handling or it SHOULD be removed from the module using
-    the extension e.g. with a deviation.";
-
+    the extension e.g. with a deviation.
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.623
       Generic Network Resource Model (NRM)
       Integration Reference Point (IRP);
       Solution Set (SS) definitions
       3GPP TS 28.623";
 
+  revision 2023-09-18 { reference CR-0271 ; } 
   revision 2022-10-20 { reference CR-0196;   }
   revision 2019-06-23 { reference "Initial version";   }
 
@@ -71,15 +73,22 @@ module _3gpp-common-yang-extensions {
 
   extension inVariant {
     description
-      "Indicates that the value for the data node can only be set when its
-      parent data node is being created. To change the value after that, the
-      parent data node must be deleted and recreated with the data node
+      "Indicates that the value for the data node can only be set when the list 
+      data node representing the containing object(MOI) is created.
+      The above statement in YANG terms means, that the value for the data 
+      node can only be set when the list entry that is the parent of the 
+      restricted node's ancestor container named 'attributes' is being created. 
+      To change the value after that, the mentioned 
+      list data node must be deleted and recreated with the restricted data node
       having the new value.
 
+      If a list or container already has the inVariant 
+      extension, that is also valid for all contained data nodes.
+
       It is unnecessary to use and MUST NOT be used for key leafs.
 
       The statement MUST only be a substatement of a leaf, leaf-list, list 
-      statements that is config=true.
+      statement that is config=true.
       Zero or one inVariant statement is allowed per parent statement.
       NO substatements are allowed.
             
diff --git a/yang-models/_3gpp-common-yang-types.yang b/yang-models/_3gpp-common-yang-types.yang
index 2e9eb85a9..6a7865341 100755
--- a/yang-models/_3gpp-common-yang-types.yang
+++ b/yang-models/_3gpp-common-yang-types.yang
@@ -11,9 +11,13 @@ module _3gpp-common-yang-types {
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "The model defines a YANG mapping of the top level 
     information classes used for management of 5G networks and 
-    network slicing.";
+    network slicing.
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.623";
 
+  revision 2023-11-06 { reference CR-0305; }
+  revision 2023-09-18 { reference CR-0271 ; } 
   revision 2023-08-09 { reference CR-0266; }
   revision 2023-05-10 { reference CR-0250; }
   revision 2023-02-14 { reference CR-0234; }
@@ -250,6 +254,35 @@ module _3gpp-common-yang-types {
     description "Longitude values";
   }
 
+  typedef Altitude  {
+    type decimal64 {
+      fraction-digits 6;
+    }
+    units "meters";
+    description
+      "Height from a reference 0 value.";  
+  }
+
+  grouping GeographicalCoordinates {
+    description "This datatype represents the geographical coordinates";
+    reference "#GPP TS 28.558 clause 6.3.8";
+    
+    leaf latitude {
+      type Latitude;
+      mandatory true; 
+    }
+      
+    leaf longitude {
+      type Longitude;
+      mandatory true; 
+    }
+    
+    leaf altitude {
+      type Altitude;
+    }
+    
+  }
+
   typedef OnOff {
     type enumeration {
       enum ON;
@@ -273,6 +306,7 @@ module _3gpp-common-yang-types {
         The format of the NF Instance ID shall be a 
         Universally Unique Identifier (UUID) version 4, 
         as described in IETF RFC 4122 " ;
+      yext3gpp:inVariant;
     }
     
     leaf-list nfType {
@@ -406,7 +440,7 @@ module _3gpp-common-yang-types {
       mandatory true;
       type Mnc;
     }
-    reference "TS 23.658";
+    reference "TS 38.413 clause 9.3.3.5";
   }
   
   typedef Nci {
@@ -539,6 +573,47 @@ module _3gpp-common-yang-types {
     
     leaf tac { type Tac; }
   }
+       
+  grouping GeoCoordinateGrp {
+    description "Geographical location on earth"; 
+    leaf latitude {
+      type decimal64 {
+        fraction-digits 4;
+        range -90..90 ;
+      }
+      mandatory true;
+      description "Latitude based on World Geodetic System (1984 version) 
+        global reference frame (WGS 84). Positive values correspond to the 
+        northern hemisphere.";
+      }
+        
+    leaf longitude {
+      type decimal64 {
+        fraction-digits 4;
+        range -180..180 ;
+      }
+      mandatory true;
+      description "Longitude based on World Geodetic System (1984 version) 
+        global reference frame (WGS 84). Positive values correspond to 
+        degrees east of 0 degrees longitude.";
+    }
+  }
+   
+  grouping GeoAreaGrp {
+    description "This data type defines a geographical area. 
+      The geo-area is defined using a convex polygon in the attribute 
+      'convexGeoPolygon'.";
+    
+    list convexGeoPolygon {
+      description "Specifies the geographical area with a convex polygon. 
+        The convex polygon is specified by its corners.";
+        key "latitude longitude";
+      min-elements 3;
+      ordered-by user;
+      
+      uses GeoCoordinateGrp;
+    }
+  }
   
   typedef AmfRegionId {
     type union { 
@@ -772,7 +847,7 @@ module _3gpp-common-yang-types {
       pattern '[A-Z][^,=+<>#;\\"\r\n*.]*|([A-Z][^,=+<>#;\\"\r\n*.]*\.[a-z][^,=+<>#;\\"\r\n*.]*)';      
     } }
 
-    leaf RegularAttributeValue { type string {       // ( AttributeValueChar – SpaceChar ) , [ { AttributeValueChar } , ( AttributeValueChar – SpaceChar ) ]
+    leaf RegularAttributeValue { type string {       // ( AttributeValueChar - SpaceChar ) , [ { AttributeValueChar } , ( AttributeValueChar - SpaceChar ) ]
       pattern '([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2}))(([^,=+<>#;\\"\r\n*]|(\\[a-fA-F0-9]{2}))*([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2})))?' ; 
     } }
     
@@ -916,7 +991,6 @@ module _3gpp-common-yang-types {
             supported.";
         }
       }
-
     }
   }
 }
\ No newline at end of file
diff --git a/yang-models/_3gpp-nr-nrm-beam.yang b/yang-models/_3gpp-nr-nrm-beam.yang
index 2d64d3647..ce8735414 100755
--- a/yang-models/_3gpp-nr-nrm-beam.yang
+++ b/yang-models/_3gpp-nr-nrm-beam.yang
@@ -12,9 +12,12 @@ module _3gpp-nr-nrm-beam {
   organization "3GPP SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "Defines the YANG mapping of the Beam Information
-    Object Class (IOC) that is part of the NR Network Resource Model (NRM).";
+    Object Class (IOC) that is part of the NR Network Resource Model (NRM).
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2023-04-26 { reference CR-0916 ; }
   revision 2019-11-26 { reference "S5-197643"; }
 
diff --git a/yang-models/_3gpp-nr-nrm-bwp.yang b/yang-models/_3gpp-nr-nrm-bwp.yang
index bd18865a6..b75642abc 100755
--- a/yang-models/_3gpp-nr-nrm-bwp.yang
+++ b/yang-models/_3gpp-nr-nrm-bwp.yang
@@ -11,9 +11,12 @@ module _3gpp-nr-nrm-bwp {
   organization "3GPP SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "Defines the YANG mapping of the BWP Information Object Class
-    (IOC) that is part of the NR Network Resource Model (NRM).";
+    (IOC) that is part of the NR Network Resource Model (NRM).
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2020-11-17 { reference CR-0410 ; }
   revision 2019-10-28 { reference S5-193518 ; }
   revision 2019-06-17 { reference "Initial revision"; }
diff --git a/yang-models/_3gpp-nr-nrm-bwpset.yang b/yang-models/_3gpp-nr-nrm-bwpset.yang
index 1e563cfbd..8b92fa083 100644
--- a/yang-models/_3gpp-nr-nrm-bwpset.yang
+++ b/yang-models/_3gpp-nr-nrm-bwpset.yang
@@ -11,9 +11,12 @@ module _3gpp-nr-nrm-bwpset {
   organization "3GPP SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "Defines the YANG mapping of the BWPSet Information Object Class
-    (IOC) that is part of the NR Network Resource Model (NRM).";
+    (IOC) that is part of the NR Network Resource Model (NRM).
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2022-06-29 { reference CR-0756 ; }
 
   grouping BWPSetGrp {
diff --git a/yang-models/_3gpp-nr-nrm-cesmanagementfunction.yang b/yang-models/_3gpp-nr-nrm-cesmanagementfunction.yang
index f438d0b22..a7d179a38 100755
--- a/yang-models/_3gpp-nr-nrm-cesmanagementfunction.yang
+++ b/yang-models/_3gpp-nr-nrm-cesmanagementfunction.yang
@@ -14,9 +14,12 @@ module _3gpp-nr-nrm-cesmanagementfunction {
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "Defines the YANG mapping of the CESManagementFunction 
     Information Object Class (IOC) that is part of the NR Network Resource Model
-    (NRM).";
+    (NRM).
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2021-08-05 { reference S5-214053/CR-0518; }
   revision 2020-05-08 { reference S5-203316; }
 
diff --git a/yang-models/_3gpp-nr-nrm-commonbeamformingfunction.yang b/yang-models/_3gpp-nr-nrm-commonbeamformingfunction.yang
index dd7285b8f..550b4972d 100755
--- a/yang-models/_3gpp-nr-nrm-commonbeamformingfunction.yang
+++ b/yang-models/_3gpp-nr-nrm-commonbeamformingfunction.yang
@@ -12,9 +12,12 @@ module _3gpp-nr-nrm-commonbeamformingfunction {
   organization "3GPP SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "Defines the YANG mapping of the CommonBeamformingFuntion IOC 
-    that is part of the NR Network Resource Model (NRM).";
+    that is part of the NR Network Resource Model (NRM).
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2023-04-26 { reference CR-0916 ; }
   revision 2019-11-22 { reference "S5-197643"; }
 
diff --git a/yang-models/_3gpp-nr-nrm-cpciconfigurationfunction.yang b/yang-models/_3gpp-nr-nrm-cpciconfigurationfunction.yang
index 2a704d3aa..4c9de6b8f 100755
--- a/yang-models/_3gpp-nr-nrm-cpciconfigurationfunction.yang
+++ b/yang-models/_3gpp-nr-nrm-cpciconfigurationfunction.yang
@@ -12,9 +12,12 @@ module _3gpp-nr-nrm-cpciconfigurationfunction {
   organization "3GPP SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "Represents the CPCIConfigurationFunction Information Object 
-    Class(IOC) that is part of the NR Network Resource Model.";
+    Class(IOC) that is part of the NR Network Resource Model.
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2021-08-05 { reference S5-214053/CR-0518; }
   revision 2020-05-08 { reference S5-203316; }
 
diff --git a/yang-models/_3gpp-nr-nrm-danrmanagementfunction.yang b/yang-models/_3gpp-nr-nrm-danrmanagementfunction.yang
index 9ec94fc20..d0afa896a 100755
--- a/yang-models/_3gpp-nr-nrm-danrmanagementfunction.yang
+++ b/yang-models/_3gpp-nr-nrm-danrmanagementfunction.yang
@@ -13,9 +13,12 @@ module _3gpp-nr-nrm-danrmanagementfunction {
   organization "3GPP SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "Defines the YANG mapping of the DANRManagementFunction Information Object Class
-    (IOC) that is part of the NR Network Resource Model (NRM).";
+    (IOC) that is part of the NR Network Resource Model (NRM).
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2020-05-08 { reference S5-203316; }
 
 
diff --git a/yang-models/_3gpp-nr-nrm-desmanagementfunction.yang b/yang-models/_3gpp-nr-nrm-desmanagementfunction.yang
index 6df736c4d..c1201b7fb 100755
--- a/yang-models/_3gpp-nr-nrm-desmanagementfunction.yang
+++ b/yang-models/_3gpp-nr-nrm-desmanagementfunction.yang
@@ -14,9 +14,12 @@ module _3gpp-nr-nrm-desmanagementfunction {
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "Defines the YANG mapping of the DESManagementFunction 
     Information Object Class (IOC) that is part of the NR Network Resource 
-    Model (NRM).";
+    Model (NRM).
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2021-08-05 { reference S5-214053/CR-0518; }
   revision 2020-05-08 { reference S5-203316; }
 
diff --git a/yang-models/_3gpp-nr-nrm-dlbofunction.yang b/yang-models/_3gpp-nr-nrm-dlbofunction.yang
index d532fe037..6ae29fa50 100644
--- a/yang-models/_3gpp-nr-nrm-dlbofunction.yang
+++ b/yang-models/_3gpp-nr-nrm-dlbofunction.yang
@@ -13,9 +13,12 @@ module _3gpp-nr-nrm-dlbofunction {
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "Defines the YANG mapping of the DLBOFunction 
     Information Object Class (IOC) that is part of the NR Network Resource 
-    Model (NRM).";
+    Model (NRM).
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2022-03-25 { reference "CR-0683"; }
   revision 2021-10-22 { reference "CR-0577"; }  
 
diff --git a/yang-models/_3gpp-nr-nrm-dmrofunction.yang b/yang-models/_3gpp-nr-nrm-dmrofunction.yang
index 4a065cdf9..ea6ef52b7 100755
--- a/yang-models/_3gpp-nr-nrm-dmrofunction.yang
+++ b/yang-models/_3gpp-nr-nrm-dmrofunction.yang
@@ -13,9 +13,12 @@ module _3gpp-nr-nrm-dmrofunction {
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "Defines the YANG mapping of the DMROFunction 
     Information Object Class (IOC) that is part of the NR Network Resource 
-    Model (NRM).";
+    Model (NRM).
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2022-01-07 { reference CR-0633; }
   revision 2021-08-05 { reference S5-214053/CR-0518; }
   revision 2020-05-08 { reference S5-203316; }
diff --git a/yang-models/_3gpp-nr-nrm-dpciconfigurationfunction.yang b/yang-models/_3gpp-nr-nrm-dpciconfigurationfunction.yang
index 806b0d659..1a11e046a 100755
--- a/yang-models/_3gpp-nr-nrm-dpciconfigurationfunction.yang
+++ b/yang-models/_3gpp-nr-nrm-dpciconfigurationfunction.yang
@@ -14,9 +14,12 @@ module _3gpp-nr-nrm-dpciconfigurationfunction {
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "Defines the YANG mapping of the DPCIConfigurationFunction 
     Information Object Class (IOC) that is part of the NR Network Resource
-    Model (NRM).";
+    Model (NRM).
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2021-08-05 { reference S5-214053/CR-0518; }
   revision 2021-01-25 { reference CR-0454 ; }
   revision 2020-11-25 { reference CR-0386 ; }
diff --git a/yang-models/_3gpp-nr-nrm-drachoptimizationfunction.yang b/yang-models/_3gpp-nr-nrm-drachoptimizationfunction.yang
index 314372c38..399bd2bfd 100755
--- a/yang-models/_3gpp-nr-nrm-drachoptimizationfunction.yang
+++ b/yang-models/_3gpp-nr-nrm-drachoptimizationfunction.yang
@@ -13,9 +13,12 @@ module _3gpp-nr-nrm-drachoptimizationfunction {
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "Defines the YANG mapping of the DRACHOptimizationFunction 
     Information Object Class (IOC) that is part of the NR Network Resource 
-    Model (NRM).";
+    Model (NRM).
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2021-08-05 { reference S5-214053/CR-0518; }
   revision 2021-01-25 { reference CR-0454 ; }
   revision 2020-10-02 { reference "CR-0384, CR-0382" ; }
diff --git a/yang-models/_3gpp-nr-nrm-ep.yang b/yang-models/_3gpp-nr-nrm-ep.yang
index f36653ea7..927bc49b1 100755
--- a/yang-models/_3gpp-nr-nrm-ep.yang
+++ b/yang-models/_3gpp-nr-nrm-ep.yang
@@ -14,9 +14,12 @@ module _3gpp-nr-nrm-ep {
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "Defines the YANG mapping of the NR related endpoint
     Information Object Classes (IOCs) that are part of the NR Network
-    Resource Model (NRM).";
+    Resource Model (NRM).
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2022-01-07 { reference CR-0643; }
   revision 2021-05-01 { reference CR-0490; }
   revision 2021-03-03 { reference CR-0435 ; }
diff --git a/yang-models/_3gpp-nr-nrm-eutrancellrelation.yang b/yang-models/_3gpp-nr-nrm-eutrancellrelation.yang
index 4eee4a401..8f7d24596 100755
--- a/yang-models/_3gpp-nr-nrm-eutrancellrelation.yang
+++ b/yang-models/_3gpp-nr-nrm-eutrancellrelation.yang
@@ -12,9 +12,12 @@ module _3gpp-nr-nrm-eutrancellrelation {
 
   organization "3GPP SA5";
   description "Defines the YANG mapping of the EUtranCellRelation Information
-    Object Class (IOC) that is part of the NR Network Resource Model (NRM).";
+    Object Class (IOC) that is part of the NR Network Resource Model (NRM).
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2019-10-28 { reference S5-193518 ; }
   revision 2019-06-17 {
     description "Initial revision";
diff --git a/yang-models/_3gpp-nr-nrm-eutranetwork.yang b/yang-models/_3gpp-nr-nrm-eutranetwork.yang
index 068bc246c..3958b9c1a 100755
--- a/yang-models/_3gpp-nr-nrm-eutranetwork.yang
+++ b/yang-models/_3gpp-nr-nrm-eutranetwork.yang
@@ -8,9 +8,12 @@ module _3gpp-nr-nrm-eutranetwork {
 
   organization "3GPP SA5";
   description "Defines the YANG mapping of the EUtraNetwork Information Object
-    Class (IOC) that is part of the NR Network Resource Model (NRM).";
+    Class (IOC) that is part of the NR Network Resource Model (NRM).
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2019-06-17 {
     description "Initial revision";
   }
diff --git a/yang-models/_3gpp-nr-nrm-eutranfreqrelation.yang b/yang-models/_3gpp-nr-nrm-eutranfreqrelation.yang
index fce8aa7ff..72e635b76 100755
--- a/yang-models/_3gpp-nr-nrm-eutranfreqrelation.yang
+++ b/yang-models/_3gpp-nr-nrm-eutranfreqrelation.yang
@@ -12,9 +12,12 @@ module _3gpp-nr-nrm-eutranfreqrelation {
 
   organization "3GPP SA5";
   description "Defines the YANG mapping of the EUtranFreqRelation Information
-    Object Class (IOC) that is part of the NR Network Resource Model (NRM).";
+    Object Class (IOC) that is part of the NR Network Resource Model (NRM).
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2019-10-28 { reference S5-193518 ; }
   revision 2019-06-17 {
     description "Initial revision";
diff --git a/yang-models/_3gpp-nr-nrm-eutranfrequency.yang b/yang-models/_3gpp-nr-nrm-eutranfrequency.yang
index 2d8a4534a..0698485b4 100755
--- a/yang-models/_3gpp-nr-nrm-eutranfrequency.yang
+++ b/yang-models/_3gpp-nr-nrm-eutranfrequency.yang
@@ -10,10 +10,13 @@ module _3gpp-nr-nrm-eutranfrequency {
 
   organization "3GPP SA5";
   description "Defines the YANG mapping of the EUtranFrequency Information
-    Object Class (IOC), that is part of the NR Network Resource Model (NRM).";
+    Object Class (IOC), that is part of the NR Network Resource Model (NRM).
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM),
     3GPP TS 28.658 (E-UTRAN) Network Resource Model (NRM)";
 
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2019-10-28 { reference S5-193518 ; }
   revision 2019-06-17 {
     description "Initial revision";
diff --git a/yang-models/_3gpp-nr-nrm-externalamffunction.yang b/yang-models/_3gpp-nr-nrm-externalamffunction.yang
index bfd30c58a..eb0547390 100755
--- a/yang-models/_3gpp-nr-nrm-externalamffunction.yang
+++ b/yang-models/_3gpp-nr-nrm-externalamffunction.yang
@@ -11,9 +11,12 @@ module _3gpp-nr-nrm-externalamffunction {
 
   organization "3GPP SA5";
   description "Defines the YANG mapping of the ExternalAMFFunction Information
-    Object Class (IOC) that is part of the NR Network Resource Model (NRM).";
+    Object Class (IOC) that is part of the NR Network Resource Model (NRM).
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2019-10-28 { reference S5-193518 ; }
   revision 2019-06-17 {
     description "Initial revision";
diff --git a/yang-models/_3gpp-nr-nrm-externalenbfunction.yang b/yang-models/_3gpp-nr-nrm-externalenbfunction.yang
index 7dab2e970..cdb1611c4 100755
--- a/yang-models/_3gpp-nr-nrm-externalenbfunction.yang
+++ b/yang-models/_3gpp-nr-nrm-externalenbfunction.yang
@@ -11,10 +11,13 @@ module _3gpp-nr-nrm-externalenbfunction {
   organization "3GPP SA5";
   description "Defines the YANG mapping of the ExternalENBFunction
     Information Object Class (IOC) that is part of the NR Network Resource
-    Model (NRM).";
+    Model (NRM).
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM),
     3GPP TS 28.658 (E-UTRAN) Network Resource Model (NRM)";
 
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2019-10-28 { reference S5-193518 ; }
   revision 2019-06-17 {
     description "Initial revision";
diff --git a/yang-models/_3gpp-nr-nrm-externaleutrancell.yang b/yang-models/_3gpp-nr-nrm-externaleutrancell.yang
index df62f1c5f..d3306bc8c 100755
--- a/yang-models/_3gpp-nr-nrm-externaleutrancell.yang
+++ b/yang-models/_3gpp-nr-nrm-externaleutrancell.yang
@@ -13,10 +13,13 @@ module _3gpp-nr-nrm-externaleutrancell {
   organization "3GPP SA5";
   description "Defines the YANG mapping of the ExternalEUtranCellFDD and
     ExternalEUtranCellTDD Information Object Classes (IOCs) that are part
-    of the NR Network Resource Model (NRM).";
+    of the NR Network Resource Model (NRM).
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM),
     3GPP TS 28.658 (E-UTRAN) Network Resource Model (NRM)";
 
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2019-10-28 { reference S5-193518 ; }
   revision 2019-06-17 {
     description "Initial revision";
diff --git a/yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang
index 531e45bed..cbe2baff3 100755
--- a/yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang
+++ b/yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang
@@ -12,9 +12,12 @@ module _3gpp-nr-nrm-externalgnbcucpfunction {
   organization "3GPP SA5";
   description "Defines the YANG mapping of the ExternalGNBCUCPFunction
     Information Object Class (IOC), that is part of the NR Network Resource
-    Model (NRM).";
+    Model (NRM).
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2019-10-28 { reference S5-193518 ; }
   revision 2019-06-17 {
     description "Initial revision";
diff --git a/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang b/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang
index bcdeecbcc..2445a1e99 100755
--- a/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang
+++ b/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang
@@ -11,9 +11,12 @@ module _3gpp-nr-nrm-externalgnbcuupfunction {
   organization "3GPP SA5";
   description "Defines the YANG mapping of the ExternalGNBCUUPFunction
     Information Object Class (IOC), that is part of the NR Network
-    Resource Model (NRM).";
+    Resource Model (NRM).
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2019-10-28 { reference S5-193518 ; }
   revision 2019-06-17 {
     description "Initial revision";
diff --git a/yang-models/_3gpp-nr-nrm-externalgnbdufunction.yang b/yang-models/_3gpp-nr-nrm-externalgnbdufunction.yang
index 844933025..064b98db3 100755
--- a/yang-models/_3gpp-nr-nrm-externalgnbdufunction.yang
+++ b/yang-models/_3gpp-nr-nrm-externalgnbdufunction.yang
@@ -4,6 +4,7 @@ module _3gpp-nr-nrm-externalgnbdufunction {
   prefix "extgnbdu3gpp";
 
   import _3gpp-common-yang-types { prefix types3gpp; }
+  import _3gpp-common-yang-extensions { prefix yext3gpp; }
   import _3gpp-common-managed-function { prefix mf3gpp; }
   import _3gpp-nr-nrm-nrnetwork { prefix nrnet3gpp; }
   import _3gpp-common-subnetwork { prefix subnet3gpp; }
@@ -12,9 +13,12 @@ module _3gpp-nr-nrm-externalgnbdufunction {
   organization "3GPP SA5";
   description "Defines the YANG mapping of the ExternalGNBDUFunction
     Information Object Class (IOC) that is part of the NR Network Resource
-    Model (NRM).";
+    Model (NRM).
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2019-10-28 { reference S5-193518 ; }
   revision 2019-06-17 {
     description "Initial revision";
@@ -31,6 +35,7 @@ module _3gpp-nr-nrm-externalgnbdufunction {
         in 3GPP TS 38.413";
       mandatory true;
       type int64 { range "0..4294967295"; }
+      yext3gpp:inVariant;
     }
 
     leaf gNBIdLength {
diff --git a/yang-models/_3gpp-nr-nrm-externalnrcellcu.yang b/yang-models/_3gpp-nr-nrm-externalnrcellcu.yang
index 78e4671f0..b982aa12c 100755
--- a/yang-models/_3gpp-nr-nrm-externalnrcellcu.yang
+++ b/yang-models/_3gpp-nr-nrm-externalnrcellcu.yang
@@ -12,9 +12,12 @@ module _3gpp-nr-nrm-externalnrcellcu {
 
   organization "3GPP SA5";
   description "Defines the YANG mapping of the ExternalNRCellCU Information
-    Object Class (IOC), that is part of the NR Network Resource Model (NRM).";
+    Object Class (IOC), that is part of the NR Network Resource Model (NRM).
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2019-10-28 { reference S5-193518 ; }
   
   revision 2019-06-17 {
diff --git a/yang-models/_3gpp-nr-nrm-externalservinggwfunction.yang b/yang-models/_3gpp-nr-nrm-externalservinggwfunction.yang
index 96f51bd22..1fd046946 100755
--- a/yang-models/_3gpp-nr-nrm-externalservinggwfunction.yang
+++ b/yang-models/_3gpp-nr-nrm-externalservinggwfunction.yang
@@ -11,9 +11,12 @@ module _3gpp-nr-nrm-externalservinggwfunction {
   organization "3GPP SA5";
   description "Defines the YANG mapping of the ExternalServingGWFunction
     Information Object Class (IOC) that is part of the NR Network Resource
-    Model (NRM).";
+    Model (NRM).
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2019-10-28 { reference S5-193518 ; }
   revision 2019-06-17 {
     description "Initial revision";
diff --git a/yang-models/_3gpp-nr-nrm-externalupffunction.yang b/yang-models/_3gpp-nr-nrm-externalupffunction.yang
index 1175c8c60..11e924dab 100755
--- a/yang-models/_3gpp-nr-nrm-externalupffunction.yang
+++ b/yang-models/_3gpp-nr-nrm-externalupffunction.yang
@@ -10,9 +10,12 @@ module _3gpp-nr-nrm-externalupffunction {
 
   organization "3GPP SA5";
   description "Defines the YANG mapping of the ExternalUPFFunction Information
-    Object Class (IOC) that is part of the NR Network Resource Model (NRM).";
+    Object Class (IOC) that is part of the NR Network Resource Model (NRM).
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2019-10-28 { reference S5-193518 ; }
   revision 2019-06-17 {
     description "Initial revision";
diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang
index 68d2bc8d6..7ddb27b0b 100755
--- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang
+++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang
@@ -4,6 +4,7 @@ module _3gpp-nr-nrm-gnbcucpfunction {
   prefix "gnbcucp3gpp";
     
   import _3gpp-common-yang-types { prefix types3gpp; }
+  import _3gpp-common-yang-extensions { prefix yext3gpp; }
   import _3gpp-common-managed-function { prefix mf3gpp; }
   import _3gpp-common-managed-element { prefix me3gpp; }
   import _3gpp-common-top { prefix top3gpp; }
@@ -12,9 +13,12 @@ module _3gpp-nr-nrm-gnbcucpfunction {
   organization "3GPP SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "Defines the YANG mapping of the GNBCUCPFunction Information 
-    Object Class (IOC) that is part of the NR Network Resource Model (NRM).";
+    Object Class (IOC) that is part of the NR Network Resource Model (NRM).
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2023-04-26 { reference CR-0916; }
   revision 2022-07-28 { reference "CR-0770"; }
   revision 2021-11-06 { reference "CR-0611" ; }
@@ -35,16 +39,16 @@ module _3gpp-nr-nrm-gnbcucpfunction {
   }
 
   feature DESManagementFunction {
-    description "Classs representing Distributed SON Energy Saving feature";
+    description "Class representing Distributed SON Energy Saving feature";
   }
 
   feature DANRManagementFunction {
-    description "Classs representing D-SON function of ANR Management feature";
+    description "Class representing D-SON function of ANR Management feature";
   }
 
 
   feature DMROFunction {
-    description "Classs representing D-SON function of MRO feature";
+    description "Class representing D-SON function of MRO feature";
   }
  
   grouping GNBCUCPFunctionGrp {
@@ -80,6 +84,7 @@ module _3gpp-nr-nrm-gnbcucpfunction {
       key "mcc mnc";
       min-elements 1;
       max-elements 1;
+      yext3gpp:inVariant;
       uses types3gpp:PLMNId;
     } 
 
diff --git a/yang-models/_3gpp-nr-nrm-gnbcuupfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcuupfunction.yang
index 66bc771a5..a104c05a9 100755
--- a/yang-models/_3gpp-nr-nrm-gnbcuupfunction.yang
+++ b/yang-models/_3gpp-nr-nrm-gnbcuupfunction.yang
@@ -4,6 +4,7 @@ module _3gpp-nr-nrm-gnbcuupfunction {
   prefix "gnbcuup3gpp";
     
   import _3gpp-common-yang-types { prefix types3gpp; }
+  import _3gpp-common-yang-extensions { prefix yext3gpp; }
   import _3gpp-common-managed-function { prefix mf3gpp; }
   import _3gpp-common-managed-element { prefix me3gpp; }
   import _3gpp-common-top { prefix top3gpp; }
@@ -13,9 +14,12 @@ module _3gpp-nr-nrm-gnbcuupfunction {
   organization "3GPP SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "Defines the YANG mapping of the GNBCUUPFunction Information
-    Object Class (IOC) that is part of the NR Network Resource Model (NRM).";
+    Object Class (IOC) that is part of the NR Network Resource Model (NRM).
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2023-04-26 { reference CR-0916; }
   revision 2022-07-28 { reference "CR-0770"; }
   revision 2020-11-05 { reference CR-0412 ; }
@@ -112,6 +116,7 @@ module _3gpp-nr-nrm-gnbcuupfunction {
       }
       config false;
       mandatory true;
+      yext3gpp:inVariant;
       description "Identifies the gNB-CU-UP at least within a gNB-CU-CP";
       reference "'gNB-CU-UP ID' in subclause 9.3.1.15 of 3GPP TS 38.463";
     }
diff --git a/yang-models/_3gpp-nr-nrm-gnbdufunction.yang b/yang-models/_3gpp-nr-nrm-gnbdufunction.yang
index a00c5759b..06928d800 100755
--- a/yang-models/_3gpp-nr-nrm-gnbdufunction.yang
+++ b/yang-models/_3gpp-nr-nrm-gnbdufunction.yang
@@ -7,14 +7,18 @@ module _3gpp-nr-nrm-gnbdufunction {
   import _3gpp-common-managed-element { prefix me3gpp; }
   import _3gpp-common-top { prefix top3gpp; }
   import _3gpp-common-yang-types { prefix types3gpp; }
+  import _3gpp-common-yang-extensions { prefix yext3gpp; }
   import _3gpp-5gc-nrm-configurable5qiset { prefix fiveqi3gpp; }
 
   organization "3GPP SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "Defines the YANG mapping of the GNBDUFunction Information
-    Object Class (IOC) that is part of the NR Network Resource Model (NRM).";
+    Object Class (IOC) that is part of the NR Network Resource Model (NRM).
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2023-04-26 { reference CR-0916; }
   revision 2022-11-02 { reference "CR-0753"; }
   revision 2022-07-28 { reference "CR-0770"; }
@@ -174,6 +178,7 @@ module _3gpp-nr-nrm-gnbdufunction {
       config false;
       min-elements 1;
       max-elements 1;
+      yext3gpp:inVariant;
       description "Used to configure gNBs to report the all necessary
         information derived from the detected RIM-RS to OAM.";
       uses RimRSReportConfGrp;
diff --git a/yang-models/_3gpp-nr-nrm-nrcellcu.yang b/yang-models/_3gpp-nr-nrm-nrcellcu.yang
index a0a3e9889..c394748a2 100755
--- a/yang-models/_3gpp-nr-nrm-nrcellcu.yang
+++ b/yang-models/_3gpp-nr-nrm-nrcellcu.yang
@@ -13,9 +13,12 @@ module _3gpp-nr-nrm-nrcellcu {
   organization "3GPP SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "Defines the YANG mapping of the NRCellCU Information Object
-    Class (IOC) that is part of the NR Network Resource Model (NRM).";
+    Class (IOC) that is part of the NR Network Resource Model (NRM).
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2021-01-25 { reference CR-0454 ; }
   revision 2020-11-25 { reference CR-0386 ; }
   revision 2020-11-05 { reference CR-0412 ; }
diff --git a/yang-models/_3gpp-nr-nrm-nrcelldu.yang b/yang-models/_3gpp-nr-nrm-nrcelldu.yang
index 94e552b38..cf4c5cbfb 100755
--- a/yang-models/_3gpp-nr-nrm-nrcelldu.yang
+++ b/yang-models/_3gpp-nr-nrm-nrcelldu.yang
@@ -14,9 +14,12 @@ module _3gpp-nr-nrm-nrcelldu {
   organization "3GPP SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "Defines the YANG mapping of the NRCellDU Information Object
-    Class (IOC) that is part of the NR Network Resource Model (NRM).";
+    Class (IOC) that is part of the NR Network Resource Model (NRM).
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2022-07-28 { reference "CR-0770"; }
   revision 2022-06-29 { reference CR-0756 ; }
   revision 2021-10-28 { reference CR-0607 ; }
diff --git a/yang-models/_3gpp-nr-nrm-nrcellrelation.yang b/yang-models/_3gpp-nr-nrm-nrcellrelation.yang
index d278ebf80..67d764326 100755
--- a/yang-models/_3gpp-nr-nrm-nrcellrelation.yang
+++ b/yang-models/_3gpp-nr-nrm-nrcellrelation.yang
@@ -11,9 +11,12 @@ module _3gpp-nr-nrm-nrcellrelation {
 
   organization "3GPP SA5";
   description "Defines the YANG mapping of the NRCellRelation Information
-    Object Class (IOC) that is part of the NR Network Resource Model (NRM).";
+    Object Class (IOC) that is part of the NR Network Resource Model (NRM).
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2023-04-26 { reference CR-0916; }
   revision 2021-01-25 { reference CR-0454 ; }
   revision 2020-06-03 { reference S5-202333 ; }
diff --git a/yang-models/_3gpp-nr-nrm-nrfreqrelation.yang b/yang-models/_3gpp-nr-nrm-nrfreqrelation.yang
index ea6e980e9..b8f79d4c2 100755
--- a/yang-models/_3gpp-nr-nrm-nrfreqrelation.yang
+++ b/yang-models/_3gpp-nr-nrm-nrfreqrelation.yang
@@ -11,9 +11,12 @@ module _3gpp-nr-nrm-nrfreqrelation {
 
   organization "3GPP SA5";
   description "Defines the YANG mapping of the NRFreqRelation Information
-    Object Class (IOC) that is part of the NR Network Resource Model (NRM).";
+    Object Class (IOC) that is part of the NR Network Resource Model (NRM).
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2023-04-26 { reference CR-0916; }
   revision 2020-04-23 { reference CR0281 ; }
   revision 2019-10-28 { reference S5-193518 ; }
diff --git a/yang-models/_3gpp-nr-nrm-nrfrequency.yang b/yang-models/_3gpp-nr-nrm-nrfrequency.yang
index 77c905ead..a1589ef2b 100755
--- a/yang-models/_3gpp-nr-nrm-nrfrequency.yang
+++ b/yang-models/_3gpp-nr-nrm-nrfrequency.yang
@@ -10,9 +10,12 @@ module _3gpp-nr-nrm-nrfrequency {
 
   organization "3GPP SA5";
   description "Defines the YANG mapping of the NRFrequency Information Object
-    Class (IOC) that is part of the NR Network Resource Model (NRM).";
+    Class (IOC) that is part of the NR Network Resource Model (NRM).
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2019-10-28 { reference S5-193518 ; }
   revision 2019-06-17 {
     description "Initial revision";
diff --git a/yang-models/_3gpp-nr-nrm-nrnetwork.yang b/yang-models/_3gpp-nr-nrm-nrnetwork.yang
index 0e0bfc559..9e622884d 100755
--- a/yang-models/_3gpp-nr-nrm-nrnetwork.yang
+++ b/yang-models/_3gpp-nr-nrm-nrnetwork.yang
@@ -8,9 +8,12 @@ module _3gpp-nr-nrm-nrnetwork {
 
   organization "3GPP SA5";
   description "Defines the YANG mapping of the NRNetwork Information Object
-    Class (IOC) that is part of the NR Network Resource Model (NRM).";
+    Class (IOC) that is part of the NR Network Resource Model (NRM).
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2019-06-17 {
     description "Initial revision";
   }
diff --git a/yang-models/_3gpp-nr-nrm-nroperatorcelldu.yang b/yang-models/_3gpp-nr-nrm-nroperatorcelldu.yang
index ac3624520..0c92ea37d 100755
--- a/yang-models/_3gpp-nr-nrm-nroperatorcelldu.yang
+++ b/yang-models/_3gpp-nr-nrm-nroperatorcelldu.yang
@@ -13,9 +13,12 @@ module _3gpp-nr-nrm-nroperatorcelldu {
   organization "3GPP SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "Defines the YANG mapping of the OperatorDU Information Object
-    Class (IOC) that is part of the NR Network Resource Model (NRM).";
+    Class (IOC) that is part of the NR Network Resource Model (NRM).
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2021-10-01 { reference "Initial revision"; }
 
   grouping NROperatorCellDUGrp {
diff --git a/yang-models/_3gpp-nr-nrm-nrsectorcarrier.yang b/yang-models/_3gpp-nr-nrm-nrsectorcarrier.yang
index 2f55cf1db..9df2e6d5d 100755
--- a/yang-models/_3gpp-nr-nrm-nrsectorcarrier.yang
+++ b/yang-models/_3gpp-nr-nrm-nrsectorcarrier.yang
@@ -12,9 +12,12 @@ module _3gpp-nr-nrm-nrsectorcarrier {
   organization "3GPP SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "Defines the YANG mapping of the NRSectorCarrier Information
-    Object Class (IOC) that is part of the NR Network Resource Model (NRM).";
+    Object Class (IOC) that is part of the NR Network Resource Model (NRM).
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2020-05-28 { reference CR-0316 ; }
   revision 2019-10-28 { reference S5-193518 ; }
   revision 2019-06-17 {
diff --git a/yang-models/_3gpp-nr-nrm-operatordu.yang b/yang-models/_3gpp-nr-nrm-operatordu.yang
index f0214a3bb..1c708e52b 100755
--- a/yang-models/_3gpp-nr-nrm-operatordu.yang
+++ b/yang-models/_3gpp-nr-nrm-operatordu.yang
@@ -6,13 +6,19 @@ module _3gpp-nr-nrm-operatordu {
   import _3gpp-common-top { prefix top3gpp; }
   import _3gpp-common-managed-element { prefix me3gpp; }
   import _3gpp-nr-nrm-gnbdufunction {prefix gnbdu3gpp; }
-
+  import _3gpp-common-yang-types { prefix types3gpp; }
+  
   organization "3GPP SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "Defines the YANG mapping of the OperatorDU Information Object
-    Class (IOC) that is part of the NR Network Resource Model (NRM).";
+    Class (IOC) that is part of the NR Network Resource Model (NRM).
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2023-11-14 { reference "CR1136"; }
+  revision 2023-09-30 { reference "CR1048"; }
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2021-10-01 { reference "Initial revision"; }
 
   grouping OperatorDUGrp {
@@ -26,12 +32,35 @@ module _3gpp-nr-nrm-operatordu {
         mandatory true;
       }
     }
+    leaf configurable5QISetRef {
+      type types3gpp:DistinguishedName;
+      description "DN of the Configurable5QISet that the OperatorDU
+      supports (is associated to).";
+    }
+
+    leaf dynamic5QISetRef {
+      type types3gpp:DistinguishedName;
+      description "DN of the Dynamic5QISet that the OperatorDU 
+      supports (is associated to).";
+    }    
   }
 
   augment "/me3gpp:ManagedElement/gnbdu3gpp:GNBDUFunction" {
 
     list OperatorDU {
-      description "Contains attributes to support the 5G MOCN network sharing.";
+      description "This IOC contains attributes to support operator specific 
+        gNB-DU level information to support the NG-RAN Multi-Operator Core 
+        Network (NG-RAN MOCN) network sharing with multiple Cell Identity 
+        broadcast feature. An instance of OperatorDU <<IOC>> should be created 
+        and configured for each POP. When configured the attributes override 
+        those in parent GNBDUFunction instance.
+        
+        The OperatorDU <<IOC>> is only used to support NG-RAN MOCN with 
+        multiple cell identity broadcast feature. If NG-RAN MOCN with multiple 
+        cell identity broadcast feature is not supported, is not used. 
+        For scenarios with an F1 interface supporting multiple PLMN broadcast, 
+        the values of the EP_F1C and EP_F1U attributes contained by different 
+        OperatorDU of the same GNBDUFunction should be same.";
       reference "3GPP TS 28.541";
       key id;
       uses top3gpp:Top_Grp;
diff --git a/yang-models/_3gpp-nr-nrm-rimrsset.yang b/yang-models/_3gpp-nr-nrm-rimrsset.yang
index 9f285a623..69caf25ea 100755
--- a/yang-models/_3gpp-nr-nrm-rimrsset.yang
+++ b/yang-models/_3gpp-nr-nrm-rimrsset.yang
@@ -10,9 +10,12 @@ module _3gpp-nr-nrm-rimrsset {
   organization "3GPP SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "Defines the YANG mapping of the RimRSSet Information Object
-    Class (IOC) that is part of the NR Network Resource Model (NRM).";
+    Class (IOC) that is part of the NR Network Resource Model (NRM).
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2021-10-28 { reference CR-0607 ; }
   
   grouping FrequencyDomainParaGrp {
diff --git a/yang-models/_3gpp-nr-nrm-rrmpolicy.yang b/yang-models/_3gpp-nr-nrm-rrmpolicy.yang
index 8165e6d0b..aad5c5e9f 100755
--- a/yang-models/_3gpp-nr-nrm-rrmpolicy.yang
+++ b/yang-models/_3gpp-nr-nrm-rrmpolicy.yang
@@ -15,9 +15,12 @@ module _3gpp-nr-nrm-rrmpolicy {
   organization "3GPP SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "Defines the YANG mapping of the RRMPolicy abstract class that 
-    is part of the NR Network Resource Model (NRM).";
+    is part of the NR Network Resource Model (NRM).
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2022-07-28 { reference "CR-0770"; }
   revision 2020-11-05 { reference CR-0412 ; }
   revision 2020-04-28 { reference "CR0285"; }
diff --git a/yang-models/_3gpp-ns-nrm-common.yang b/yang-models/_3gpp-ns-nrm-common.yang
index 3b03adda2..44ed3e538 100755
--- a/yang-models/_3gpp-ns-nrm-common.yang
+++ b/yang-models/_3gpp-ns-nrm-common.yang
@@ -10,13 +10,16 @@ module _3gpp-ns-nrm-common {
   organization "3GPP SA5";
   contact 
     "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
-  description "Common network slice definitions";
+  description "Common network slice definitions
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541
     Management and orchestration; 
     5G Network Resource Model (NRM);
     Information model definitions for network slice NRM (chapter 6)
     ";
 
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2021-07-16 { reference CR-0566 ; } 
   revision 2021-05-17 {
     description "Introduction of Common Data types";
diff --git a/yang-models/_3gpp-ns-nrm-networkslice.yang b/yang-models/_3gpp-ns-nrm-networkslice.yang
index f5704943c..a92b0ad4d 100755
--- a/yang-models/_3gpp-ns-nrm-networkslice.yang
+++ b/yang-models/_3gpp-ns-nrm-networkslice.yang
@@ -12,13 +12,16 @@ module _3gpp-ns-nrm-networkslice {
   organization "3GPP SA5";
   contact 
     "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
-  description "A network slice instance in a 5G network.";
+  description "A network slice instance in a 5G network.
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541
     Management and orchestration; 
     5G Network Resource Model (NRM);
     Information model definitions for network slice NRM (chapter 6)
     ";
 
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2022-07-26 { reference CR-770 ; }
   revision 2020-06-02 {
     reference "CR-0485, CR-0508";
diff --git a/yang-models/_3gpp-ns-nrm-networkslicesubnet.yang b/yang-models/_3gpp-ns-nrm-networkslicesubnet.yang
index 5ee15127f..3453e5166 100755
--- a/yang-models/_3gpp-ns-nrm-networkslicesubnet.yang
+++ b/yang-models/_3gpp-ns-nrm-networkslicesubnet.yang
@@ -14,13 +14,16 @@ module _3gpp-ns-nrm-networkslicesubnet {
   contact 
     "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "This IOC represents the properties of a network slice subnet 
-    instance in a 5G network.";
+    instance in a 5G network.
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541
     Management and orchestration; 
     5G Network Resource Model (NRM);
     Information model definitions for network slice NRM (chapter 6)
     ";
 
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2022-07-26 { reference CR-0770 ; }
   revision 2021-05-05 {
     description "replace perfReq with 3 new datatypes xxxSliceSubnetProfile";
diff --git a/yang-models/_3gpp-ns-nrm-serviceprofile.yang b/yang-models/_3gpp-ns-nrm-serviceprofile.yang
index d3630dc23..190bc24e0 100755
--- a/yang-models/_3gpp-ns-nrm-serviceprofile.yang
+++ b/yang-models/_3gpp-ns-nrm-serviceprofile.yang
@@ -9,13 +9,16 @@ submodule _3gpp-ns-nrm-serviceprofile {
   organization "3GPP SA5";
   contact 
     "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
-  description "A network slice instance in a 5G network.";
+  description "A network slice instance in a 5G network.
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541
     Management and orchestration; 
     5G Network Resource Model (NRM);
     Information model definitions for network slice NRM (chapter 6)
     ";
 
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2020-06-02 {
     reference "CR-0485, CR-0508";
   }
diff --git a/yang-models/_3gpp-ns-nrm-sliceprofile.yang b/yang-models/_3gpp-ns-nrm-sliceprofile.yang
index 715e05504..8745dd815 100755
--- a/yang-models/_3gpp-ns-nrm-sliceprofile.yang
+++ b/yang-models/_3gpp-ns-nrm-sliceprofile.yang
@@ -12,13 +12,17 @@ submodule _3gpp-ns-nrm-sliceprofile {
     "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "Represents the properties of network slice subnet related 
     requirement that should be supported by the network slice subnet 
-    instance in a 5G network.";
+    instance in a 5G network.
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541
     Management and orchestration; 
     5G Network Resource Model (NRM);
     Information model definitions for network slice NRM (chapter 6)
     ";
 
+  revision 2023-11-04 { reference CR-1129; }
+  revision 2023-09-18 { reference CR-1043 ; } 
   revision 2023-04-26 { reference CR-0916; }
   revision 2021-07-20 { reference CR-0566; } 
   revision 2021-05-05 { reference CR-0485; }
@@ -104,11 +108,6 @@ submodule _3gpp-ns-nrm-sliceprofile {
   }
 
   grouping TopSliceSubnetProfileGrp {
-    leaf-list coverageArea {
-       min-elements 1;
-       description "A list of TrackingAreas where the NSI can be selected.";
-       type types3gpp:Tac;
-    }
     leaf latency {
       description "The packet transmission latency (milliseconds) through 
         the RAN, CN, and TN part of 5G network, used to evaluate 
@@ -306,11 +305,13 @@ submodule _3gpp-ns-nrm-sliceprofile {
         fraction-digits 1;
       }
     }
-    leaf-list coverageAreaTAList {
+    list coverageAreaTAList {
       description "A list of TrackingAreas where the NSI can be selected.";
+      key idx; //no obvious leaf to use as a key
+      leaf idx { type uint32; }
       //optional support
       min-elements 1;
-      type types3gpp:Tac;
+      uses types3gpp:TaiGrp;
     }
     leaf uEMobilityLevel {
       description "The mobility level of UE accessing the network slice 
@@ -406,11 +407,6 @@ submodule _3gpp-ns-nrm-sliceprofile {
   }
     
   grouping CNSliceSubnetProfileGrp {
-    leaf-list coverageArea {
-       min-elements 1;
-       description "A list of TrackingAreas where the NSI can be selected.";
-       type types3gpp:Tac;
-    }
     leaf latency {
       description "The packet transmission latency (milliseconds) through 
         the RAN, CN, and TN part of 5G network, used to evaluate 
@@ -569,11 +565,13 @@ submodule _3gpp-ns-nrm-sliceprofile {
         type ns3cmn3gpp:Support-enum;
       }
     }
-    leaf-list coverageAreaTAList {
+    list coverageAreaTAList {
       description "A list of TrackingAreas where the NSI can be selected.";
+      key idx; //no obvious leaf to use as a key
+      leaf idx { type uint32; }
       //optional support
       min-elements 1;
-      type types3gpp:Tac;
+      uses types3gpp:TaiGrp;
     }
     leaf resourceSharingLevel {
       description "Specifies whether the resources to be allocated to the 
@@ -842,11 +840,13 @@ submodule _3gpp-ns-nrm-sliceprofile {
         fraction-digits 1;
       }
     }
-    leaf-list coverageAreaTAList {
+    list coverageAreaTAList {
       description "A list of TrackingAreas where the NSI can be selected.";
+      key idx; //no obvious leaf to use as a key
+      leaf idx { type uint32; }
       //optional support
       min-elements 1;
-      type types3gpp:Tac;
+      uses types3gpp:TaiGrp;
     }
     leaf uEMobilityLevel {
       description "The mobility level of UE accessing the network slice 
@@ -981,11 +981,13 @@ submodule _3gpp-ns-nrm-sliceprofile {
       type uint64;
     }
     
-    leaf-list coverageAreaTAList {
+    list coverageAreaTAList {
       description "A list of TrackingAreas where the NSI can be selected.";
+      key idx; //no obvious leaf to use as a key
+      leaf idx { type uint32; }
       //optional support
       min-elements 1;
-      type types3gpp:Tac;
+      uses types3gpp:TaiGrp;
     }
     
     leaf latency {
-- 
GitLab