diff --git a/core/modules/views/src/Entity/Render/EntityFieldRenderer.php b/core/modules/views/src/Entity/Render/EntityFieldRenderer.php
index 82b9d07..98899ef 100644
--- a/core/modules/views/src/Entity/Render/EntityFieldRenderer.php
+++ b/core/modules/views/src/Entity/Render/EntityFieldRenderer.php
@@ -128,7 +128,7 @@ protected function buildFields(array $values) {
       // We store a field name for each relationship to make it easier
       // retrieving the related entity from the row.
       if (!isset($entity_type_ids)) {
-        $row_entities = [$row->_entity] + array_intersect_key($row->_relationship_entities, $this->view->field);
+        $row_entities = [$row->_entity] + array_intersect_key($row->_relationship_entities, $this->view->relationship);
         $entity_type_ids = array_combine(
           array_keys($row_entities),
           array_map(function (EntityInterface $entity) { return $entity->getEntityTypeId(); }, $row_entities)
@@ -137,7 +137,7 @@ protected function buildFields(array $values) {
 
       // Process all entities for each entity type.
       foreach ($entity_type_ids as $rel_field_name => $entity_type_id) {
-        $entity = isset($this->view->field[$rel_field_name]) ? $this->view->field[$rel_field_name]->getEntity($row) : $row->_entity;
+        $entity = isset($row->_relationship_entities[$rel_field_name]) ? $row->_relationship_entities[$rel_field_name] : $row->_entity;
         $entity_type_id = $entity->getEntityTypeId();
         $bundle = $entity->bundle();
         $key = $this->getEntityRowKey($row, $entity);
diff --git a/core/modules/views/src/Tests/Handler/FieldFieldTest.php b/core/modules/views/src/Tests/Handler/FieldFieldTest.php
index 7d5fdd8..ed5756a 100644
--- a/core/modules/views/src/Tests/Handler/FieldFieldTest.php
+++ b/core/modules/views/src/Tests/Handler/FieldFieldTest.php
@@ -12,6 +12,7 @@
 use Drupal\entity_test\Entity\EntityTestRev;
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\user\Entity\User;
 use Drupal\views\Plugin\views\field\Field;
 use Drupal\views\Tests\ViewUnitTestBase;
 use Drupal\views\Views;
@@ -32,7 +33,7 @@ class FieldFieldTest extends ViewUnitTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $testViews = ['test_field_field_test', 'test_field_field_complex_test', 'test_field_field_revision_test'];
+  public static $testViews = ['test_field_field_test', 'test_field_field_complex_test', 'test_field_field_revision_test', 'test_field_field_revision_complex_test'];
 
   /**
    * The stored test entities.
@@ -49,14 +50,45 @@ class FieldFieldTest extends ViewUnitTestBase {
   protected $entityRevision;
 
   /**
+   * Stores a couple of test users.
+   *
+   * @var \Drupal\user\UserInterface[]
+   */
+  protected $testUsers;
+
+  /**
+   * The admin user.
+   *
+   * @var \Drupal\user\UserInterface
+   */
+  protected $adminUser;
+
+  /**
    * {@inheritdoc}
    */
   protected function setUp() {
     parent::setUp();
 
     $this->installEntitySchema('entity_test');
+    $this->installEntitySchema('user');
     $this->installEntitySchema('entity_test_rev');
 
+    // Bypass any field access.
+    $this->adminUser = User::create([
+      'admin_role' => true,
+    ]);
+    $this->adminUser->save();
+    $this->container->get('current_user')->setAccount($this->adminUser);
+
+    $this->testUsers = [];
+    for ($i = 0; $i < 5; $i++) {
+      $this->testUsers[$i] = User::create([
+        'name' => 'test ' . $i,
+        'timezone' => User::getAllowedTimezones()[$i],
+      ]);
+      $this->testUsers[$i]->save();
+    }
+
     // Setup a field storage and field, but also change the views data for the
     // entity_test entity type.
     $field_storage = FieldStorageConfig::create([
@@ -95,6 +127,7 @@ protected function setUp() {
         'bundle' => 'entity_test',
         'field_test' => $random_number[$i],
         'field_test_multiple' => [$random_number_multiple[$i * 2], $random_number_multiple[$i * 2 + 1]],
+        'user_id' => $this->testUsers[$i]->id(),
       ]);
       $entity->save();
     }
@@ -119,6 +152,7 @@ protected function setUp() {
       'field_name' => 'field_test_multiple',
       'type' => 'integer',
       'entity_type' => 'entity_test_rev',
+      'cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED,
     ]);
     $field_storage_multiple->save();
 
@@ -133,28 +167,39 @@ protected function setUp() {
     $this->entityRevision[0] = $entity = EntityTestRev::create([
       'name' => 'base value',
       'field_test' => 1,
-      'field_test_multiple' => [1, 3, 7]
+      'field_test_multiple' => [1, 3, 7],
+      'user_id' =>  $this->testUsers[0]->id(),
     ]);
     $entity->save();
+    $original_entity = clone $entity;
 
-    $entity = clone $entity;
+    $entity = clone $original_entity;
     $entity->setNewRevision(TRUE);
     $entity->name->value = 'revision value1';
     $entity->field_test->value = 2;
-    $entity->field_test_multiple->value = 2;
+    $entity->field_test_multiple[0]->value = 0;
+    $entity->field_test_multiple[1]->value = 3;
+    $entity->field_test_multiple[2]->value = 5;
+    $entity->user_id->target_id = $this->testUsers[1]->id();
     $entity->save();
     $this->entityRevision[1] = $entity;
 
-    $entity = clone $entity;
+    $entity = clone $original_entity;
     $entity->setNewRevision(TRUE);
     $entity->name->value = 'revision value2';
     $entity->field_test->value = 3;
+    $entity->field_test_multiple[0]->value = 9;
+    $entity->field_test_multiple[1]->value = 9;
+    $entity->field_test_multiple[2]->value = 9;
+    $entity->user_id->target_id = $this->testUsers[2]->id();
     $entity->save();
     $this->entityRevision[2] = $entity;
 
-    $this->entityRevision[0] = $entity = EntityTestRev::create([
+    $this->entityRevision[3] = $entity = EntityTestRev::create([
       'name' => 'next entity value',
       'field_test' => 4,
+      'field_test_multiple' => [2, 9, 9],
+      'user_id' => $this->testUsers[3]->id(),
     ]);
     $entity->save();
 
@@ -229,19 +274,25 @@ public function testComplexExecute() {
     $executable = Views::getView('test_field_field_complex_test');
     $executable->execute();
 
+    $timezones = [];
+    foreach ($this->testUsers as $user) {
+      $timezones[] = $user->getTimeZone();
+    }
+
     $this->assertTrue($executable->field['field_test_multiple'] instanceof Field);
     $this->assertTrue($executable->field['field_test_multiple_1'] instanceof Field);
     $this->assertTrue($executable->field['field_test_multiple_2'] instanceof Field);
+    $this->assertTrue($executable->field['timezone'] instanceof Field);
 
     $this->assertIdenticalResultset($executable,
       [
-        ['field_test_multiple' => ['1', '3'], 'field_test_multiple_1' => ['1', '3'], 'field_test_multiple_2' => ['1', '3']],
-        ['field_test_multiple' => ['7', '0'], 'field_test_multiple_1' => ['7', '0'], 'field_test_multiple_2' => ['7', '0']],
-        ['field_test_multiple' => ['3', '5'], 'field_test_multiple_1' => ['3', '5'], 'field_test_multiple_2' => ['3', '5']],
-        ['field_test_multiple' => ['9', '9'], 'field_test_multiple_1' => ['9', '9'], 'field_test_multiple_2' => ['9', '9']],
-        ['field_test_multiple' => ['9', '0'], 'field_test_multiple_1' => ['9', '0'], 'field_test_multiple_2' => ['9', '0']],
+        ['timezone' => $timezones[0], 'field_test_multiple' => [1, 3], 'field_test_multiple_1' => [1, 3], 'field_test_multiple_2' => [1, 3]],
+        ['timezone' => $timezones[1], 'field_test_multiple' => [7, 0], 'field_test_multiple_1' => [7, 0], 'field_test_multiple_2' => [7, 0]],
+        ['timezone' => $timezones[2], 'field_test_multiple' => [3, 5], 'field_test_multiple_1' => [3, 5], 'field_test_multiple_2' => [3, 5]],
+        ['timezone' => $timezones[3], 'field_test_multiple' => [9, 9], 'field_test_multiple_1' => [9, 9], 'field_test_multiple_2' => [9, 9]],
+        ['timezone' => $timezones[4], 'field_test_multiple' => [9, 0], 'field_test_multiple_1' => [9, 0], 'field_test_multiple_2' => [9, 0]],
       ],
-      ['field_test_multiple' => 'field_test_multiple', 'field_test_multiple_1' => 'field_test_multiple_1', 'field_test_multiple_2' => 'field_test_multiple_2']
+      ['timezone' => 'timezone', 'field_test_multiple' => 'field_test_multiple', 'field_test_multiple_1' => 'field_test_multiple_1', 'field_test_multiple_2' => 'field_test_multiple_2']
     );
   }
 
@@ -252,22 +303,27 @@ public function testComplexRender() {
     $executable = Views::getView('test_field_field_complex_test');
     $executable->render();
 
+    $this->assertEqual($this->testUsers[0]->getTimeZone(), $executable->getStyle()->getField(0, 'timezone'));
     $this->assertEqual("1, 3", $executable->getStyle()->getField(0, 'field_test_multiple'));
     $this->assertEqual("1", $executable->getStyle()->getField(0, 'field_test_multiple_1'));
     $this->assertEqual("3", $executable->getStyle()->getField(0, 'field_test_multiple_2'));
 
+    $this->assertEqual($this->testUsers[1]->getTimeZone(), $executable->getStyle()->getField(1, 'timezone'));
     $this->assertEqual("7, 0", $executable->getStyle()->getField(1, 'field_test_multiple'));
     $this->assertEqual("7", $executable->getStyle()->getField(1, 'field_test_multiple_1'));
     $this->assertEqual("0", $executable->getStyle()->getField(1, 'field_test_multiple_2'));
 
+    $this->assertEqual($this->testUsers[2]->getTimeZone(), $executable->getStyle()->getField(2, 'timezone'));
     $this->assertEqual("3, 5", $executable->getStyle()->getField(2, 'field_test_multiple'));
     $this->assertEqual("3", $executable->getStyle()->getField(2, 'field_test_multiple_1'));
     $this->assertEqual("5", $executable->getStyle()->getField(2, 'field_test_multiple_2'));
 
+    $this->assertEqual($this->testUsers[3]->getTimeZone(), $executable->getStyle()->getField(3, 'timezone'));
     $this->assertEqual("9, 9", $executable->getStyle()->getField(3, 'field_test_multiple'));
     $this->assertEqual("9", $executable->getStyle()->getField(3, 'field_test_multiple_1'));
     $this->assertEqual("9", $executable->getStyle()->getField(3, 'field_test_multiple_2'));
 
+    $this->assertEqual($this->testUsers[4]->getTimeZone(), $executable->getStyle()->getField(4, 'timezone'));
     $this->assertEqual("9, 0", $executable->getStyle()->getField(4, 'field_test_multiple'));
     $this->assertEqual("9", $executable->getStyle()->getField(4, 'field_test_multiple_1'));
     $this->assertEqual("0", $executable->getStyle()->getField(4, 'field_test_multiple_2'));
@@ -320,7 +376,72 @@ public function testRevisionRender() {
     $this->assertEqual(4, $executable->getStyle()->getField(3, 'revision_id'));
     $this->assertEqual(4, $executable->getStyle()->getField(3, 'field_test'));
     $this->assertEqual('next entity value', $executable->getStyle()->getField(3, 'name'));
+  }
 
+  /**
+   * Tests the revision result.
+   */
+  public function testRevisionComplexExecute() {
+    $executable = Views::getView('test_field_field_revision_complex_test');
+    $executable->execute();
+
+    $timezones = [];
+    foreach ($this->testUsers as $user) {
+      $timezones[] = $user->getTimeZone();
+    }
+
+    $this->assertTrue($executable->field['id'] instanceof Field);
+    $this->assertTrue($executable->field['revision_id'] instanceof Field);
+    $this->assertTrue($executable->field['timezone'] instanceof Field);
+    $this->assertTrue($executable->field['field_test_multiple'] instanceof Field);
+    $this->assertTrue($executable->field['field_test_multiple_1'] instanceof Field);
+    $this->assertTrue($executable->field['field_test_multiple_2'] instanceof Field);
+
+    $this->assertIdenticalResultset($executable,
+      [
+        ['id' => 1, 'field_test' => 1, 'revision_id' => 1, 'uid' => $this->testUsers[0]->id(), 'timezone' => $timezones[0], 'field_test_multiple' => [1, 3, 7], 'field_test_multiple_1' => [1, 3, 7], 'field_test_multiple_2' => [1, 3, 7]],
+        ['id' => 1, 'field_test' => 2, 'revision_id' => 2, 'uid' => $this->testUsers[1]->id(), 'timezone' => $timezones[1], 'field_test_multiple' => [0, 3, 5], 'field_test_multiple_1' => [0, 3, 5], 'field_test_multiple_2' => [0, 3, 5]],
+        ['id' => 1, 'field_test' => 3, 'revision_id' => 3, 'uid' => $this->testUsers[2]->id(), 'timezone' => $timezones[2], 'field_test_multiple' => [9, 9, 9], 'field_test_multiple_1' => [9, 9, 9], 'field_test_multiple_2' => [9, 9, 9]],
+        ['id' => 2, 'field_test' => 4, 'revision_id' => 4, 'uid' => $this->testUsers[3]->id(), 'timezone' => $timezones[3], 'field_test_multiple' => [2, 9, 9], 'field_test_multiple_1' => [2, 9, 9], 'field_test_multiple_2' => [2, 9, 9]],
+      ],
+      ['entity_test_rev_revision_id' => 'id', 'revision_id' => 'revision_id', 'users_field_data_entity_test_rev_revision_uid' => 'uid', 'timezone' => 'timezone', 'field_test_multiple' => 'field_test_multiple', 'field_test_multiple_1' => 'field_test_multiple_1', 'field_test_multiple_2' => 'field_test_multiple_2']
+    );
+  }
+
+  /**
+   * Tests the output of a revision view with base fields and configurable fields.
+   */
+  public function testRevisionComplexRender() {
+    $executable = Views::getView('test_field_field_revision_complex_test');
+    $executable->render();
+
+    $this->assertEqual(1, $executable->getStyle()->getField(0, 'id'));
+    $this->assertEqual(1, $executable->getStyle()->getField(0, 'revision_id'));
+    $this->assertEqual($this->testUsers[0]->getTimeZone(), $executable->getStyle()->getField(0, 'timezone'));
+    $this->assertEqual('1, 3, 7', $executable->getStyle()->getField(0, 'field_test_multiple'));
+    $this->assertEqual('1', $executable->getStyle()->getField(0, 'field_test_multiple_1'));
+    $this->assertEqual('3, 7', $executable->getStyle()->getField(0, 'field_test_multiple_2'));
+
+    $this->assertEqual(1, $executable->getStyle()->getField(1, 'id'));
+    $this->assertEqual(2, $executable->getStyle()->getField(1, 'revision_id'));
+    $this->assertEqual($this->testUsers[1]->getTimeZone(), $executable->getStyle()->getField(1, 'timezone'));
+    $this->assertEqual('0, 3, 5', $executable->getStyle()->getField(1, 'field_test_multiple'));
+    $this->assertEqual('0', $executable->getStyle()->getField(1, 'field_test_multiple_1'));
+    $this->assertEqual('3, 5', $executable->getStyle()->getField(1, 'field_test_multiple_2'));
+
+    $this->assertEqual(1, $executable->getStyle()->getField(2, 'id'));
+    $this->assertEqual(3, $executable->getStyle()->getField(2, 'revision_id'));
+    $this->assertEqual($this->testUsers[2]->getTimeZone(), $executable->getStyle()->getField(2, 'timezone'));
+    $this->assertEqual('9, 9, 9', $executable->getStyle()->getField(2, 'field_test_multiple'));
+    $this->assertEqual('9', $executable->getStyle()->getField(2, 'field_test_multiple_1'));
+    $this->assertEqual('9, 9', $executable->getStyle()->getField(2, 'field_test_multiple_2'));
+
+    $this->assertEqual(2, $executable->getStyle()->getField(3, 'id'));
+    $this->assertEqual(4, $executable->getStyle()->getField(3, 'revision_id'));
+    $this->assertEqual($this->testUsers[3]->getTimeZone(), $executable->getStyle()->getField(3, 'timezone'));
+    $this->assertEqual('2, 9, 9', $executable->getStyle()->getField(3, 'field_test_multiple'));
+    $this->assertEqual('2', $executable->getStyle()->getField(3, 'field_test_multiple_1'));
+    $this->assertEqual('9, 9', $executable->getStyle()->getField(3, 'field_test_multiple_2'));
   }
 
 }
diff --git a/core/modules/views/src/Tests/ViewResultAssertionTrait.php b/core/modules/views/src/Tests/ViewResultAssertionTrait.php
index 96bdbbe..ed10ce2 100644
--- a/core/modules/views/src/Tests/ViewResultAssertionTrait.php
+++ b/core/modules/views/src/Tests/ViewResultAssertionTrait.php
@@ -112,8 +112,11 @@ protected function assertIdenticalResultsetHelper($view, $expected_result, $colu
         if (is_object($value)) {
           $row[$expected_column] = (string) $value->$expected_column;
         }
+        // This case is about fields with mulitple values.
         elseif (is_array($value[$expected_column])) {
-          $row[$expected_column] = $value[$expected_column];
+          foreach (array_keys($value[$expected_column]) as $delta) {
+            $row[$expected_column][$delta] = (string) $value[$expected_column][$delta];
+          }
         }
         else {
           $row[$expected_column] = (string) $value[$expected_column];
@@ -144,4 +147,3 @@ protected function assertIdenticalResultsetHelper($view, $expected_result, $colu
   }
 
 }
-
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_field_complex_test.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_field_complex_test.yml
index 666b1ba..58ee430 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_field_complex_test.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_field_complex_test.yml
@@ -51,6 +51,19 @@ display:
           delta_limit: 0
           delta_offset: 1
           group_rows: true
+        timezone:
+          id: timezone
+          table: users_field_data
+          field: timezone
+          plugin_id: field
+          relationship: user_id
+          alter: {}
+      relationships:
+        user_id:
+          table: entity_test
+          field: user_id
+          id: user_id
+          plugin_id: standard
       sorts:
         id:
           id: id
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_field_complex_test.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_field_revision_complex_test.yml
similarity index 50%
copy from core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_field_complex_test.yml
copy to core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_field_revision_complex_test.yml
index 666b1ba..b0122a3 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_field_complex_test.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_field_revision_complex_test.yml
@@ -1,11 +1,11 @@
 langcode: und
 status: true
 dependencies: {  }
-id: test_field_field_complex_test
+id: test_field_field_revision_complex_test
 module: views
 description: ''
 tag: ''
-base_table: entity_test
+base_table: entity_test_rev_revision
 base_field: id
 core: '8'
 display:
@@ -18,46 +18,67 @@ display:
       fields:
         id:
           id: id
-          table: entity_test
+          table: entity_test_rev_revision
           field: id
           plugin_id: field
-          entity_type: entity_test
+          entity_type: entity_test_rev
           entity_field: id
+        revision_id:
+          id: revision_id
+          table: entity_test_rev_revision
+          field: revision_id
+          plugin_id: field
+          entity_type: entity_test_rev
+          entity_field: revision_id
         field_test_multiple:
           id: field_test_multiple
-          table: entity_test__field_test_multiple
+          table: entity_test_rev__field_test_multiple
           field: field_test_multiple
           plugin_id: field
-          entity_type: entity_test
+          entity_type: entity_test_rev
           entity_field: field_test_multiple
           delta_limit: 0
           group_rows: true
         field_test_multiple_1:
           id: field_test_multiple_1
-          table: entity_test__field_test_multiple
+          table: entity_test_rev__field_test_multiple
           field: field_test_multiple
           plugin_id: field
-          entity_type: entity_test
+          entity_type: entity_test_rev
           entity_field: field_test_multiple
           delta_limit: 1
           group_rows: true
         field_test_multiple_2:
           id: field_test_multiple_2
-          table: entity_test__field_test_multiple
+          table: entity_test_rev__field_test_multiple
           field: field_test_multiple
           plugin_id: field
-          entity_type: entity_test
+          entity_type: entity_test_rev
           entity_field: field_test_multiple
           delta_limit: 0
           delta_offset: 1
           group_rows: true
-      sorts:
-        id:
-          id: id
-          table: entity_test
-          field: id
+        timezone:
+          id: timezone
+          table: users_field_data
+          field: timezone
+          plugin_id: field
+          relationship: user_id
+          alter: {}
+      relationships:
+        user_id:
+          table: entity_test_rev_revision
+          field: user_id
+          id: user_id
           plugin_id: standard
-          order: asc
+      sorts:
+        revision_id:
+          id: revision_id
+          table: entity_test_rev_revision
+          field: revision_id
+          entity_type: entity_test_rev
+          entity_field: revision_id
+          order: ASC
       style:
         type: html_list
     display_plugin: default