diff --git a/core/modules/views/config/views.view.archive.yml b/core/modules/views/config/views.view.archive.yml
old mode 100644
new mode 100755
diff --git a/core/modules/views/config/views.view.backlinks.yml b/core/modules/views/config/views.view.backlinks.yml
old mode 100644
new mode 100755
index 8c1f2a7..b5c22af
--- a/core/modules/views/config/views.view.backlinks.yml
+++ b/core/modules/views/config/views.view.backlinks.yml
@@ -36,6 +36,7 @@ display:
           empty: false
           content: 'No backlinks found.'
           format: '1'
+          plugin_id: text
       fields:
         title:
           id: title
@@ -43,6 +44,7 @@ display:
           field: title
           label: ''
           link_to_node: 1
+          plugin_id: node
       arguments:
         nid:
           id: nid
diff --git a/core/modules/views/config/views.view.comments_recent.yml b/core/modules/views/config/views.view.comments_recent.yml
old mode 100644
new mode 100755
index 6e86a0c..16f3f55
--- a/core/modules/views/config/views.view.comments_recent.yml
+++ b/core/modules/views/config/views.view.comments_recent.yml
@@ -42,12 +42,14 @@ display:
           field: subject
           label: ''
           link_to_comment: 1
+          plugin_id: comment
         timestamp:
           id: timestamp
           table: comment
           field: changed
           label: ''
           date_format: 'time ago'
+          plugin_id: date
       sorts:
         timestamp:
           id: timestamp
@@ -88,23 +90,27 @@ display:
           relationship: nid
           label: 'Reply to'
           link_to_node: 1
+          plugin_id: node
         timestamp:
           id: timestamp
           table: comment
           field: changed
           label: ''
           date_format: 'time ago'
+          plugin_id: date
         subject:
           id: subject
           table: comment
           field: subject
           label: ''
           link_to_comment: 1
+          plugin_id: comment
         comment:
           id: comment
           table: field_data_comment_body
           field: comment_body
           label: ''
+          plugin_id: field
       path: comments/recent
       style:
         type: html_list
diff --git a/core/modules/views/config/views.view.frontpage.yml b/core/modules/views/config/views.view.frontpage.yml
old mode 100644
new mode 100755
diff --git a/core/modules/views/config/views.view.glossary.yml b/core/modules/views/config/views.view.glossary.yml
old mode 100644
new mode 100755
index 966da7c..60a8726
--- a/core/modules/views/config/views.view.glossary.yml
+++ b/core/modules/views/config/views.view.glossary.yml
@@ -35,6 +35,7 @@ display:
           table: node
           field: title
           link_to_node: 1
+          plugin_id: node
         name:
           id: name
           table: users
@@ -42,12 +43,14 @@ display:
           label: Author
           link_to_user: 1
           relationship: uid
+          plugin_id: user_name
         changed:
           id: changed
           table: node
           field: changed
           label: 'Last update'
           date_format: large
+          plugin_id: date
       arguments:
         title:
           id: title
diff --git a/core/modules/views/config/views.view.taxonomy_term.yml b/core/modules/views/config/views.view.taxonomy_term.yml
old mode 100644
new mode 100755
diff --git a/core/modules/views/config/views.view.tracker.yml b/core/modules/views/config/views.view.tracker.yml
old mode 100644
new mode 100755
index 5d31e2f..dae7cad
--- a/core/modules/views/config/views.view.tracker.yml
+++ b/core/modules/views/config/views.view.tracker.yml
@@ -39,26 +39,31 @@ display:
           id: type
           table: node
           field: type
+          plugin_id: node_type
         title:
           id: title
           table: node
           field: title
+          plugin_id: node
         name:
           id: name
           table: users
           field: name
           relationship: uid
           label: Author
+          plugin_id: user_name
         comment_count:
           id: comment_count
           table: node_comment_statistics
           field: comment_count
           label: Replies
+          plugin_id: numeric
         last_comment_timestamp:
           id: last_comment_timestamp
           table: node_comment_statistics
           field: last_comment_timestamp
           label: 'Last Post'
+          plugin_id: comment_last_timestamp
         timestamp:
           id: timestamp
           table: history
@@ -66,6 +71,7 @@ display:
           label: ''
           link_to_node: 0
           comments: 1
+          plugin_id: node_history_user_timestamp
         new_comments:
           id: new_comments
           table: node
@@ -74,6 +80,7 @@ display:
           hide_empty: true
           suffix: ' new'
           link_to_comment: 1
+          plugin_id: node_new_comments
       sorts:
         last_comment_timestamp:
           id: last_comment_timestamp
diff --git a/core/modules/views/lib/Drupal/views/ViewExecutable.php b/core/modules/views/lib/Drupal/views/ViewExecutable.php
index 36aaee8..1157701 100644
--- a/core/modules/views/lib/Drupal/views/ViewExecutable.php
+++ b/core/modules/views/lib/Drupal/views/ViewExecutable.php
@@ -2050,13 +2050,14 @@ public function addItem($display_id, $type, $table, $field, $options = array(),
     // If the desired type is not found, use the original value directly.
     $handler_type = !empty($types[$type]['type']) ? $types[$type]['type'] : $type;
 
-    // @todo This variable is never used.
-    $handler = views_get_handler($table, $field, $handler_type);
+    $data = views_fetch_data($table, FALSE);
+    $plugin_id = $data[$field][$handler_type]['id'];
 
     $fields[$id] = array(
       'id' => $id,
       'table' => $table,
       'field' => $field,
+      'plugin_id' => $plugin_id
     ) + $options;
 
     $this->displayHandlers[$display_id]->setOption($types[$type]['plural'], $fields);
diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_access_none.yml b/core/modules/views/tests/views_test_config/config/views.view.test_access_none.yml
old mode 100644
new mode 100755
diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_access_perm.yml b/core/modules/views/tests/views_test_config/config/views.view.test_access_perm.yml
old mode 100644
new mode 100755
diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_access_role.yml b/core/modules/views/tests/views_test_config/config/views.view.test_access_role.yml
old mode 100644
new mode 100755
diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_aggregate_count.yml b/core/modules/views/tests/views_test_config/config/views.view.test_aggregate_count.yml
old mode 100644
new mode 100755
index 7a42247..753d96c
--- a/core/modules/views/tests/views_test_config/config/views.view.test_aggregate_count.yml
+++ b/core/modules/views/tests/views_test_config/config/views.view.test_aggregate_count.yml
@@ -37,6 +37,7 @@ display:
           id: nid
           link_to_node: '0'
           table: node
+          plugin_id: node
       group_by: '1'
       pager:
         type: some
diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_alias.yml b/core/modules/views/tests/views_test_config/config/views.view.test_alias.yml
old mode 100644
new mode 100755
index 3755f24..cb21bf8
--- a/core/modules/views/tests/views_test_config/config/views.view.test_alias.yml
+++ b/core/modules/views/tests/views_test_config/config/views.view.test_alias.yml
@@ -32,6 +32,7 @@ display:
           link_to_user: '1'
           overwrite_anonymous: '0'
           table: users
+          plugin_id: user_name
       filters:
         uid_raw:
           admin_label: ''
diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_argument_default_fixed.yml b/core/modules/views/tests/views_test_config/config/views.view.test_argument_default_fixed.yml
old mode 100644
new mode 100755
index 061b209..34f83ff
--- a/core/modules/views/tests/views_test_config/config/views.view.test_argument_default_fixed.yml
+++ b/core/modules/views/tests/views_test_config/config/views.view.test_argument_default_fixed.yml
@@ -37,6 +37,7 @@ display:
           id: title
           link_to_node: '0'
           table: node
+          plugin_id: node
       pager:
         options:
           id: '0'
diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_comment_user_uid.yml b/core/modules/views/tests/views_test_config/config/views.view.test_comment_user_uid.yml
old mode 100644
new mode 100755
index 4dca1cd..b093081
--- a/core/modules/views/tests/views_test_config/config/views.view.test_comment_user_uid.yml
+++ b/core/modules/views/tests/views_test_config/config/views.view.test_comment_user_uid.yml
@@ -29,6 +29,7 @@ display:
           field: nid
           id: nid
           table: node
+          plugin_id: node
       pager:
         type: full
       query:
diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_destroy.yml b/core/modules/views/tests/views_test_config/config/views.view.test_destroy.yml
old mode 100644
new mode 100755
index a28c6b1..eb72f30
--- a/core/modules/views/tests/views_test_config/config/views.view.test_destroy.yml
+++ b/core/modules/views/tests/views_test_config/config/views.view.test_destroy.yml
@@ -69,14 +69,17 @@ display:
           field: created
           id: created
           table: node
+          plugin_id: date
         nid:
           field: nid
           id: nid
           table: node
+          plugin_id: node
         path:
           field: path
           id: path
           table: node
+          plugin_id: node_path
       filters:
         nid:
           field: nid
diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_display.yml b/core/modules/views/tests/views_test_config/config/views.view.test_display.yml
old mode 100644
new mode 100755
index 5c44bb2..666d99e
--- a/core/modules/views/tests/views_test_config/config/views.view.test_display.yml
+++ b/core/modules/views/tests/views_test_config/config/views.view.test_display.yml
@@ -45,6 +45,7 @@ display:
           field: title
           id: title
           table: node
+          plugin_id: node
       filters:
         status:
           field: status
diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_executable_displays.yml b/core/modules/views/tests/views_test_config/config/views.view.test_executable_displays.yml
old mode 100644
new mode 100755
index 8feb580..df2b80a
--- a/core/modules/views/tests/views_test_config/config/views.view.test_executable_displays.yml
+++ b/core/modules/views/tests/views_test_config/config/views.view.test_executable_displays.yml
@@ -16,7 +16,7 @@ display:
     position: '1'
   page_2:
     display_plugin: page
-    display_title: Page 2
+    display_title: 'Page 2'
     id: page_2
     position: '2'
 human_name: ''
diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_exposed_form.yml b/core/modules/views/tests/views_test_config/config/views.view.test_exposed_form.yml
old mode 100644
new mode 100755
diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_feed_display.yml b/core/modules/views/tests/views_test_config/config/views.view.test_feed_display.yml
old mode 100644
new mode 100755
index 6ba9d11..309f1c3
--- a/core/modules/views/tests/views_test_config/config/views.view.test_feed_display.yml
+++ b/core/modules/views/tests/views_test_config/config/views.view.test_feed_display.yml
@@ -30,6 +30,7 @@ display:
           label: ''
           link_to_node: '1'
           table: node
+          plugin_id: node
       filters:
         status:
           expose:
@@ -66,7 +67,7 @@ display:
     position: '0'
   feed:
     display_options:
-      displays: {}
+      displays: {  }
       pager:
         type: some
       path: test-feed-display.xml
diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_field_get_entity.yml b/core/modules/views/tests/views_test_config/config/views.view.test_field_get_entity.yml
old mode 100644
new mode 100755
index 5ba2fc9..b85ac35
--- a/core/modules/views/tests/views_test_config/config/views.view.test_field_get_entity.yml
+++ b/core/modules/views/tests/views_test_config/config/views.view.test_field_get_entity.yml
@@ -17,16 +17,19 @@ display:
           field: cid
           id: cid
           table: comment
+          plugin_id: comment
         nid:
           field: nid
           id: nid
           table: node
           relationship: nid
+          plugin_id: node
         uid:
           field: uid
           id: uid
           table: users
           relationship: uid
+          plugin_id: user
       filter_groups:
         groups: {  }
         operator: AND
diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_field_tokens.yml b/core/modules/views/tests/views_test_config/config/views.view.test_field_tokens.yml
old mode 100644
new mode 100755
index 01431a6..93d6b99
--- a/core/modules/views/tests/views_test_config/config/views.view.test_field_tokens.yml
+++ b/core/modules/views/tests/views_test_config/config/views.view.test_field_tokens.yml
@@ -21,18 +21,22 @@ display:
           id: name
           table: views_test_data
           field: name
+          plugin_id: string
         name_1:
           id: name_1
           table: views_test_data
           field: name
+          plugin_id: string
         name_2:
           id: name_2
           table: views_test_data
           field: name
+          plugin_id: string
         job:
           id: job
           table: views_test_data
           field: job
+          plugin_id: string
       style:
         type: default
       row:
diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_field_type.yml b/core/modules/views/tests/views_test_config/config/views.view.test_field_type.yml
old mode 100644
new mode 100755
index c9172bc..5be9857
--- a/core/modules/views/tests/views_test_config/config/views.view.test_field_type.yml
+++ b/core/modules/views/tests/views_test_config/config/views.view.test_field_type.yml
@@ -11,6 +11,7 @@ display:
           field: type
           id: type
           table: node
+          plugin_id: node_type
     display_plugin: default
     display_title: Master
     id: default
diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_filter_date_between.yml b/core/modules/views/tests/views_test_config/config/views.view.test_filter_date_between.yml
old mode 100644
new mode 100755
index 71f4b2f..7682e65
--- a/core/modules/views/tests/views_test_config/config/views.view.test_filter_date_between.yml
+++ b/core/modules/views/tests/views_test_config/config/views.view.test_filter_date_between.yml
@@ -17,6 +17,7 @@ display:
           field: nid
           id: nid
           table: node
+          plugin_id: node
       filters:
         created:
           field: created
diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_filter_group_override.yml b/core/modules/views/tests/views_test_config/config/views.view.test_filter_group_override.yml
old mode 100644
new mode 100755
index 379eff6..2b04925
--- a/core/modules/views/tests/views_test_config/config/views.view.test_filter_group_override.yml
+++ b/core/modules/views/tests/views_test_config/config/views.view.test_filter_group_override.yml
@@ -21,6 +21,7 @@ display:
           id: title
           label: ''
           table: node
+          plugin_id: node
       filters:
         status:
           expose:
diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_filter_groups.yml b/core/modules/views/tests/views_test_config/config/views.view.test_filter_groups.yml
old mode 100644
new mode 100755
index d71c02e..6176fa4
--- a/core/modules/views/tests/views_test_config/config/views.view.test_filter_groups.yml
+++ b/core/modules/views/tests/views_test_config/config/views.view.test_filter_groups.yml
@@ -21,6 +21,7 @@ display:
           id: title
           label: ''
           table: node
+          plugin_id: node
       filter_groups:
         groups:
           1: AND
diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_filter_node_uid_revision.yml b/core/modules/views/tests/views_test_config/config/views.view.test_filter_node_uid_revision.yml
old mode 100644
new mode 100755
index 69000ec..27fcb2a
--- a/core/modules/views/tests/views_test_config/config/views.view.test_filter_node_uid_revision.yml
+++ b/core/modules/views/tests/views_test_config/config/views.view.test_filter_node_uid_revision.yml
@@ -17,6 +17,7 @@ display:
           id: nid
           table: node
           field: nid
+          plugin_id: node
       filter_groups:
         groups:
           1: AND
diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_glossary.yml b/core/modules/views/tests/views_test_config/config/views.view.test_glossary.yml
old mode 100644
new mode 100755
index 33045e5..3373017
--- a/core/modules/views/tests/views_test_config/config/views.view.test_glossary.yml
+++ b/core/modules/views/tests/views_test_config/config/views.view.test_glossary.yml
@@ -31,6 +31,7 @@ display:
           id: title
           label: ''
           table: node
+          plugin_id: node
       pager:
         type: full
       query:
diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_group_by_count.yml b/core/modules/views/tests/views_test_config/config/views.view.test_group_by_count.yml
old mode 100644
new mode 100755
index 7ea0ab8..a312291
--- a/core/modules/views/tests/views_test_config/config/views.view.test_group_by_count.yml
+++ b/core/modules/views/tests/views_test_config/config/views.view.test_group_by_count.yml
@@ -29,6 +29,7 @@ display:
           id: nid
           link_to_node: '0'
           table: node
+          plugin_id: node
         type:
           alter:
             alter_text: '0'
@@ -44,6 +45,7 @@ display:
           id: type
           link_to_node: '0'
           table: node
+          plugin_id: node_type
       group_by: '1'
       pager:
         type: some
diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_group_by_in_filters.yml b/core/modules/views/tests/views_test_config/config/views.view.test_group_by_in_filters.yml
old mode 100644
new mode 100755
index c494b09..3949c80
--- a/core/modules/views/tests/views_test_config/config/views.view.test_group_by_in_filters.yml
+++ b/core/modules/views/tests/views_test_config/config/views.view.test_group_by_in_filters.yml
@@ -28,6 +28,7 @@ display:
           id: type
           link_to_node: '0'
           table: node
+          plugin_id: node_type
       filters:
         nid:
           field: nid
diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_groupwise_term.yml b/core/modules/views/tests/views_test_config/config/views.view.test_groupwise_term.yml
old mode 100644
new mode 100755
index 5240f0c..d75b2e5
--- a/core/modules/views/tests/views_test_config/config/views.view.test_groupwise_term.yml
+++ b/core/modules/views/tests/views_test_config/config/views.view.test_groupwise_term.yml
@@ -18,11 +18,13 @@ display:
           field: name
           id: name
           table: taxonomy_term_data
+          plugin_id: taxonomy
         nid:
           field: nid
           id: nid
           relationship: tid_representative
           table: node
+          plugin_id: node
       pager:
         options:
           items_per_page: '10'
diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_groupwise_user.yml b/core/modules/views/tests/views_test_config/config/views.view.test_groupwise_user.yml
old mode 100644
new mode 100755
index 7d79d11..452c5d2
--- a/core/modules/views/tests/views_test_config/config/views.view.test_groupwise_user.yml
+++ b/core/modules/views/tests/views_test_config/config/views.view.test_groupwise_user.yml
@@ -19,11 +19,13 @@ display:
           field: name
           id: name
           table: users
+          plugin_id: user_name
         nid:
           field: nid
           id: nid
           relationship: uid_representative
           table: node
+          plugin_id: node
       filters:
         status:
           expose:
diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_handler_relationships.yml b/core/modules/views/tests/views_test_config/config/views.view.test_handler_relationships.yml
old mode 100644
new mode 100755
index 409fb2c..ce55ade
--- a/core/modules/views/tests/views_test_config/config/views.view.test_handler_relationships.yml
+++ b/core/modules/views/tests/views_test_config/config/views.view.test_handler_relationships.yml
@@ -11,6 +11,7 @@ display:
           id: title
           table: node
           field: title
+          plugin_id: node
       relationships:
         cid:
           id: cid
diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_node_revision_nid.yml b/core/modules/views/tests/views_test_config/config/views.view.test_node_revision_nid.yml
old mode 100644
new mode 100755
index cefedda..946d2b8
--- a/core/modules/views/tests/views_test_config/config/views.view.test_node_revision_nid.yml
+++ b/core/modules/views/tests/views_test_config/config/views.view.test_node_revision_nid.yml
@@ -10,24 +10,27 @@ display:
           id: nid
           table: node_revision
           field: nid
-          required: TRUE
+          required: true
       fields:
         vid:
           id: vid
           table: node_revision
           field: vid
+          plugin_id: standard
         nid_1:
           id: nid_1
           table: node_revision
           field: nid
+          plugin_id: standard
         nid:
           id: nid
           table: node
           field: nid
           relationship: nid
+          plugin_id: node
       arguments:
         nid:
-          id: nid:
+          id: 'nid:'
           table: node_revision
           field: nid
     display_plugin: default
diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_node_revision_vid.yml b/core/modules/views/tests/views_test_config/config/views.view.test_node_revision_vid.yml
old mode 100644
new mode 100755
index b36f549..20d3f67
--- a/core/modules/views/tests/views_test_config/config/views.view.test_node_revision_vid.yml
+++ b/core/modules/views/tests/views_test_config/config/views.view.test_node_revision_vid.yml
@@ -10,24 +10,27 @@ display:
           id: vid
           table: node_revision
           field: vid
-          required: TRUE
+          required: true
       fields:
         vid:
           id: vid
           table: node_revision
           field: vid
+          plugin_id: standard
         nid_1:
           id: nid_1
           table: node_revision
           field: nid
+          plugin_id: standard
         nid:
           id: nid
           table: node
           field: nid
           relationship: vid
+          plugin_id: node
       arguments:
         nid:
-          id: nid:
+          id: 'nid:'
           table: node_revision
           field: nid
     display_plugin: default
diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_pager_full.yml b/core/modules/views/tests/views_test_config/config/views.view.test_pager_full.yml
old mode 100644
new mode 100755
diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_pager_none.yml b/core/modules/views/tests/views_test_config/config/views.view.test_pager_none.yml
old mode 100644
new mode 100755
diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_pager_some.yml b/core/modules/views/tests/views_test_config/config/views.view.test_pager_some.yml
old mode 100644
new mode 100755
diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_plugin_argument_default_current_user.yml b/core/modules/views/tests/views_test_config/config/views.view.test_plugin_argument_default_current_user.yml
old mode 100644
new mode 100755
index 54180b6..69292ee
--- a/core/modules/views/tests/views_test_config/config/views.view.test_plugin_argument_default_current_user.yml
+++ b/core/modules/views/tests/views_test_config/config/views.view.test_plugin_argument_default_current_user.yml
@@ -37,6 +37,7 @@ display:
           id: title
           link_to_node: '0'
           table: node
+          plugin_id: node
       pager:
         options:
           id: '0'
diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_redirect_view.yml b/core/modules/views/tests/views_test_config/config/views.view.test_redirect_view.yml
old mode 100644
new mode 100755
index 1217693..692b48d
--- a/core/modules/views/tests/views_test_config/config/views.view.test_redirect_view.yml
+++ b/core/modules/views/tests/views_test_config/config/views.view.test_redirect_view.yml
@@ -50,6 +50,7 @@ display:
           hide_empty: '0'
           empty_zero: '0'
           link_to_node: '1'
+          plugin_id: node
       filters:
         status:
           value: '1'
diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_store_pager_settings.yml b/core/modules/views/tests/views_test_config/config/views.view.test_store_pager_settings.yml
old mode 100644
new mode 100755
diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_taxonomy_node_term_data.yml b/core/modules/views/tests/views_test_config/config/views.view.test_taxonomy_node_term_data.yml
old mode 100644
new mode 100755
diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_tokens.yml b/core/modules/views/tests/views_test_config/config/views.view.test_tokens.yml
old mode 100644
new mode 100755
index f6e640c..7892f18
--- a/core/modules/views/tests/views_test_config/config/views.view.test_tokens.yml
+++ b/core/modules/views/tests/views_test_config/config/views.view.test_tokens.yml
@@ -20,16 +20,19 @@ display:
           id: age
           relationship: none
           table: views_test_data
+          plugin_id: numeric
         id:
           field: id
           id: id
           relationship: none
           table: views_test_data
+          plugin_id: numeric
         name:
           field: name
           id: name
           relationship: none
           table: views_test_data
+          plugin_id: string
       pager:
         type: full
         options:
diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_user_relationship.yml b/core/modules/views/tests/views_test_config/config/views.view.test_user_relationship.yml
old mode 100644
new mode 100755
index 096fa16..b1e4979
--- a/core/modules/views/tests/views_test_config/config/views.view.test_user_relationship.yml
+++ b/core/modules/views/tests/views_test_config/config/views.view.test_user_relationship.yml
@@ -37,6 +37,7 @@ display:
           link_to_user: '1'
           overwrite_anonymous: '0'
           table: users
+          plugin_id: user_name
         title:
           alter:
             absolute: '0'
@@ -54,6 +55,7 @@ display:
           label: ''
           link_to_node: '1'
           table: node
+          plugin_id: node
         uid:
           alter:
             absolute: '0'
@@ -77,6 +79,7 @@ display:
           id: uid
           link_to_user: '1'
           table: users
+          plugin_id: user
       pager:
         options:
           items_per_page: '10'
diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_view.yml b/core/modules/views/tests/views_test_config/config/views.view.test_view.yml
old mode 100644
new mode 100755
index 57dd103..b3786d4
--- a/core/modules/views/tests/views_test_config/config/views.view.test_view.yml
+++ b/core/modules/views/tests/views_test_config/config/views.view.test_view.yml
@@ -17,16 +17,19 @@ display:
           id: age
           relationship: none
           table: views_test_data
+          plugin_id: numeric
         id:
           field: id
           id: id
           relationship: none
           table: views_test_data
+          plugin_id: numeric
         name:
           field: name
           id: name
           relationship: none
           table: views_test_data
+          plugin_id: string
       pager:
         options:
           offset: '0'
@@ -39,6 +42,7 @@ display:
           order: ASC
           relationship: none
           table: views_test_data
+          plugin_id: numeric
     display_plugin: default
     display_title: Master
     id: default
diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_view_argument_validate_numeric.yml b/core/modules/views/tests/views_test_config/config/views.view.test_view_argument_validate_numeric.yml
old mode 100644
new mode 100755
diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_view_argument_validate_php.yml b/core/modules/views/tests/views_test_config/config/views.view.test_view_argument_validate_php.yml
old mode 100644
new mode 100755
diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_view_argument_validate_user.yml b/core/modules/views/tests/views_test_config/config/views.view.test_view_argument_validate_user.yml
old mode 100644
new mode 100755
diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_view_delete.yml b/core/modules/views/tests/views_test_config/config/views.view.test_view_delete.yml
old mode 100644
new mode 100755
diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_view_fieldapi.yml b/core/modules/views/tests/views_test_config/config/views.view.test_view_fieldapi.yml
old mode 100644
new mode 100755
index fe2ecc0..ea37bdb
--- a/core/modules/views/tests/views_test_config/config/views.view.test_view_fieldapi.yml
+++ b/core/modules/views/tests/views_test_config/config/views.view.test_view_fieldapi.yml
@@ -13,6 +13,7 @@ display:
           field: nid
           id: nid
           table: node
+          plugin_id: node
       cache:
         type: none
       exposed_form:
diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_view_handler_weight.yml b/core/modules/views/tests/views_test_config/config/views.view.test_view_handler_weight.yml
old mode 100644
new mode 100755
index cf47d54..3b30d96
--- a/core/modules/views/tests/views_test_config/config/views.view.test_view_handler_weight.yml
+++ b/core/modules/views/tests/views_test_config/config/views.view.test_view_handler_weight.yml
@@ -17,16 +17,19 @@ display:
           id: id
           relationship: none
           table: views_test_data
+          plugin_id: numeric
         age:
           field: age
           id: age
           relationship: none
           table: views_test_data
+          plugin_id: numeric
         name:
           field: name
           id: name
           relationship: none
           table: views_test_data
+          plugin_id: string
       pager:
         options:
           offset: '0'
@@ -39,21 +42,25 @@ display:
           order: ASC
           relationship: none
           table: views_test_data
+          plugin_id: numeric
         age:
           field: age
           id: standard
           order: ASC
           relationship: none
           table: views_test_data
+          plugin_id: numeric
       filters:
         name:
           field: name
           id: string
           table: views_test_data
+          plugin_id: string
         age:
           field: age
           id: numeric
           table: views_test_data
+          plugin_id: numeric
     display_plugin: default
     display_title: Master
     id: default
diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_view_pager_full_zero_items_per_page.yml b/core/modules/views/tests/views_test_config/config/views.view.test_view_pager_full_zero_items_per_page.yml
old mode 100644
new mode 100755
index 5b909ea..8d0b157
--- a/core/modules/views/tests/views_test_config/config/views.view.test_view_pager_full_zero_items_per_page.yml
+++ b/core/modules/views/tests/views_test_config/config/views.view.test_view_pager_full_zero_items_per_page.yml
@@ -28,6 +28,7 @@ display:
           id: title
           link_to_node: '0'
           table: node
+          plugin_id: node
       pager:
         options:
           id: '0'
diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_view_status.yml b/core/modules/views/tests/views_test_config/config/views.view.test_view_status.yml
old mode 100644
new mode 100755
diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_views_handler_field_user_name.yml b/core/modules/views/tests/views_test_config/config/views.view.test_views_handler_field_user_name.yml
old mode 100644
new mode 100755
index 48522e0..284315d
--- a/core/modules/views/tests/views_test_config/config/views.view.test_views_handler_field_user_name.yml
+++ b/core/modules/views/tests/views_test_config/config/views.view.test_views_handler_field_user_name.yml
@@ -31,6 +31,7 @@ display:
           link_to_user: '1'
           overwrite_anonymous: '0'
           table: users
+          plugin_id: user_name
       pager:
         type: full
       query:
diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_views_move_to_field.yml b/core/modules/views/tests/views_test_config/config/views.view.test_views_move_to_field.yml
deleted file mode 100644
index 22642b5..0000000
--- a/core/modules/views/tests/views_test_config/config/views.view.test_views_move_to_field.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-api_version: '3.0'
-base_table: views_test_data
-core: '8'
-description: ''
-disabled: '0'
-display:
-  default:
-    display_options:
-      fields:
-        old_field_1:
-          field: old_field_1
-          id: old_field_1
-          table: views_test_data
-    display_plugin: default
-    display_title: Master
-    id: default
-    position: '0'
-human_name: ''
-name: test_views_move_to_field
-tag: ''
diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_views_move_to_handler.yml b/core/modules/views/tests/views_test_config/config/views.view.test_views_move_to_handler.yml
deleted file mode 100644
index d66c95d..0000000
--- a/core/modules/views/tests/views_test_config/config/views.view.test_views_move_to_handler.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-api_version: '3.0'
-base_table: views_test_data
-core: '8'
-description: ''
-disabled: '0'
-display:
-  default:
-    display_options:
-      fields:
-        old_field_2:
-          field: old_field_2
-          id: old_field_2
-          table: views_test_data
-      filters:
-        old_field_3:
-          field: old_field_3
-          id: old_field_3
-          table: views_test_data
-    display_plugin: default
-    display_title: Master
-    id: default
-    position: '0'
-human_name: ''
-name: test_views_move_to_handler
-tag: ''
diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_views_move_to_table.yml b/core/modules/views/tests/views_test_config/config/views.view.test_views_move_to_table.yml
deleted file mode 100644
index 956a7f0..0000000
--- a/core/modules/views/tests/views_test_config/config/views.view.test_views_move_to_table.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-api_version: '3.0'
-base_table: views_old_table
-core: '8'
-description: ''
-disabled: '0'
-display:
-  default:
-    display_options:
-      fields:
-        id:
-          field: id
-          id: id
-          table: views_old_table
-    display_plugin: default
-    display_title: Master
-    id: default
-    position: '0'
-human_name: ''
-name: test_views_move_to_table
-tag: ''
diff --git a/core/modules/views/tests/views_test_data/config/views.view.test_access_dynamic.yml b/core/modules/views/tests/views_test_data/config/views.view.test_access_dynamic.yml
old mode 100644
new mode 100755
diff --git a/core/modules/views/tests/views_test_data/config/views.view.test_access_static.yml b/core/modules/views/tests/views_test_data/config/views.view.test_access_static.yml
old mode 100644
new mode 100755
diff --git a/core/modules/views/tests/views_test_data/config/views.view.test_argument_default_current_user.yml b/core/modules/views/tests/views_test_data/config/views.view.test_argument_default_current_user.yml
old mode 100644
new mode 100755
index 3cf754d..9732a70
--- a/core/modules/views/tests/views_test_data/config/views.view.test_argument_default_current_user.yml
+++ b/core/modules/views/tests/views_test_data/config/views.view.test_argument_default_current_user.yml
@@ -14,6 +14,7 @@ display:
           field: uid
           id: uid
           table: node
+          plugin_id: numeric
       cache:
         type: none
       exposed_form:
@@ -34,6 +35,7 @@ display:
           id: title
           link_to_node: '0'
           table: node
+          plugin_id: node
       pager:
         options:
           id: '0'
diff --git a/core/modules/views/tests/views_test_data/config/views.view.test_click_sort.yml b/core/modules/views/tests/views_test_data/config/views.view.test_click_sort.yml
old mode 100644
new mode 100755
index 8aa2eb2..59996f9
--- a/core/modules/views/tests/views_test_data/config/views.view.test_click_sort.yml
+++ b/core/modules/views/tests/views_test_data/config/views.view.test_click_sort.yml
@@ -11,14 +11,17 @@ display:
           id: id
           table: views_test_data
           field: id
+          plugin_id: numeric
         name:
           id: name
           table: views_test_data
           field: name
+          plugin_id: string
         created:
           id: created
           table: views_test_data
           field: created
+          plugin_id: date
       display_options:
         access:
           type: none
diff --git a/core/modules/views/tests/views_test_data/config/views.view.test_example_area.yml b/core/modules/views/tests/views_test_data/config/views.view.test_example_area.yml
old mode 100644
new mode 100755
index 2a8fb0b..75bec26
--- a/core/modules/views/tests/views_test_data/config/views.view.test_example_area.yml
+++ b/core/modules/views/tests/views_test_data/config/views.view.test_example_area.yml
@@ -15,16 +15,19 @@ display:
           field: test_example
           id: test_example
           table: views
+          plugin_id: test_example
       footer:
         test_example:
           field: test_example
           id: test_example
           table: views
+          plugin_id: test_example
       empty:
         test_example:
           field: test_example
           id: test_example
           table: views
+          plugin_id: test_example
     display_plugin: default
     display_title: Master
     id: default
diff --git a/core/modules/views/tests/views_test_data/config/views.view.test_exposed_admin_ui.yml b/core/modules/views/tests/views_test_data/config/views.view.test_exposed_admin_ui.yml
old mode 100644
new mode 100755
diff --git a/core/modules/views/tests/views_test_data/config/views.view.test_field_classes.yml b/core/modules/views/tests/views_test_data/config/views.view.test_field_classes.yml
old mode 100644
new mode 100755
index d2fe5b2..7c7ce39
--- a/core/modules/views/tests/views_test_data/config/views.view.test_field_classes.yml
+++ b/core/modules/views/tests/views_test_data/config/views.view.test_field_classes.yml
@@ -15,6 +15,7 @@ display:
           id: id
           table: views_test_data
           field: id
+          plugin_id: numeric
       style:
         type: html_list
     display_plugin: default
diff --git a/core/modules/views/tests/views_test_data/config/views.view.test_field_output.yml b/core/modules/views/tests/views_test_data/config/views.view.test_field_output.yml
old mode 100644
new mode 100755
index 6d0d73f..ad50c7d
--- a/core/modules/views/tests/views_test_data/config/views.view.test_field_output.yml
+++ b/core/modules/views/tests/views_test_data/config/views.view.test_field_output.yml
@@ -15,6 +15,7 @@ display:
           id: name
           table: views_test_data
           field: name
+          plugin_id: string
       style:
         type: html_list
     display_plugin: default
diff --git a/core/modules/views/tests/views_test_data/config/views.view.test_filter.yml b/core/modules/views/tests/views_test_data/config/views.view.test_filter.yml
old mode 100644
new mode 100755
index 3f11e83..9adec74
--- a/core/modules/views/tests/views_test_data/config/views.view.test_filter.yml
+++ b/core/modules/views/tests/views_test_data/config/views.view.test_filter.yml
@@ -20,11 +20,13 @@ display:
           id: name
           label: ''
           table: views_test_data
+          plugin_id: string
       filters:
         type:
           field: name
           id: test_filter
           table: views_test_data
+          plugin_id: string
       query:
         type: views_query
       use_more_always: '0'
diff --git a/core/modules/views/tests/views_test_data/config/views.view.test_filter_in_operator_ui.yml b/core/modules/views/tests/views_test_data/config/views.view.test_filter_in_operator_ui.yml
old mode 100644
new mode 100755
index a68c790..b9cad91
--- a/core/modules/views/tests/views_test_data/config/views.view.test_filter_in_operator_ui.yml
+++ b/core/modules/views/tests/views_test_data/config/views.view.test_filter_in_operator_ui.yml
@@ -24,6 +24,7 @@ display:
           field: type
           id: type
           table: node
+          plugin_id: string
       pager:
         type: full
       style:
diff --git a/core/modules/views/tests/views_test_data/config/views.view.test_handler_test_access.yml b/core/modules/views/tests/views_test_data/config/views.view.test_handler_test_access.yml
old mode 100644
new mode 100755
diff --git a/core/modules/views/tests/views_test_data/config/views.view.test_page_display.yml b/core/modules/views/tests/views_test_data/config/views.view.test_page_display.yml
old mode 100644
new mode 100755
diff --git a/core/modules/views/tests/views_test_data/config/views.view.test_rename_reset_button.yml b/core/modules/views/tests/views_test_data/config/views.view.test_rename_reset_button.yml
old mode 100644
new mode 100755
index e03d666..b288db5
--- a/core/modules/views/tests/views_test_data/config/views.view.test_rename_reset_button.yml
+++ b/core/modules/views/tests/views_test_data/config/views.view.test_rename_reset_button.yml
@@ -25,6 +25,7 @@ display:
           field: type
           id: type
           table: node
+          plugin_id: node_type
       pager:
         type: full
       query:
diff --git a/core/modules/views/tests/views_test_data/config/views.view.test_style_mapping.yml b/core/modules/views/tests/views_test_data/config/views.view.test_style_mapping.yml
old mode 100644
new mode 100755
index 30d4dd9..050d7f0
--- a/core/modules/views/tests/views_test_data/config/views.view.test_style_mapping.yml
+++ b/core/modules/views/tests/views_test_data/config/views.view.test_style_mapping.yml
@@ -17,16 +17,19 @@ display:
           id: age
           relationship: none
           table: views_test_data
+          plugin_id: numeric
         job:
           field: job
           id: job
           relationship: none
           table: views_test_data
+          plugin_id: string
         name:
           field: name
           id: name
           relationship: none
           table: views_test_data
+          plugin_id: string
       pager:
         options:
           offset: '0'
@@ -39,6 +42,7 @@ display:
           order: ASC
           relationship: none
           table: views_test_data
+          plugin_id: numeric
       style:
         type: mapping_test
         options:
diff --git a/core/modules/views/tests/views_test_data/config/views.view.test_views_groupby_save.yml b/core/modules/views/tests/views_test_data/config/views.view.test_views_groupby_save.yml
old mode 100644
new mode 100755
