diff --git a/yang-models/_3gpp-common-managed-element.yang b/yang-models/_3gpp-common-managed-element.yang
index 233aa6f4a2ab338201ffe86eab7eb0c679110085..b9c7fa51c4345e26853cb158bd6629054c059956 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-12 { reference CR-1336 ; }
   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";
@@ -142,6 +148,7 @@ module _3gpp-common-managed-element {
       type string;
     }
     
+    
     leaf locationName {
       description "The physical location (e.g. an address) of an entity 
         represented by a (derivative of) ManagedElement_. It may contain no 
@@ -304,5 +311,9 @@ module _3gpp-common-managed-element {
     uses econn3gpp:EcmConnectionInfoSubtree {
       if-feature EcmConnectionInfoUnderManagedElement;
     }
+
+    uses ecmap3gpp:NRECMappingRuleSubtree {
+      if-feature ECMappingRuleUnderManagedElement;
+    }
   }    
 }
diff --git a/yang-models/_3gpp-common-subnetwork.yang b/yang-models/_3gpp-common-subnetwork.yang
index d6d5f7010369bea58396611428ff5c1ba8e16cca..23362b81d9bf722115ff9ed3202b9e1ce2c4d43a 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-08-18 { reference CR-1336 ; } 
   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";
@@ -269,6 +275,10 @@ module _3gpp-common-subnetwork {
       reference "RFC8528 YANG Schema Mount";
     }
     
+    uses ecmap3gpp:NRECMappingRuleSubtree {
+      if-feature EcmConnectionInfoUnderSubNetwork;
+    }
+    
     // augment external parts here
   }
-}
\ 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..81519e61ceb2b979bafeee7c2006e6198e2ded5f
--- /dev/null
+++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
@@ -0,0 +1,57 @@
+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-12 { reference CR-1336 ; } 
+  
+  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 {
+      description "The mapping rule.";
+      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-externalgnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang
index cbe2baff36c7f3b994d3bba7fc306ba78fdcffe8..6c295a4040a94b75fc73c9da68c6d208422733b4 100755
--- a/yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang
+++ b/yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang
@@ -76,4 +76,4 @@ module _3gpp-nr-nrm-externalgnbcucpfunction {
     if-feature nrnet3gpp:ExternalsUnderNRNetwork;
     uses ExternalGNBCUCPFunctionWrapper;
   }		
-}
\ No newline at end of file
+}
diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang
index 7d8eabeec81675750634464c98f6e60d59175eb2..e8ce1c9f80f469a9bf5e96400a7a2c1b46ea9a9d 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-12 { reference CR-1336 ; } 
   revision 2024-05-24 { reference CR-1273 ; } 
   revision 2024-04-04 { reference CR-1139; }
   revision 2024-02-24 { reference CR-1218; } 
@@ -180,6 +181,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 +231,4 @@ module _3gpp-nr-nrm-gnbcucpfunction {
       }
     }
   }
-}
\ No newline at end of file
+}