diff --git a/OpenAPI/README.md b/OpenAPI/README.md
index 20c46f56ce49b12a2c7df947a22020fa68a6346b..0c8118d7be25129f32f0746a569cc3cc1b73625e 100644
--- a/OpenAPI/README.md
+++ b/OpenAPI/README.md
@@ -1,6 +1,6 @@
 # 3GPP SA5 models and MnS OpenAPI definitions
 
-(c) 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
+(c) 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
 
 The links below will open the Swagger Editor/UI and auto-load the OpenAPI YAML file of each API:
 
diff --git a/OpenAPI/TS28532_FaultMnS.yaml b/OpenAPI/TS28532_FaultMnS.yaml
index 2b26939028641f9f7106e8374acde801ca99cbfe..cbf54aa6ae3149c52e3a81611363432248cb6059 100644
--- a/OpenAPI/TS28532_FaultMnS.yaml
+++ b/OpenAPI/TS28532_FaultMnS.yaml
@@ -1,10 +1,10 @@
 openapi: 3.0.1
 info:
   title: Fault Supervision MnS
-  version: 16.12.0
+  version: 16.15.0
   description: >-
     OAS 3.0.1 definition of the Fault Supervision MnS
-    © 2022, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
+    © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
     All rights reserved.
 externalDocs:
   description: 3GPP TS 28.532; Generic management services
diff --git a/OpenAPI/TS28532_FileDataReportingMnS.yaml b/OpenAPI/TS28532_FileDataReportingMnS.yaml
index f946776ab0c15485b929aa0fc613003382c29ef7..5cb93b6c113ab89dec1db396ecf39be997bc5a91 100644
--- a/OpenAPI/TS28532_FileDataReportingMnS.yaml
+++ b/OpenAPI/TS28532_FileDataReportingMnS.yaml
@@ -1,10 +1,10 @@
 openapi: 3.0.1
 info:
   title: File Data Reporting MnS
-  version: 16.11.0
+  version: 16.15.0
   description: >-
     OAS 3.0.1 definition of the File Data Reporting MnS
-    © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
+    © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
     All rights reserved.
 externalDocs:
   description: 3GPP TS 28.532; Generic management services
diff --git a/OpenAPI/TS28532_HeartbeatNtf.yaml b/OpenAPI/TS28532_HeartbeatNtf.yaml
index c3f855e3a191e006e511051f95b2e3aff789e68e..f3b2eb077b52182f95f59c12423e6ecf068fed67 100644
--- a/OpenAPI/TS28532_HeartbeatNtf.yaml
+++ b/OpenAPI/TS28532_HeartbeatNtf.yaml
@@ -1,10 +1,10 @@
 openapi: 3.0.1
 info:
   title: Heartbeat notification
-  version: 16.7.0
+  version: 16.15.0
   description: >-
     OAS 3.0.1 definition of the heartbeat notification
-    © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
+    © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
     All rights reserved.
 externalDocs:
   description: 3GPP TS 28.532 V16.6.0; Generic management services
diff --git a/OpenAPI/TS28532_PerfMnS.yaml b/OpenAPI/TS28532_PerfMnS.yaml
index 709efb6458aab6e4c5526e4cf14f68f0da065682..4a72a57512617198ec3d08b1c7c92b79dd4903bf 100644
--- a/OpenAPI/TS28532_PerfMnS.yaml
+++ b/OpenAPI/TS28532_PerfMnS.yaml
@@ -1,10 +1,10 @@
 openapi: 3.0.1
 info:
   title: TS 28.532 Performance Threshold Monitoring MnS
-  version: 16.7.0
+  version: 16.15.0
   description: >-
     OAS 3.0.1 definition of the Performance Threshold Monitoring MnS
-    © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
+    © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
     All rights reserved.
 externalDocs:
   description: 3GPP TS 28.532 V16.6.0; Generic management services
diff --git a/OpenAPI/TS28532_ProvMnS.yaml b/OpenAPI/TS28532_ProvMnS.yaml
index 40969b5b6db74ebdab3a1b44f28a0f6defe767b1..74450c4fcccb0f0914f8c320382f40dcb2180dcc 100644
--- a/OpenAPI/TS28532_ProvMnS.yaml
+++ b/OpenAPI/TS28532_ProvMnS.yaml
@@ -1,10 +1,10 @@
 openapi: 3.0.1
 info:
   title: Provisioning MnS
-  version: 16.12.0
+  version: 16.15.0
   description: >-
     OAS 3.0.1 definition of the Provisioning MnS
-    © 2022, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
+    © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
     All rights reserved.
 externalDocs:
   description: 3GPP TS 28.532; Generic management services
@@ -493,4 +493,8 @@ components:
           type: string
         path:
           type: string
-        value: {}
+        value:
+          nullable: true
+      required:
+        - op
+        - path
diff --git a/OpenAPI/TS28532_StreamingDataMnS.yaml b/OpenAPI/TS28532_StreamingDataMnS.yaml
index 7511b70833189fa093f0ce4cc310ec9d30486572..8e34a0eab0faa92d9e473a73e8524eca5c81584a 100644
--- a/OpenAPI/TS28532_StreamingDataMnS.yaml
+++ b/OpenAPI/TS28532_StreamingDataMnS.yaml
@@ -1,10 +1,10 @@
 openapi: 3.0.1
 info:
   title: TS 28.532 Streaming data reporting service
-  version: 16.11.0
+  version: 16.15.0
   description: >-
     OAS 3.0.1 specification for the Streaming data reporting service (Streaming MnS)
-    © 2022, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
+    © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
     All rights reserved.
 servers:
   - url: '{MnSRoot}/StreamingDataReportingMnS/{MnSVersion}'
diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml
index 167f23075314ef330f0295afe45da33c245a69ed..0116560e6f5d8349a12a2b9f450da4de07bbc243 100644
--- a/OpenAPI/TS28541_5GcNrm.yaml
+++ b/OpenAPI/TS28541_5GcNrm.yaml
@@ -1,10 +1,10 @@
 openapi: 3.0.1
 info:
   title: 3GPP 5GC NRM
-  version: 16.15.0
+  version: 16.16.0
   description: >-
     OAS 3.0.1 specification of the 5GC NRM
-    © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
+    © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
     All rights reserved.
 externalDocs:
   description: 3GPP TS 28.541; 5G NRM, 5GC NRM
diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml
index 436988652889f33efae63efd1888dc540e38a838..82df429f29b6c4f3fd23e580467d03e08938d478 100644
--- a/OpenAPI/TS28541_NrNrm.yaml
+++ b/OpenAPI/TS28541_NrNrm.yaml
@@ -1,10 +1,10 @@
 openapi: 3.0.1
 info:
   title: NR NRM
-  version: 16.15.0
+  version: 16.16.0
   description: >-
     OAS 3.0.1 specification of the NR NRM
-    © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
+    © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
     All rights reserved.
 externalDocs:
   description: 3GPP TS 28.541; 5G NRM, NR NRM
@@ -175,16 +175,18 @@ components:
           type: integer
 
     NRPciList:
-      type: object
-      properties:
-        NRPci:
-          type: integer
+      type: array
+      items:
+        $ref: '#/components/schemas/NrPci'
+      minItems: 0
+      maxItems: 1007
 
     CSonPciList:
-      type: object
-      properties:
-        NRPci:
-          type: integer
+      type: array
+      items:
+        $ref: '#/components/schemas/NrPci'
+      minItems: 1
+      maxItems: 100
 
     MaximumDeviationHoTrigger:
       type: integer
diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml
index 820e7b5e29ccbb545130b5e3eba33d326203e9d4..080c9cf31216cae1fa5b3147f5549af6550660ca 100644
--- a/OpenAPI/TS28541_SliceNrm.yaml
+++ b/OpenAPI/TS28541_SliceNrm.yaml
@@ -1,10 +1,10 @@
 openapi: 3.0.1
 info:
   title: Slice NRM
-  version: 16.12.0
+  version: 16.16.0
   description: >-
     OAS 3.0.1 specification of the Slice NRM
-    @ 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
+    @ 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
     All rights reserved.
 externalDocs:
   description: 3GPP TS 28.541; 5G NRM, Slice NRM
diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml
index fdc8a3eb7d4ad412df21eb77094318b243eff8fc..da7ceb9eed70fd747c09e4861687f3138ce3dd06 100644
--- a/OpenAPI/TS28623_ComDefs.yaml
+++ b/OpenAPI/TS28623_ComDefs.yaml
@@ -1,10 +1,10 @@
 openapi: 3.0.1
 info:
   title: Common Type Definitions
-  version: 16.9.0
+  version: 16.15.0
   description: >-
     OAS 3.0.1 specification of common type definitions in the Generic NRM
-    © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
+    © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
     All rights reserved.
 externalDocs:
   description: 3GPP TS 28.623; Generic NRM; Common type definitions
@@ -85,7 +85,7 @@ components:
       oneOf:
         - $ref: '#/components/schemas/Ipv4Addr'
         - $ref: '#/components/schemas/Ipv6Addr'
-        - $ref: '#/components/schemas/Ipv6Prefix'        
+        - $ref: '#/components/schemas/Ipv6Prefix'
     HostAddr:
       #  This definition will be deprecated, when all occurances of HostAddr
       #  are replaced by Host.
diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml
index 24ce7d80fac4c20a820bdf51eb269cad42eea89f..3581a4169db5f01e5e3df14800086331c79ba4cf 100644
--- a/OpenAPI/TS28623_GenericNrm.yaml
+++ b/OpenAPI/TS28623_GenericNrm.yaml
@@ -1,10 +1,10 @@
 openapi: 3.0.1
 info:
   title: Generic NRM
-  version: 16.14.0
+  version: 16.15.0
   description: >-
     OAS 3.0.1 definition of the Generic NRM
-    © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
+    © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
     All rights reserved.
 externalDocs:
   description: 3GPP TS 28.623; Generic NRM