diff --git a/build/ci-cd/copy-and-convert-content.sh b/build/ci-cd/copy-and-convert-content.sh
index 67d3b8084a..aa4169076d 100755
--- a/build/ci-cd/copy-and-convert-content.sh
+++ b/build/ci-cd/copy-and-convert-content.sh
@@ -157,7 +157,7 @@ post_process_content() {
       # Remove extra slashes
       perl -pi -e 's,\\/,/,g' "${target_file}"
       # translate OSCAL mime types
-      perl -pi -e 's,(application/oscal\.[a-z]+\+)xml\",\1json\",g' "${target_file}"
+      perl -pi -e 's,(application/(oscal\.)?[a-z]+\+)xml\",\1json\",g' "${target_file}"
       # relative content paths
       # translate path names for local references
       perl -pi -e 's,((?:\.\./)+(?:(?!xml/)[^\s/"'']+/)+)xml/((?:(?!.xml)[^\s"'']+)+).xml,\1json/\2.json,g' "${target_file}"
diff --git a/build/metaschema b/build/metaschema
index b7875351a6..78c29f45bb 160000
--- a/build/metaschema
+++ b/build/metaschema
@@ -1 +1 @@
-Subproject commit b7875351a67b9ec74708c1c926701fc2b3e60659
+Subproject commit 78c29f45bb06df7df47283736dd049518ff2a332
diff --git a/xml/convert/oscal_assessment-plan_json-to-xml-converter.xsl b/xml/convert/oscal_assessment-plan_json-to-xml-converter.xsl
index 27aec3b294..3175ded799 100644
--- a/xml/convert/oscal_assessment-plan_json-to-xml-converter.xsl
+++ b/xml/convert/oscal_assessment-plan_json-to-xml-converter.xsl
@@ -4911,11 +4911,11 @@
       <xsl:apply-templates select="$str-as-textnode" mode="infer-inlines"/>
    </xsl:template>
    <xsl:template name="parse-markdown">
-
+        
 <!-- First, group according to ``` delimiters btw codeblocks and not
         within codeblock, escape & and < (only)
         within not-codeblock split lines at \n\s*\n
-
+        
         -->
         <!-- $str may be passed in, or we can process the current node -->
       <xsl:param name="markdown-str" as="xs:string" required="yes"/>
diff --git a/xml/convert/oscal_assessment-results_json-to-xml-converter.xsl b/xml/convert/oscal_assessment-results_json-to-xml-converter.xsl
index 250592edac..83adeab4c5 100644
--- a/xml/convert/oscal_assessment-results_json-to-xml-converter.xsl
+++ b/xml/convert/oscal_assessment-results_json-to-xml-converter.xsl
@@ -9386,11 +9386,11 @@
       <xsl:apply-templates select="$str-as-textnode" mode="infer-inlines"/>
    </xsl:template>
    <xsl:template name="parse-markdown">
-
+        
 <!-- First, group according to ``` delimiters btw codeblocks and not
         within codeblock, escape & and < (only)
         within not-codeblock split lines at \n\s*\n
-
+        
         -->
         <!-- $str may be passed in, or we can process the current node -->
       <xsl:param name="markdown-str" as="xs:string" required="yes"/>
diff --git a/xml/convert/oscal_catalog_json-to-xml-converter.xsl b/xml/convert/oscal_catalog_json-to-xml-converter.xsl
index 2a4c03dd26..885eba1fba 100644
--- a/xml/convert/oscal_catalog_json-to-xml-converter.xsl
+++ b/xml/convert/oscal_catalog_json-to-xml-converter.xsl
@@ -2967,11 +2967,11 @@
       <xsl:apply-templates select="$str-as-textnode" mode="infer-inlines"/>
    </xsl:template>
    <xsl:template name="parse-markdown">
-
+        
 <!-- First, group according to ``` delimiters btw codeblocks and not
         within codeblock, escape & and < (only)
         within not-codeblock split lines at \n\s*\n
-
+        
         -->
         <!-- $str may be passed in, or we can process the current node -->
       <xsl:param name="markdown-str" as="xs:string" required="yes"/>
diff --git a/xml/convert/oscal_complete_json-to-xml-converter.xsl b/xml/convert/oscal_complete_json-to-xml-converter.xsl
index 760c872d4e..dfa76898cd 100644
--- a/xml/convert/oscal_complete_json-to-xml-converter.xsl
+++ b/xml/convert/oscal_complete_json-to-xml-converter.xsl
@@ -28856,11 +28856,11 @@
       <xsl:apply-templates select="$str-as-textnode" mode="infer-inlines"/>
    </xsl:template>
    <xsl:template name="parse-markdown">
-
+        
 <!-- First, group according to ``` delimiters btw codeblocks and not
         within codeblock, escape & and < (only)
         within not-codeblock split lines at \n\s*\n
-
+        
         -->
         <!-- $str may be passed in, or we can process the current node -->
       <xsl:param name="markdown-str" as="xs:string" required="yes"/>
diff --git a/xml/convert/oscal_component_json-to-xml-converter.xsl b/xml/convert/oscal_component_json-to-xml-converter.xsl
index d939f6baa3..f771955483 100644
--- a/xml/convert/oscal_component_json-to-xml-converter.xsl
+++ b/xml/convert/oscal_component_json-to-xml-converter.xsl
@@ -2781,11 +2781,11 @@
       <xsl:apply-templates select="$str-as-textnode" mode="infer-inlines"/>
    </xsl:template>
    <xsl:template name="parse-markdown">
-
+        
 <!-- First, group according to ``` delimiters btw codeblocks and not
         within codeblock, escape & and < (only)
         within not-codeblock split lines at \n\s*\n
-
+        
         -->
         <!-- $str may be passed in, or we can process the current node -->
       <xsl:param name="markdown-str" as="xs:string" required="yes"/>
diff --git a/xml/convert/oscal_poam_json-to-xml-converter.xsl b/xml/convert/oscal_poam_json-to-xml-converter.xsl
index 4439e77c04..d2ada61f64 100644
--- a/xml/convert/oscal_poam_json-to-xml-converter.xsl
+++ b/xml/convert/oscal_poam_json-to-xml-converter.xsl
@@ -5967,11 +5967,11 @@
       <xsl:apply-templates select="$str-as-textnode" mode="infer-inlines"/>
    </xsl:template>
    <xsl:template name="parse-markdown">
-
+        
 <!-- First, group according to ``` delimiters btw codeblocks and not
         within codeblock, escape & and < (only)
         within not-codeblock split lines at \n\s*\n
-
+        
         -->
         <!-- $str may be passed in, or we can process the current node -->
       <xsl:param name="markdown-str" as="xs:string" required="yes"/>
diff --git a/xml/convert/oscal_profile_json-to-xml-converter.xsl b/xml/convert/oscal_profile_json-to-xml-converter.xsl
index c95942eab1..fae2fffb5e 100644
--- a/xml/convert/oscal_profile_json-to-xml-converter.xsl
+++ b/xml/convert/oscal_profile_json-to-xml-converter.xsl
@@ -3213,11 +3213,11 @@
       <xsl:apply-templates select="$str-as-textnode" mode="infer-inlines"/>
    </xsl:template>
    <xsl:template name="parse-markdown">
-
+        
 <!-- First, group according to ``` delimiters btw codeblocks and not
         within codeblock, escape & and < (only)
         within not-codeblock split lines at \n\s*\n
-
+        
         -->
         <!-- $str may be passed in, or we can process the current node -->
       <xsl:param name="markdown-str" as="xs:string" required="yes"/>
diff --git a/xml/convert/oscal_ssp_json-to-xml-converter.xsl b/xml/convert/oscal_ssp_json-to-xml-converter.xsl
index 92117df258..94b619b10f 100644
--- a/xml/convert/oscal_ssp_json-to-xml-converter.xsl
+++ b/xml/convert/oscal_ssp_json-to-xml-converter.xsl
@@ -5331,11 +5331,11 @@
       <xsl:apply-templates select="$str-as-textnode" mode="infer-inlines"/>
    </xsl:template>
    <xsl:template name="parse-markdown">
-
+        
 <!-- First, group according to ``` delimiters btw codeblocks and not
         within codeblock, escape & and < (only)
         within not-codeblock split lines at \n\s*\n
-
+        
         -->
         <!-- $str may be passed in, or we can process the current node -->
       <xsl:param name="markdown-str" as="xs:string" required="yes"/>