diff --git a/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang b/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang
index 0c76743164a1eaa3dd37ea1c8d9ac839794e9370..9561ede161dfd0b172a2c1cd434824d50d1a4c27 100755
--- a/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang
+++ b/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang
@@ -10,11 +10,12 @@ module _3gpp-5gc-nrm-configurable5qiset {
   
   organization "3gpp SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
-  description "This IOC represents the non-standardized 5QIs, including 
+  description "This IOC represents the configurable 5QIs, including 
     their QoS characteristics, that need to be pre-configured 
     (and configurable) to the 5G NFs.";
   reference "3GPP TS 28.541";
 
+  revision 2022-04-29 { reference "CR-0729"; }
   revision 2022-01-07 { reference CR-0643; }
   revision 2020-08-04 { reference "CR-0321"; }
   revision 2020-06-03 { reference "CR-0286"; }
@@ -142,4 +143,4 @@ module _3gpp-5gc-nrm-configurable5qiset {
   augment "/me3gpp:ManagedElement" {
     uses Configurable5QISetSubtree;
   }
-}
\ No newline at end of file
+}
diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang
index 45737c161bba3e48fb7c8cfd060e6d0de0d45d93..df01996aa3ae3bb09054e9aba515dc2bd9165b8c 100755
--- a/yang-models/_3gpp-common-mnsregistry.yang
+++ b/yang-models/_3gpp-common-mnsregistry.yang
@@ -48,7 +48,7 @@ module _3gpp-common-mnsregistry {
     }    
     
     leaf-list mnsScope {
-      description "List of top level addresses (Root DN) of the supported 3GPP models.";
+      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.";
       min-elements 1;
       type types3gpp:DistinguishedName;
     }
diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang
index b559ab193a632b3e44aa2b648be18fb8ff22326d..8051893e7a276d0ebdd857711f952eb198bf6cb1 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -22,6 +22,7 @@ module _3gpp-common-trace {
       Integration Reference Point (IRP);
       Information Service (IS)";
 
+  revision 2022-04-27 { reference "CR-0159"; }
   revision 2021-10-18 { reference "CR-0139"; }
   revision 2021-07-22 { reference "CR-0137"; }
   revision 2021-01-25 { reference "CR-0122"; }
@@ -396,7 +397,7 @@ module _3gpp-common-trace {
     }
 
     leaf tjStreamingTraceConsumerURI {
-      when './tjTraceReportingFormat  = "STREAMING"';
+      when '../tjTraceReportingFormat  = "STREAMING"';
       type inet:uri;
       mandatory true;
       description "URI of the Streaming Trace data reporting MnS consumer
@@ -408,8 +409,8 @@ module _3gpp-common-trace {
     }
 
     leaf tjTraceCollectionEntityAddress {
-      when './tjTraceReportingFormat  = "FILE_BASED" or '
-        +'./tjJobType = "LOGGED_MDT_ONLY" or ./tjJobType = "LOGGED_MBSFN_MDT"';
+      when '../tjTraceReportingFormat  = "FILE_BASED" or '
+        +'../tjJobType = "LOGGED_MDT_ONLY" or ../tjJobType = "LOGGED_MBSFN_MDT"';
       type union {
         type inet:uri;
         type inet:ip-address;
@@ -422,8 +423,8 @@ module _3gpp-common-trace {
     }
 
     leaf tjTraceDepth {
-      when './tjJobType = "TRACE_ONLY"'
-        +  ' or ./tjJobType = "IMMEDIATE_MDT_AND_TRACE"';
+      when '../tjJobType = "TRACE_ONLY"'
+        +  ' or ../tjJobType = "IMMEDIATE_MDT_AND_TRACE"';
       type enumeration  {
         enum MINIMUM;
         enum MEDIUM;
@@ -540,7 +541,7 @@ module _3gpp-common-trace {
     }
 
     leaf tjTriggeringEvent {
-      when './tjJobType = "TRACE" or ./tjJobType = "IMMEDIATE_MDT_AND_TRACE"';
+      when '../tjJobType = "TRACE_ONLY" or ../tjJobType = "IMMEDIATE_MDT_AND_TRACE"';
       type string ;
       mandatory true;
       description "Specifies the triggering event parameter of the trace session.
@@ -550,7 +551,7 @@ module _3gpp-common-trace {
     }
 
     leaf tjMDTAnonymizationOfData {
-      when ./tjMDTAreaScope ;
+      when ../tjMDTAreaScope ;
       type enumeration {
         enum NO_IDENTITY;
         enum TAC_OF_IMEI;
@@ -561,7 +562,7 @@ module _3gpp-common-trace {
     }
 
     list tjMDTAreaConfigurationForNeighCell {
-      when './tjJobType = "LOGGED_MDT_ONLY"';
+      when '../tjJobType = "LOGGED_MDT_ONLY"';
       key "idx";
       min-elements 1;
       leaf idx { type uint32 ; }
@@ -603,8 +604,8 @@ module _3gpp-common-trace {
     }
 
     leaf tjMDTCollectionPeriodRrmLte {
-      when './tjJobType = "IMMEDIATE_MDT_ONLY"' 
-        +  ' or ./tjJobType = "IMMEDIATE_MDT_AND_TRACE"';
+      when '../tjJobType = "IMMEDIATE_MDT_ONLY"' 
+        +  ' or ../tjJobType = "IMMEDIATE_MDT_AND_TRACE"';
       type uint32 {
         range "250|500|1000|2000|3000|4000|6000|8000|12000|16000|20000|"
           +"24000|28000|32000|64000";
@@ -618,8 +619,8 @@ module _3gpp-common-trace {
     }
 
     leaf tjMDTCollectionPeriodM6Lte {
-      when './tjJobType = "IMMEDIATE_MDT_ONLY"' 
-        +  ' or ./tjJobType = "IMMEDIATE_MDT_AND_TRACE"';
+      when '../tjJobType = "IMMEDIATE_MDT_ONLY"' 
+        +  ' or ../tjJobType = "IMMEDIATE_MDT_AND_TRACE"';
       type uint32 {
         range "1024|2048|5120|10240";
       }
@@ -632,8 +633,8 @@ module _3gpp-common-trace {
     }
     
     leaf tjMDTCollectionPeriodM7Lte {
-      when './tjJobType = "IMMEDIATE_MDT_ONLY"' 
-        +  ' or ./tjJobType = "IMMEDIATE_MDT_AND_TRACE"';
+      when '../tjJobType = "IMMEDIATE_MDT_ONLY"' 
+        +  ' or ../tjJobType = "IMMEDIATE_MDT_AND_TRACE"';
       type uint16 {
         range 1..60 ;
       }
@@ -645,8 +646,8 @@ module _3gpp-common-trace {
     }
     
     leaf tjMDTCollectionPeriodRrmUmts {
-      when './tjJobType = "IMMEDIATE_MDT_ONLY"'
-        +  ' or ./tjJobType = "IMMEDIATE_MDT_AND_TRACE"';
+      when '../tjJobType = "IMMEDIATE_MDT_ONLY"'
+        +  ' or ../tjJobType = "IMMEDIATE_MDT_AND_TRACE"';
       type uint32 {
         range "1024|1280|2048|2560|5120|"
           +"10240|60000";
@@ -660,8 +661,8 @@ module _3gpp-common-trace {
     }
 
     leaf tjMDTCollectionPeriodRrmNR {
-      when './tjJobType = "IMMEDIATE_MDT_ONLY"'
-        + ' or ./tjJobType = "IMMEDIATE_MDT_AND_TRACE"';
+      when '../tjJobType = "IMMEDIATE_MDT_ONLY"'
+        + ' or ../tjJobType = "IMMEDIATE_MDT_AND_TRACE"';
       type uint32 {
         range "1024|2048|5120|10240|60000";
       }
@@ -674,8 +675,8 @@ module _3gpp-common-trace {
     }
 
     leaf tjMDTCollectionPeriodM6NR {
-      when './tjJobType = "IMMEDIATE_MDT_ONLY"'
-        + ' or ./tjJobType = "IMMEDIATE_MDT_AND_TRACE"';
+      when '../tjJobType = "IMMEDIATE_MDT_ONLY"'
+        + ' or ../tjJobType = "IMMEDIATE_MDT_AND_TRACE"';
       type enumeration {
         enum 120ms;
         enum 240ms;
@@ -700,8 +701,8 @@ module _3gpp-common-trace {
     }
     
     leaf tjMDTCollectionPeriodM7NR {
-      when './tjJobType = "IMMEDIATE_MDT_ONLY"'
-        + ' or ./tjJobType = "IMMEDIATE_MDT_AND_TRACE"';
+      when '../tjJobType = "IMMEDIATE_MDT_ONLY"'
+        + ' or ../tjJobType = "IMMEDIATE_MDT_AND_TRACE"';
       type uint32 {
         range "1..60";
       }
@@ -713,7 +714,7 @@ module _3gpp-common-trace {
     }
     
     leaf tjMDTEventListForTriggeredMeasurement {
-      when './tjJobType = "LOGGED_MDT_ONLY"';
+      when '../tjJobType = "LOGGED_MDT_ONLY"';
       type enumeration {
         enum OUT_OF_COVERAGE ;
         enum A2_EVENT ;
@@ -739,7 +740,7 @@ module _3gpp-common-trace {
     }
 
     leaf tjMDTListOfMeasurements {
-      when './tjJobType = "IMMEDIATE_MDT"';
+      when '../tjJobType = "IMMEDIATE_MDT_ONLY"';
       type int64;
       mandatory true;
       description "It specifies the UE measurements that shall be collected in
@@ -749,7 +750,7 @@ module _3gpp-common-trace {
     }
 
     leaf tjMDTLoggingDuration {
-      when './tjJobType = "LOGGED_MDT_ONLY" or ./tjJobType = "LOGGED_MBSFN_MDT"';
+      when '../tjJobType = "LOGGED_MDT_ONLY" or ../tjJobType = "LOGGED_MBSFN_MDT"';
       type uint32 {
         range "600|1200|2400|3600|5400|7200";
       }
@@ -763,7 +764,7 @@ module _3gpp-common-trace {
     }
 
     leaf tjMDTLoggingInterval {
-      when './tjJobType = "LOGGED_MDT_ONLY" or ./tjJobType = "LOGGED_MBSFN_MDT"';
+      when '../tjJobType = "LOGGED_MDT_ONLY" or ../tjJobType = "LOGGED_MBSFN_MDT"';
       type uint32 {
         range "1280|2560|5120|10240|20480|"
           +"30720|40960|61440";
@@ -777,7 +778,7 @@ module _3gpp-common-trace {
     }
 
     leaf tjMDTLoggingEventThreshold {
-      when './tjJobType = "LOGGED_MDT_ONLY" or ./tjJobType = "LOGGED_MBSFN_MDT"';
+      when '../tjJobType = "LOGGED_MDT_ONLY" or ../tjJobType = "LOGGED_MBSFN_MDT"';
       type uint32 {
         range "0..127";
       }
@@ -791,7 +792,7 @@ module _3gpp-common-trace {
     }
     
     leaf tjMDTLoggedHysteresis {
-      when './tjJobType = "LOGGED_MDT_ONLY" or ./tjJobType = "LOGGED_MBSFN_MDT"';
+      when '../tjJobType = "LOGGED_MDT_ONLY" or ../tjJobType = "LOGGED_MBSFN_MDT"';
       type uint32 {
         range "0..30";
       }
@@ -805,7 +806,7 @@ module _3gpp-common-trace {
     }
     
     leaf tjMDTLoggedTimeToTrigger {
-      when './tjJobType = "LOGGED_MDT_ONLY" or ./tjJobType = "LOGGED_MBSFN_MDT"';
+      when '../tjJobType = "LOGGED_MDT_ONLY" or ../tjJobType = "LOGGED_MBSFN_MDT"';
       type int32 ;
       description "It specifies the threshold which should trigger 
         the reporting in case of event based reporting of logged NR MDT. 
@@ -817,7 +818,7 @@ module _3gpp-common-trace {
     }
     
     leaf-list tjMDTMBSFNAreaList {
-      when './tjJobType = "LOGGED_MBSFN_MDT"';
+      when '../tjJobType = "LOGGED_MBSFN_MDT"';
       type string;
       min-elements 1;
       max-elements 8;
@@ -828,8 +829,8 @@ module _3gpp-common-trace {
     }
 
     leaf tjMDTMeasurementPeriodLTE {
-          when './tjJobType = "IMMEDIATE_MDT_ONLY"'
-            +  ' or ./tjJobType = "IMMEDIATE_MDT_AND_TRACE"';
+          when '../tjJobType = "IMMEDIATE_MDT_ONLY"'
+            +  ' or ../tjJobType = "IMMEDIATE_MDT_AND_TRACE"';
       type uint32 {
         range "1024|1280|2048|2560|5120|"
           +"10240|60000";
@@ -844,8 +845,8 @@ module _3gpp-common-trace {
     }
 
     leaf tjMDTMeasurementPeriodUMTS {
-      when './tjJobType = "IMMEDIATE_MDT_ONLY"'
-        +  'or ./tjJobType = "IMMEDIATE_MDT_AND_TRACE"';
+      when '../tjJobType = "IMMEDIATE_MDT_ONLY"'
+        +  'or ../tjJobType = "IMMEDIATE_MDT_AND_TRACE"';
       type uint32 {
         range "250|500|1000|2000|3000|4000|6000|8000|12000|16000|20000|"
           +"24000|28000|32000|64000";
@@ -860,8 +861,8 @@ module _3gpp-common-trace {
     }
 
     leaf tjMDTMeasurementQuantity {
-      when './tjJobType = "IMMEDIATE_MDT_ONLY"'
-        +  ' or ./tjJobType = "IMMEDIATE_MDT_AND_TRACE"';
+      when '../tjJobType = "IMMEDIATE_MDT_ONLY"'
+        +  ' or ../tjJobType = "IMMEDIATE_MDT_AND_TRACE"';
       type uint64 ;
       mandatory true;
       description "It specifies the measurements that are collected in an MDT
@@ -870,8 +871,8 @@ module _3gpp-common-trace {
     }
 
     leaf tjMDTM4ThresholdUmts {
-      when './tjJobType = "IMMEDIATE_MDT_ONLY"' 
-        +  ' or ./tjJobType = "IMMEDIATE_MDT_AND_TRACE"';
+      when '../tjJobType = "IMMEDIATE_MDT_ONLY"' 
+        +  ' or ../tjJobType = "IMMEDIATE_MDT_AND_TRACE"';
       type uint16 {
         range 0..31 ;
       }        
@@ -883,7 +884,7 @@ module _3gpp-common-trace {
     }
     
     list tjMDTPLMList {
-      when './tjJobType = "LOGGED_MDT_ONLY"';
+      when '../tjJobType = "LOGGED_MDT_ONLY"';
       key "mcc mnc";
       uses types3gpp:PLMNId;
       min-elements 1;
@@ -894,8 +895,8 @@ module _3gpp-common-trace {
     }
 
     leaf tjMDTPositioningMethod {
-      when './tjJobType = "IMMEDIATE_MDT_ONLY"'
-        +  ' or ./tjJobType = "IMMEDIATE_MDT_AND_TRACE"';
+      when '../tjJobType = "IMMEDIATE_MDT_ONLY"'
+        +  ' or ../tjJobType = "IMMEDIATE_MDT_AND_TRACE"';
       type enumeration {
         enum GNSS;
         enum E_CELL_ID;
@@ -907,8 +908,8 @@ module _3gpp-common-trace {
     }
 
     leaf tjMDTReportAmount {
-      when './tjJobType = "IMMEDIATE_MDT_ONLY"'
-        +  ' and ./tjMDTReportingTrigger = "PERIODICAL"';
+      when '../tjJobType = "IMMEDIATE_MDT_ONLY"'
+        +  ' and ../tjMDTReportingTrigger = "PERIODICAL"';
       type union {
         type uint32 {
           range "1|4|8|16|32|64" ;
@@ -927,7 +928,7 @@ module _3gpp-common-trace {
     }
 
     leaf tjMDTReportingTrigger {
-      when './tjJobType = "IMMEDIATE_MDT_ONLY"';
+      when '../tjJobType = "IMMEDIATE_MDT_ONLY"';
       type enumeration {
         enum PERIODICAL;
         enum A2_FOR_LTE;
@@ -947,8 +948,8 @@ module _3gpp-common-trace {
     }
 
     leaf tjMDTReportInterval {
-      when './tjJobType = "IMMEDIATE_MDT_ONLY"'
-        +  ' and ./tjMDTReportingTrigger = "PERIODICAL"';
+      when '../tjJobType = "IMMEDIATE_MDT_ONLY"'
+        +  ' and ../tjMDTReportingTrigger = "PERIODICAL"';
       type uint32 {
         range "120|240|250|480|500|640|1000|1024|2000|2048|3000|4000|"
           +"5120|6000|8000|10240|12000|16000|20000|"
@@ -966,7 +967,7 @@ module _3gpp-common-trace {
     }
 
     leaf tjMDTReportType {
-      when './tjJobType = "LOGGED_MDT_ONLY"';
+      when '../tjJobType = "LOGGED_MDT_ONLY"';
       type enumeration {
         enum PERIODICAL;
         enum EVENT_TRIGGERED;
@@ -991,7 +992,7 @@ module _3gpp-common-trace {
     }
 
     leaf tjMDTTraceCollectionEntityID {
-      when './tjJobType = "LOGGED_MDT_ONLY" or ./tjJobType = "LOGGED_MBSFN_MDT"';
+      when '../tjJobType = "LOGGED_MDT_ONLY" or ../tjJobType = "LOGGED_MBSFN_MDT"';
       type uint8;
       mandatory true;
       description "It specifies the TCE Id which is sent to the UE in 
@@ -1116,4 +1117,4 @@ module _3gpp-common-trace {
       }
     }
   }
-}
\ 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 e3146a24b49666cabbde0709a81ed1947b9a983a..a9915f7f3d0905bc477599d83ecdb5b8853c1856 100644
--- a/yang-models/_3gpp-nr-nrm-dlbofunction.yang
+++ b/yang-models/_3gpp-nr-nrm-dlbofunction.yang
@@ -16,6 +16,7 @@ module _3gpp-nr-nrm-dlbofunction {
     Model (NRM).";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2022-03-25 { reference "CR-XXXX"; }
   revision 2021-10-22 { reference "CR-0577"; }  
 
   feature DLBOUnderGNBCUCPFunction {
@@ -41,12 +42,19 @@ module _3gpp-nr-nrm-dlbofunction {
       type boolean;
     }
 
-    leaf maximumDeviationHoTrigger {
-      description "This parameter defines the maximum allowed absolute 
+    leaf maximumDeviationHoTriggerLow {
+      description "This parameter defines the maximum allowed lower 
         deviation of the Handover Trigger, from the default point of 
         operation.";
         type int32 { range "-20..20"; }
-        units "0.5";
+        units "0.5 dB";
+    }
+    leaf maximumDeviationHoTriggerHigh {
+      description "This parameter defines the maximum allowed upper 
+        deviation of the Handover Trigger, from the default point of 
+        operation.";
+        type int32 { range "-20..20"; }
+        units "0.5 dB";
     }
 
     leaf minimumTimeBetweenHoTriggerChange {
@@ -89,4 +97,4 @@ module _3gpp-nr-nrm-dlbofunction {
     if-feature DLBOUnderSubNetwork;
     uses DLBOFunctionSubtree;
   }
-}
\ No newline at end of file
+}