diff --git a/yang-models/_3gpp-5gc-nrm-amffunction.yang b/yang-models/_3gpp-5gc-nrm-amffunction.yang
index cf6b290f25dbf59c50ca436afc9c49a1e51a2ea3..1fb341e17335e2e4063e39d2537e2ca106f53de8 100755
--- a/yang-models/_3gpp-5gc-nrm-amffunction.yang
+++ b/yang-models/_3gpp-5gc-nrm-amffunction.yang
@@ -11,14 +11,17 @@ module _3gpp-5gc-nrm-amffunction {
   import ietf-yang-types { prefix yang; }
   import _3gpp-common-top { prefix top3gpp; }
   import _3gpp-5gc-nrm-nfprofile { prefix nfp3gpp; }
+  import _3gpp-nr-nrm-ntnfunction { prefix ntn3gpp; }
+
 
   organization "3gpp SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "AMFFunction derived from basic ManagedFunction.
-    Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
   
+  revision 2025-03-27 { reference CR-1512; }
   revision 2024-11-01 { reference CR-1405; }
   revision 2024-10-06 { reference CR-1389; }
   revision 2024-04-04 { reference CR-1139; }
@@ -453,8 +456,12 @@ module _3gpp-5gc-nrm-amffunction {
     }
   }
   
+  
   grouping AMFFunctionGrp {
-    description "Represents the AMFFunction IOC";
+    description "Represents the AMFFunction IOC.
+    This IOC contains instances of NTNTimeBasedConfig to support 
+    time-based configuration of the following NTN related entities:  
+    AMFFunction and EP_N2.";
     uses mf3gpp:ManagedFunctionGrp;
 
     list pLMNInfoList {
@@ -580,6 +587,15 @@ module _3gpp-5gc-nrm-amffunction {
       type types3gpp:DistinguishedName;
       description "This is the DN of AMFSet";
     }
+
+    list NTNTimeBasedConfig {
+        description "This is the NTN time-based configuration.";
+        key id;
+        uses top3gpp:Top_Grp;
+        container attributes {
+          uses ntn3gpp:NTNTimeBasedConfigGrp;
+        }
+      }
   }
   
   augment "/me3gpp:ManagedElement" {
diff --git a/yang-models/_3gpp-nr-nrm-ntnfunction.yang b/yang-models/_3gpp-nr-nrm-ntnfunction.yang
index 20dd62cf49cdec11839c67acd15f18ee4d892c7b..43e2a86ebb7dadbeb5c226e897bd1263562278b2 100644
--- a/yang-models/_3gpp-nr-nrm-ntnfunction.yang
+++ b/yang-models/_3gpp-nr-nrm-ntnfunction.yang
@@ -19,6 +19,7 @@ module _3gpp-nr-nrm-ntnfunction {
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541";
   
+  revision 2025-03-27 { reference CR-1512; }
   revision 2025-02-17 { reference CR-1479 ; }
   revision 2024-05-24 { reference CR-1273 ; } 
 
@@ -326,7 +327,9 @@ module _3gpp-nr-nrm-ntnfunction {
         NR access.  This IOC contains instances of NTNTimeBasedConfig to support
         time-based configuration of the following NTN related entities:  
         EP_NgC, NRCellCU, NRCellDU, NRSectorCarrier, SectorEquipmentFunction, 
-        and NRCellRelation.";
+        and NRCellRelation.  The IP Configuration of the feeder links may be 
+        configured via IP Autoconfiguration services [x] and/or configured via 
+        instances of NTNTimeBasedConfig in anticipation of feeder link switchovers.";
       key id;
       max-elements 1;
       uses top3gpp:Top_Grp;