diff --git a/docs/api/apiv3/components/examples/portfolio.yml b/docs/api/apiv3/components/examples/portfolio.yml
index 488e4f221dc..17ade74a9ac 100644
--- a/docs/api/apiv3/components/examples/portfolio.yml
+++ b/docs/api/apiv3/components/examples/portfolio.yml
@@ -54,3 +54,4 @@ value:
   createdAt: '2014-05-21T08:51:20.396Z'
   updatedAt: '2014-05-21T08:51:20.396Z'
   customField123: 123
+  customComment123: Why is the value 123?
diff --git a/docs/api/apiv3/components/examples/portfolio_body.yml b/docs/api/apiv3/components/examples/portfolio_body.yml
index 908df4144ee..a0e3622312b 100644
--- a/docs/api/apiv3/components/examples/portfolio_body.yml
+++ b/docs/api/apiv3/components/examples/portfolio_body.yml
@@ -7,6 +7,7 @@ value:
   description:
     raw: Lorem **ipsum** dolor sit amet
   customField123: 123
+  customComment123: Because it is 123!
   _links:
     parent:
       href: "/api/v3/portfolios/123"
diff --git a/docs/api/apiv3/components/examples/program.yml b/docs/api/apiv3/components/examples/program.yml
index a43e74f1a87..137edbac77e 100644
--- a/docs/api/apiv3/components/examples/program.yml
+++ b/docs/api/apiv3/components/examples/program.yml
@@ -54,3 +54,4 @@ value:
   createdAt: '2014-05-21T08:51:20.396Z'
   updatedAt: '2014-05-21T08:51:20.396Z'
   customField123: 123
+  customComment123: Why is the value 123?
diff --git a/docs/api/apiv3/components/examples/program_body.yml b/docs/api/apiv3/components/examples/program_body.yml
index 41d26bd80dd..ee52497bf4f 100644
--- a/docs/api/apiv3/components/examples/program_body.yml
+++ b/docs/api/apiv3/components/examples/program_body.yml
@@ -7,6 +7,7 @@ value:
   description:
     raw: Lorem **ipsum** dolor sit amet
   customField123: 123
+  customComment123: Because it is 123!
   _links:
     parent:
       href: "/api/v3/programs/123"
diff --git a/docs/api/apiv3/components/examples/project.yml b/docs/api/apiv3/components/examples/project.yml
index e1a6f7645b5..3b6d8a19480 100644
--- a/docs/api/apiv3/components/examples/project.yml
+++ b/docs/api/apiv3/components/examples/project.yml
@@ -54,3 +54,4 @@ value:
   createdAt: '2014-05-21T08:51:20.396Z'
   updatedAt: '2014-05-21T08:51:20.396Z'
   customField123: 123
+  customComment123: Why is the value 123?
diff --git a/docs/api/apiv3/components/examples/project_body.yml b/docs/api/apiv3/components/examples/project_body.yml
index 2ffe05a6934..2d1584220ca 100644
--- a/docs/api/apiv3/components/examples/project_body.yml
+++ b/docs/api/apiv3/components/examples/project_body.yml
@@ -7,6 +7,7 @@ value:
   description:
     raw: Lorem **ipsum** dolor sit amet
   customField123: 123
+  customComment123: Because it is 123!
   _links:
     parent:
       href: "/api/v3/projects/123"
diff --git a/docs/api/apiv3/components/schemas/portfolio_model.yml b/docs/api/apiv3/components/schemas/portfolio_model.yml
index 3dc4a8f0543..1e8191e4c40 100644
--- a/docs/api/apiv3/components/schemas/portfolio_model.yml
+++ b/docs/api/apiv3/components/schemas/portfolio_model.yml
@@ -2,6 +2,7 @@
 ---
 allOf:
   - $ref: "./custom_field_properties.yml"
+  - $ref: "./custom_comment_properties.yml"
   - type: object
     properties:
       _type:
diff --git a/docs/api/apiv3/components/schemas/program_model.yml b/docs/api/apiv3/components/schemas/program_model.yml
index 30456506735..1abe73e4e0d 100644
--- a/docs/api/apiv3/components/schemas/program_model.yml
+++ b/docs/api/apiv3/components/schemas/program_model.yml
@@ -2,6 +2,7 @@
 ---
 allOf:
   - $ref: "./custom_field_properties.yml"
+  - $ref: "./custom_comment_properties.yml"
   - type: object
     properties:
       _type:
diff --git a/docs/api/apiv3/components/schemas/project_model.yml b/docs/api/apiv3/components/schemas/project_model.yml
index 32019ebd708..4a1c3fd3871 100644
--- a/docs/api/apiv3/components/schemas/project_model.yml
+++ b/docs/api/apiv3/components/schemas/project_model.yml
@@ -2,6 +2,7 @@
 ---
 allOf:
   - $ref: "./custom_field_properties.yml"
+  - $ref: "./custom_comment_properties.yml"
   - type: object
     properties:
       _type:
diff --git a/docs/api/apiv3/components/schemas/workspaces_schema_model.yml b/docs/api/apiv3/components/schemas/workspaces_schema_model.yml
index ab2bd48316d..3ecfab3bcca 100644
--- a/docs/api/apiv3/components/schemas/workspaces_schema_model.yml
+++ b/docs/api/apiv3/components/schemas/workspaces_schema_model.yml
@@ -96,6 +96,8 @@ properties:
 patternProperties:
   "^customField\\d+$":
     $ref: './schema_property_model.yml'
+  "^customComment\\d+$":
+    $ref: './schema_property_model.yml'
 
 example:
   _type: Schema
@@ -232,6 +234,12 @@ example:
     hasDefault: false
     writable: true
     visibility: default
+  customComment35:
+    type: String
+    name: Text project custom field comment
+    required: false
+    hasDefault: false
+    writable: true
   _links:
     self:
       href: "/api/v3/workspaces/schema"