diff --git a/core/modules/comment/config/schema/comment.views.schema.yml b/core/modules/comment/config/schema/comment.views.schema.yml
index be3816e1..606af82 100644
--- a/core/modules/comment/config/schema/comment.views.schema.yml
+++ b/core/modules/comment/config/schema/comment.views.schema.yml
@@ -8,10 +8,26 @@ views.field.comment_depth:
   type: views_field
   label: 'Comment depth'
 
+views.field.comment_entity_link:
+  type: views_field
+  label: 'Comment link'
+  mapping:
+    teaser:
+      type: boolean
+      label: 'Show teaser-style link'
+
 views.field.comment_last_timestamp:
   type: views.field.date
   label: 'Last comment date'
 
+views.field.comment_link_approve:
+  type: views.field.comment_link
+  label: 'Comment approve link'
+
+views.field.comment_link_reply:
+  type: views.field.comment_link
+  label: 'Comment reply link'
+
 views.field.node_new_comments:
   type: views.field.numeric
   label: 'Number of new comments'
diff --git a/core/modules/comment/src/CommentViewsData.php b/core/modules/comment/src/CommentViewsData.php
index 3f134c8..c70f77f 100644
--- a/core/modules/comment/src/CommentViewsData.php
+++ b/core/modules/comment/src/CommentViewsData.php
@@ -102,6 +102,22 @@ public function getViewsData() {
     $data['comment_field_data']['status']['filter']['label'] = t('Approved comment status');
     $data['comment_field_data']['status']['filter']['type'] = 'yes-no';
 
+    $data['comment']['approve_comment'] = array(
+      'field' => array(
+        'title' => t('Link to approve comment'),
+        'help' => t('Provide a simple link to approve the comment.'),
+        'id' => 'comment_link_approve',
+      ),
+    );
+
+    $data['comment']['replyto_comment'] = array(
+      'field' => array(
+        'title' => t('Link to reply-to comment'),
+        'help' => t('Provide a simple link to reply to the comment.'),
+        'id' => 'comment_link_reply',
+      ),
+    );
+
     $data['comment_field_data']['thread']['field'] = array(
       'title' => t('Depth'),
       'help' => t('Display the depth of the comment if it is threaded.'),
diff --git a/core/modules/node/config/schema/node.views.schema.yml b/core/modules/node/config/schema/node.views.schema.yml
index 864e9ee..70c5c23 100644
--- a/core/modules/node/config/schema/node.views.schema.yml
+++ b/core/modules/node/config/schema/node.views.schema.yml
@@ -94,7 +94,7 @@ views.argument_validator.node:
       label: 'Filter value format'
 
 views.field.node:
-  type: views.field.entity_link
+  type: views_field
   label: 'Node'
   mapping:
     link_to_node:
diff --git a/core/modules/user/config/schema/user.views.schema.yml b/core/modules/user/config/schema/user.views.schema.yml
index 7366f9c..d74140f 100644
--- a/core/modules/user/config/schema/user.views.schema.yml
+++ b/core/modules/user/config/schema/user.views.schema.yml
@@ -67,14 +67,6 @@ views_field_user:
       type: boolean
       label: 'Link this field to its user'
 
-views.field.user_link:
-  type: views_field
-  label: 'User link'
-  mapping:
-    text:
-      type: text
-      label: 'Text to display'
-
 views.field.user_permissions:
   type: views.field.prerender_list
   label: 'List of permission'
diff --git a/core/modules/views/config/schema/views.field.schema.yml b/core/modules/views/config/schema/views.field.schema.yml
index 6c310a2..0f87189 100644
--- a/core/modules/views/config/schema/views.field.schema.yml
+++ b/core/modules/views/config/schema/views.field.schema.yml
@@ -171,14 +171,16 @@ views.field.url:
 views.field.language:
   type: views_field
   label: 'Language'
+  mapping:
+    native_language:
+      type: boolean
+      label: 'Display in native language'
+
 
 views.field.entity_link:
   type: views_field
   label: 'Entity link'
   mapping:
-    native_language:
-      type: boolean
-      label: 'Display in native language'
     text:
       type: label
       label: 'Text to display'
@@ -187,6 +189,18 @@ views.field.entity_link_delete:
   type: views.field.entity_link
   label: 'Entity delete link'
   mapping:
+    text:
+      type: label
+      label: 'Text to display'
+
+ views.field.entity_link_edit:
+   type: views.field.entity_link
+   label: 'Entity edit link'
+     mapping:
+       text:
+         type: label
+         label: 'Text to display'
+
 views.field.bulk_form:
   type: views_field_bulk_form
   label: 'Bulk form'
@@ -194,12 +208,8 @@ views.field.bulk_form:
 views.field.field:
   type: views_field
   label: 'Views entity field handler'
-views.field.entity_link_edit:
-  type: views.field.entity_link
-  label: 'Entity edit link'
   mapping:
     click_sort_column:
-    text:
       type: string
       label: 'Column used for click sorting'
     type: