diff --git a/core/modules/tracker/lib/Drupal/tracker/Plugin/views/argument/TrackerCommentUserUid.php b/core/modules/tracker/lib/Drupal/tracker/Plugin/views/argument/TrackerCommentUserUid.php
new file mode 100644
index 0000000..a6c03e6
--- /dev/null
+++ b/core/modules/tracker/lib/Drupal/tracker/Plugin/views/argument/TrackerCommentUserUid.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\tracker\Plugin\views\argument\UserUid
+ */
+
+namespace Drupal\tracker\Plugin\views\argument;
+
+use Drupal\Core\Annotation\Plugin;
+use Drupal\comment\Plugin\views\argument\UserUid as UserUid;
+
+/**
+ * UID argument to check for nodes that user posted or commented on.
+ *
+ * @ingroup views_argument_handlers
+ *
+ * @Plugin(
+ *   id = "tracker_comment_user_uid",
+ *   module = "tracker"
+ * )
+ */
+class TrackerCommentUserUid extends UserUid {
+
+  /**
+   * Overrides \Drupal\comment\Plugin\views\argument\UserUid::query().
+   */
+  public function query($group_by = FALSE) {
+    // Because this handler thinks it's an argument for a field on the {node}
+    // table, we need to make sure {tracker_user} is JOINed and use its alias
+    // for the WHERE clause.
+    $tracker_user_alias = $this->query->ensure_table('tracker_user');
+    $this->query->add_where(0, "$tracker_user_alias.uid", $this->argument);
+  }
+
+}
diff --git a/core/modules/tracker/lib/Drupal/tracker/Plugin/views/filter/TrackerCommentUserUid.php b/core/modules/tracker/lib/Drupal/tracker/Plugin/views/filter/TrackerCommentUserUid.php
new file mode 100644
index 0000000..456982c
--- /dev/null
+++ b/core/modules/tracker/lib/Drupal/tracker/Plugin/views/filter/TrackerCommentUserUid.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\tracker\Plugin\views\filter\TrackerCommentUserUid.
+ */
+
+namespace Drupal\tracker\Plugin\views\filter;
+
+use Drupal\Core\Annotation\Plugin;
+use Drupal\comment\Plugin\views\filter\UserUid;
+
+/**
+ * UID filter to check for nodes that user posted or commented on.
+ *
+ * @ingroup views_filter_handlers
+ *
+ * @Plugin(
+ *   id = "tracker_comment_user_uid",
+ *   module = "tracker"
+ * )
+ */
+class TrackerCommentUserUid extends UserUid {
+
+  /**
+   * Overrides \Drupal\comment\Plugin\views\filter\UserUid::query()
+   */
+  public function query() {
+    // Because this handler thinks it's an argument for a field on the {node}
+    // table, we need to make sure {tracker_user} is JOINed and use its alias
+    // for the WHERE clause.
+    $tracker_user_alias = $this->query->ensure_table('tracker_user');
+    $this->query->add_where(0, "$tracker_user_alias.uid", $this->value);
+  }
+
+}
diff --git a/core/modules/tracker/tracker.views.inc b/core/modules/tracker/tracker.views.inc
new file mode 100644
index 0000000..af481d0
--- /dev/null
+++ b/core/modules/tracker/tracker.views.inc
@@ -0,0 +1,181 @@
+<?php
+
+/**
+ * @file
+ * Provide views data for tracker.module.
+ *
+ * @ingroup views_module_handlers
+ */
+
+/**
+ * Implements of hook_views_data().
+ */
+function tracker_views_data() {
+  $data = array();
+
+  $data['tracker_node']['table']['group'] = t('Tracker');
+  $data['tracker_node']['table']['join'] = array(
+    'node' => array(
+      'type' => 'INNER',
+      'left_field' => 'nid',
+      'field' => 'nid',
+    ),
+  );
+  $data['tracker_node']['nid'] = array(
+    'title' => t('Nid'),
+    'help' => t('The node ID of the node.'),
+    'field' => array(
+      'id' => 'node',
+    ),
+    'argument' => array(
+      'id' => 'node_nid',
+      'name field' => 'title',
+      'numeric' => TRUE,
+      'validate type' => 'nid',
+    ),
+    'filter' => array(
+      'id' => 'numeric',
+    ),
+    'sort' => array(
+      'id' => 'standard',
+    ),
+  );
+  $data['tracker_node']['changed'] = array(
+    'title' => t('Updated date'),
+    'help' => t('The date the node was last updated.'),
+    'field' => array(
+      'id' => 'date',
+    ),
+    'sort' => array(
+      'id' => 'date',
+    ),
+    'filter' => array(
+      'id' => 'date',
+    ),
+  );
+  $data['tracker_node']['published'] = array(
+    'title' => t('Published'),
+    'help' => t('Whether or not the node is published.'),
+    'field' => array(
+      'id' => 'boolean',
+    ),
+    'filter' => array(
+      'id' => 'boolean',
+      'label' => t('Published'),
+      'type' => 'yes-no',
+      'accept null' => TRUE,
+      'use_equal' => TRUE,
+    ),
+    'sort' => array(
+      'id' => 'standard',
+    ),
+  );
+
+  $data['tracker_user']['table']['group'] = t('Tracker - User');
+  $data['tracker_user']['table']['join'] = array(
+    'node' => array(
+      'type' => 'INNER',
+      'left_field' => 'nid',
+      'field' => 'nid',
+    ),
+    'user' => array(
+      'type' => 'INNER',
+      'left_field' => 'uid',
+      'field' => 'uid',
+    ),
+  );
+  $data['tracker_user']['nid'] = array(
+    'title' => t('Nid'),
+    'help' => t('The node ID of the node a user created or commented on. You must use an argument or filter on UID or you will get misleading results using this field.'),
+    'field' => array(
+      'id' => 'node',
+    ),
+    'argument' => array(
+      'id' => 'node_nid',
+      'name field' => 'title',
+      'numeric' => TRUE,
+      'validate type' => 'nid',
+    ),
+    'filter' => array(
+      'id' => 'numeric',
+    ),
+    'sort' => array(
+      'id' => 'standard',
+    ),
+  );
+  $data['tracker_user']['uid'] = array(
+    'title' => t('Uid'),
+    'help' => t('The user ID of a user who touched the node (either created or commented on it).'),
+    'field' => array(
+      'id' => 'user_name',
+    ),
+    'argument' => array(
+      'id' => 'user_uid',
+      'name field' => 'name',
+    ),
+    'filter' => array(
+      'title' => t('Name'),
+      'id' => 'user_name',
+    ),
+    'sort' => array(
+      'id' => 'standard',
+    ),
+  );
+  $data['tracker_user']['changed'] = array(
+    'title' => t('Updated date'),
+    'help' => t('The date the node was last updated or commented on. You must use an argument or filter on UID or you will get misleading results using this field.'),
+    'field' => array(
+      'id' => 'date',
+    ),
+    'sort' => array(
+      'id' => 'date',
+    ),
+    'filter' => array(
+      'id' => 'date',
+    ),
+  );
+  $data['tracker_user']['published'] = array(
+    'title' => t('Published'),
+    'help' => t('Whether or not the node is published. You must use an argument or filter on UID or you will get misleading results using this field.'),
+    'field' => array(
+      'id' => 'boolean',
+    ),
+    'filter' => array(
+      'id' => 'boolean',
+      'label' => t('Published'),
+      'type' => 'yes-no',
+      'accept null' => TRUE,
+      'use_equal' => TRUE,
+    ),
+    'sort' => array(
+      'id' => 'standard',
+    ),
+  );
+
+  return $data;
+}
+
+/**
+ * Implementation of hook_views_data_alter().
+ */
+function tracker_views_data_alter(&$data) {
+  // Provide additional uid_touch handlers which are handled by tracker
+  $data['node']['uid_touch_tracker'] = array(
+    'group' => t('Tracker - User'),
+    'title' => t('User posted or commented'),
+    'help' => t('Display nodes only if a user posted the node or commented on the node.'),
+    'argument' => array(
+      'field' => 'uid',
+      'name table' => 'users',
+      'name field' => 'name',
+      'id' => 'tracker_comment_user_uid',
+      'no group by' => TRUE,
+    ),
+    'filter' => array(
+      'field' => 'uid',
+      'name table' => 'users',
+      'name field' => 'name',
+      'id' => 'tracker_comment_user_uid'
+    ),
+  );
+}