diff --git a/dist/content/rev4/baselines/json/FedRAMP_rev4_HIGH-baseline-resolved-profile_catalog-min.json b/dist/content/rev4/baselines/json/FedRAMP_rev4_HIGH-baseline-resolved-profile_catalog-min.json
index 5a0cf0833..33ba0a0af 100644
--- a/dist/content/rev4/baselines/json/FedRAMP_rev4_HIGH-baseline-resolved-profile_catalog-min.json
+++ b/dist/content/rev4/baselines/json/FedRAMP_rev4_HIGH-baseline-resolved-profile_catalog-min.json
@@ -1,10 +1,10 @@
 {
   "catalog": {
-    "uuid": "bb77868b-4a08-4677-8f3a-67d9b3c46d38",
+    "uuid": "7990a0d5-6f24-458b-b15a-d8fc6d088584",
     "metadata": {
       "title": "FedRAMP Rev 4 High Baseline",
       "published": "2021-02-05T00:00:00.000-04:00",
-      "last-modified": "2024-03-07T07:53:34.410816-05:00",
+      "last-modified": "2024-09-23T17:31:41.295536-04:00",
       "version": "fedramp1.1.1-oscal1.0.4",
       "oscal-version": "1.0.4",
       "links": [
diff --git a/dist/content/rev4/baselines/json/FedRAMP_rev4_HIGH-baseline-resolved-profile_catalog.json b/dist/content/rev4/baselines/json/FedRAMP_rev4_HIGH-baseline-resolved-profile_catalog.json
index 3a4072a7b..0fecc21cd 100644
--- a/dist/content/rev4/baselines/json/FedRAMP_rev4_HIGH-baseline-resolved-profile_catalog.json
+++ b/dist/content/rev4/baselines/json/FedRAMP_rev4_HIGH-baseline-resolved-profile_catalog.json
@@ -1,10 +1,10 @@
 {
   "catalog": {
-    "uuid": "bb77868b-4a08-4677-8f3a-67d9b3c46d38",
+    "uuid": "7990a0d5-6f24-458b-b15a-d8fc6d088584",
     "metadata": {
       "title": "FedRAMP Rev 4 High Baseline",
       "published": "2021-02-05T00:00:00.000-04:00",
-      "last-modified": "2024-03-07T07:53:34.410816-05:00",
+      "last-modified": "2024-09-23T17:31:41.295536-04:00",
       "version": "fedramp1.1.1-oscal1.0.4",
       "oscal-version": "1.0.4",
       "links": [
diff --git a/dist/content/rev4/baselines/json/FedRAMP_rev4_LI-SaaS-baseline-resolved-profile_catalog-min.json b/dist/content/rev4/baselines/json/FedRAMP_rev4_LI-SaaS-baseline-resolved-profile_catalog-min.json
index 5191e6e3b..4e743a8cc 100644
--- a/dist/content/rev4/baselines/json/FedRAMP_rev4_LI-SaaS-baseline-resolved-profile_catalog-min.json
+++ b/dist/content/rev4/baselines/json/FedRAMP_rev4_LI-SaaS-baseline-resolved-profile_catalog-min.json
@@ -1,10 +1,10 @@
 {
   "catalog": {
-    "uuid": "0ef04c26-728d-4a69-849b-44a5dc27f253",
+    "uuid": "d2c7f531-be0c-42d6-a166-8a079ab8043a",
     "metadata": {
       "title": "FedRAMP Rev 4 Tailored Low Impact Software as a Service (LI-SaaS) Baseline",
       "published": "2021-02-05T00:00:00.000-04:00",
-      "last-modified": "2024-03-07T07:54:13.261804-05:00",
+      "last-modified": "2024-09-23T17:32:19.034177-04:00",
       "version": "fedramp1.1.1-oscal1.0.4",
       "oscal-version": "1.0.4",
       "links": [
diff --git a/dist/content/rev4/baselines/json/FedRAMP_rev4_LI-SaaS-baseline-resolved-profile_catalog.json b/dist/content/rev4/baselines/json/FedRAMP_rev4_LI-SaaS-baseline-resolved-profile_catalog.json
index 5594ac6ac..c9cc65f76 100644
--- a/dist/content/rev4/baselines/json/FedRAMP_rev4_LI-SaaS-baseline-resolved-profile_catalog.json
+++ b/dist/content/rev4/baselines/json/FedRAMP_rev4_LI-SaaS-baseline-resolved-profile_catalog.json
@@ -1,10 +1,10 @@
 {
   "catalog": {
-    "uuid": "0ef04c26-728d-4a69-849b-44a5dc27f253",
+    "uuid": "d2c7f531-be0c-42d6-a166-8a079ab8043a",
     "metadata": {
       "title": "FedRAMP Rev 4 Tailored Low Impact Software as a Service (LI-SaaS) Baseline",
       "published": "2021-02-05T00:00:00.000-04:00",
-      "last-modified": "2024-03-07T07:54:13.261804-05:00",
+      "last-modified": "2024-09-23T17:32:19.034177-04:00",
       "version": "fedramp1.1.1-oscal1.0.4",
       "oscal-version": "1.0.4",
       "links": [
diff --git a/dist/content/rev4/baselines/json/FedRAMP_rev4_LOW-baseline-resolved-profile_catalog-min.json b/dist/content/rev4/baselines/json/FedRAMP_rev4_LOW-baseline-resolved-profile_catalog-min.json
index 93fd558a9..2f07e8fd1 100644
--- a/dist/content/rev4/baselines/json/FedRAMP_rev4_LOW-baseline-resolved-profile_catalog-min.json
+++ b/dist/content/rev4/baselines/json/FedRAMP_rev4_LOW-baseline-resolved-profile_catalog-min.json
@@ -1,10 +1,10 @@
 {
   "catalog": {
-    "uuid": "e52255ac-769d-4351-a740-b10460cdbbc1",
+    "uuid": "989c709b-4952-4725-add2-04ce1e48ec88",
     "metadata": {
       "title": "FedRAMP Rev 4 Low Baseline",
       "published": "2021-02-05T00:00:00.000-04:00",
-      "last-modified": "2024-03-07T07:54:27.562625-05:00",
+      "last-modified": "2024-09-23T17:32:33.388677-04:00",
       "version": "fedramp1.1.1-oscal1.0.4",
       "oscal-version": "1.0.4",
       "links": [
diff --git a/dist/content/rev4/baselines/json/FedRAMP_rev4_LOW-baseline-resolved-profile_catalog.json b/dist/content/rev4/baselines/json/FedRAMP_rev4_LOW-baseline-resolved-profile_catalog.json
index 2ac5847ed..503b7bbf6 100644
--- a/dist/content/rev4/baselines/json/FedRAMP_rev4_LOW-baseline-resolved-profile_catalog.json
+++ b/dist/content/rev4/baselines/json/FedRAMP_rev4_LOW-baseline-resolved-profile_catalog.json
@@ -1,10 +1,10 @@
 {
   "catalog": {
-    "uuid": "e52255ac-769d-4351-a740-b10460cdbbc1",
+    "uuid": "989c709b-4952-4725-add2-04ce1e48ec88",
     "metadata": {
       "title": "FedRAMP Rev 4 Low Baseline",
       "published": "2021-02-05T00:00:00.000-04:00",
-      "last-modified": "2024-03-07T07:54:27.562625-05:00",
+      "last-modified": "2024-09-23T17:32:33.388677-04:00",
       "version": "fedramp1.1.1-oscal1.0.4",
       "oscal-version": "1.0.4",
       "links": [
diff --git a/dist/content/rev4/baselines/json/FedRAMP_rev4_MODERATE-baseline-resolved-profile_catalog-min.json b/dist/content/rev4/baselines/json/FedRAMP_rev4_MODERATE-baseline-resolved-profile_catalog-min.json
index ccdbad958..d842c881a 100644
--- a/dist/content/rev4/baselines/json/FedRAMP_rev4_MODERATE-baseline-resolved-profile_catalog-min.json
+++ b/dist/content/rev4/baselines/json/FedRAMP_rev4_MODERATE-baseline-resolved-profile_catalog-min.json
@@ -1,10 +1,10 @@
 {
   "catalog": {
-    "uuid": "60d993b9-3ae7-4b3d-9b5f-c30f81bf1659",
+    "uuid": "51d45ec2-96cf-44cb-9c69-f62531e1da66",
     "metadata": {
       "title": "FedRAMP Rev 4 Moderate Baseline",
       "published": "2021-02-05T00:00:00.000-04:00",
-      "last-modified": "2024-03-07T07:54:49.877548-05:00",
+      "last-modified": "2024-09-23T17:32:55.718903-04:00",
       "version": "fedramp1.1.1-oscal1.0.4",
       "oscal-version": "1.0.4",
       "links": [
diff --git a/dist/content/rev4/baselines/json/FedRAMP_rev4_MODERATE-baseline-resolved-profile_catalog.json b/dist/content/rev4/baselines/json/FedRAMP_rev4_MODERATE-baseline-resolved-profile_catalog.json
index bef4c61bd..773701625 100644
--- a/dist/content/rev4/baselines/json/FedRAMP_rev4_MODERATE-baseline-resolved-profile_catalog.json
+++ b/dist/content/rev4/baselines/json/FedRAMP_rev4_MODERATE-baseline-resolved-profile_catalog.json
@@ -1,10 +1,10 @@
 {
   "catalog": {
-    "uuid": "60d993b9-3ae7-4b3d-9b5f-c30f81bf1659",
+    "uuid": "51d45ec2-96cf-44cb-9c69-f62531e1da66",
     "metadata": {
       "title": "FedRAMP Rev 4 Moderate Baseline",
       "published": "2021-02-05T00:00:00.000-04:00",
-      "last-modified": "2024-03-07T07:54:49.877548-05:00",
+      "last-modified": "2024-09-23T17:32:55.718903-04:00",
       "version": "fedramp1.1.1-oscal1.0.4",
       "oscal-version": "1.0.4",
       "links": [
diff --git a/dist/content/rev4/baselines/xml/FedRAMP_rev4_HIGH-baseline-resolved-profile_catalog.xml b/dist/content/rev4/baselines/xml/FedRAMP_rev4_HIGH-baseline-resolved-profile_catalog.xml
index 121a4c8e9..34f47bf95 100644
--- a/dist/content/rev4/baselines/xml/FedRAMP_rev4_HIGH-baseline-resolved-profile_catalog.xml
+++ b/dist/content/rev4/baselines/xml/FedRAMP_rev4_HIGH-baseline-resolved-profile_catalog.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0"
-         uuid="bb77868b-4a08-4677-8f3a-67d9b3c46d38">
+         uuid="7990a0d5-6f24-458b-b15a-d8fc6d088584">
    <metadata>
       <title>FedRAMP Rev 4 High Baseline</title>
       <published>2021-02-05T00:00:00.000-04:00</published>
-      <last-modified>2024-03-07T07:53:34.410816-05:00</last-modified>
+      <last-modified>2024-09-23T17:31:41.295536-04:00</last-modified>
       <version>fedramp1.1.1-oscal1.0.4</version>
       <oscal-version>1.0.4</oscal-version>
       <link rel="resolution-source" href="FedRAMP_rev4_HIGH-baseline_profile.xml"/>
diff --git a/dist/content/rev4/baselines/xml/FedRAMP_rev4_LI-SaaS-baseline-resolved-profile_catalog.xml b/dist/content/rev4/baselines/xml/FedRAMP_rev4_LI-SaaS-baseline-resolved-profile_catalog.xml
index 77a41b700..0f055f1e2 100644
--- a/dist/content/rev4/baselines/xml/FedRAMP_rev4_LI-SaaS-baseline-resolved-profile_catalog.xml
+++ b/dist/content/rev4/baselines/xml/FedRAMP_rev4_LI-SaaS-baseline-resolved-profile_catalog.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0"
-         uuid="0ef04c26-728d-4a69-849b-44a5dc27f253">
+         uuid="d2c7f531-be0c-42d6-a166-8a079ab8043a">
    <metadata>
       <title>FedRAMP Rev 4 Tailored Low Impact Software as a Service (LI-SaaS) Baseline</title>
       <published>2021-02-05T00:00:00.000-04:00</published>
-      <last-modified>2024-03-07T07:54:13.261804-05:00</last-modified>
+      <last-modified>2024-09-23T17:32:19.034177-04:00</last-modified>
       <version>fedramp1.1.1-oscal1.0.4</version>
       <oscal-version>1.0.4</oscal-version>
       <link rel="resolution-source"
diff --git a/dist/content/rev4/baselines/xml/FedRAMP_rev4_LOW-baseline-resolved-profile_catalog.xml b/dist/content/rev4/baselines/xml/FedRAMP_rev4_LOW-baseline-resolved-profile_catalog.xml
index e4cc93f31..d161c0b2e 100644
--- a/dist/content/rev4/baselines/xml/FedRAMP_rev4_LOW-baseline-resolved-profile_catalog.xml
+++ b/dist/content/rev4/baselines/xml/FedRAMP_rev4_LOW-baseline-resolved-profile_catalog.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0"
-         uuid="e52255ac-769d-4351-a740-b10460cdbbc1">
+         uuid="989c709b-4952-4725-add2-04ce1e48ec88">
    <metadata>
       <title>FedRAMP Rev 4 Low Baseline</title>
       <published>2021-02-05T00:00:00.000-04:00</published>
-      <last-modified>2024-03-07T07:54:27.562625-05:00</last-modified>
+      <last-modified>2024-09-23T17:32:33.388677-04:00</last-modified>
       <version>fedramp1.1.1-oscal1.0.4</version>
       <oscal-version>1.0.4</oscal-version>
       <link rel="resolution-source" href="FedRAMP_rev4_LOW-baseline_profile.xml"/>
diff --git a/dist/content/rev4/baselines/xml/FedRAMP_rev4_MODERATE-baseline-resolved-profile_catalog.xml b/dist/content/rev4/baselines/xml/FedRAMP_rev4_MODERATE-baseline-resolved-profile_catalog.xml
index 8a754b2d4..b3bb47819 100644
--- a/dist/content/rev4/baselines/xml/FedRAMP_rev4_MODERATE-baseline-resolved-profile_catalog.xml
+++ b/dist/content/rev4/baselines/xml/FedRAMP_rev4_MODERATE-baseline-resolved-profile_catalog.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0"
-         uuid="60d993b9-3ae7-4b3d-9b5f-c30f81bf1659">
+         uuid="51d45ec2-96cf-44cb-9c69-f62531e1da66">
    <metadata>
       <title>FedRAMP Rev 4 Moderate Baseline</title>
       <published>2021-02-05T00:00:00.000-04:00</published>
-      <last-modified>2024-03-07T07:54:49.877548-05:00</last-modified>
+      <last-modified>2024-09-23T17:32:55.718903-04:00</last-modified>
       <version>fedramp1.1.1-oscal1.0.4</version>
       <oscal-version>1.0.4</oscal-version>
       <link rel="resolution-source"
diff --git a/dist/content/rev4/baselines/yaml/FedRAMP_rev4_HIGH-baseline-resolved-profile_catalog.yaml b/dist/content/rev4/baselines/yaml/FedRAMP_rev4_HIGH-baseline-resolved-profile_catalog.yaml
index 94c8fabb8..09f4c9823 100644
--- a/dist/content/rev4/baselines/yaml/FedRAMP_rev4_HIGH-baseline-resolved-profile_catalog.yaml
+++ b/dist/content/rev4/baselines/yaml/FedRAMP_rev4_HIGH-baseline-resolved-profile_catalog.yaml
@@ -1,10 +1,10 @@
 ---
 catalog:
-  uuid: bb77868b-4a08-4677-8f3a-67d9b3c46d38
+  uuid: 7990a0d5-6f24-458b-b15a-d8fc6d088584
   metadata:
     title: FedRAMP Rev 4 High Baseline
     published: 2021-02-05T00:00:00.000-04:00
-    last-modified: 2024-03-07T07:53:34.410816-05:00
+    last-modified: 2024-09-23T17:31:41.295536-04:00
     version: fedramp1.1.1-oscal1.0.4
     oscal-version: 1.0.4
     links:
diff --git a/dist/content/rev4/baselines/yaml/FedRAMP_rev4_LI-SaaS-baseline-resolved-profile_catalog.yaml b/dist/content/rev4/baselines/yaml/FedRAMP_rev4_LI-SaaS-baseline-resolved-profile_catalog.yaml
index ed65a0193..a39753a9e 100644
--- a/dist/content/rev4/baselines/yaml/FedRAMP_rev4_LI-SaaS-baseline-resolved-profile_catalog.yaml
+++ b/dist/content/rev4/baselines/yaml/FedRAMP_rev4_LI-SaaS-baseline-resolved-profile_catalog.yaml
@@ -1,10 +1,10 @@
 ---
 catalog:
-  uuid: 0ef04c26-728d-4a69-849b-44a5dc27f253
+  uuid: d2c7f531-be0c-42d6-a166-8a079ab8043a
   metadata:
     title: FedRAMP Rev 4 Tailored Low Impact Software as a Service (LI-SaaS) Baseline
     published: 2021-02-05T00:00:00.000-04:00
-    last-modified: 2024-03-07T07:54:13.261804-05:00
+    last-modified: 2024-09-23T17:32:19.034177-04:00
     version: fedramp1.1.1-oscal1.0.4
     oscal-version: 1.0.4
     links:
diff --git a/dist/content/rev4/baselines/yaml/FedRAMP_rev4_LOW-baseline-resolved-profile_catalog.yaml b/dist/content/rev4/baselines/yaml/FedRAMP_rev4_LOW-baseline-resolved-profile_catalog.yaml
index 12542619c..589e3a9f3 100644
--- a/dist/content/rev4/baselines/yaml/FedRAMP_rev4_LOW-baseline-resolved-profile_catalog.yaml
+++ b/dist/content/rev4/baselines/yaml/FedRAMP_rev4_LOW-baseline-resolved-profile_catalog.yaml
@@ -1,10 +1,10 @@
 ---
 catalog:
-  uuid: e52255ac-769d-4351-a740-b10460cdbbc1
+  uuid: 989c709b-4952-4725-add2-04ce1e48ec88
   metadata:
     title: FedRAMP Rev 4 Low Baseline
     published: 2021-02-05T00:00:00.000-04:00
-    last-modified: 2024-03-07T07:54:27.562625-05:00
+    last-modified: 2024-09-23T17:32:33.388677-04:00
     version: fedramp1.1.1-oscal1.0.4
     oscal-version: 1.0.4
     links:
diff --git a/dist/content/rev4/baselines/yaml/FedRAMP_rev4_MODERATE-baseline-resolved-profile_catalog.yaml b/dist/content/rev4/baselines/yaml/FedRAMP_rev4_MODERATE-baseline-resolved-profile_catalog.yaml
index 4dde85f35..2a1bb3c01 100644
--- a/dist/content/rev4/baselines/yaml/FedRAMP_rev4_MODERATE-baseline-resolved-profile_catalog.yaml
+++ b/dist/content/rev4/baselines/yaml/FedRAMP_rev4_MODERATE-baseline-resolved-profile_catalog.yaml
@@ -1,10 +1,10 @@
 ---
 catalog:
-  uuid: 60d993b9-3ae7-4b3d-9b5f-c30f81bf1659
+  uuid: 51d45ec2-96cf-44cb-9c69-f62531e1da66
   metadata:
     title: FedRAMP Rev 4 Moderate Baseline
     published: 2021-02-05T00:00:00.000-04:00
-    last-modified: 2024-03-07T07:54:49.877548-05:00
+    last-modified: 2024-09-23T17:32:55.718903-04:00
     version: fedramp1.1.1-oscal1.0.4
     oscal-version: 1.0.4
     links:
diff --git a/dist/content/rev4/templates/poam/json/FedRAMP-POAM-OSCAL-Template-min.json b/dist/content/rev4/templates/poam/json/FedRAMP-POAM-OSCAL-Template-min.json
index 65cc1bb1e..4dbb464f3 100644
--- a/dist/content/rev4/templates/poam/json/FedRAMP-POAM-OSCAL-Template-min.json
+++ b/dist/content/rev4/templates/poam/json/FedRAMP-POAM-OSCAL-Template-min.json
@@ -202,7 +202,7 @@
           "uuid": "9d194268-a9d1-4c38-839f-9c4aa57bf71e",
           "type": "software",
           "title": "XYZ Vulnerability Scanning Tool",
-          "description": "",
+          "description": "...",
           "props": [
             {
               "name": "vendor",
@@ -744,7 +744,7 @@
             {
               "uuid": "1b500d56-1936-41eb-8b60-a2984937ab89",
               "title": "Activity 1",
-              "description": "",
+              "description": "...",
               "start": "2020-07-02T00:00:00Z",
               "related-responses": [
                 {
@@ -760,7 +760,7 @@
             {
               "uuid": "316fb3fe-927a-49a1-9a72-a58722862623",
               "title": "Activity 2",
-              "description": "",
+              "description": "...",
               "start": "2020-07-07T00:00:00Z"
             },
             {
@@ -784,7 +784,7 @@
       {
         "uuid": "6F5FFF73-CAC6-4DA0-A0D9-0F931A5EFAFA",
         "title": "[EXAMPLE]POA&M Item",
-        "description": "",
+        "description": "...",
         "props": [
           {
             "name": "POAM-ID",
diff --git a/dist/content/rev4/templates/poam/json/FedRAMP-POAM-OSCAL-Template.json b/dist/content/rev4/templates/poam/json/FedRAMP-POAM-OSCAL-Template.json
index 4cdbd25de..a0ffb93d5 100644
--- a/dist/content/rev4/templates/poam/json/FedRAMP-POAM-OSCAL-Template.json
+++ b/dist/content/rev4/templates/poam/json/FedRAMP-POAM-OSCAL-Template.json
@@ -202,7 +202,7 @@
           "uuid": "9d194268-a9d1-4c38-839f-9c4aa57bf71e",
           "type": "software",
           "title": "XYZ Vulnerability Scanning Tool",
-          "description": "",
+          "description": "...",
           "props": [
             {
               "name": "vendor",
@@ -744,7 +744,7 @@
             {
               "uuid": "1b500d56-1936-41eb-8b60-a2984937ab89",
               "title": "Activity 1",
-              "description": "",
+              "description": "...",
               "start": "2020-07-02T00:00:00Z",
               "related-responses": [
                 {
@@ -760,7 +760,7 @@
             {
               "uuid": "316fb3fe-927a-49a1-9a72-a58722862623",
               "title": "Activity 2",
-              "description": "",
+              "description": "...",
               "start": "2020-07-07T00:00:00Z"
             },
             {
@@ -784,7 +784,7 @@
       {
         "uuid": "6F5FFF73-CAC6-4DA0-A0D9-0F931A5EFAFA",
         "title": "[EXAMPLE]POA&M Item",
-        "description": "",
+        "description": "...",
         "props": [
           {
             "name": "POAM-ID",
diff --git a/dist/content/rev4/templates/poam/xml/FedRAMP-POAM-OSCAL-Template.xml b/dist/content/rev4/templates/poam/xml/FedRAMP-POAM-OSCAL-Template.xml
index f79efa257..625615e03 100644
--- a/dist/content/rev4/templates/poam/xml/FedRAMP-POAM-OSCAL-Template.xml
+++ b/dist/content/rev4/templates/poam/xml/FedRAMP-POAM-OSCAL-Template.xml
@@ -123,7 +123,7 @@
    <local-definitions>
       <component uuid="9d194268-a9d1-4c38-839f-9c4aa57bf71e" type="software">
          <title>XYZ Vulnerability Scanning Tool</title>
-         <description/>
+         <description><p>...</p></description>
          <prop name="vendor" value="Vendor Name"/>
          <prop name="name" value="Tool Name"/>
          <prop name="version" value="1.2.3"/>
@@ -449,7 +449,7 @@
       <risk-log>
          <entry uuid="1b500d56-1936-41eb-8b60-a2984937ab89">
             <title>Activity 1</title>
-            <description/>
+            <description><p>...</p></description>
             <start>2020-07-02T00:00:00Z</start>
             <related-response response-uuid="e9ee6fe2-856f-42c7-8c2e-ff6466d31010">
                <related-task task-uuid="a12dea1d-e4d1-4f09-aacf-1eaf203a3092"/>
@@ -457,7 +457,7 @@
          </entry>
          <entry uuid="316fb3fe-927a-49a1-9a72-a58722862623">
             <title>Activity 2</title>
-            <description/>
+            <description><p>...</p></description>
             <start>2020-07-07T00:00:00Z</start>
          </entry>
          <entry uuid="d084a039-bdd1-4ccd-a06a-53355e07fa2f">
@@ -480,7 +480,7 @@
    </risk>
    <poam-item uuid="6F5FFF73-CAC6-4DA0-A0D9-0F931A5EFAFA">
       <title>[EXAMPLE]POA&amp;M Item</title>
-      <description/>
+      <description><p>...</p></description>
       <prop ns="https://fedramp.gov/ns/oscal" name="POAM-ID" value="V-1"/>
       <related-observation observation-uuid="0aa54106-8a63-4953-ac0d-30ff91f8d4ab"/>
       <associated-risk risk-uuid="9cbd98f3-abcb-4948-ad06-14e0bcba742f"/>
diff --git a/dist/content/rev4/templates/poam/yaml/FedRAMP-POAM-OSCAL-Template.yaml b/dist/content/rev4/templates/poam/yaml/FedRAMP-POAM-OSCAL-Template.yaml
index 9c944d5c9..daa7c0cab 100644
--- a/dist/content/rev4/templates/poam/yaml/FedRAMP-POAM-OSCAL-Template.yaml
+++ b/dist/content/rev4/templates/poam/yaml/FedRAMP-POAM-OSCAL-Template.yaml
@@ -132,7 +132,7 @@ plan-of-action-and-milestones:
       - uuid: 9d194268-a9d1-4c38-839f-9c4aa57bf71e
         type: software
         title: XYZ Vulnerability Scanning Tool
-        description: ""
+        description: '...'
         props:
           - name: vendor
             value: Vendor Name
@@ -490,7 +490,7 @@ plan-of-action-and-milestones:
         entries:
           - uuid: 1b500d56-1936-41eb-8b60-a2984937ab89
             title: Activity 1
-            description: ""
+            description: '...'
             start: 2020-07-02T00:00:00Z
             related-responses:
               - response-uuid: e9ee6fe2-856f-42c7-8c2e-ff6466d31010
@@ -498,7 +498,7 @@ plan-of-action-and-milestones:
                   - task-uuid: a12dea1d-e4d1-4f09-aacf-1eaf203a3092
           - uuid: 316fb3fe-927a-49a1-9a72-a58722862623
             title: Activity 2
-            description: ""
+            description: '...'
             start: 2020-07-07T00:00:00Z
           - uuid: d084a039-bdd1-4ccd-a06a-53355e07fa2f
             title: Vendor Check-in
@@ -517,7 +517,7 @@ plan-of-action-and-milestones:
   poam-items:
     - uuid: 6F5FFF73-CAC6-4DA0-A0D9-0F931A5EFAFA
       title: "[EXAMPLE]POA&M Item"
-      description: ""
+      description: '...'
       props:
         - name: POAM-ID
           ns: https://fedramp.gov/ns/oscal
diff --git a/dist/content/rev4/templates/sar/json/FedRAMP-SAR-OSCAL-Template-min.json b/dist/content/rev4/templates/sar/json/FedRAMP-SAR-OSCAL-Template-min.json
index 30ec52be9..4a0653e2e 100644
--- a/dist/content/rev4/templates/sar/json/FedRAMP-SAR-OSCAL-Template-min.json
+++ b/dist/content/rev4/templates/sar/json/FedRAMP-SAR-OSCAL-Template-min.json
@@ -1782,7 +1782,7 @@
       {
         "uuid": "cfa9b157-540e-456b-980d-efa789e50ace",
         "title": "2019 Annual Assessment",
-        "description": "",
+        "description": "...",
         "start": "2019-03-01T00:00:00Z",
         "end": "2019-03-12T00:00:00Z",
         "reviewed-controls": {
@@ -1803,7 +1803,7 @@
         "observations": [
           {
             "uuid": "EF3A436A-7445-41B7-A980-78E9BAB3B83A",
-            "description": "",
+            "description": "...",
             "methods": [
               "EXAMINE"
             ],
@@ -1814,7 +1814,7 @@
       {
         "uuid": "d755e7fd-346d-40f0-b538-1b1da1aa5821",
         "title": "Initial (2018) Assessment",
-        "description": "",
+        "description": "...",
         "start": "2018-03-01T00:00:00Z",
         "end": "2018-03-12T00:00:00Z",
         "reviewed-controls": {
@@ -1860,7 +1860,7 @@
           {
             "uuid": "A0A1395D-59CD-46D9-91A2-E6CA62AE9BAB",
             "title": "",
-            "description": "",
+            "description": "...",
             "target": {
               "type": "statement-id",
               "target-id": "ac-1_smt.a",
diff --git a/dist/content/rev4/templates/sar/json/FedRAMP-SAR-OSCAL-Template.json b/dist/content/rev4/templates/sar/json/FedRAMP-SAR-OSCAL-Template.json
index cdb968915..58bd322e8 100644
--- a/dist/content/rev4/templates/sar/json/FedRAMP-SAR-OSCAL-Template.json
+++ b/dist/content/rev4/templates/sar/json/FedRAMP-SAR-OSCAL-Template.json
@@ -1782,7 +1782,7 @@
       {
         "uuid": "cfa9b157-540e-456b-980d-efa789e50ace",
         "title": "2019 Annual Assessment",
-        "description": "",
+        "description": "...",
         "start": "2019-03-01T00:00:00Z",
         "end": "2019-03-12T00:00:00Z",
         "reviewed-controls": {
@@ -1803,7 +1803,7 @@
         "observations": [
           {
             "uuid": "EF3A436A-7445-41B7-A980-78E9BAB3B83A",
-            "description": "",
+            "description": "...",
             "methods": [
               "EXAMINE"
             ],
@@ -1814,7 +1814,7 @@
       {
         "uuid": "d755e7fd-346d-40f0-b538-1b1da1aa5821",
         "title": "Initial (2018) Assessment",
-        "description": "",
+        "description": "...",
         "start": "2018-03-01T00:00:00Z",
         "end": "2018-03-12T00:00:00Z",
         "reviewed-controls": {
@@ -1860,7 +1860,7 @@
           {
             "uuid": "A0A1395D-59CD-46D9-91A2-E6CA62AE9BAB",
             "title": "",
-            "description": "",
+            "description": "...",
             "target": {
               "type": "statement-id",
               "target-id": "ac-1_smt.a",
diff --git a/dist/content/rev4/templates/sar/xml/FedRAMP-SAR-OSCAL-Template.xml b/dist/content/rev4/templates/sar/xml/FedRAMP-SAR-OSCAL-Template.xml
index 12aefa301..2f2c45e74 100644
--- a/dist/content/rev4/templates/sar/xml/FedRAMP-SAR-OSCAL-Template.xml
+++ b/dist/content/rev4/templates/sar/xml/FedRAMP-SAR-OSCAL-Template.xml
@@ -1176,7 +1176,7 @@
    </result>
    <result uuid="cfa9b157-540e-456b-980d-efa789e50ace">
       <title>2019 Annual Assessment</title>
-      <description/>
+      <description><p>...</p></description>
       <start>2019-03-01T00:00:00Z</start>
       <end>2019-03-12T00:00:00Z</end>
       <reviewed-controls>
@@ -1189,14 +1189,14 @@
          </control-selection>
       </reviewed-controls>
       <observation uuid="EF3A436A-7445-41B7-A980-78E9BAB3B83A">
-         <description/>
+         <description><p>...</p></description>
          <method>EXAMINE</method>
          <collected>2019-03-01T10:11:12Z</collected>
       </observation>
    </result>
    <result uuid="d755e7fd-346d-40f0-b538-1b1da1aa5821">
       <title>Initial (2018) Assessment</title>
-      <description/>
+      <description><p>...</p></description>
       <start>2018-03-01T00:00:00Z</start>
       <end>2018-03-12T00:00:00Z</end>
       <reviewed-controls>
@@ -1222,7 +1222,7 @@
       </observation>
       <finding uuid="A0A1395D-59CD-46D9-91A2-E6CA62AE9BAB">
          <title/>
-         <description/>
+         <description><p>...</p></description>
          <target target-id="ac-1_smt.a" type="statement-id">
             <status state="not-satisfied"/>
          </target>
diff --git a/dist/content/rev4/templates/sar/yaml/FedRAMP-SAR-OSCAL-Template.yaml b/dist/content/rev4/templates/sar/yaml/FedRAMP-SAR-OSCAL-Template.yaml
index 9fb1cd80f..14762517e 100644
--- a/dist/content/rev4/templates/sar/yaml/FedRAMP-SAR-OSCAL-Template.yaml
+++ b/dist/content/rev4/templates/sar/yaml/FedRAMP-SAR-OSCAL-Template.yaml
@@ -1291,7 +1291,7 @@ assessment-results:
             the risk assembly is required.
     - uuid: cfa9b157-540e-456b-980d-efa789e50ace
       title: 2019 Annual Assessment
-      description: ""
+      description: '...'
       start: 2019-03-01T00:00:00Z
       end: 2019-03-12T00:00:00Z
       reviewed-controls:
@@ -1302,13 +1302,13 @@ assessment-results:
             remarks: Other controls omitted from example.
       observations:
         - uuid: EF3A436A-7445-41B7-A980-78E9BAB3B83A
-          description: ""
+          description: '...'
           methods:
             - EXAMINE
           collected: 2019-03-01T10:11:12Z
     - uuid: d755e7fd-346d-40f0-b538-1b1da1aa5821
       title: Initial (2018) Assessment
-      description: ""
+      description: '...'
       start: 2018-03-01T00:00:00Z
       end: 2018-03-12T00:00:00Z
       reviewed-controls:
@@ -1334,7 +1334,7 @@ assessment-results:
       findings:
         - uuid: A0A1395D-59CD-46D9-91A2-E6CA62AE9BAB
           title: ""
-          description: ""
+          description: '...'
           target:
             type: statement-id
             target-id: ac-1_smt.a
diff --git a/dist/content/rev5/baselines/json/FedRAMP_rev5_HIGH-baseline-resolved-profile_catalog-min.json b/dist/content/rev5/baselines/json/FedRAMP_rev5_HIGH-baseline-resolved-profile_catalog-min.json
index 78a81fe14..318452b7a 100644
--- a/dist/content/rev5/baselines/json/FedRAMP_rev5_HIGH-baseline-resolved-profile_catalog-min.json
+++ b/dist/content/rev5/baselines/json/FedRAMP_rev5_HIGH-baseline-resolved-profile_catalog-min.json
@@ -1,12 +1,12 @@
 {
   "catalog": {
-    "uuid": "45cd23a3-b191-419a-8929-ae94da2e7c85",
+    "uuid": "f0ed6557-e5a9-487c-a565-f0917705dc32",
     "metadata": {
       "title": "FedRAMP Rev 5 High Baseline",
       "published": "2023-08-31T00:00:00Z",
-      "last-modified": "2024-03-07T07:55:37.00783-05:00",
-      "version": "5.1.1+fedramp-20240111-0",
-      "oscal-version": "1.1.1",
+      "last-modified": "2024-09-23T17:33:43.054063-04:00",
+      "version": "5.1.1+fedramp-20240510-0",
+      "oscal-version": "1.1.2",
       "links": [
         {
           "href": "FedRAMP_rev5_HIGH-baseline_profile.json",
@@ -126150,11 +126150,6 @@
               {
                 "id": "si-03_odp.05",
                 "label": "action",
-                "constraints": [
-                  {
-                    "description": "administrator or defined security personnel near-realtime"
-                  }
-                ],
                 "guidelines": [
                   {
                     "prose": "action to be taken in response to malicious code detection are defined (if selected);"
@@ -126164,6 +126159,11 @@
               {
                 "id": "si-03_odp.06",
                 "label": "personnel or roles",
+                "constraints": [
+                  {
+                    "description": "administrator or defined security personnel near-realtime"
+                  }
+                ],
                 "guidelines": [
                   {
                     "prose": "personnel or roles to be alerted when malicious code is detected is/are defined;"
diff --git a/dist/content/rev5/baselines/json/FedRAMP_rev5_HIGH-baseline-resolved-profile_catalog.json b/dist/content/rev5/baselines/json/FedRAMP_rev5_HIGH-baseline-resolved-profile_catalog.json
index 4ec51e4bb..412412d2b 100644
--- a/dist/content/rev5/baselines/json/FedRAMP_rev5_HIGH-baseline-resolved-profile_catalog.json
+++ b/dist/content/rev5/baselines/json/FedRAMP_rev5_HIGH-baseline-resolved-profile_catalog.json
@@ -1,12 +1,12 @@
 {
   "catalog": {
-    "uuid": "45cd23a3-b191-419a-8929-ae94da2e7c85",
+    "uuid": "f0ed6557-e5a9-487c-a565-f0917705dc32",
     "metadata": {
       "title": "FedRAMP Rev 5 High Baseline",
       "published": "2023-08-31T00:00:00Z",
-      "last-modified": "2024-03-07T07:55:37.00783-05:00",
-      "version": "5.1.1+fedramp-20240111-0",
-      "oscal-version": "1.1.1",
+      "last-modified": "2024-09-23T17:33:43.054063-04:00",
+      "version": "5.1.1+fedramp-20240510-0",
+      "oscal-version": "1.1.2",
       "links": [
         {
           "href": "FedRAMP_rev5_HIGH-baseline_profile.json",
@@ -126150,11 +126150,6 @@
               {
                 "id": "si-03_odp.05",
                 "label": "action",
-                "constraints": [
-                  {
-                    "description": "administrator or defined security personnel near-realtime"
-                  }
-                ],
                 "guidelines": [
                   {
                     "prose": "action to be taken in response to malicious code detection are defined (if selected);"
@@ -126164,6 +126159,11 @@
               {
                 "id": "si-03_odp.06",
                 "label": "personnel or roles",
+                "constraints": [
+                  {
+                    "description": "administrator or defined security personnel near-realtime"
+                  }
+                ],
                 "guidelines": [
                   {
                     "prose": "personnel or roles to be alerted when malicious code is detected is/are defined;"
diff --git a/dist/content/rev5/baselines/json/FedRAMP_rev5_HIGH-baseline_profile-min.json b/dist/content/rev5/baselines/json/FedRAMP_rev5_HIGH-baseline_profile-min.json
index a96769c46..25b32e7e7 100644
--- a/dist/content/rev5/baselines/json/FedRAMP_rev5_HIGH-baseline_profile-min.json
+++ b/dist/content/rev5/baselines/json/FedRAMP_rev5_HIGH-baseline_profile-min.json
@@ -5,8 +5,8 @@
       "title": "FedRAMP Rev 5 High Baseline",
       "published": "2023-08-31T00:00:00Z",
       "last-modified": "2024-01-11T23:40:17Z",
-      "version": "5.1.1+fedramp-20240111-0",
-      "oscal-version": "1.1.1",
+      "version": "5.1.1+fedramp-20240510-0",
+      "oscal-version": "1.1.2",
       "roles": [
         {
           "id": "prepared-by",
@@ -2568,7 +2568,7 @@
           ]
         },
         {
-          "param-id": "si-03_odp.05",
+          "param-id": "si-03_odp.06",
           "constraints": [
             {
               "description": "administrator or defined security personnel near-realtime"
diff --git a/dist/content/rev5/baselines/json/FedRAMP_rev5_HIGH-baseline_profile.json b/dist/content/rev5/baselines/json/FedRAMP_rev5_HIGH-baseline_profile.json
index f10798312..09ec6fbf3 100644
--- a/dist/content/rev5/baselines/json/FedRAMP_rev5_HIGH-baseline_profile.json
+++ b/dist/content/rev5/baselines/json/FedRAMP_rev5_HIGH-baseline_profile.json
@@ -5,8 +5,8 @@
       "title": "FedRAMP Rev 5 High Baseline",
       "published": "2023-08-31T00:00:00Z",
       "last-modified": "2024-01-11T23:40:17Z",
-      "version": "5.1.1+fedramp-20240111-0",
-      "oscal-version": "1.1.1",
+      "version": "5.1.1+fedramp-20240510-0",
+      "oscal-version": "1.1.2",
       "roles": [
         {
           "id": "prepared-by",
@@ -2568,7 +2568,7 @@
           ]
         },
         {
-          "param-id": "si-03_odp.05",
+          "param-id": "si-03_odp.06",
           "constraints": [
             {
               "description": "administrator or defined security personnel near-realtime"
diff --git a/dist/content/rev5/baselines/json/FedRAMP_rev5_LI-SaaS-baseline-resolved-profile_catalog-min.json b/dist/content/rev5/baselines/json/FedRAMP_rev5_LI-SaaS-baseline-resolved-profile_catalog-min.json
index 12ccf7ca0..04dd81274 100644
--- a/dist/content/rev5/baselines/json/FedRAMP_rev5_LI-SaaS-baseline-resolved-profile_catalog-min.json
+++ b/dist/content/rev5/baselines/json/FedRAMP_rev5_LI-SaaS-baseline-resolved-profile_catalog-min.json
@@ -1,12 +1,12 @@
 {
   "catalog": {
-    "uuid": "c82aaef5-4ec7-48bc-830c-222910423aeb",
+    "uuid": "69c30416-200b-4d79-aa9d-60989450a0df",
     "metadata": {
       "title": "FedRAMP Rev 5 Tailored Low Impact Software as a Service (LI-SaaS) Baseline",
       "published": "2023-08-31T00:00:00Z",
-      "last-modified": "2024-03-07T07:56:24.04219-05:00",
-      "version": "5.1.1+fedramp-20240111-0",
-      "oscal-version": "1.1.1",
+      "last-modified": "2024-09-23T17:34:28.746238-04:00",
+      "version": "5.1.1+fedramp-20240510-0",
+      "oscal-version": "1.1.2",
       "links": [
         {
           "href": "FedRAMP_rev5_LI-SaaS-baseline_profile.json",
@@ -38231,11 +38231,6 @@
               {
                 "id": "si-03_odp.05",
                 "label": "action",
-                "constraints": [
-                  {
-                    "description": "administrator or defined security personnel near-realtime"
-                  }
-                ],
                 "guidelines": [
                   {
                     "prose": "action to be taken in response to malicious code detection are defined (if selected);"
@@ -38245,6 +38240,11 @@
               {
                 "id": "si-03_odp.06",
                 "label": "personnel or roles",
+                "constraints": [
+                  {
+                    "description": "administrator or defined security personnel near-realtime"
+                  }
+                ],
                 "guidelines": [
                   {
                     "prose": "personnel or roles to be alerted when malicious code is detected is/are defined;"
diff --git a/dist/content/rev5/baselines/json/FedRAMP_rev5_LI-SaaS-baseline-resolved-profile_catalog.json b/dist/content/rev5/baselines/json/FedRAMP_rev5_LI-SaaS-baseline-resolved-profile_catalog.json
index 55671ddfa..9a520f58a 100644
--- a/dist/content/rev5/baselines/json/FedRAMP_rev5_LI-SaaS-baseline-resolved-profile_catalog.json
+++ b/dist/content/rev5/baselines/json/FedRAMP_rev5_LI-SaaS-baseline-resolved-profile_catalog.json
@@ -1,12 +1,12 @@
 {
   "catalog": {
-    "uuid": "c82aaef5-4ec7-48bc-830c-222910423aeb",
+    "uuid": "69c30416-200b-4d79-aa9d-60989450a0df",
     "metadata": {
       "title": "FedRAMP Rev 5 Tailored Low Impact Software as a Service (LI-SaaS) Baseline",
       "published": "2023-08-31T00:00:00Z",
-      "last-modified": "2024-03-07T07:56:24.04219-05:00",
-      "version": "5.1.1+fedramp-20240111-0",
-      "oscal-version": "1.1.1",
+      "last-modified": "2024-09-23T17:34:28.746238-04:00",
+      "version": "5.1.1+fedramp-20240510-0",
+      "oscal-version": "1.1.2",
       "links": [
         {
           "href": "FedRAMP_rev5_LI-SaaS-baseline_profile.json",
@@ -38231,11 +38231,6 @@
               {
                 "id": "si-03_odp.05",
                 "label": "action",
-                "constraints": [
-                  {
-                    "description": "administrator or defined security personnel near-realtime"
-                  }
-                ],
                 "guidelines": [
                   {
                     "prose": "action to be taken in response to malicious code detection are defined (if selected);"
@@ -38245,6 +38240,11 @@
               {
                 "id": "si-03_odp.06",
                 "label": "personnel or roles",
+                "constraints": [
+                  {
+                    "description": "administrator or defined security personnel near-realtime"
+                  }
+                ],
                 "guidelines": [
                   {
                     "prose": "personnel or roles to be alerted when malicious code is detected is/are defined;"
diff --git a/dist/content/rev5/baselines/json/FedRAMP_rev5_LI-SaaS-baseline_profile-min.json b/dist/content/rev5/baselines/json/FedRAMP_rev5_LI-SaaS-baseline_profile-min.json
index f4e1cdcbc..9e0cbcaf7 100644
--- a/dist/content/rev5/baselines/json/FedRAMP_rev5_LI-SaaS-baseline_profile-min.json
+++ b/dist/content/rev5/baselines/json/FedRAMP_rev5_LI-SaaS-baseline_profile-min.json
@@ -5,8 +5,8 @@
       "title": "FedRAMP Rev 5 Tailored Low Impact Software as a Service (LI-SaaS) Baseline",
       "published": "2023-08-31T00:00:00Z",
       "last-modified": "2024-01-11T23:40:17Z",
-      "version": "5.1.1+fedramp-20240111-0",
-      "oscal-version": "1.1.1",
+      "version": "5.1.1+fedramp-20240510-0",
+      "oscal-version": "1.1.2",
       "roles": [
         {
           "id": "prepared-by",
@@ -1434,7 +1434,7 @@
           ]
         },
         {
-          "param-id": "si-03_odp.05",
+          "param-id": "si-03_odp.06",
           "constraints": [
             {
               "description": "administrator or defined security personnel near-realtime"
diff --git a/dist/content/rev5/baselines/json/FedRAMP_rev5_LI-SaaS-baseline_profile.json b/dist/content/rev5/baselines/json/FedRAMP_rev5_LI-SaaS-baseline_profile.json
index c0281ff57..596cd6f3c 100644
--- a/dist/content/rev5/baselines/json/FedRAMP_rev5_LI-SaaS-baseline_profile.json
+++ b/dist/content/rev5/baselines/json/FedRAMP_rev5_LI-SaaS-baseline_profile.json
@@ -5,8 +5,8 @@
       "title": "FedRAMP Rev 5 Tailored Low Impact Software as a Service (LI-SaaS) Baseline",
       "published": "2023-08-31T00:00:00Z",
       "last-modified": "2024-01-11T23:40:17Z",
-      "version": "5.1.1+fedramp-20240111-0",
-      "oscal-version": "1.1.1",
+      "version": "5.1.1+fedramp-20240510-0",
+      "oscal-version": "1.1.2",
       "roles": [
         {
           "id": "prepared-by",
@@ -1434,7 +1434,7 @@
           ]
         },
         {
-          "param-id": "si-03_odp.05",
+          "param-id": "si-03_odp.06",
           "constraints": [
             {
               "description": "administrator or defined security personnel near-realtime"
diff --git a/dist/content/rev5/baselines/json/FedRAMP_rev5_LOW-baseline-resolved-profile_catalog-min.json b/dist/content/rev5/baselines/json/FedRAMP_rev5_LOW-baseline-resolved-profile_catalog-min.json
index d51ca93e3..c4c630f97 100644
--- a/dist/content/rev5/baselines/json/FedRAMP_rev5_LOW-baseline-resolved-profile_catalog-min.json
+++ b/dist/content/rev5/baselines/json/FedRAMP_rev5_LOW-baseline-resolved-profile_catalog-min.json
@@ -1,12 +1,12 @@
 {
   "catalog": {
-    "uuid": "f9f1a510-ecb7-459a-91a5-b16cf59f42a0",
+    "uuid": "171e16e0-f8da-47e9-ac5a-8a61e0a55c5e",
     "metadata": {
       "title": "FedRAMP Rev 5 Low Baseline",
       "published": "2023-08-31T00:00:00Z",
-      "last-modified": "2024-03-07T07:56:42.346347-05:00",
-      "version": "5.1.1+fedramp-20240111-0",
-      "oscal-version": "1.1.1",
+      "last-modified": "2024-09-23T17:34:47.137261-04:00",
+      "version": "5.1.1+fedramp-20240510-0",
+      "oscal-version": "1.1.2",
       "links": [
         {
           "href": "FedRAMP_rev5_LOW-baseline_profile.json",
@@ -70818,11 +70818,6 @@
               {
                 "id": "si-03_odp.05",
                 "label": "action",
-                "constraints": [
-                  {
-                    "description": "administrator or defined security personnel near-realtime"
-                  }
-                ],
                 "guidelines": [
                   {
                     "prose": "action to be taken in response to malicious code detection are defined (if selected);"
@@ -70832,6 +70827,11 @@
               {
                 "id": "si-03_odp.06",
                 "label": "personnel or roles",
+                "constraints": [
+                  {
+                    "description": "administrator or defined security personnel near-realtime"
+                  }
+                ],
                 "guidelines": [
                   {
                     "prose": "personnel or roles to be alerted when malicious code is detected is/are defined;"
diff --git a/dist/content/rev5/baselines/json/FedRAMP_rev5_LOW-baseline-resolved-profile_catalog.json b/dist/content/rev5/baselines/json/FedRAMP_rev5_LOW-baseline-resolved-profile_catalog.json
index c854e5985..67d309508 100644
--- a/dist/content/rev5/baselines/json/FedRAMP_rev5_LOW-baseline-resolved-profile_catalog.json
+++ b/dist/content/rev5/baselines/json/FedRAMP_rev5_LOW-baseline-resolved-profile_catalog.json
@@ -1,12 +1,12 @@
 {
   "catalog": {
-    "uuid": "f9f1a510-ecb7-459a-91a5-b16cf59f42a0",
+    "uuid": "171e16e0-f8da-47e9-ac5a-8a61e0a55c5e",
     "metadata": {
       "title": "FedRAMP Rev 5 Low Baseline",
       "published": "2023-08-31T00:00:00Z",
-      "last-modified": "2024-03-07T07:56:42.346347-05:00",
-      "version": "5.1.1+fedramp-20240111-0",
-      "oscal-version": "1.1.1",
+      "last-modified": "2024-09-23T17:34:47.137261-04:00",
+      "version": "5.1.1+fedramp-20240510-0",
+      "oscal-version": "1.1.2",
       "links": [
         {
           "href": "FedRAMP_rev5_LOW-baseline_profile.json",
@@ -70818,11 +70818,6 @@
               {
                 "id": "si-03_odp.05",
                 "label": "action",
-                "constraints": [
-                  {
-                    "description": "administrator or defined security personnel near-realtime"
-                  }
-                ],
                 "guidelines": [
                   {
                     "prose": "action to be taken in response to malicious code detection are defined (if selected);"
@@ -70832,6 +70827,11 @@
               {
                 "id": "si-03_odp.06",
                 "label": "personnel or roles",
+                "constraints": [
+                  {
+                    "description": "administrator or defined security personnel near-realtime"
+                  }
+                ],
                 "guidelines": [
                   {
                     "prose": "personnel or roles to be alerted when malicious code is detected is/are defined;"
diff --git a/dist/content/rev5/baselines/json/FedRAMP_rev5_LOW-baseline_profile-min.json b/dist/content/rev5/baselines/json/FedRAMP_rev5_LOW-baseline_profile-min.json
index f833aae31..e295fcd98 100644
--- a/dist/content/rev5/baselines/json/FedRAMP_rev5_LOW-baseline_profile-min.json
+++ b/dist/content/rev5/baselines/json/FedRAMP_rev5_LOW-baseline_profile-min.json
@@ -5,8 +5,8 @@
       "title": "FedRAMP Rev 5 Low Baseline",
       "published": "2023-08-31T00:00:00Z",
       "last-modified": "2024-01-11T23:40:17Z",
-      "version": "5.1.1+fedramp-20240111-0",
-      "oscal-version": "1.1.1",
+      "version": "5.1.1+fedramp-20240510-0",
+      "oscal-version": "1.1.2",
       "roles": [
         {
           "id": "prepared-by",
@@ -1434,7 +1434,7 @@
           ]
         },
         {
-          "param-id": "si-03_odp.05",
+          "param-id": "si-03_odp.06",
           "constraints": [
             {
               "description": "administrator or defined security personnel near-realtime"
diff --git a/dist/content/rev5/baselines/json/FedRAMP_rev5_LOW-baseline_profile.json b/dist/content/rev5/baselines/json/FedRAMP_rev5_LOW-baseline_profile.json
index 5af23b02f..de0ff6d07 100644
--- a/dist/content/rev5/baselines/json/FedRAMP_rev5_LOW-baseline_profile.json
+++ b/dist/content/rev5/baselines/json/FedRAMP_rev5_LOW-baseline_profile.json
@@ -5,8 +5,8 @@
       "title": "FedRAMP Rev 5 Low Baseline",
       "published": "2023-08-31T00:00:00Z",
       "last-modified": "2024-01-11T23:40:17Z",
-      "version": "5.1.1+fedramp-20240111-0",
-      "oscal-version": "1.1.1",
+      "version": "5.1.1+fedramp-20240510-0",
+      "oscal-version": "1.1.2",
       "roles": [
         {
           "id": "prepared-by",
@@ -1434,7 +1434,7 @@
           ]
         },
         {
-          "param-id": "si-03_odp.05",
+          "param-id": "si-03_odp.06",
           "constraints": [
             {
               "description": "administrator or defined security personnel near-realtime"
diff --git a/dist/content/rev5/baselines/json/FedRAMP_rev5_MODERATE-baseline-resolved-profile_catalog-min.json b/dist/content/rev5/baselines/json/FedRAMP_rev5_MODERATE-baseline-resolved-profile_catalog-min.json
index b80c5528d..20122bae4 100644
--- a/dist/content/rev5/baselines/json/FedRAMP_rev5_MODERATE-baseline-resolved-profile_catalog-min.json
+++ b/dist/content/rev5/baselines/json/FedRAMP_rev5_MODERATE-baseline-resolved-profile_catalog-min.json
@@ -1,12 +1,12 @@
 {
   "catalog": {
-    "uuid": "49927a6c-ecad-4e7e-9f6b-ae3d81c98550",
+    "uuid": "23d101fc-6ea0-4d91-8b93-8f5442a6a363",
     "metadata": {
       "title": "FedRAMP Rev 5 Moderate Baseline",
       "published": "2023-08-31T00:00:00Z",
-      "last-modified": "2024-03-07T07:57:13.170441-05:00",
-      "version": "5.1.1+fedramp-20240111-0",
-      "oscal-version": "1.1.1",
+      "last-modified": "2024-09-23T17:35:17.805747-04:00",
+      "version": "5.1.1+fedramp-20240510-0",
+      "oscal-version": "1.1.2",
       "links": [
         {
           "href": "FedRAMP_rev5_MODERATE-baseline_profile.json",
@@ -108256,11 +108256,6 @@
               {
                 "id": "si-03_odp.05",
                 "label": "action",
-                "constraints": [
-                  {
-                    "description": "administrator or defined security personnel near-realtime"
-                  }
-                ],
                 "guidelines": [
                   {
                     "prose": "action to be taken in response to malicious code detection are defined (if selected);"
@@ -108270,6 +108265,11 @@
               {
                 "id": "si-03_odp.06",
                 "label": "personnel or roles",
+                "constraints": [
+                  {
+                    "description": "administrator or defined security personnel near-realtime"
+                  }
+                ],
                 "guidelines": [
                   {
                     "prose": "personnel or roles to be alerted when malicious code is detected is/are defined;"
diff --git a/dist/content/rev5/baselines/json/FedRAMP_rev5_MODERATE-baseline-resolved-profile_catalog.json b/dist/content/rev5/baselines/json/FedRAMP_rev5_MODERATE-baseline-resolved-profile_catalog.json
index ff7d59208..76a3c4295 100644
--- a/dist/content/rev5/baselines/json/FedRAMP_rev5_MODERATE-baseline-resolved-profile_catalog.json
+++ b/dist/content/rev5/baselines/json/FedRAMP_rev5_MODERATE-baseline-resolved-profile_catalog.json
@@ -1,12 +1,12 @@
 {
   "catalog": {
-    "uuid": "49927a6c-ecad-4e7e-9f6b-ae3d81c98550",
+    "uuid": "23d101fc-6ea0-4d91-8b93-8f5442a6a363",
     "metadata": {
       "title": "FedRAMP Rev 5 Moderate Baseline",
       "published": "2023-08-31T00:00:00Z",
-      "last-modified": "2024-03-07T07:57:13.170441-05:00",
-      "version": "5.1.1+fedramp-20240111-0",
-      "oscal-version": "1.1.1",
+      "last-modified": "2024-09-23T17:35:17.805747-04:00",
+      "version": "5.1.1+fedramp-20240510-0",
+      "oscal-version": "1.1.2",
       "links": [
         {
           "href": "FedRAMP_rev5_MODERATE-baseline_profile.json",
@@ -108256,11 +108256,6 @@
               {
                 "id": "si-03_odp.05",
                 "label": "action",
-                "constraints": [
-                  {
-                    "description": "administrator or defined security personnel near-realtime"
-                  }
-                ],
                 "guidelines": [
                   {
                     "prose": "action to be taken in response to malicious code detection are defined (if selected);"
@@ -108270,6 +108265,11 @@
               {
                 "id": "si-03_odp.06",
                 "label": "personnel or roles",
+                "constraints": [
+                  {
+                    "description": "administrator or defined security personnel near-realtime"
+                  }
+                ],
                 "guidelines": [
                   {
                     "prose": "personnel or roles to be alerted when malicious code is detected is/are defined;"
diff --git a/dist/content/rev5/baselines/json/FedRAMP_rev5_MODERATE-baseline_profile-min.json b/dist/content/rev5/baselines/json/FedRAMP_rev5_MODERATE-baseline_profile-min.json
index a9086ef9c..d75d24f05 100644
--- a/dist/content/rev5/baselines/json/FedRAMP_rev5_MODERATE-baseline_profile-min.json
+++ b/dist/content/rev5/baselines/json/FedRAMP_rev5_MODERATE-baseline_profile-min.json
@@ -5,8 +5,8 @@
       "title": "FedRAMP Rev 5 Moderate Baseline",
       "published": "2023-08-31T00:00:00Z",
       "last-modified": "2024-01-11T23:40:17Z",
-      "version": "5.1.1+fedramp-20240111-0",
-      "oscal-version": "1.1.1",
+      "version": "5.1.1+fedramp-20240510-0",
+      "oscal-version": "1.1.2",
       "roles": [
         {
           "id": "prepared-by",
@@ -2177,7 +2177,7 @@
           ]
         },
         {
-          "param-id": "si-03_odp.05",
+          "param-id": "si-03_odp.06",
           "constraints": [
             {
               "description": "administrator or defined security personnel near-realtime"
diff --git a/dist/content/rev5/baselines/json/FedRAMP_rev5_MODERATE-baseline_profile.json b/dist/content/rev5/baselines/json/FedRAMP_rev5_MODERATE-baseline_profile.json
index d2129af7e..3a1551516 100644
--- a/dist/content/rev5/baselines/json/FedRAMP_rev5_MODERATE-baseline_profile.json
+++ b/dist/content/rev5/baselines/json/FedRAMP_rev5_MODERATE-baseline_profile.json
@@ -5,8 +5,8 @@
       "title": "FedRAMP Rev 5 Moderate Baseline",
       "published": "2023-08-31T00:00:00Z",
       "last-modified": "2024-01-11T23:40:17Z",
-      "version": "5.1.1+fedramp-20240111-0",
-      "oscal-version": "1.1.1",
+      "version": "5.1.1+fedramp-20240510-0",
+      "oscal-version": "1.1.2",
       "roles": [
         {
           "id": "prepared-by",
@@ -2177,7 +2177,7 @@
           ]
         },
         {
-          "param-id": "si-03_odp.05",
+          "param-id": "si-03_odp.06",
           "constraints": [
             {
               "description": "administrator or defined security personnel near-realtime"
diff --git a/dist/content/rev5/baselines/xml/FedRAMP_rev5_HIGH-baseline-resolved-profile_catalog.xml b/dist/content/rev5/baselines/xml/FedRAMP_rev5_HIGH-baseline-resolved-profile_catalog.xml
index 01c11d721..332964912 100644
--- a/dist/content/rev5/baselines/xml/FedRAMP_rev5_HIGH-baseline-resolved-profile_catalog.xml
+++ b/dist/content/rev5/baselines/xml/FedRAMP_rev5_HIGH-baseline-resolved-profile_catalog.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0"
-         uuid="45cd23a3-b191-419a-8929-ae94da2e7c85">
+         uuid="f0ed6557-e5a9-487c-a565-f0917705dc32">
    <metadata>
       <title>FedRAMP Rev 5 High Baseline</title>
       <published>2023-08-31T00:00:00Z</published>
-      <last-modified>2024-03-07T07:55:37.00783-05:00</last-modified>
-      <version>5.1.1+fedramp-20240111-0</version>
-      <oscal-version>1.1.1</oscal-version>
+      <last-modified>2024-09-23T17:33:43.054063-04:00</last-modified>
+      <version>5.1.1+fedramp-20240510-0</version>
+      <oscal-version>1.1.2</oscal-version>
       <link rel="resolution-source" href="FedRAMP_rev5_HIGH-baseline_profile.xml"/>
       <role id="prepared-by">
          <title>Document creator</title>
@@ -52037,17 +52037,17 @@
          </param>
          <param id="si-03_odp.05">
             <label>action</label>
-            <constraint>
-               <description>
-                  <p>administrator or defined security personnel near-realtime</p>
-               </description>
-            </constraint>
             <guideline>
                <p>action to be taken in response to malicious code detection are defined (if selected);</p>
             </guideline>
          </param>
          <param id="si-03_odp.06">
             <label>personnel or roles</label>
+            <constraint>
+               <description>
+                  <p>administrator or defined security personnel near-realtime</p>
+               </description>
+            </constraint>
             <guideline>
                <p>personnel or roles to be alerted when malicious code is detected is/are defined;</p>
             </guideline>
diff --git a/dist/content/rev5/baselines/xml/FedRAMP_rev5_HIGH-baseline_profile.xml b/dist/content/rev5/baselines/xml/FedRAMP_rev5_HIGH-baseline_profile.xml
index df22cdddf..b0e641567 100644
--- a/dist/content/rev5/baselines/xml/FedRAMP_rev5_HIGH-baseline_profile.xml
+++ b/dist/content/rev5/baselines/xml/FedRAMP_rev5_HIGH-baseline_profile.xml
@@ -5,8 +5,8 @@
 		<title>FedRAMP Rev 5 High Baseline</title>
 		<published>2023-08-31T00:00:00Z</published>
 		<last-modified>2024-01-11T23:40:17Z</last-modified>
-		<version>5.1.1+fedramp-20240111-0</version>
-		<oscal-version>1.1.1</oscal-version>
+		<version>5.1.1+fedramp-20240510-0</version>
+		<oscal-version>1.1.2</oscal-version>
 		<role id="prepared-by">
 			<title>Document creator</title>
 		</role>
@@ -2261,7 +2261,7 @@
 				</description>
 			</constraint>
 		</set-parameter>
-		<set-parameter param-id="si-03_odp.05">
+		<set-parameter param-id="si-03_odp.06">
 			<constraint>
 				<description>
 					<p>administrator or defined security personnel near-realtime</p>
diff --git a/dist/content/rev5/baselines/xml/FedRAMP_rev5_LI-SaaS-baseline-resolved-profile_catalog.xml b/dist/content/rev5/baselines/xml/FedRAMP_rev5_LI-SaaS-baseline-resolved-profile_catalog.xml
index f853e8fbc..fe449d283 100644
--- a/dist/content/rev5/baselines/xml/FedRAMP_rev5_LI-SaaS-baseline-resolved-profile_catalog.xml
+++ b/dist/content/rev5/baselines/xml/FedRAMP_rev5_LI-SaaS-baseline-resolved-profile_catalog.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0"
-         uuid="c82aaef5-4ec7-48bc-830c-222910423aeb">
+         uuid="69c30416-200b-4d79-aa9d-60989450a0df">
    <metadata>
       <title>FedRAMP Rev 5 Tailored Low Impact Software as a Service (LI-SaaS) Baseline</title>
       <published>2023-08-31T00:00:00Z</published>
-      <last-modified>2024-03-07T07:56:24.04219-05:00</last-modified>
-      <version>5.1.1+fedramp-20240111-0</version>
-      <oscal-version>1.1.1</oscal-version>
+      <last-modified>2024-09-23T17:34:28.746238-04:00</last-modified>
+      <version>5.1.1+fedramp-20240510-0</version>
+      <oscal-version>1.1.2</oscal-version>
       <link rel="resolution-source"
             href="FedRAMP_rev5_LI-SaaS-baseline_profile.xml"/>
       <role id="prepared-by">
@@ -14634,17 +14634,17 @@
          </param>
          <param id="si-03_odp.05">
             <label>action</label>
-            <constraint>
-               <description>
-                  <p>administrator or defined security personnel near-realtime</p>
-               </description>
-            </constraint>
             <guideline>
                <p>action to be taken in response to malicious code detection are defined (if selected);</p>
             </guideline>
          </param>
          <param id="si-03_odp.06">
             <label>personnel or roles</label>
+            <constraint>
+               <description>
+                  <p>administrator or defined security personnel near-realtime</p>
+               </description>
+            </constraint>
             <guideline>
                <p>personnel or roles to be alerted when malicious code is detected is/are defined;</p>
             </guideline>
diff --git a/dist/content/rev5/baselines/xml/FedRAMP_rev5_LI-SaaS-baseline_profile.xml b/dist/content/rev5/baselines/xml/FedRAMP_rev5_LI-SaaS-baseline_profile.xml
index 1ff3d5693..3fa720ccd 100644
--- a/dist/content/rev5/baselines/xml/FedRAMP_rev5_LI-SaaS-baseline_profile.xml
+++ b/dist/content/rev5/baselines/xml/FedRAMP_rev5_LI-SaaS-baseline_profile.xml
@@ -5,8 +5,8 @@
         <title>FedRAMP Rev 5 Tailored Low Impact Software as a Service (LI-SaaS) Baseline</title>
         <published>2023-08-31T00:00:00Z</published>
         <last-modified>2024-01-11T23:40:17Z</last-modified>
-        <version>5.1.1+fedramp-20240111-0</version>
-        <oscal-version>1.1.1</oscal-version>
+        <version>5.1.1+fedramp-20240510-0</version>
+        <oscal-version>1.1.2</oscal-version>
         <role id="prepared-by">
             <title>Document creator</title>
         </role>
@@ -1239,7 +1239,7 @@
                 </description>
             </constraint>
         </set-parameter>
-        <set-parameter param-id="si-03_odp.05">
+        <set-parameter param-id="si-03_odp.06">
             <constraint>
                 <description>
                     <p>administrator or defined security personnel near-realtime</p>
diff --git a/dist/content/rev5/baselines/xml/FedRAMP_rev5_LOW-baseline-resolved-profile_catalog.xml b/dist/content/rev5/baselines/xml/FedRAMP_rev5_LOW-baseline-resolved-profile_catalog.xml
index 542a5724e..ffea1c66a 100644
--- a/dist/content/rev5/baselines/xml/FedRAMP_rev5_LOW-baseline-resolved-profile_catalog.xml
+++ b/dist/content/rev5/baselines/xml/FedRAMP_rev5_LOW-baseline-resolved-profile_catalog.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0"
-         uuid="f9f1a510-ecb7-459a-91a5-b16cf59f42a0">
+         uuid="171e16e0-f8da-47e9-ac5a-8a61e0a55c5e">
    <metadata>
       <title>FedRAMP Rev 5 Low Baseline</title>
       <published>2023-08-31T00:00:00Z</published>
-      <last-modified>2024-03-07T07:56:42.346347-05:00</last-modified>
-      <version>5.1.1+fedramp-20240111-0</version>
-      <oscal-version>1.1.1</oscal-version>
+      <last-modified>2024-09-23T17:34:47.137261-04:00</last-modified>
+      <version>5.1.1+fedramp-20240510-0</version>
+      <oscal-version>1.1.2</oscal-version>
       <link rel="resolution-source" href="FedRAMP_rev5_LOW-baseline_profile.xml"/>
       <role id="prepared-by">
          <title>Document creator</title>
@@ -28498,17 +28498,17 @@
          </param>
          <param id="si-03_odp.05">
             <label>action</label>
-            <constraint>
-               <description>
-                  <p>administrator or defined security personnel near-realtime</p>
-               </description>
-            </constraint>
             <guideline>
                <p>action to be taken in response to malicious code detection are defined (if selected);</p>
             </guideline>
          </param>
          <param id="si-03_odp.06">
             <label>personnel or roles</label>
+            <constraint>
+               <description>
+                  <p>administrator or defined security personnel near-realtime</p>
+               </description>
+            </constraint>
             <guideline>
                <p>personnel or roles to be alerted when malicious code is detected is/are defined;</p>
             </guideline>
diff --git a/dist/content/rev5/baselines/xml/FedRAMP_rev5_LOW-baseline_profile.xml b/dist/content/rev5/baselines/xml/FedRAMP_rev5_LOW-baseline_profile.xml
index f5114d968..a3d8e6a51 100644
--- a/dist/content/rev5/baselines/xml/FedRAMP_rev5_LOW-baseline_profile.xml
+++ b/dist/content/rev5/baselines/xml/FedRAMP_rev5_LOW-baseline_profile.xml
@@ -5,8 +5,8 @@
         <title>FedRAMP Rev 5 Low Baseline</title>
         <published>2023-08-31T00:00:00Z</published>
         <last-modified>2024-01-11T23:40:17Z</last-modified>
-        <version>5.1.1+fedramp-20240111-0</version>
-        <oscal-version>1.1.1</oscal-version>
+        <version>5.1.1+fedramp-20240510-0</version>
+        <oscal-version>1.1.2</oscal-version>
         <role id="prepared-by">
             <title>Document creator</title>
         </role>
@@ -1239,7 +1239,7 @@
                 </description>
             </constraint>
         </set-parameter>
-        <set-parameter param-id="si-03_odp.05">
+        <set-parameter param-id="si-03_odp.06">
             <constraint>
                 <description>
                     <p>administrator or defined security personnel near-realtime</p>
diff --git a/dist/content/rev5/baselines/xml/FedRAMP_rev5_MODERATE-baseline-resolved-profile_catalog.xml b/dist/content/rev5/baselines/xml/FedRAMP_rev5_MODERATE-baseline-resolved-profile_catalog.xml
index 79d56d5d8..d4b6df67a 100644
--- a/dist/content/rev5/baselines/xml/FedRAMP_rev5_MODERATE-baseline-resolved-profile_catalog.xml
+++ b/dist/content/rev5/baselines/xml/FedRAMP_rev5_MODERATE-baseline-resolved-profile_catalog.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0"
-         uuid="49927a6c-ecad-4e7e-9f6b-ae3d81c98550">
+         uuid="23d101fc-6ea0-4d91-8b93-8f5442a6a363">
    <metadata>
       <title>FedRAMP Rev 5 Moderate Baseline</title>
       <published>2023-08-31T00:00:00Z</published>
-      <last-modified>2024-03-07T07:57:13.170441-05:00</last-modified>
-      <version>5.1.1+fedramp-20240111-0</version>
-      <oscal-version>1.1.1</oscal-version>
+      <last-modified>2024-09-23T17:35:17.805747-04:00</last-modified>
+      <version>5.1.1+fedramp-20240510-0</version>
+      <oscal-version>1.1.2</oscal-version>
       <link rel="resolution-source"
             href="FedRAMP_rev5_MODERATE-baseline_profile.xml"/>
       <role id="prepared-by">
@@ -44633,17 +44633,17 @@
          </param>
          <param id="si-03_odp.05">
             <label>action</label>
-            <constraint>
-               <description>
-                  <p>administrator or defined security personnel near-realtime</p>
-               </description>
-            </constraint>
             <guideline>
                <p>action to be taken in response to malicious code detection are defined (if selected);</p>
             </guideline>
          </param>
          <param id="si-03_odp.06">
             <label>personnel or roles</label>
+            <constraint>
+               <description>
+                  <p>administrator or defined security personnel near-realtime</p>
+               </description>
+            </constraint>
             <guideline>
                <p>personnel or roles to be alerted when malicious code is detected is/are defined;</p>
             </guideline>
diff --git a/dist/content/rev5/baselines/xml/FedRAMP_rev5_MODERATE-baseline_profile.xml b/dist/content/rev5/baselines/xml/FedRAMP_rev5_MODERATE-baseline_profile.xml
index fde0a96bb..5f7923a33 100644
--- a/dist/content/rev5/baselines/xml/FedRAMP_rev5_MODERATE-baseline_profile.xml
+++ b/dist/content/rev5/baselines/xml/FedRAMP_rev5_MODERATE-baseline_profile.xml
@@ -5,8 +5,8 @@
 		<title>FedRAMP Rev 5 Moderate Baseline</title>
 		<published>2023-08-31T00:00:00Z</published>
 		<last-modified>2024-01-11T23:40:17Z</last-modified>
-		<version>5.1.1+fedramp-20240111-0</version>
-		<oscal-version>1.1.1</oscal-version>
+		<version>5.1.1+fedramp-20240510-0</version>
+		<oscal-version>1.1.2</oscal-version>
 		<role id="prepared-by">
 			<title>Document creator</title>
 		</role>
@@ -1938,7 +1938,7 @@
 				</description>
 			</constraint>
 		</set-parameter>
-		<set-parameter param-id="si-03_odp.05">
+		<set-parameter param-id="si-03_odp.06">
 			<constraint>
 				<description>
 					<p>administrator or defined security personnel near-realtime</p>
diff --git a/dist/content/rev5/baselines/yaml/FedRAMP_rev5_HIGH-baseline-resolved-profile_catalog.yaml b/dist/content/rev5/baselines/yaml/FedRAMP_rev5_HIGH-baseline-resolved-profile_catalog.yaml
index 5aced646e..c1ac45e30 100644
--- a/dist/content/rev5/baselines/yaml/FedRAMP_rev5_HIGH-baseline-resolved-profile_catalog.yaml
+++ b/dist/content/rev5/baselines/yaml/FedRAMP_rev5_HIGH-baseline-resolved-profile_catalog.yaml
@@ -1,12 +1,12 @@
 ---
 catalog:
-  uuid: 45cd23a3-b191-419a-8929-ae94da2e7c85
+  uuid: f0ed6557-e5a9-487c-a565-f0917705dc32
   metadata:
     title: FedRAMP Rev 5 High Baseline
     published: 2023-08-31T00:00:00Z
-    last-modified: 2024-03-07T07:55:37.00783-05:00
-    version: 5.1.1+fedramp-20240111-0
-    oscal-version: 1.1.1
+    last-modified: 2024-09-23T17:33:43.054063-04:00
+    version: 5.1.1+fedramp-20240510-0
+    oscal-version: 1.1.2
     links:
       - href: FedRAMP_rev5_HIGH-baseline_profile.yaml
         rel: resolution-source
@@ -91627,13 +91627,13 @@ catalog:
                   - "take {{ insert: param, si-03_odp.05 }} "
             - id: si-03_odp.05
               label: action
-              constraints:
-                - description: administrator or defined security personnel near-realtime
               guidelines:
                 - prose: action to be taken in response to malicious code detection
                     are defined (if selected);
             - id: si-03_odp.06
               label: personnel or roles
+              constraints:
+                - description: administrator or defined security personnel near-realtime
               guidelines:
                 - prose: personnel or roles to be alerted when malicious code is detected
                     is/are defined;
diff --git a/dist/content/rev5/baselines/yaml/FedRAMP_rev5_HIGH-baseline_profile.yaml b/dist/content/rev5/baselines/yaml/FedRAMP_rev5_HIGH-baseline_profile.yaml
index ebd5934db..08b9f907c 100644
--- a/dist/content/rev5/baselines/yaml/FedRAMP_rev5_HIGH-baseline_profile.yaml
+++ b/dist/content/rev5/baselines/yaml/FedRAMP_rev5_HIGH-baseline_profile.yaml
@@ -5,8 +5,8 @@ profile:
     title: FedRAMP Rev 5 High Baseline
     published: 2023-08-31T00:00:00Z
     last-modified: 2024-01-11T23:40:17Z
-    version: 5.1.1+fedramp-20240111-0
-    oscal-version: 1.1.1
+    version: 5.1.1+fedramp-20240510-0
+    oscal-version: 1.1.2
     roles:
       - id: prepared-by
         title: Document creator
@@ -1332,7 +1332,7 @@ profile:
       - param-id: si-03_odp.04
         constraints:
           - description: to include blocking and quarantining malicious code
-      - param-id: si-03_odp.05
+      - param-id: si-03_odp.06
         constraints:
           - description: administrator or defined security personnel near-realtime
       - param-id: si-4.4_prm_1
diff --git a/dist/content/rev5/baselines/yaml/FedRAMP_rev5_LI-SaaS-baseline-resolved-profile_catalog.yaml b/dist/content/rev5/baselines/yaml/FedRAMP_rev5_LI-SaaS-baseline-resolved-profile_catalog.yaml
index 7a60aa77b..6d8979245 100644
--- a/dist/content/rev5/baselines/yaml/FedRAMP_rev5_LI-SaaS-baseline-resolved-profile_catalog.yaml
+++ b/dist/content/rev5/baselines/yaml/FedRAMP_rev5_LI-SaaS-baseline-resolved-profile_catalog.yaml
@@ -1,12 +1,12 @@
 ---
 catalog:
-  uuid: c82aaef5-4ec7-48bc-830c-222910423aeb
+  uuid: 69c30416-200b-4d79-aa9d-60989450a0df
   metadata:
     title: FedRAMP Rev 5 Tailored Low Impact Software as a Service (LI-SaaS) Baseline
     published: 2023-08-31T00:00:00Z
-    last-modified: 2024-03-07T07:56:24.04219-05:00
-    version: 5.1.1+fedramp-20240111-0
-    oscal-version: 1.1.1
+    last-modified: 2024-09-23T17:34:28.746238-04:00
+    version: 5.1.1+fedramp-20240510-0
+    oscal-version: 1.1.2
     links:
       - href: FedRAMP_rev5_LI-SaaS-baseline_profile.yaml
         rel: resolution-source
@@ -26634,13 +26634,13 @@ catalog:
                   - "take {{ insert: param, si-03_odp.05 }} "
             - id: si-03_odp.05
               label: action
-              constraints:
-                - description: administrator or defined security personnel near-realtime
               guidelines:
                 - prose: action to be taken in response to malicious code detection
                     are defined (if selected);
             - id: si-03_odp.06
               label: personnel or roles
+              constraints:
+                - description: administrator or defined security personnel near-realtime
               guidelines:
                 - prose: personnel or roles to be alerted when malicious code is detected
                     is/are defined;
diff --git a/dist/content/rev5/baselines/yaml/FedRAMP_rev5_LI-SaaS-baseline_profile.yaml b/dist/content/rev5/baselines/yaml/FedRAMP_rev5_LI-SaaS-baseline_profile.yaml
index 40c83ae3e..2e5449455 100644
--- a/dist/content/rev5/baselines/yaml/FedRAMP_rev5_LI-SaaS-baseline_profile.yaml
+++ b/dist/content/rev5/baselines/yaml/FedRAMP_rev5_LI-SaaS-baseline_profile.yaml
@@ -5,8 +5,8 @@ profile:
     title: FedRAMP Rev 5 Tailored Low Impact Software as a Service (LI-SaaS) Baseline
     published: 2023-08-31T00:00:00Z
     last-modified: 2024-01-11T23:40:17Z
-    version: 5.1.1+fedramp-20240111-0
-    oscal-version: 1.1.1
+    version: 5.1.1+fedramp-20240510-0
+    oscal-version: 1.1.2
     roles:
       - id: prepared-by
         title: Document creator
@@ -694,7 +694,7 @@ profile:
       - param-id: si-03_odp.04
         constraints:
           - description: to include blocking and quarantining malicious code
-      - param-id: si-03_odp.05
+      - param-id: si-03_odp.06
         constraints:
           - description: administrator or defined security personnel near-realtime
       - param-id: si-05_odp.01
diff --git a/dist/content/rev5/baselines/yaml/FedRAMP_rev5_LOW-baseline-resolved-profile_catalog.yaml b/dist/content/rev5/baselines/yaml/FedRAMP_rev5_LOW-baseline-resolved-profile_catalog.yaml
index de1e19b1b..f2b71be92 100644
--- a/dist/content/rev5/baselines/yaml/FedRAMP_rev5_LOW-baseline-resolved-profile_catalog.yaml
+++ b/dist/content/rev5/baselines/yaml/FedRAMP_rev5_LOW-baseline-resolved-profile_catalog.yaml
@@ -1,12 +1,12 @@
 ---
 catalog:
-  uuid: f9f1a510-ecb7-459a-91a5-b16cf59f42a0
+  uuid: 171e16e0-f8da-47e9-ac5a-8a61e0a55c5e
   metadata:
     title: FedRAMP Rev 5 Low Baseline
     published: 2023-08-31T00:00:00Z
-    last-modified: 2024-03-07T07:56:42.346347-05:00
-    version: 5.1.1+fedramp-20240111-0
-    oscal-version: 1.1.1
+    last-modified: 2024-09-23T17:34:47.137261-04:00
+    version: 5.1.1+fedramp-20240510-0
+    oscal-version: 1.1.2
     links:
       - href: FedRAMP_rev5_LOW-baseline_profile.yaml
         rel: resolution-source
@@ -49273,13 +49273,13 @@ catalog:
                   - "take {{ insert: param, si-03_odp.05 }} "
             - id: si-03_odp.05
               label: action
-              constraints:
-                - description: administrator or defined security personnel near-realtime
               guidelines:
                 - prose: action to be taken in response to malicious code detection
                     are defined (if selected);
             - id: si-03_odp.06
               label: personnel or roles
+              constraints:
+                - description: administrator or defined security personnel near-realtime
               guidelines:
                 - prose: personnel or roles to be alerted when malicious code is detected
                     is/are defined;
diff --git a/dist/content/rev5/baselines/yaml/FedRAMP_rev5_LOW-baseline_profile.yaml b/dist/content/rev5/baselines/yaml/FedRAMP_rev5_LOW-baseline_profile.yaml
index 1f1f1eb1a..fc00d0c06 100644
--- a/dist/content/rev5/baselines/yaml/FedRAMP_rev5_LOW-baseline_profile.yaml
+++ b/dist/content/rev5/baselines/yaml/FedRAMP_rev5_LOW-baseline_profile.yaml
@@ -5,8 +5,8 @@ profile:
     title: FedRAMP Rev 5 Low Baseline
     published: 2023-08-31T00:00:00Z
     last-modified: 2024-01-11T23:40:17Z
-    version: 5.1.1+fedramp-20240111-0
-    oscal-version: 1.1.1
+    version: 5.1.1+fedramp-20240510-0
+    oscal-version: 1.1.2
     roles:
       - id: prepared-by
         title: Document creator
@@ -694,7 +694,7 @@ profile:
       - param-id: si-03_odp.04
         constraints:
           - description: to include blocking and quarantining malicious code
-      - param-id: si-03_odp.05
+      - param-id: si-03_odp.06
         constraints:
           - description: administrator or defined security personnel near-realtime
       - param-id: si-05_odp.01
diff --git a/dist/content/rev5/baselines/yaml/FedRAMP_rev5_MODERATE-baseline-resolved-profile_catalog.yaml b/dist/content/rev5/baselines/yaml/FedRAMP_rev5_MODERATE-baseline-resolved-profile_catalog.yaml
index 3cc93888c..72be9c4de 100644
--- a/dist/content/rev5/baselines/yaml/FedRAMP_rev5_MODERATE-baseline-resolved-profile_catalog.yaml
+++ b/dist/content/rev5/baselines/yaml/FedRAMP_rev5_MODERATE-baseline-resolved-profile_catalog.yaml
@@ -1,12 +1,12 @@
 ---
 catalog:
-  uuid: 49927a6c-ecad-4e7e-9f6b-ae3d81c98550
+  uuid: 23d101fc-6ea0-4d91-8b93-8f5442a6a363
   metadata:
     title: FedRAMP Rev 5 Moderate Baseline
     published: 2023-08-31T00:00:00Z
-    last-modified: 2024-03-07T07:57:13.170441-05:00
-    version: 5.1.1+fedramp-20240111-0
-    oscal-version: 1.1.1
+    last-modified: 2024-09-23T17:35:17.805747-04:00
+    version: 5.1.1+fedramp-20240510-0
+    oscal-version: 1.1.2
     links:
       - href: FedRAMP_rev5_MODERATE-baseline_profile.yaml
         rel: resolution-source
@@ -77990,13 +77990,13 @@ catalog:
                   - "take {{ insert: param, si-03_odp.05 }} "
             - id: si-03_odp.05
               label: action
-              constraints:
-                - description: administrator or defined security personnel near-realtime
               guidelines:
                 - prose: action to be taken in response to malicious code detection
                     are defined (if selected);
             - id: si-03_odp.06
               label: personnel or roles
+              constraints:
+                - description: administrator or defined security personnel near-realtime
               guidelines:
                 - prose: personnel or roles to be alerted when malicious code is detected
                     is/are defined;
diff --git a/dist/content/rev5/baselines/yaml/FedRAMP_rev5_MODERATE-baseline_profile.yaml b/dist/content/rev5/baselines/yaml/FedRAMP_rev5_MODERATE-baseline_profile.yaml
index bf17056bf..94d351ad8 100644
--- a/dist/content/rev5/baselines/yaml/FedRAMP_rev5_MODERATE-baseline_profile.yaml
+++ b/dist/content/rev5/baselines/yaml/FedRAMP_rev5_MODERATE-baseline_profile.yaml
@@ -5,8 +5,8 @@ profile:
     title: FedRAMP Rev 5 Moderate Baseline
     published: 2023-08-31T00:00:00Z
     last-modified: 2024-01-11T23:40:17Z
-    version: 5.1.1+fedramp-20240111-0
-    oscal-version: 1.1.1
+    version: 5.1.1+fedramp-20240510-0
+    oscal-version: 1.1.2
     roles:
       - id: prepared-by
         title: Document creator
@@ -1106,7 +1106,7 @@ profile:
       - param-id: si-03_odp.04
         constraints:
           - description: to include blocking and quarantining malicious code
-      - param-id: si-03_odp.05
+      - param-id: si-03_odp.06
         constraints:
           - description: administrator or defined security personnel near-realtime
       - param-id: si-4.4_prm_1