diff --git a/src/5gmsaf/5G_APIs-overrides/TS26512_M1_MetricsReportingProvisioning.yaml b/src/5gmsaf/5G_APIs-overrides/TS26512_M1_MetricsReportingProvisioning.yaml
deleted file mode 100644
index 45607b1..0000000
--- a/src/5gmsaf/5G_APIs-overrides/TS26512_M1_MetricsReportingProvisioning.yaml
+++ /dev/null
@@ -1,150 +0,0 @@
-openapi: 3.0.0
-info:
-  title: M1_MetricsReportingProvisioning
-  version: 2.1.0
-  description: |
-    5GMS AF M1 Metrics Reporting Provisioning API
-    © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
-    All rights reserved.
-tags:
-  - name: M1_MetricsReportingProvisioning
-    description: '5G Media Streaming: Provisioning (M1) APIs: Metrics Reporting Provisioning'
-externalDocs:
-  description: 'TS 26.512 V17.6.0; 5G Media Streaming (5GMS); Protocols'
-  url: 'https://www.3gpp.org/ftp/Specs/archive/26_series/26.512/'
-servers:
-  - url: '{apiRoot}/3gpp-m1/v2'
-    variables:
-      apiRoot:
-        default: https://example.com
-        description: See 3GPP TS 29.512 clause 6.1.
-paths:
-  /provisioning-sessions/{provisioningSessionId}/metrics-reporting-configurations:
-    parameters:
-      - name: provisioningSessionId
-        in: path
-        required: true
-        schema: 
-          $ref: 'TS26512_CommonData.yaml#/components/schemas/ResourceId'
-        description: 'The resource identifier of an existing Provisioning Session.'
-    post:
-      operationId: activateMetricsReporting
-      summary: 'Activate the Metrics reporting procedure for the specified Provisioning Session by providing the Metrics Reporting Configuration'
-      requestBody:
-        description: 'A JSON representation of a Metrics Reporting Configuration'
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/MetricsReportingConfiguration'
-      responses:
-        '201':
-          description: 'Metrics Reporting Configuration Created'
-          headers:
-            Location:
-              description: 'URL of the newly created Metrics Reporting Configuration (same as request URL).'
-              required: true
-              schema:
-                $ref: 'TS26512_CommonData.yaml#/components/schemas/AbsoluteUrl'
-  /provisioning-sessions/{provisioningSessionId}/metrics-reporting-configurations/{metricsReportingConfigurationId}:
-    parameters:
-      - name: provisioningSessionId
-        in: path
-        required: true
-        schema: 
-          $ref: 'TS26512_CommonData.yaml#/components/schemas/ResourceId'
-        description: 'The resource identifier of an existing Provisioning Session.'
-      - name: metricsReportingConfigurationId
-        in: path
-        required: true
-        schema: 
-          $ref: 'TS26512_CommonData.yaml#/components/schemas/ResourceId'
-        description: 'The resource identifier of a Metrics Reporting Configuration.'
-    get:
-      operationId: retrieveMetricsReportingConfiguration
-      summary: 'Retrieve the specified Metrics Reporting Configuration of the specified Provisioning Session'
-      responses:
-        '200':
-          description: 'Success'
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/MetricsReportingConfiguration'
-    put:
-      operationId: updateMetricsReportingConfiguration
-      summary: 'Update the specified Metrics Reporting Configuration for the specified Provisioning Session'
-      requestBody:
-        description: 'A JSON representation of a Metrics Reporting Configuration'
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/MetricsReportingConfiguration'
-      responses:
-        '204':
-          description: 'Updated Metrics Reporting Configuration'
-        '404':
-          description: 'Not Found'
-    patch:
-      operationId: patchMetricsReportingConfiguration
-      summary: 'Patch the specified Metrics Reporting Configuration for the specified Provisioning Session'
-      requestBody:
-        description: 'A JSON representation of a Metrics Reporting Configuration'
-        required: true
-        content:
-          application/merge-patch+json:
-            schema:
-              $ref: '#/components/schemas/MetricsReportingConfiguration'
-          application/json-patch+json:
-            schema:
-              $ref: '#/components/schemas/MetricsReportingConfiguration'
-      responses:
-        '200':
-          description: 'Patched Metrics Reporting Configuration'
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/MetricsReportingConfiguration'
-        '404':
-          description: 'Not Found'
-    delete:
-      operationId: destroyMetricsReportingConfiguration
-      summary: 'Destroy the specified Metrics Reporting Configuration of the specified Provisioning Session'
-      responses:
-        '204':
-          description: 'Destroyed Metrics Reporting Configuration'
-        '404':
-          description: 'Not Found'    
-components:
-  schemas:
-    MetricsReportingConfiguration:
-      type: object
-      description: "A representation of a Metrics Reporting Configuration resource."
-      required:
-        - metricsReportingConfigurationId
-        - samplingPeriod
-      properties:
-        metricsReportingConfigurationId:
-          readOnly: true
-          allOf:
-            - $ref: 'TS26512_CommonData.yaml#/components/schemas/ResourceId'
-        scheme:
-          $ref: 'TS29571_CommonData.yaml#/components/schemas/Uri'
-        dataNetworkName:
-          $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnn'
-        reportingInterval:
-          $ref: 'TS29571_CommonData.yaml#/components/schemas/DurationSec'
-        samplePercentage:
-          $ref: 'TS26512_CommonData.yaml#/components/schemas/Percentage'
-        urlFilters:
-          type: array
-          items:
-            type: string
-          minItems: 1
-        samplingPeriod:
-          $ref: 'TS29571_CommonData.yaml#/components/schemas/DurationSec'
-        metrics:
-          type: array
-          items:
-            type: string
-          minItems: 1
diff --git a/src/5gmsaf/service-access-information.c b/src/5gmsaf/service-access-information.c
index ea842f7..5704fc1 100644
--- a/src/5gmsaf/service-access-information.c
+++ b/src/5gmsaf/service-access-information.c
@@ -163,11 +163,11 @@ msaf_context_service_access_information_create(msaf_provisioning_session_t *prov
                             NULL,
                             metrics_config->config->scheme,
                             metrics_config->config->data_network_name,
-                            metrics_config->config->is_reporting_interval,
-                            metrics_config->config->reporting_interval,
+                            !!metrics_config->config->reporting_interval,
+                            metrics_config->config->reporting_interval?*metrics_config->config->reporting_interval:0,
                             metrics_config->config->sample_percentage,
                             metrics_config->config->url_filters,
-                            metrics_config->config->sampling_period,
+                            metrics_config->config->sampling_period?*metrics_config->config->sampling_period:0,
                             metrics_config->config->metrics);
 
             if (cmrc_inner) {
diff --git a/subprojects/rt-common-shared b/subprojects/rt-common-shared
index 23d49aa..1210229 160000
--- a/subprojects/rt-common-shared
+++ b/subprojects/rt-common-shared
@@ -1 +1 @@
-Subproject commit 23d49aaea7c4cea100583ac078804fe45dd56b88
+Subproject commit 12102299bb4775f9a8d10225d5e20c2a96422b9c