diff --git a/yang-models/_3gpp-5gc-nrm-anlffunction.yang b/yang-models/_3gpp-5gc-nrm-anlffunction.yang
index 85673a4c7815f90dfe0f892352e1ee94b186ea80..3bb52fcdd868897c487d58d3aecf3560db79b557 100644
--- a/yang-models/_3gpp-5gc-nrm-anlffunction.yang
+++ b/yang-models/_3gpp-5gc-nrm-anlffunction.yang
@@ -7,15 +7,17 @@ module _3gpp-5gc-nrm-anlffunction {
   import _3gpp-common-managed-element { prefix me3gpp; }
   import _3gpp-common-top { prefix top3gpp; }
   import _3gpp-5gc-nrm-nwdaffunction { prefix nwdaf3gpp; }
+  import _3gpp-common-yang-types { prefix types3gpp; }
   
   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, 
+    Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541";
   
+  revision 2024-08-07 { reference CR-1331; }
   revision 2023-11-03 { reference "initial revision"; }
   
   grouping AnLFFunctionGrp {
@@ -29,6 +31,18 @@ module _3gpp-5gc-nrm-anlffunction {
       config false;
       description "It indicates the activation status of the AnLF";
     }
+     leaf-list mLModelRefList {
+      type types3gpp:DistinguishedName;
+      description "This attribute holds a DN list of MLModel ¨
+        (See TS 28.105).";
+       config false;     
+    }
+    leaf-list aIMLInferenceFunctionRefList {
+      type types3gpp:DistinguishedName;
+      description "This attribute holds a DN list of AIMLInferenceFunction
+        (See TS 28.105) .";
+      config false;      
+    }   
   }
     
   augment "/me3gpp:ManagedElement/nwdaf3gpp:NWDAFFunction" {
diff --git a/yang-models/_3gpp-5gc-nrm-ep.yang b/yang-models/_3gpp-5gc-nrm-ep.yang
index 803d3b134c2bb8bdd9171f312d23caf0106bb9c5..73854e5d45fa034761d8579167207f964b15d391 100755
--- a/yang-models/_3gpp-5gc-nrm-ep.yang
+++ b/yang-models/_3gpp-5gc-nrm-ep.yang
@@ -28,10 +28,11 @@ module _3gpp-5gc-nrm-ep {
   description "Defines the YANG mapping of the 5GC related endpoint
                Information Object Classes (IOCs) that are part of the 5G Core 
                Network Resource Model.
-    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541";
   
+  revision 2024-08-19 { reference CR-1314 ; } 
   revision 2023-09-18 { reference CR-1043 ; } 
   revision 2019-11-18 {
     description "Ericsson refactoring.";
@@ -179,7 +180,7 @@ module _3gpp-5gc-nrm-ep {
     uses eprp3gpp:EP_Common;
   }
   
-  grouping EP_NLGGrp {
+  grouping EP_NL2Grp {
     uses eprp3gpp:EP_Common;
   }
   
@@ -312,12 +313,12 @@ module _3gpp-5gc-nrm-ep {
       }
     }
     
-    list EP_NLG {
-      description "Represents the EP_NLG IOC.";
+    list EP_NL2 {
+      description "Represents the EP_NL2 IOC.";
       key id;
       uses top3gpp:Top_Grp;
       container attributes {
-        uses EP_NLGGrp;
+        uses EP_NL2Grp;
       }
     }
   }
diff --git a/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang b/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang
index 5fe7eb7ae142767122d471d1be5edf12e3fed2bf..33033562c97cb2786a484c86444f6faab748eef0 100755
--- a/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang
+++ b/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang
@@ -21,6 +21,7 @@ module _3gpp-5gc-nrm-nwdaffunction {
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541";
   
+  revision 2024-08-07 { reference CR-1329; }
   revision 2024-04-12 { reference CR-1218; } 
   revision 2023-09-18 { reference CR-1043; } 
   revision 2023-04-26 { reference CR-0916; }
@@ -279,7 +280,8 @@ module _3gpp-5gc-nrm-nwdaffunction {
   }
   
   grouping NWDAFFunctionGrp {
-    description "Represents the NWDAFFunction IOC";
+    description "The NWDAFFunction IOC includes attributes inherited from 
+    ManagedFunction IOC(defined in TS 28.622)and the following attributes:";
     uses mf3gpp:ManagedFunctionGrp;
     
     list pLMNInfoList {
@@ -319,9 +321,10 @@ module _3gpp-5gc-nrm-nwdaffunction {
       key idx;
       min-elements 1;
       description "The attribute specifies a list of NetworkSliceInfo which 
-        is defined as a datatype (see clause 5.3.95). It can be used by the 
-        NWDAF to facilitate the data collection from OAM.";
-      leaf idx {
+        is defined as a datatype (see clause 5.3.95). It is used by an 
+        authorized consumer, e.g. NWDAF, to facilitate the data collection 
+        from OAM.";
+       leaf idx {
         type string;
       }
       uses NetworkSliceInfoGrp;    
@@ -393,4 +396,4 @@ module _3gpp-5gc-nrm-nwdaffunction {
       uses mf3gpp:ManagedFunctionContainedClasses;
     }
   }
-}
\ No newline at end of file
+}
diff --git a/yang-models/_3gpp-common-managed-element.yang b/yang-models/_3gpp-common-managed-element.yang
index 233aa6f4a2ab338201ffe86eab7eb0c679110085..705d01a2912c0e572c59d0cbad770cdb36099105 100755
--- a/yang-models/_3gpp-common-managed-element.yang
+++ b/yang-models/_3gpp-common-managed-element.yang
@@ -12,6 +12,7 @@ module _3gpp-common-managed-element {
   import _3gpp-common-files { prefix files3gpp; }
   import _3gpp-5gc-nrm-configurable5qiset { prefix fiveqi3gpp; }
   import _3gpp-5gc-nrm-ecmconnectioninfo { prefix econn3gpp ; }
+  import _3gpp-nr-nrm-ecmappingrule { prefix ecmap3gpp ; }
 
   organization "3GPP SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
@@ -33,6 +34,7 @@ module _3gpp-common-managed-element {
       3GPP TS 28.620 
       Umbrella Information Model (UIM)";
       
+  revision 2024-08-21 { reference CR-1337 ; } 
   revision 2024-01-30 { reference CR-0328 ; } 
   revision 2023-11-14 { reference CR-0305 ; }
   revision 2023-09-18 { reference CR-0271 ; } 
@@ -49,6 +51,10 @@ module _3gpp-common-managed-element {
   revision 2019-06-17 { reference " S5-203316"; }
   revision 2019-05-08 { reference "Initial revision"; }
   
+  feature ECMappingRuleUnderManagedElement {
+    description "ECMappingRule shall be contained under ManagedElement.";
+  }
+
   feature EcmConnectionInfoUnderManagedElement  {
     description "The EcmConnectionInfo shall be contained under
     ManagedElement";
@@ -304,5 +310,10 @@ module _3gpp-common-managed-element {
     uses econn3gpp:EcmConnectionInfoSubtree {
       if-feature EcmConnectionInfoUnderManagedElement;
     }
+
+     uses ecmap3gpp:NRECMappingRuleSubtree {
+      if-feature ECMappingRuleUnderManagedElement;
+    }
+
   }    
 }
diff --git a/yang-models/_3gpp-common-mecontext.yang b/yang-models/_3gpp-common-mecontext.yang
new file mode 100644
index 0000000000000000000000000000000000000000..ed183f1a72c8e880e788732bdd3edac15487e6f5
--- /dev/null
+++ b/yang-models/_3gpp-common-mecontext.yang
@@ -0,0 +1,82 @@
+module _3gpp-common-mecontext {
+  yang-version 1.1;
+  namespace "urn:3gpp:sa5:_3gpp-common-mecontext";
+  prefix "mectx3gpp";
+
+  import _3gpp-common-yang-types { prefix types3gpp; }
+  import _3gpp-common-top { prefix top3gpp; }
+  import _3gpp-common-subnetwork { prefix subnet3gpp; }
+  import ietf-yang-schema-mount { prefix yangmnt; }
+
+  organization "3GPP SA5";
+  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
+
+  description "Defines basic MeContext which will be augmented by other IOCs
+    Copyright 2024, 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.622
+    Generic Network Resource Model (NRM)
+    Integration Reference Point (IRP);
+    Information Service (IS)";
+
+  revision 2024-07-17 { reference "CR-0381 CR-0382 CR-0383"; }
+
+  grouping MeContextGrp {
+    description "Represents the MeContext IOC.";
+
+    leaf dnPrefix {
+      type types3gpp:DistinguishedName;
+      description "It carries the DN Prefix information or no information.
+        The instance of MeContext is the local root instance of the MIB.
+        Otherwise the attribute shall be absent or carry no information.";
+      reference "Annex C of 32.300 ";
+    }
+  }
+
+  augment "/subnet3gpp:SubNetwork" {
+    list Mecontext {
+      description "This IOC is introduced for naming purposes. It may support
+        creation of unique DNs in scenarios when some MEs have the same RDNs due
+        to the fact that they have been manufacturer pre-configured.
+
+        If some MEs have the same RDNs (for the above mentioned reason) and they
+        are contained in the same SubNetwork instance, some measure shall be
+        taken in order to assure the global uniqueness of DNs for all IOC
+        instances under those MEs. One way could be to set different dnPrefix
+        for those NEs, but that would require either that:
+
+        a)  all LDNs or DNs are locally modified using the new dnPrefix for the
+        upper portion of the DNs, or
+        b)  a mapping (translation) of the old LDNs or DNs to the new DNs every
+        time they are used externally, e.g. in alarm notifications.
+
+        As both the two alternatives above may involve unacceptable drawbacks
+        (as the old RDNs for the MEs then would have to be changed or mapped to
+        new values), using MeContext offers a new alternative to resolve the DN
+        creation. Using MeContext as part of the naming tree (and thus the DN)
+        means that the dnPrefix, including a unique MeContext for each ME, may
+        be directly concatenated with the LDNs, without any need to change or
+        map the existing ME RDNs to new values.
+
+        MeContext have 0..N instances. It may exist even if no SubNetwork exists.
+        Every instance of MeContext contains exactly one ManagedElement during
+        steady-state operations.";
+
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses MeContextGrp;
+      }
+
+      yangmnt:mount-point children-of-MeContext {
+        description "Mountpoint for ManagedElement";
+        reference "RFC8528 YANG Schema Mount";
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/yang-models/_3gpp-common-subnetwork.yang b/yang-models/_3gpp-common-subnetwork.yang
index d6d5f7010369bea58396611428ff5c1ba8e16cca..ddd472941d58fa4e07081352f39dfd301da42e7b 100755
--- a/yang-models/_3gpp-common-subnetwork.yang
+++ b/yang-models/_3gpp-common-subnetwork.yang
@@ -13,6 +13,7 @@ module _3gpp-common-subnetwork {
   import _3gpp-common-files { prefix files3gpp; }
   import _3gpp-5gc-nrm-configurable5qiset { prefix fiveqi3gpp; }
   import _3gpp-5gc-nrm-ecmconnectioninfo { prefix econn3gpp ; }
+  import _3gpp-nr-nrm-ecmappingrule { prefix ecmap3gpp ; }
 
   organization "3GPP SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
@@ -33,6 +34,7 @@ module _3gpp-common-subnetwork {
       3GPP TS 28.620 
       Umbrella Information Model (UIM)";
   
+  revision 2024-01-30 { reference CR-1337 ; } 
   revision 2024-01-30 { reference CR-0328 ; } 
   revision 2023-11-14 { reference CR-0305 ; } 
   revision 2023-09-18 { reference CR-0271 ; } 
@@ -61,6 +63,10 @@ module _3gpp-common-subnetwork {
     reference "Initial revision";
   }
 
+  feature ECMappingRuleUnderSubNetwork {
+    description "ECMappingRule shall be contained under SubNetwork.";
+  }
+
   feature EcmConnectionInfoUnderSubNetwork {
     description "The EcmConnectionInfo shall be contained under
     Subnetwork";
@@ -264,6 +270,11 @@ module _3gpp-common-subnetwork {
       if-feature EcmConnectionInfoUnderSubNetwork;
     }
 
+    uses ecmap3gpp:NRECMappingRuleSubtree {
+      if-feature EcmConnectionInfoUnderSubNetwork;
+    }
+
+
     yangmnt:mount-point children-of-SubNetwork {
       description "Mountpoint for ManagedElement";
       reference "RFC8528 YANG Schema Mount";
@@ -271,4 +282,4 @@ module _3gpp-common-subnetwork {
     
     // augment external parts here
   }
-}
\ No newline at end of file
+}
diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang
index 0953de0b60628980ce1f64511bb3221b82dc55cd..30a4db45b2bb86cb8a7377a8b37dad152e80c036 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -25,6 +25,8 @@ module _3gpp-common-trace {
       Integration Reference Point (IRP);
       Information Service (IS)" ;
 
+  revision 2024-08-13 { reference "CR-0387 CR-0377"; } 
+  revision 2024-08-07 { reference "CR-0405 CR-0421 CR-0379"; }
   revision 2024-05-12 { reference "CR-0401"; }
   revision 2024-05-06 { reference CR-0359; }
   revision 2024-04-06 { reference "CR-0342"; }
@@ -105,20 +107,9 @@ module _3gpp-common-trace {
   
   grouping AreaScopeGrp {
     description "Represents the AreaScope dataType.
-      This <<dataType>> defines the area scope of MDT.
-      The Area Scope parameter in LTE and NR is either:
-      - list of Cells, identified by E-UTRAN-CGI or NG-RAN CGI. 
-      Maximum 32 CGI can be defined.
-      - list of Tracking Area, identified by TAC. 
-      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.
-      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 .";    
+      This <<dataType>> defines the area scope of MDT and QoE.
+      The Area Scope for MDT is specified in clause 5.10.2 of TS 32.422.
+      The Area Scope for QoE is specified in clause 5.4 of TS 28.405.";    
 
     choice AreaScopeChoice {
       leaf-list eutraCellIdList {
@@ -128,11 +119,11 @@ module _3gpp-common-trace {
         description "List of E-UTRAN cells identified by E-UTRAN-CGI";
       }
       
-      leaf-list utraCellIdList {
+      leaf-list nrCellIdList {
         type string;
         min-elements 1;
         max-elements 32;
-        description "List of UTRAN cells identified by UTRAN CGI";
+        description "List of NR cells identified by NG-RAN CGI";
       }
       
       leaf-list tacList {
@@ -690,15 +681,15 @@ module _3gpp-common-trace {
         -reportingTrigger: conditional for M1 in LTE or NR and M1/M2 in UMTS,
         -eventThreshold: conditional for A2 event reporting or A2 event
           triggered periodic reporting,
-        -collectionPeriodRrmNR: conditional for M4 and M5 in NR,
+        -collectionPeriodRRMNR: conditional for M4 and M5 in NR,
         -collectionPeriodM6NR: conditional for M6 in NR,
         -collectionPeriodM7NR: conditional for M7 in NR,
-        -collectionPeriodRrmLte (conditional for M3 in LTE),
+        -collectionPeriodRRMLTE (conditional for M3 in LTE),
         -measurementPeriodLTE (conditional for M4 and M5 in LTE),
-        -collectionPeriodM6Lte (conditional for M6 in LTE),
-        -collectionPeriodM7Lte (conditional for M7 in LTE),
-        -collectionPeriodRrmUmts (conditional for M4 and M5 in UMTS),
-        -measurementPeriodUmts (conditional for M6 and M7 in UMTS),
+        -collectionPeriodM6LTE (conditional for M6 in LTE),
+        -collectionPeriodM7LTE (conditional for M7 in LTE),
+        -collectionPeriodRRMUMTS (conditional for M4 and M5 in UMTS),
+        -measurementPeriodUMTS (conditional for M6 and M7 in UMTS),
         -measurementQuantity (conditional for 1F event reporting),
         -beamLevelMeasurement (conditional for M1 in NR),
         -excessPacketDelayThresholds (conditional for M6 UL measurement in NR).
@@ -736,8 +727,8 @@ module _3gpp-common-trace {
         configuration, see TS 38.321, TS 36.321 and TS 38.331, TS 36.331.  
         For measurement M4 in UMTS, reporting is either according to RRM 
         configuration, see TS 25.321 and TS 25.331 or periodic or event
-        triggered periodic using parameter collectionPeriodRrmUmts and 
-        eventThresholdUphUmts.
+        triggered periodic using parameter collectionPeriodRRMUMTS and 
+        eventThresholdUphUMTS.
         
         - For measurement M3 in UMTS, the reporting is done upon
         availability, see TS 37.320.
@@ -745,10 +736,10 @@ module _3gpp-common-trace {
         - For measurements M4, M5, M6 and M7 in NR, for measurements 
         M3, M4, M5, M6 and M7 in LTE and for measurements M5, M6 and M7 
         in UMTS periodical reporting is applied. The configurable parameter
-        is the interval between two measurements (collectionPeriodRrmNr, 
-        collectionPeriodM6NR, collectionPeriodM7Nr, collectionPeriodRrmLte,
-        measurementPeriodLte, collectionPeriodM6Lte, collectionPeriodM7Lte,
-        collectionPeriodRrmUmts, measurementPeriodUmts).  If no collection
+        is the interval between two measurements (collectionPeriodRRMNR, 
+        collectionPeriodM6NR, collectionPeriodM7NR, collectionPeriodRRMLTE,
+        measurementPeriodLte, collectionPeriodM6LTE, collectionPeriodM7LTE,
+        collectionPeriodRRMUMTS, measurementPeriodUMTS).  If no collection
         period is configured for M5 in UMTS, all available measurements are
         logged according to RRM configuration.";
         
@@ -844,7 +835,7 @@ module _3gpp-common-trace {
       reference "Clauses 5.10.7 and 5.10.7a of 3GPP TS 32.422";
     }
     
-   leaf collectionPeriodRrmNr {
+   leaf collectionPeriodRRMNR {
       when '../../../jobType = "IMMEDIATE_MDT_ONLY"'
         + ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"';
       type uint32 {
@@ -858,7 +849,7 @@ module _3gpp-common-trace {
       reference "Clause 5.10.30 of 3GPP TS 32.422";
     }
 
-   leaf collectionPeriodM6Nr {
+   leaf collectionPeriodM6NR {
       when '../../../jobType = "IMMEDIATE_MDT_ONLY"'
         + ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"';
       type enumeration {
@@ -884,7 +875,7 @@ module _3gpp-common-trace {
       reference "clause 5.10.34 of  TS 32.422";
     }
     
-    leaf collectionPeriodM7Nr {
+    leaf collectionPeriodM7NR {
       when '../../../jobType = "IMMEDIATE_MDT_ONLY"'
         + ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"';
       type uint32 {
@@ -897,7 +888,7 @@ module _3gpp-common-trace {
       reference "clause 5.10.35 of  TS 32.422";
     }
 
-   leaf collectionPeriodRrmLte {
+   leaf collectionPeriodRRMLTE {
       when '../../../jobType = "IMMEDIATE_MDT_ONLY"' 
         +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"';
       type uint32 {
@@ -928,7 +919,7 @@ module _3gpp-common-trace {
       reference "Clause 5.10.23 of 3GPP TS 32.422";
     }
     
-    leaf collectionPeriodM6Lte {
+    leaf collectionPeriodM6LTE {
       when '../../../jobType = "IMMEDIATE_MDT_ONLY"' 
         +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"';
       type uint32 {
@@ -942,7 +933,7 @@ module _3gpp-common-trace {
       reference "Clause 5.10.32 of  TS 32.422 ";
     }
     
-    leaf collectionPeriodM7Lte {
+    leaf collectionPeriodM7LTE {
       when '../../../jobType = "IMMEDIATE_MDT_ONLY"' 
         +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"';
       type uint16 {
@@ -955,7 +946,7 @@ module _3gpp-common-trace {
       reference "Clause 5.10.33 of  TS 32.422 .";
     }
 
-    leaf eventThresholdUphUmts {
+    leaf eventThresholdUphUMTS {
       when '../../../jobType = "IMMEDIATE_MDT_ONLY"' 
         +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"';
       type uint16 {
@@ -968,7 +959,7 @@ module _3gpp-common-trace {
         reference "5.10.39 of TS 32.422";
     }
 
-    leaf collectionPeriodRrmUmts {
+    leaf collectionPeriodRRMUMTS {
       when '../../../jobType = "IMMEDIATE_MDT_ONLY"'
         +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"';
       type uint32 {
@@ -983,7 +974,7 @@ module _3gpp-common-trace {
       reference "Clause 5.10.21 of 3GPP TS 32.422";
     }
 
-    leaf measurementPeriodUmts {
+    leaf measurementPeriodUMTS {
       when '../../../jobType = "IMMEDIATE_MDT_ONLY"'
         +  'or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"';
       type uint32 {
@@ -1519,21 +1510,48 @@ module _3gpp-common-trace {
       leaf idx { type string; }
       uses LoggedMdtConfigGrp;
     }    
+    
+    leaf mNOnly {
+      type boolean;
+      default false;
+      description "Specifies whether the MDT configuration is for MN  
+        only or not. The value FALSE means the MDT configuration is for 
+        both MN and SN. The value TRUE means the MDT configuration is  
+        for MN only.";
+    }      
   }
 
-  grouping UEMeasConfigGrp {
-    description "Represents the UEMeasConfig dataType.
+  grouping UECoreMeasConfigGrp {
+    description "Represents the UECoreMeasConfig dataType.
       This <<dataType>> defines the aconfiguration parameters of IOC TraceJob
         which are specific for UE level measurements collection.";
     
-    leaf-list ueMeasurements {
+    leaf-list ueCoreMeasurements {
       type string;
-      description "It specifies the List of UE level measurements.";
-    }
+      min-elements 1;
+      description "List of 5GC UE level measurements identified by name.
 
-    leaf ueMeasGranularityPeriod {
+        The list may include 5GC UE level measurements defined in TS 28.558, 
+        or vendor specific measurements.
+        
+        For 5GC UE level measurements defined in TS 28.558, the name is 
+        constructed as follows:
+        -  'family.measurementName.subcounter' for measurement type with 
+        specified subcounter
+        -  'family.measurementName.ALL' for measurement type with all supported 
+        subcounters
+        -  'family.measurementName' for measurement type without subcounters
+        -  'family' for measurement family, including all measurement types and 
+        the associated subcounters under this family.
+        For non-3GPP specified 5GC UE level measurements the name is defined 
+        elsewhere.";
+    }
+
+    leaf ueCoreMeasGranularityPeriod {
       type uint32;
-      description "It specifies the Granularity period used to produce UE level 
+      mandatory true;
+      units milliseconds;
+      description "It specifies the Granularity period used to produce 5GC UE level 
         measurements. The period is defined in milliseconds (ms).";
     }
 
@@ -1574,18 +1592,34 @@ module _3gpp-common-trace {
         enum TRACE_AND_5GC_UE_LEVEL_MEASUREMENTS;
         enum IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS;
         enum TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS;      
+        enum RRC_REPORT;
       }
       default TRACE_ONLY;
       description "Specifies the MDT mode and it specifies also whether the
         TraceJob represents only MDT, Logged MBSFN MDT, Trace, or 5GC UE 
         level measurement collection, or any combination 
-        of Trace, immediate MDT and 5GC UE level measurement collection. 
-        The attribute is applicable for Trace, MDT, RCEF and
+        of Trace, immediate MDT and 5GC UE level measurement collection or RRC
+        reporting. 
+        The attribute is applicable for Trace, MDT, RCEF, RRC and
         RLF reporting, and 5GC UE level measurement collection.";
       reference "Clause 5.9a of 3GPP TS 32.422 for additional details on the
         allowed values.";
     }
-    
+    leaf-list rrcReportType {
+      type enumeration {
+        enum RLF_REPORT;
+        enum RCEF_REPORT;
+        enum SHR;
+        enum SPR;
+        enum MHI;
+        enum RA_REPORT;
+        enum UHI_REPORT;
+      }
+    description "Specifies the RRC reports requested. ";
+    reference "Clause 5.X of 3GPP TS 32.422 for additional details on the
+        allowed values.";
+    }
+
     list pLMNTarget {
       key "mcc mnc";
       description "Specifies which PLMN that the subscriber of the session to
@@ -1753,7 +1787,7 @@ module _3gpp-common-trace {
       leaf idx { type string; }    
     }
 
-    list ueMeasConfig { 
+    list ueCoreMeasConfig { 
       when '../jobType = "5GC_UE_LEVEL_MEASUREMENTS_ONLY"'
          + ' or ../jobType = "TRACE_AND_5GC_UE_LEVEL_MEASUREMENTS"'
          + ' or ../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
@@ -1762,7 +1796,7 @@ module _3gpp-common-trace {
       key idx;
       description "5GC UE level measurements config";
       max-elements 1;       
-      uses UEMeasConfigGrp;
+      uses UECoreMeasConfigGrp;
       leaf idx { type string; }    
     }
    
@@ -1840,10 +1874,10 @@ module _3gpp-common-trace {
         only, RCEF reports only and Logged MBSFN MDT, the configuration 
         parameters of attribute mdtConfig or a subset of these shall be 
         applied. In case of UE measurements only, the configuration parameters 
-        of attribute ueMeasConfig shall be applied. In case of any combination 
+        of attribute ueCoreMeasConfig shall be applied. In case of any combination 
         of Trace, Immediate MDT, Trace and UE measurements, the configuration
         parameters of the corresponding attributes traceConfig, mdtConfig and 
-        ueMeasConfig are applicable. 
+        ueCoreMeasConfig are applicable. 
 
         Creation and deletion of TraceJob instances by MnS consumers is 
         optional; when not supported, the TraceJob instances may be created 
diff --git a/yang-models/_3gpp-common-util.yang b/yang-models/_3gpp-common-util.yang
index 6e58aa14fcdb98d95f9dc78d1c20c12fcf447b0c..040b1f5010b4f58a92f84213d95b09651f0fd7b4 100644
--- a/yang-models/_3gpp-common-util.yang
+++ b/yang-models/_3gpp-common-util.yang
@@ -3,6 +3,7 @@ module _3gpp-common-util {
   namespace urn:3gpp:sa5:_3gpp-common-util;
   prefix "util3gpp";
   
+  import ietf-yang-types { prefix yang ; }
   import _3gpp-common-top { prefix top3gpp; }  
   import _3gpp-common-yang-types { prefix types3gpp ; }
   import _3gpp-common-managed-element { prefix me3gpp ; }
@@ -16,6 +17,8 @@ module _3gpp-common-util {
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.623";
 
+  revision 2024-08-13 { reference CR-0387; }
+  revision 2024-07-30 { reference "CR-0392 CR-0393"; }  
   revision 2024-05-06 { reference CR-0359; }
 
   feature SchedulerUnderManagedElement {
@@ -88,7 +91,7 @@ module _3gpp-common-util {
           must 'not(../daysOfWeek)';
           description "Shall be present in case of Monthly periodicity, 
             otherwise not";
-          type types3gpp:DaysOfMonth;
+          type types3gpp:DateMonthDay;
         }
       }
     }
@@ -157,14 +160,22 @@ module _3gpp-common-util {
     description "Represents the Scheduler IOC.";
     
     leaf condition {
-      type string {
+      type yang:xpath1.0 {
         length 1..max;
       }
       mandatory true;
-      description "Logical expression of one or several condition(s). 
-
-        A restricted XPath may be used. The definition of the exact syntax 
-        is not ready yet.
+      description "A logical condition containing an XPath expression. 
+        The leaf contains an XPath 1.0 string with the following restrictions 
+        - The accessible tree is the full Network Resource Model 
+        - The root node is the list representing the top level MOI 
+        (E.g. ManagedElement)
+        - In the accessible tree, all leafs and leaf-lists with default values
+        in use exist
+        - The data tree has no concept of document order except when 'ordered-by 
+        user' is declared.
+        - The set of variable bindings is empty.
+        - The function library is the core function library defined in XPATH
+        - Namespaces should be ignored when evaluating the expression 
 
         An empty string is not allowed.";
     }
@@ -173,7 +184,8 @@ module _3gpp-common-util {
       type boolean;
       mandatory true;
       config false;
-      description "Switches between TRUE and FALSE depending upon whether the 
+      description "The boolean result of the condition.
+        Switches between TRUE and FALSE depending upon whether the 
         configured constraints are fulfilled or not.";
     }
   }
diff --git a/yang-models/_3gpp-common-yang-types.yang b/yang-models/_3gpp-common-yang-types.yang
index 3c8b9c7a4299b5a44b8c95d7387ee78f145d5767..25d9a5b5b16205f7252de52c381f6ce87fc822eb 100755
--- a/yang-models/_3gpp-common-yang-types.yang
+++ b/yang-models/_3gpp-common-yang-types.yang
@@ -16,6 +16,7 @@ module _3gpp-common-yang-types {
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.623";
 
+  revision 2024-08-13 { reference CR-0387; } 
   revision 2024-05-18 { reference CR-0359; } 
   revision 2024-04-12 { reference CR-0346; } 
   revision 2023-11-06 { reference CR-0305; }
@@ -94,7 +95,13 @@ module _3gpp-common-yang-types {
     }
   }
   
-  typedef DaysOfMonth {
+  typedef DateMonth {
+    type uint8 {
+      range 0..12;
+    }
+  }
+  
+  typedef DateMonthDay {
     type uint8 {
       range 0..31;
     }
@@ -103,6 +110,22 @@ module _3gpp-common-yang-types {
   typedef FullTime {
     type yang:time-with-zone-offset;
   }
+  
+  grouping DayInYearGrp {
+    description "This <<dataType>> represents a day in a year.";
+    
+    leaf month {
+      description "It indicates the month in a year.";
+      type DateMonth;
+      mandatory true;
+    }
+
+    leaf monthDay {
+      description "It indicates the day in a month.";
+      type DateMonthDay;
+      mandatory true;
+    }
+  }
 
   grouping TimeWindowGrp {
     leaf startTime {
diff --git a/yang-models/_3gpp-nr-nrm-bwpset.yang b/yang-models/_3gpp-nr-nrm-bwpset.yang
index 8b92fa0830d6b4781ca08bb88898ff86dcdf3816..cba0ca407fd9f8445ba55ee37b6c66d826ad4e49 100644
--- a/yang-models/_3gpp-nr-nrm-bwpset.yang
+++ b/yang-models/_3gpp-nr-nrm-bwpset.yang
@@ -12,10 +12,11 @@ module _3gpp-nr-nrm-bwpset {
   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).
-    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2024-08-19 { reference CR-1314 ; } 
   revision 2023-09-18 { reference CR-1043 ; } 
   revision 2022-06-29 { reference CR-0756 ; }
 
@@ -26,7 +27,7 @@ module _3gpp-nr-nrm-bwpset {
   }
   augment "/me3gpp:ManagedElement/gnbdu3gpp:GNBDUFunction" {
 
-    list BWPList {
+    list BWPLSett {
       description "Represents a bandwidth part (BWP) set.";
       key id;
       uses top3gpp:Top_Grp;
diff --git a/yang-models/_3gpp-nr-nrm-danrmanagementfunction.yang b/yang-models/_3gpp-nr-nrm-danrmanagementfunction.yang
index d0afa896a0b344c48d377034a81cd083c922a14e..3260d36464076d4366b6329e4609a637028a6e17 100755
--- a/yang-models/_3gpp-nr-nrm-danrmanagementfunction.yang
+++ b/yang-models/_3gpp-nr-nrm-danrmanagementfunction.yang
@@ -3,45 +3,47 @@ module _3gpp-nr-nrm-danrmanagementfunction {
   namespace "urn:3gpp:sa5:_3gpp-nr-nrm-danrmanagementfunction";
   prefix "danrmanagementfunction3gpp";
 
-
   import _3gpp-common-top { prefix top3gpp; }
   import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; }
   import _3gpp-common-managed-element { prefix me3gpp; }
 
- 
-
   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).
-    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+  description "Defines the YANG mapping of the DANRManagementFunction IOC
+    that is part of the NR Network Resource Model (NRM).
+    Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2024-08-19 { reference CR-1314 ; } 
   revision 2023-09-18 { reference CR-1043 ; } 
   revision 2020-05-08 { reference S5-203316; }
 
-
   grouping DANRManagementFunctionGrp {
     description "Represents the DANRManagementFunction IOC.";
-    reference "3GPP TS 28.541";
-    uses top3gpp:Top_Grp;
 
     leaf intrasystemANRManagementSwitch {
-        description "This attribute determines whether the intra-system ANR function is activated or deactivated.";
-         type boolean;
+      description "This attribute determines whether the intra-system ANR 
+        function is activated or deactivated.";
+        type boolean;
     }
 
     leaf intersystemANRManagementSwitch {
-        description "This attribute determines whether the inter-system ANR function is activated or deactivated.";
-        type boolean;
+      description "This attribute determines whether the inter-system ANR 
+        function is activated or deactivated.";
+      type boolean;
     }
-
-    
   }
 
   augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction" {
-    if-feature gnbcucp3gpp:DANRManagementFunction;
-    uses DANRManagementFunctionGrp;
+    list DANRManagementFunction {
+      description "This IOC contains attributes to support the D-SON function 
+        of ANR Management (See clause 6.4.1.3 in TS 28.313 .";
+      key id;   
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses DANRManagementFunctionGrp;
+      }
+    }
   }
 }
\ No newline at end of file
diff --git a/yang-models/_3gpp-nr-nrm-desmanagementfunction.yang b/yang-models/_3gpp-nr-nrm-desmanagementfunction.yang
index c1201b7fb86b6614652e30739d8e91c3946fd25f..2e1e5bbaaa072d4935e52545b70639b18c9bab06 100755
--- a/yang-models/_3gpp-nr-nrm-desmanagementfunction.yang
+++ b/yang-models/_3gpp-nr-nrm-desmanagementfunction.yang
@@ -9,16 +9,18 @@ module _3gpp-nr-nrm-desmanagementfunction {
   import _3gpp-nr-nrm-nrcellcu { prefix nrcellcu3gpp; }
   import _3gpp-common-subnetwork { prefix subnet3gpp; }
   import _3gpp-5g-common-yang-types { prefix type5g3gpp; }
+  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 DESManagementFunction 
     Information Object Class (IOC) that is part of the NR Network Resource 
     Model (NRM).
-    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2024-08-07 { reference CR-1331; }
   revision 2023-09-18 { reference CR-1043 ; } 
   revision 2021-08-05 { reference S5-214053/CR-0518; }
   revision 2020-05-08 { reference S5-203316; }
@@ -139,7 +141,19 @@ module _3gpp-nr-nrm-desmanagementfunction {
         enum yes;
         enum no;
       }  
-    }  
+    }
+    leaf-list mLModelRefList {
+      type types3gpp:DistinguishedName;
+      description "This attribute holds a DN list of MLModel ¨
+        (See TS 28.105]).";
+      config false; 
+    }
+    leaf-list aIMLInferenceFunctionRefList {
+      type types3gpp:DistinguishedName;
+      description "This attribute holds a DN list of AIMLInferenceFunction
+        (See TS 28.105) .";
+      config false; 
+    }
   }
 
   grouping EsNotAllowedTimePeriodGrp {
@@ -200,4 +214,4 @@ module _3gpp-nr-nrm-desmanagementfunction {
     if-feature subnet3gpp:DESManagementFunction;
     uses DESManagementFunctionSubtree;
   }
-}
\ No newline at end of file
+}
diff --git a/yang-models/_3gpp-nr-nrm-dlbofunction.yang b/yang-models/_3gpp-nr-nrm-dlbofunction.yang
index 6ae29fa509cee4528a3574f313fd42fbc271729a..9a3781a4560d67a36d6166e52f75fda55627799f 100644
--- a/yang-models/_3gpp-nr-nrm-dlbofunction.yang
+++ b/yang-models/_3gpp-nr-nrm-dlbofunction.yang
@@ -8,16 +8,18 @@ module _3gpp-nr-nrm-dlbofunction {
   import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; }
   import _3gpp-common-managed-element { prefix me3gpp; }
   import _3gpp-nr-nrm-nrcellcu { prefix nrcellcu3gpp; }
+  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 DLBOFunction 
     Information Object Class (IOC) that is part of the NR Network Resource 
     Model (NRM).
-    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2024-08-07 { reference CR-1331; }
   revision 2023-09-18 { reference CR-1043 ; } 
   revision 2022-03-25 { reference "CR-0683"; }
   revision 2021-10-22 { reference "CR-0577"; }  
@@ -68,7 +70,18 @@ module _3gpp-nr-nrm-dlbofunction {
         type int32 { range "0..604800"; }
         units "1";
     }
-
+    leaf-list mLModelRefList {
+      type types3gpp:DistinguishedName;
+      description "This attribute holds a DN list of MLModel ¨
+        (See TS 28.105).";
+      config false; 
+    }
+    leaf-list aIMLInferenceFunctionRefList {
+      type types3gpp:DistinguishedName;
+      description "This attribute holds a DN list of AIMLInferenceFunction
+        (See TS 28.105) .";
+      config false; 
+    }
   }
 
   grouping DLBOFunctionSubtree {
@@ -84,7 +97,7 @@ module _3gpp-nr-nrm-dlbofunction {
       uses top3gpp:Top_Grp;
       container attributes {
         uses DLBOFunctionGrp;
-      }      
+      }           
     }
   }
 
@@ -101,4 +114,4 @@ module _3gpp-nr-nrm-dlbofunction {
     if-feature DLBOUnderSubNetwork;
     uses DLBOFunctionSubtree;
   }
-}
\ No newline at end of file
+}
diff --git a/yang-models/_3gpp-nr-nrm-dmrofunction.yang b/yang-models/_3gpp-nr-nrm-dmrofunction.yang
index ea6ef52b7f65c2f8ea11bfa55949b6a0400ff19e..9c1937e1d7522027358a2a7d39a830140a498d95 100755
--- a/yang-models/_3gpp-nr-nrm-dmrofunction.yang
+++ b/yang-models/_3gpp-nr-nrm-dmrofunction.yang
@@ -8,16 +8,18 @@ module _3gpp-nr-nrm-dmrofunction {
   import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; }
   import _3gpp-common-managed-element { prefix me3gpp; }
   import _3gpp-nr-nrm-nrcellcu { prefix nrcellcu3gpp; }
+  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 DMROFunction 
     Information Object Class (IOC) that is part of the NR Network Resource 
     Model (NRM).
-    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2024-08-07 { reference CR-1331; }  
   revision 2023-09-18 { reference CR-1043 ; } 
   revision 2022-01-07 { reference CR-0633; }
   revision 2021-08-05 { reference S5-214053/CR-0518; }
@@ -64,6 +66,18 @@ module _3gpp-nr-nrm-dmrofunction {
       description "This attribute determines whether the MRO function is 
         enabled or disabled.";
       type boolean;
+    }
+        leaf-list mLModelRefList {
+      type types3gpp:DistinguishedName;
+      description "This attribute holds a DN list of MLModel ¨
+        (See TS 28.105).";
+      config false;
+    }
+    leaf-list aIMLInferenceFunctionRefList {
+      type types3gpp:DistinguishedName;
+      description "This attribute holds a DN list of AIMLInferenceFunction
+        (See TS 28.105) .";
+      config false;
     }
   }
 
@@ -101,4 +115,4 @@ module _3gpp-nr-nrm-dmrofunction {
     if-feature subnet3gpp:DMROFunction;
     uses DMROFunctionSubtree;
   }
-}
\ No newline at end of file
+}
diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
new file mode 100644
index 0000000000000000000000000000000000000000..ac5fbfe309e502edf1b4eea2cbf2ba2053bdee03
--- /dev/null
+++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
@@ -0,0 +1,56 @@
+module _3gpp-nr-nrm-ecmappingrule {
+  yang-version 1.1;
+  namespace urn:3gpp:sa5:_3gpp-nr-nrm-ecmappingrule;
+  prefix ecmap3gpp;
+  
+  import _3gpp-common-top { prefix top3gpp; }
+  
+  organization "3gpp SA5";
+  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
+  description "This IOC represents the unified mapping rule input to support
+    Energy Cost Index Mapping when Energy Cost Reporting.
+    Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
+  reference "3GPP TS 28.541";
+
+  revision 2024-08-21 { reference CR-1337 ; } 
+  
+  grouping NRECMappingRuleGrp {
+    description "Represents the unified mapping rule to support Energy Cost Mapping 
+      when Energy Cost Reporting is supported.  Can be name-contained by SubNetwork 
+      or ManagedElement.  It applies to all ManagedEntity contained by the parent.";
+    leaf eCMRInputMinValue {
+      type uint8;
+      description "The minimum value of to be applied 
+        for mapping from this attribute to the energy cost.";
+    }
+    
+    leaf eCMRInputMaxValue {
+      type uint8;
+      description "The maximum value of to be applied 
+        for mapping from this attribute to the energy cost.";  
+    }
+
+    leaf eCTimeInterval {
+      type uint8;
+      description "Time interval (in seconds) that 
+        should be applied for collecting values of mapping 
+        rule attribute to be used for computing the energy cost.";
+      units seconds;
+    }
+  }
+
+  grouping NRECMappingRuleSubtree {
+    description "Helps augmenting NRECMappingRule into multiple places.";
+    list NRECMappingRule {
+      key id;
+      uses top3gpp:Top_Grp;
+      min-elements 1;
+      max-elements 1;
+      leaf idx { type uint32; }
+      container attributes {
+        uses NRECMappingRuleGrp;  
+      }
+    }
+  }
+}
diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang
index 7d8eabeec81675750634464c98f6e60d59175eb2..839cb879c47bac02062c1b0a6f2e31a7c7a959e6 100755
--- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang
+++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang
@@ -19,6 +19,7 @@ module _3gpp-nr-nrm-gnbcucpfunction {
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2024-08-19 { reference "CR-1337 CR-1352"; } 
   revision 2024-05-24 { reference CR-1273 ; } 
   revision 2024-04-04 { reference CR-1139; }
   revision 2024-02-24 { reference CR-1218; } 
@@ -141,6 +142,12 @@ module _3gpp-nr-nrm-gnbcucpfunction {
         enabled or disabled.";
     }
 
+    leaf dLTMCellSwitchControl {
+      type boolean;
+      description "This attribute determines whether the distributed SON
+        function LTM Cell Switch is enabled or disabled.";
+    }
+
     leaf dDAPSHOControl {
       type boolean;
       description "This attribute determines whether the DAPS handover function
@@ -180,6 +187,13 @@ module _3gpp-nr-nrm-gnbcucpfunction {
       type types3gpp:DistinguishedName;
       description "This is the DN of EphemerisInfoSet.";
     }
+
+    leaf nRECMappingRuleRef {
+      type types3gpp:DistinguishedName;
+      description "DN of a NRECMappingRule.  An empty value indicates the 
+        NRECMappingRule contained by parent, e.g. ManagedElement or
+        SubNetwork, applies.";
+    }
   }
 
   grouping QceIdMappingInfoGrp {
@@ -223,4 +237,4 @@ module _3gpp-nr-nrm-gnbcucpfunction {
       }
     }
   }
-}
\ No newline at end of file
+}