diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module
index 16949ff..002621d 100644
--- a/core/modules/comment/comment.module
+++ b/core/modules/comment/comment.module
@@ -741,6 +741,9 @@ function comment_preprocess_field(&$variables) {
     // Append additional attributes (eg. RDFa) from the first field item.
     $variables['attributes'] += $variables['items'][0]['attributes']->storage();
 
+    // Get comment form heading.
+    $variables['form_heading'] = $element[0]['#comment_form_heading'];
+
     // Create separate variables for the comments and comment form.
     $variables['comments'] = $element[0]['comments'];
     $variables['comment_form'] = $element[0]['comment_form'];
diff --git a/core/modules/comment/config/schema/comment.schema.yml b/core/modules/comment/config/schema/comment.schema.yml
index a55488a..0b51ce8 100644
--- a/core/modules/comment/config/schema/comment.schema.yml
+++ b/core/modules/comment/config/schema/comment.schema.yml
@@ -54,6 +54,9 @@ comment.type.*:
     description:
       type: text
       label: 'Description'
+    form_heading:
+      type: label
+      label: 'Form heading'
 
 field.storage_settings.comment:
   type: mapping
diff --git a/core/modules/comment/src/CommentTypeForm.php b/core/modules/comment/src/CommentTypeForm.php
index 9cb147f..5736a5f 100644
--- a/core/modules/comment/src/CommentTypeForm.php
+++ b/core/modules/comment/src/CommentTypeForm.php
@@ -95,6 +95,13 @@ public function form(array $form, FormStateInterface $form_state) {
       '#title' => t('Description'),
     ];
 
+    $form['form_heading'] = [
+      '#type' => 'textfield',
+      '#title' => t('Form heading'),
+      '#maxlength' => 255,
+      '#default_value' => $comment_type->getFormHeading(),
+    ];
+
     if ($comment_type->isNew()) {
       $options = [];
       foreach ($this->entityManager->getDefinitions() as $entity_type) {
diff --git a/core/modules/comment/src/CommentTypeInterface.php b/core/modules/comment/src/CommentTypeInterface.php
index acde96c..591ce51 100644
--- a/core/modules/comment/src/CommentTypeInterface.php
+++ b/core/modules/comment/src/CommentTypeInterface.php
@@ -28,6 +28,24 @@ public function getDescription();
   public function setDescription($description);
 
   /**
+   * Returns the comment type form heading.
+   *
+   * @return string
+   *   The comment-type form heading.
+   */
+  public function getFormHeading();
+
+  /**
+   * Sets the form heading of the comment type.
+   *
+   * @param string $form_heading
+   *   The new form heading.
+   *
+   * @return $this
+   */
+  public function setFormHeading($form_heading);
+
+  /**
    * Gets the target entity type id for this comment type.
    *
    * @return string
diff --git a/core/modules/comment/src/Entity/CommentType.php b/core/modules/comment/src/Entity/CommentType.php
index a773c58..e0187fc 100644
--- a/core/modules/comment/src/Entity/CommentType.php
+++ b/core/modules/comment/src/Entity/CommentType.php
@@ -44,6 +44,7 @@
  *     "label",
  *     "target_entity_type_id",
  *     "description",
+ *     "form_heading",
  *   }
  * )
  */
@@ -71,6 +72,13 @@ class CommentType extends ConfigEntityBundleBase implements CommentTypeInterface
   protected $description;
 
   /**
+   * The form heading of the comment type.
+   *
+   * @var string
+   */
+  protected $form_heading = '';
+
+  /**
    * The target entity type.
    *
    * @var string
@@ -95,6 +103,21 @@ public function setDescription($description) {
   /**
    * {@inheritdoc}
    */
+  public function getFormHeading() {
+    return $this->form_heading;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setFormHeading($form_heading) {
+    $this->form_heading = $form_heading;
+    return $this;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
   public function getTargetEntityTypeId() {
     return $this->target_entity_type_id;
   }
diff --git a/core/modules/comment/src/Plugin/Field/FieldFormatter/CommentDefaultFormatter.php b/core/modules/comment/src/Plugin/Field/FieldFormatter/CommentDefaultFormatter.php
index b03accc..310bca7 100644
--- a/core/modules/comment/src/Plugin/Field/FieldFormatter/CommentDefaultFormatter.php
+++ b/core/modules/comment/src/Plugin/Field/FieldFormatter/CommentDefaultFormatter.php
@@ -14,6 +14,7 @@
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\Core\Routing\RouteMatchInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
+use Drupal\comment\Entity\CommentType;
 
 /**
  * Provides a default comment formatter.
@@ -203,9 +204,11 @@ public function viewElements(FieldItemListInterface $items, $langcode) {
         }
       }
 
+      $comment_type = CommentType::load($this->getFieldSetting('comment_type'));
       $elements[] = $output + [
         '#comment_type' => $this->getFieldSetting('comment_type'),
         '#comment_display_mode' => $this->getFieldSetting('default_mode'),
+        '#comment_form_heading' => $comment_type->getFormHeading(),
         'comments' => [],
         'comment_form' => [],
       ];
diff --git a/core/modules/comment/src/Tests/CommentTestTrait.php b/core/modules/comment/src/Tests/CommentTestTrait.php
index 038a3df..6f7bec4 100644
--- a/core/modules/comment/src/Tests/CommentTestTrait.php
+++ b/core/modules/comment/src/Tests/CommentTestTrait.php
@@ -47,6 +47,7 @@ public function addDefaultCommentField($entity_type, $bundle, $field_name = 'com
         'id' => $comment_type_id,
         'label' => Unicode::ucfirst($comment_type_id),
         'target_entity_type_id' => $entity_type,
+        'form_heading' => 'Add new comment',
         'description' => 'Default comment field',
       ])->save();
     }
diff --git a/core/modules/comment/templates/field--comment.html.twig b/core/modules/comment/templates/field--comment.html.twig
index 879f4d5..a3b168e 100644
--- a/core/modules/comment/templates/field--comment.html.twig
+++ b/core/modules/comment/templates/field--comment.html.twig
@@ -14,7 +14,8 @@
  *   be displayed after the main title tag that appears in the template.
  * - comments: List of comments rendered through comment.html.twig.
  * - content_attributes: HTML attributes for the form title.
- * - comment_form: The 'Add new comment' form.
+ * - comment_form: The form to add new comment.
+ * - form_heading: The heading for comment form.
  * - comment_display_mode: Is the comments are threaded.
  * - comment_type: The comment type bundle ID for the comment field.
  * - entity_type: The entity type to which the field belongs.
@@ -36,7 +37,7 @@
   {{ comments }}
 
   {% if comment_form %}
-    <h2{{ content_attributes }}>{{ 'Add new comment'|t }}</h2>
+    <h2{{ content_attributes }}>{{ form_heading }}</h2>
     {{ comment_form }}
   {% endif %}
 
diff --git a/core/profiles/standard/config/install/comment.type.comment.yml b/core/profiles/standard/config/install/comment.type.comment.yml
index ddcbbc9..18b7325 100644
--- a/core/profiles/standard/config/install/comment.type.comment.yml
+++ b/core/profiles/standard/config/install/comment.type.comment.yml
@@ -5,3 +5,4 @@ id: comment
 label: 'Default comments'
 target_entity_type_id: node
 description: 'Allows commenting on content'
+form_heading: 'Add new comment'
diff --git a/core/themes/classy/templates/field/field--comment.html.twig b/core/themes/classy/templates/field/field--comment.html.twig
index 1ec3ee6..1211ec6 100644
--- a/core/themes/classy/templates/field/field--comment.html.twig
+++ b/core/themes/classy/templates/field/field--comment.html.twig
@@ -13,7 +13,8 @@
  * - title_suffix: Additional title output populated by modules, intended to
  *   be displayed after the main title tag that appears in the template.
  * - comments: List of comments rendered through comment.html.twig.
- * - comment_form: The 'Add new comment' form.
+ * - comment_form: The form to add new comment.
+ * - form_heading: The heading for comment form.
  * - comment_display_mode: Is the comments are threaded.
  * - comment_type: The comment type bundle ID for the comment field.
  * - entity_type: The entity type to which the field belongs.
@@ -50,7 +51,7 @@
   {{ comments }}
 
   {% if comment_form %}
-    <h2 class="title comment-form__title">{{ 'Add new comment'|t }}</h2>
+    <h2{{ content_attributes.addClass('title', 'comment-form__title') }}>{{ form_heading }}</h2>
     {{ comment_form }}
   {% endif %}
 
diff --git a/core/themes/stable/templates/field/field--comment.html.twig b/core/themes/stable/templates/field/field--comment.html.twig
index 33a60ae..128b1d8 100644
--- a/core/themes/stable/templates/field/field--comment.html.twig
+++ b/core/themes/stable/templates/field/field--comment.html.twig
@@ -14,7 +14,8 @@
  *   be displayed after the main title tag that appears in the template.
  * - comments: List of comments rendered through comment.html.twig.
  * - content_attributes: HTML attributes for the form title.
- * - comment_form: The 'Add new comment' form.
+ * - comment_form: The form to add new comment.
+ * - form_heading: The heading for comment form.
  * - comment_display_mode: Is the comments are threaded.
  * - comment_type: The comment type bundle ID for the comment field.
  * - entity_type: The entity type to which the field belongs.