diff --git a/composer.lock b/composer.lock
index 86881211a..f2c6c183a 100644
--- a/composer.lock
+++ b/composer.lock
@@ -891,16 +891,16 @@
         },
         {
             "name": "masterminds/html5",
-            "version": "2.1.2",
+            "version": "2.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Masterminds/html5-php.git",
-                "reference": "8f782e0f01a6e33a319bdc8f6de9cfd6569979a4"
+                "reference": "170aa5cb35b29fccafbf5ea63487c013f396fdc9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/8f782e0f01a6e33a319bdc8f6de9cfd6569979a4",
-                "reference": "8f782e0f01a6e33a319bdc8f6de9cfd6569979a4",
+                "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/170aa5cb35b29fccafbf5ea63487c013f396fdc9",
+                "reference": "170aa5cb35b29fccafbf5ea63487c013f396fdc9",
                 "shasum": ""
             },
             "require": {
@@ -910,7 +910,7 @@
             "require-dev": {
                 "phpunit/phpunit": "4.*",
                 "sami/sami": "~2.0",
-                "satooshi/php-coveralls": "0.6.*"
+                "satooshi/php-coveralls": "1.0.*"
             },
             "type": "library",
             "extra": {
@@ -952,7 +952,7 @@
                 "serializer",
                 "xml"
             ],
-            "time": "2015-06-07 08:43:18"
+            "time": "2016-05-10 14:11:45"
         },
         {
             "name": "paragonie/random_compat",
diff --git a/core/INSTALL.txt b/core/INSTALL.txt
index ff35ee334..8c5ee8723 100644
--- a/core/INSTALL.txt
+++ b/core/INSTALL.txt
@@ -27,7 +27,7 @@ Drupal requires:
   - Percona Server 5.5.8 (or greater) (http://www.percona.com/). Percona
     Server is a backwards-compatible replacement for MySQL.
   - PostgreSQL 9.1.2 (or greater) (http://www.postgresql.org/).
-  - SQLite 3.6.8 (or greater) (http://www.sqlite.org/).
+  - SQLite 3.7.11 (or greater) (http://www.sqlite.org/).
 
 For more detailed information about Drupal requirements, including a list of
 PHP extensions and configurations that are required, see "System requirements"
diff --git a/core/MAINTAINERS.txt b/core/MAINTAINERS.txt
index 44b4d7a01..10ee48cf7 100644
--- a/core/MAINTAINERS.txt
+++ b/core/MAINTAINERS.txt
@@ -28,8 +28,12 @@ Provisional membership:
 - Scott Reeves 'Cottser' https://www.drupal.org/u/cottser
 
 Drupal 7
+- Fabian Franz 'Fabianx' https://www.drupal.org/u/fabianx
+  (Framework Manager)
 - David Rothstein 'David_Rothstein' https://www.drupal.org/u/david_rothstein
   (Release Manager, Framework Manager, Product Manager)
+- Stefan Ruijsenaars 'stefan.r' https://www.drupal.org/u/stefanr-0
+  (Release Manager, Product Manager)
 
 Provisional membership: None at this time.
 
@@ -200,7 +204,6 @@ Transliteration system
 - Andrei Mateescu 'amateescu' https://www.drupal.org/u/amateescu
 - Damien Tournoud 'damien-tournoud' https://www.drupal.org/u/damien-tournoud
 - Daniel F. Kudwien 'sun' https://www.drupal.org/u/sun
-- Jennifer Hodgdon 'jhodgdon' https://www.drupal.org/u/jhodgdon
 
 Typed data system
 - Wolfgang Ziegler 'fago' https://www.drupal.org/u/fago
@@ -213,7 +216,7 @@ Accessibility
 - Jesse Renée Beach 'jessebeach' https://www.drupal.org/u/jessebeach
 
 Documentation
-- Jennifer Hodgdon 'jhodgdon' https://www.drupal.org/u/jhodgdon
+- ?
 
 Performance
 - Nathaniel Catchpole 'catch' https://www.drupal.org/u/catch
@@ -413,7 +416,6 @@ Responsive Image module
 - Jelle Sebreghts 'Jelle_S' https://www.drupal.org/u/jelle_s
 
 Search module
-- Jennifer Hodgdon 'jhodgdon' https://www.drupal.org/u/jhodgdon
 - Peter Wolanin 'pwolanin' https://www.drupal.org/u/pwolanin
 
 Serialization module
diff --git a/core/composer.json b/core/composer.json
index 1266df391..a8ee73e4c 100644
--- a/core/composer.json
+++ b/core/composer.json
@@ -64,8 +64,10 @@
         "drupal/content_translation": "self.version",
         "drupal/contextual": "self.version",
         "drupal/core-annotation": "self.version",
+        "drupal/core-assertion": "self.version",
         "drupal/core-bridge": "self.version",
         "drupal/core-datetime": "self.version",
+        "drupal/core-dependency-injection": "self.version",
         "drupal/core-diff": "self.version",
         "drupal/core-discovery": "self.version",
         "drupal/core-event-dispatcher": "self.version",
diff --git a/core/includes/entity.inc b/core/includes/entity.inc
index d48aa4eb2..cdf3120b9 100644
--- a/core/includes/entity.inc
+++ b/core/includes/entity.inc
@@ -32,12 +32,13 @@ function entity_render_cache_clear() {
  *   The bundle info for a specific entity type, or all entity types.
  *
  * @deprecated in Drupal 8.x-dev and will be removed before Drupal 9.0.0. Use
- *   \Drupal\Core\Entity\EntityManagerInterface::getBundleInfo() for a single
- *   bundle, or \Drupal\Core\Entity\EntityManagerInterface::getAllBundleInfo()
- *   for all bundles.
+ *   \Drupal\Core\Entity\EntityTypeBundleInfoInterface::getBundleInfo() for a
+ *   single bundle, or
+ *   \Drupal\Core\Entity\EntityTypeBundleInfoInterface::getAllBundleInfo() for
+ *   all bundles.
  *
- * @see \Drupal\Core\Entity\EntityManagerInterface::getBundleInfo()
- * @see \Drupal\Core\Entity\EntityManagerInterface::getAllBundleInfo()
+ * @see \Drupal\Core\Entity\EntityTypeBundleInfoInterface::getBundleInfo()
+ * @see \Drupal\Core\Entity\EntityTypeBundleInfoInterface::getAllBundleInfo()
  */
 function entity_get_bundles($entity_type = NULL) {
   if (isset($entity_type)) {
@@ -67,11 +68,11 @@ function entity_get_bundles($entity_type = NULL) {
  *   entity type is variable, use the entity manager service to load the entity
  *   from the entity storage:
  * @code
- * \Drupal::entityManager()->getStorage($entity_type)->load($id)
+ * \Drupal::entityTypeManager()->getStorage($entity_type)->load($id);
  * @endcode
  *
  * @see \Drupal\Core\Entity\EntityInterface::load()
- * @see \Drupal\Core\Entity\EntityManagerInterface::getStorage()
+ * @see \Drupal\Core\Entity\EntityTypeManagerInterface::getStorage()
  * @see \Drupal\Core\Entity\EntityStorageInterface::load()
  * @see \Drupal\Core\Entity\Sql\SqlContentEntityStorage
  * @see \Drupal\Core\Entity\Query\QueryInterface
@@ -100,10 +101,12 @@ function entity_load($entity_type, $id, $reset = FALSE) {
  *   the entity storage's loadRevision() method to load a specific entity
  *   revision:
  * @code
- * \Drupal::entityManager()->getStorage($entity_type)->loadRevision($revision_id);
+ * \Drupal::entityTypeManager()
+ *   ->getStorage($entity_type)
+ *   ->loadRevision($revision_id);
  * @endcode
  *
- * @see \Drupal\Core\Entity\EntityManagerInterface::getStorage()
+ * @see \Drupal\Core\Entity\EntityTypeManagerInterface::getStorage()
  * @see \Drupal\Core\Entity\EntityStorageInterface::loadRevision()
  * @see \Drupal\Core\Entity\Sql\SqlContentEntityStorage
  */
@@ -125,10 +128,12 @@ function entity_revision_load($entity_type, $revision_id) {
  *   the entity storage's deleteRevision() method to delete a specific entity
  *   revision:
  * @code
- * \Drupal::entityManager()->getStorage($entity_type)>deleteRevision($revision_id);
+ * \Drupal::entityTypeManager()
+ *   ->getStorage($entity_type)
+ *   ->deleteRevision($revision_id);
  * @endcode
  *
- * @see \Drupal\Core\Entity\EntityManagerInterface::getStorage()
+ * @see \Drupal\Core\Entity\EntityTypeManagerInterface::getStorage()
  * @see \Drupal\Core\Entity\EntityStorageInterface::deleteRevision()
  */
 function entity_revision_delete($entity_type, $revision_id) {
@@ -171,11 +176,11 @@ function entity_revision_delete($entity_type, $revision_id) {
  *   the entity type is variable, use the entity manager service to load the
  *   entity from the entity storage:
  * @code
- * \Drupal::entityManager()->getStorage($entity_type)->loadMultiple($id)
+ * \Drupal::entityTypeManager()->getStorage($entity_type)->loadMultiple($id);
  * @endcode
  *
  * @see \Drupal\Core\Entity\EntityInterface::loadMultiple()
- * @see \Drupal\Core\Entity\EntityManagerInterface::getStorage()
+ * @see \Drupal\Core\Entity\EntityTypeManagerInterface::getStorage()
  * @see \Drupal\Core\Entity\EntityStorageInterface::loadMultiple()
  * @see \Drupal\Core\Entity\Sql\SqlContentEntityStorage
  * @see \Drupal\Core\Entity\Query\QueryInterface
@@ -205,10 +210,12 @@ function entity_load_multiple($entity_type, array $ids = NULL, $reset = FALSE) {
  *   the entity storage's loadByProperties() method to load an entity by their
  *   property values:
  * @code
- * \Drupal::entityManager()->getStorage($entity_type)->loadByProperties($values);
+ * \Drupal::entityTypeManager()
+ *   ->getStorage($entity_type)
+ *   ->loadByProperties($values);
  * @endcode
  *
- * @see \Drupal\Core\Entity\EntityManagerInterface::getStorage()
+ * @see \Drupal\Core\Entity\EntityTypeManagerInterface::getStorage()
  * @see \Drupal\Core\Entity\EntityStorageInterface::loadByProperties()
  */
 function entity_load_multiple_by_properties($entity_type, array $values) {
@@ -236,10 +243,10 @@ function entity_load_multiple_by_properties($entity_type, array $values) {
  * @deprecated as of Drupal 8.0.x, will be removed before Drupal 9.0.0. Use
  *   the entity storage's loadUnchanged() method to load an unchanged entity:
  * @code
- * \Drupal::entityManager()->getStorage($entity_type)->loadUnchanged($id).
+ * \Drupal::entityTypeManager()->getStorage($entity_type)->loadUnchanged($id);
  * @endcode
  *
- * @see \Drupal\Core\Entity\EntityManagerInterface::getStorage()
+ * @see \Drupal\Core\Entity\EntityTypeManagerInterface::getStorage()
  * @see \Drupal\Core\Entity\EntityStorageInterface::loadUnchanged()
  */
 function entity_load_unchanged($entity_type, $id) {
@@ -259,12 +266,12 @@ function entity_load_unchanged($entity_type, $id) {
  * @deprecated as of Drupal 8.0.x, will be removed before Drupal 9.0.0. Use
  *   the entity storage's delete() method to delete multiple entities:
  * @code
- * $storage_handler = \Drupal::entityManager()->getStorage($entity_type);
+ * $storage_handler = \Drupal::entityTypeManager()->getStorage($entity_type);
  * $entities = $storage_handler->loadMultiple($ids);
  * $storage_handler->delete($entities);
  * @endcode
  *
- * @see \Drupal\Core\Entity\EntityManagerInterface::getStorage()
+ * @see \Drupal\Core\Entity\EntityTypeManagerInterface::getStorage()
  * @see \Drupal\Core\Entity\EntityStorageInterface::loadMultiple()
  * @see \Drupal\Core\Entity\EntityStorageInterface::delete()
  */
@@ -292,10 +299,10 @@ function entity_delete_multiple($entity_type, array $ids) {
  *   entity type is variable, use the entity storage's create() method to
  *   construct a new entity:
  * @code
- * \Drupal::entityManager()->getStorage($entity_type)->create($values)
+ * \Drupal::entityTypeManager()->getStorage($entity_type)->create($values);
  * @endcode
  *
- * @see \Drupal\Core\Entity\EntityManagerInterface::getStorage()
+ * @see \Drupal\Core\Entity\EntityTypeManagerInterface::getStorage()
  * @see \Drupal\Core\Entity\EntityStorageInterface::create()
  */
 function entity_create($entity_type, array $values = array()) {
@@ -349,11 +356,12 @@ function entity_page_label(EntityInterface $entity, $langcode = NULL) {
  * @deprecated as of Drupal 8.0.x, will be removed before Drupal 9.0.0.
  *   Use the entity view builder's view() method for creating a render array:
  * @code
- * $view_builder = \Drupal::entityManager()->getViewBuilder($entity->getEntityTypeId());
+ * $view_builder = \Drupal::entityTypeManager()
+ *   ->getViewBuilder($entity->getEntityTypeId());
  * return $view_builder->view($entity, $view_mode, $langcode);
  * @endcode
  *
- * @see \Drupal\Core\Entity\EntityManagerInterface::getViewBuilder()
+ * @see \Drupal\Core\Entity\EntityTypeManagerInterface::getViewBuilder()
  * @see \Drupal\Core\Entity\EntityViewBuilderInterface::view()
  */
 function entity_view(EntityInterface $entity, $view_mode, $langcode = NULL, $reset = FALSE) {
@@ -386,11 +394,12 @@ function entity_view(EntityInterface $entity, $view_mode, $langcode = NULL, $res
  *   Use the entity view builder's viewMultiple() method for creating a render
  *   array for the provided entities:
  * @code
- * $view_builder = \Drupal::entityManager()->getViewBuilder($entity->getEntityTypeId());
+ * $view_builder = \Drupal::entityTypeManager()
+ *   ->getViewBuilder($entity->getEntityTypeId());
  * return $view_builder->viewMultiple($entities, $view_mode, $langcode);
  * @endcode
  *
- * @see \Drupal\Core\Entity\EntityManagerInterface::getViewBuilder()
+ * @see \Drupal\Core\Entity\EntityTypeManagerInterface::getViewBuilder()
  * @see \Drupal\Core\Entity\EntityViewBuilderInterface::viewMultiple()
  */
 function entity_view_multiple(array $entities, $view_mode, $langcode = NULL, $reset = FALSE) {
@@ -443,7 +452,9 @@ function entity_view_multiple(array $entities, $view_mode, $langcode = NULL, $re
  * @deprecated as of Drupal 8.0.x, will be removed before Drupal 9.0.0.
  *   If the display is available in configuration use:
  *   @code
- *   \Drupal::entityManager()->getStorage('entity_view_display')->load($entity_type . '.' . $bundle . '.' . $view_mode);
+ *   \Drupal::entityTypeManager()
+ *     ->getStorage('entity_view_display')
+ *     ->load($entity_type . '.' . $bundle . '.' . $view_mode);
  *   @endcode
  *   When the display is not available in configuration, you can create a new
  *   EntityViewDisplay object using:
@@ -454,7 +465,9 @@ function entity_view_multiple(array $entities, $view_mode, $langcode = NULL, $re
  *     'mode' => $view_mode,
  *     'status' => TRUE,
  *   ));
- *   \Drupal::entityManager()->getStorage('entity_view_display')->create($values);
+ *   \Drupal::entityTypeManager()
+ *     ->getStorage('entity_view_display')
+ *     ->create($values);
  *   @endcode
  *
  * @see \Drupal\Core\Entity\EntityStorageInterface::create()
@@ -519,10 +532,12 @@ function entity_get_display($entity_type, $bundle, $view_mode) {
  * @deprecated as of Drupal 8.0.x, will be removed before Drupal 9.0.0.
  *   If the entity form display is available in configuration use:
  * @code
- *   \Drupal::entityManager()->getStorage('entity_form_display')->load($entity_type . '.' . $bundle . '.' . $form_mode);
+ *   \Drupal::entityTypeManager()
+ *     ->getStorage('entity_form_display')
+ *     ->load($entity_type . '.' . $bundle . '.' . $form_mode);
  * @endcode
- *   When the entity form display is not available in configuration, you can create a new
- *   EntityFormDisplay object using:
+ *   When the entity form display is not available in configuration, you can
+ *   create a new EntityFormDisplay object using:
  * @code
  * $values = ('entity_form_display', array(
  *  'targetEntityType' => $entity_type,
@@ -530,7 +545,9 @@ function entity_get_display($entity_type, $bundle, $view_mode) {
  *  'mode' => $form_mode,
  *  'status' => TRUE,
  * ));
- * \Drupal::entityManager()->getStorage('entity_form_display')->create($values);
+ * \Drupal::entityTypeManager()
+ *   ->getStorage('entity_form_display')
+ *   ->create($values);
  * @endcode
  *
  * @see \Drupal\Core\Entity\EntityStorageInterface::create()
diff --git a/core/includes/file.inc b/core/includes/file.inc
index 3cd943982..528d00bc4 100644
--- a/core/includes/file.inc
+++ b/core/includes/file.inc
@@ -397,7 +397,7 @@ function file_valid_uri($uri) {
 }
 
 /**
- * Copies a file to a new location without invoking the file API.
+ * Copies a file to a new location without database changes or hook invocation.
  *
  * This is a powerful function that in many ways performs like an advanced
  * version of copy().
@@ -407,10 +407,9 @@ function file_valid_uri($uri) {
  * - If the $source and $destination are equal, the behavior depends on the
  *   $replace parameter. FILE_EXISTS_REPLACE will error out. FILE_EXISTS_RENAME
  *   will rename the file until the $destination is unique.
- * - Provides a fallback using realpaths if the move fails using stream
- *   wrappers. This can occur because PHP's copy() function does not properly
- *   support streams if open_basedir is enabled. See
- *   https://bugs.php.net/bug.php?id=60456
+ * - Works around a PHP bug where copy() does not properly support streams if
+ *   safe_mode or open_basedir are enabled.
+ *   @see https://bugs.php.net/bug.php?id=60456
  *
  * @param $source
  *   A string specifying the filepath or URI of the source file.
@@ -431,18 +430,66 @@ function file_valid_uri($uri) {
  * @see file_copy()
  */
 function file_unmanaged_copy($source, $destination = NULL, $replace = FILE_EXISTS_RENAME) {
+  if (!file_unmanaged_prepare($source, $destination, $replace)) {
+    return FALSE;
+  }
+  // Attempt to resolve the URIs. This is necessary in certain configurations
+  // (see above).
+  $real_source = drupal_realpath($source) ?: $source;
+  $real_destination = drupal_realpath($destination) ?: $destination;
+  // Perform the copy operation.
+  if (!@copy($real_source, $real_destination)) {
+    \Drupal::logger('file')->error('The specified file %file could not be copied to %destination.', array('%file' => $source, '%destination' => $destination));
+    return FALSE;
+  }
+  // Set the permissions on the new file.
+  drupal_chmod($destination);
+  return $destination;
+}
+
+/**
+ * Internal function that prepares the destination for a file_unmanaged_copy or
+ * file_unmanaged_move operation.
+ *
+ * - Checks if $source and $destination are valid and readable/writable.
+ * - Checks that $source is not equal to $destination; if they are an error
+ *   is reported.
+ * - If file already exists in $destination either the call will error out,
+ *   replace the file or rename the file based on the $replace parameter.
+ *
+ * @param $source
+ *   A string specifying the filepath or URI of the source file.
+ * @param $destination
+ *   A URI containing the destination that $source should be moved/copied to.
+ *   The URI may be a bare filepath (without a scheme) and in that case the
+ *   default scheme (file://) will be used. If this value is omitted, Drupal's
+ *   default files scheme will be used, usually "public://".
+ * @param $replace
+ *   Replace behavior when the destination file already exists:
+ *   - FILE_EXISTS_REPLACE - Replace the existing file.
+ *   - FILE_EXISTS_RENAME - Append _{incrementing number} until the filename is
+ *       unique.
+ *   - FILE_EXISTS_ERROR - Do nothing and return FALSE.
+ *
+ * @return
+ *   TRUE, or FALSE in the event of an error.
+ *
+ * @see file_unmanaged_copy()
+ * @see file_unmanaged_move()
+ */
+function file_unmanaged_prepare($source, &$destination = NULL, $replace = FILE_EXISTS_RENAME) {
   $original_source = $source;
   $logger = \Drupal::logger('file');
 
   // Assert that the source file actually exists.
   if (!file_exists($source)) {
     // @todo Replace drupal_set_message() calls with exceptions instead.
-    drupal_set_message(t('The specified file %file could not be copied because no file by that name exists. Please check that you supplied the correct filename.', array('%file' => $original_source)), 'error');
+    drupal_set_message(t('The specified file %file could not be moved/copied because no file by that name exists. Please check that you supplied the correct filename.', array('%file' => $original_source)), 'error');
     if (($realpath = drupal_realpath($original_source)) !== FALSE) {
-      $logger->notice('File %file (%realpath) could not be copied because it does not exist.', array('%file' => $original_source, '%realpath' => $realpath));
+      $logger->notice('File %file (%realpath) could not be moved/copied because it does not exist.', array('%file' => $original_source, '%realpath' => $realpath));
     }
     else {
-      $logger->notice('File %file could not be copied because it does not exist.', array('%file' => $original_source));
+      $logger->notice('File %file could not be moved/copied because it does not exist.', array('%file' => $original_source));
     }
     return FALSE;
   }
@@ -463,8 +510,8 @@ function file_unmanaged_copy($source, $destination = NULL, $replace = FILE_EXIST
     $dirname = drupal_dirname($destination);
     if (!file_prepare_directory($dirname)) {
       // The destination is not valid.
-      $logger->notice('File %file could not be copied because the destination directory %destination is not configured correctly.', array('%file' => $original_source, '%destination' => $dirname));
-      drupal_set_message(t('The specified file %file could not be copied because the destination directory is not properly configured. This may be caused by a problem with file or directory permissions. More information is available in the system log.', array('%file' => $original_source)), 'error');
+      $logger->notice('File %file could not be moved/copied because the destination directory %destination is not configured correctly.', array('%file' => $original_source, '%destination' => $dirname));
+      drupal_set_message(t('The specified file %file could not be moved/copied because the destination directory is not properly configured. This may be caused by a problem with file or directory permissions. More information is available in the system log.', array('%file' => $original_source)), 'error');
       return FALSE;
     }
   }
@@ -472,8 +519,8 @@ function file_unmanaged_copy($source, $destination = NULL, $replace = FILE_EXIST
   // Determine whether we can perform this operation based on overwrite rules.
   $destination = file_destination($destination, $replace);
   if ($destination === FALSE) {
-    drupal_set_message(t('The file %file could not be copied because a file by that name already exists in the destination directory.', array('%file' => $original_source)), 'error');
-    $logger->notice('File %file could not be copied because a file by that name already exists in the destination directory (%destination)', array('%file' => $original_source, '%destination' => $destination));
+    drupal_set_message(t('The file %file could not be moved/copied because a file by that name already exists in the destination directory.', array('%file' => $original_source)), 'error');
+    $logger->notice('File %file could not be moved/copied because a file by that name already exists in the destination directory (%destination)', array('%file' => $original_source, '%destination' => $destination));
     return FALSE;
   }
 
@@ -481,26 +528,13 @@ function file_unmanaged_copy($source, $destination = NULL, $replace = FILE_EXIST
   $real_source = drupal_realpath($source);
   $real_destination = drupal_realpath($destination);
   if ($source == $destination || ($real_source !== FALSE) && ($real_source == $real_destination)) {
-    drupal_set_message(t('The specified file %file was not copied because it would overwrite itself.', array('%file' => $source)), 'error');
-    $logger->notice('File %file could not be copied because it would overwrite itself.', array('%file' => $source));
+    drupal_set_message(t('The specified file %file was not moved/copied because it would overwrite itself.', array('%file' => $source)), 'error');
+    $logger->notice('File %file could not be moved/copied because it would overwrite itself.', array('%file' => $source));
     return FALSE;
   }
   // Make sure the .htaccess files are present.
   file_ensure_htaccess();
-  // Perform the copy operation.
-  if (!@copy($source, $destination)) {
-    // If the copy failed and realpaths exist, retry the operation using them
-    // instead.
-    if ($real_source === FALSE || $real_destination === FALSE || !@copy($real_source, $real_destination)) {
-      $logger->error('The specified file %file could not be copied to %destination.', array('%file' => $source, '%destination' => $destination));
-      return FALSE;
-    }
-  }
-
-  // Set the permissions on the new file.
-  drupal_chmod($destination);
-
-  return $destination;
+  return TRUE;
 }
 
 /**
@@ -551,12 +585,24 @@ function file_destination($destination, $replace) {
 /**
  * Moves a file to a new location without database changes or hook invocation.
  *
+ * This is a powerful function that in many ways performs like an advanced
+ * version of rename().
+ * - Checks if $source and $destination are valid and readable/writable.
+ * - Checks that $source is not equal to $destination; if they are an error
+ *   is reported.
+ * - If file already exists in $destination either the call will error out,
+ *   replace the file or rename the file based on the $replace parameter.
+ * - Works around a PHP bug where rename() does not properly support streams if
+ *   safe_mode or open_basedir are enabled.
+ *   @see https://bugs.php.net/bug.php?id=60456
+ *
  * @param $source
- *   A string specifying the filepath or URI of the original file.
+ *   A string specifying the filepath or URI of the source file.
  * @param $destination
- *   A string containing the destination that $source should be moved to.
- *   This must be a stream wrapper URI. If this value is omitted, Drupal's
- *   default files scheme will be used, usually "public://".
+ *   A URI containing the destination that $source should be moved to. The
+ *   URI may be a bare filepath (without a scheme) and in that case the default
+ *   scheme (file://) will be used. If this value is omitted, Drupal's default
+ *   files scheme will be used, usually "public://".
  * @param $replace
  *   Replace behavior when the destination file already exists:
  *   - FILE_EXISTS_REPLACE - Replace the existing file.
@@ -565,16 +611,37 @@ function file_destination($destination, $replace) {
  *   - FILE_EXISTS_ERROR - Do nothing and return FALSE.
  *
  * @return
- *   The URI of the moved file, or FALSE in the event of an error.
+ *   The path to the new file, or FALSE in the event of an error.
  *
  * @see file_move()
  */
 function file_unmanaged_move($source, $destination = NULL, $replace = FILE_EXISTS_RENAME) {
-  $filepath = file_unmanaged_copy($source, $destination, $replace);
-  if ($filepath == FALSE || file_unmanaged_delete($source) == FALSE) {
+  if (!file_unmanaged_prepare($source, $destination, $replace)) {
     return FALSE;
   }
-  return $filepath;
+  // Ensure compatibility with Windows.
+  // @see drupal_unlink()
+  if ((substr(PHP_OS, 0, 3) == 'WIN') && (!file_stream_wrapper_valid_scheme(file_uri_scheme($source)))) {
+    chmod($source, 0600);
+  }
+  // Attempt to resolve the URIs. This is necessary in certain configurations
+  // (see above) and can also permit fast moves across local schemes.
+  $real_source = drupal_realpath($source) ?: $source;
+  $real_destination = drupal_realpath($destination) ?: $destination;
+  // Perform the move operation.
+  if (!@rename($real_source, $real_destination)) {
+    // Fall back to slow copy and unlink procedure. This is necessary for
+    // renames across schemes that are not local, or where rename() has not been
+    // implemented. It's not necessary to use drupal_unlink() as the Windows
+    // issue has already been resolved above.
+    if (!@copy($real_source, $real_destination) || !@unlink($real_source)) {
+      \Drupal::logger('file')->error('The specified file %file could not be moved to %destination.', array('%file' => $source, '%destination' => $destination));
+      return FALSE;
+    }
+  }
+  // Set the permissions on the new file.
+  drupal_chmod($destination);
+  return $destination;
 }
 
 /**
diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc
index 8dd191cb1..1b3b255b8 100644
--- a/core/includes/install.core.inc
+++ b/core/includes/install.core.inc
@@ -1084,7 +1084,7 @@ function install_verify_completed_task() {
  *   The site path.
  *
  * @return bool
- *  TRUE if there are no database errors.
+ *   TRUE if there are no database errors.
  */
 function install_verify_database_settings($site_path) {
   if ($database = Database::getConnectionInfo()) {
diff --git a/core/includes/install.inc b/core/includes/install.inc
index 88ca1e2ad..f8008b3ed 100644
--- a/core/includes/install.inc
+++ b/core/includes/install.inc
@@ -115,8 +115,8 @@ function drupal_install_profile_distribution_name() {
  * Loads the installation profile, extracting its defined version.
  *
  * @return string Distribution version defined in the profile's .info.yml file.
- * Defaults to \Drupal::VERSION if no version is explicitly provided
- * by the installation profile.
+ *   Defaults to \Drupal::VERSION if no version is explicitly provided
+ *   by the installation profile.
  *
  * @see install_profile_info()
  */
@@ -139,7 +139,7 @@ function drupal_install_profile_distribution_version() {
  * Detects all supported databases that are compiled into PHP.
  *
  * @return
- *  An array of database types compiled into PHP.
+ *   An array of database types compiled into PHP.
  */
 function drupal_detect_database_types() {
   $databases = drupal_get_database_types();
@@ -724,7 +724,7 @@ function drupal_verify_install_file($file, $mask = NULL, $type = 'file') {
  *   (optional) Whether to output messages. Defaults to TRUE.
  *
  * @return
- *  TRUE/FALSE whether or not the directory was successfully created.
+ *   TRUE/FALSE whether or not the directory was successfully created.
  */
 function drupal_install_mkdir($file, $mask, $message = TRUE) {
   $mod = 0;
@@ -773,7 +773,7 @@ function drupal_install_mkdir($file, $mask, $message = TRUE) {
  *   (optional) Whether to output messages. Defaults to TRUE.
  *
  * @return
- *  TRUE/FALSE whether or not we were able to fix the file's permissions.
+ *   TRUE/FALSE whether or not we were able to fix the file's permissions.
  */
 function drupal_install_fix_file($file, $mask, $message = TRUE) {
   // If $file does not exist, fileperms() issues a PHP warning.
diff --git a/core/includes/update.inc b/core/includes/update.inc
index a07595e63..2c020db6b 100644
--- a/core/includes/update.inc
+++ b/core/includes/update.inc
@@ -65,7 +65,7 @@ function update_check_incompatibility($name, $type = 'module') {
  * Returns whether the minimum schema requirement has been satisfied.
  *
  * @return array
- *  A requirements info array.
+ *   A requirements info array.
  */
 function update_system_schema_requirements() {
   $requirements = array();
diff --git a/core/lib/Drupal.php b/core/lib/Drupal.php
index 7b367069b..aa4fc0aee 100644
--- a/core/lib/Drupal.php
+++ b/core/lib/Drupal.php
@@ -81,7 +81,7 @@ class Drupal {
   /**
    * The current system version.
    */
-  const VERSION = '8.1.3';
+  const VERSION = '8.1.5';
 
   /**
    * Core API compatibility.
diff --git a/core/lib/Drupal/Component/Annotation/Plugin.php b/core/lib/Drupal/Component/Annotation/Plugin.php
index 9ec9b9022..29f36759c 100644
--- a/core/lib/Drupal/Component/Annotation/Plugin.php
+++ b/core/lib/Drupal/Component/Annotation/Plugin.php
@@ -49,7 +49,7 @@ class Plugin implements AnnotationInterface {
    *   The annotation array.
    *
    * @return array
-   *  The parsed annotation as a definition.
+   *   The parsed annotation as a definition.
    */
   protected function parse(array $values) {
     $definitions = array();
diff --git a/core/lib/Drupal/Component/Datetime/DateTimePlus.php b/core/lib/Drupal/Component/Datetime/DateTimePlus.php
index 377bb27b5..56bd92f23 100644
--- a/core/lib/Drupal/Component/Datetime/DateTimePlus.php
+++ b/core/lib/Drupal/Component/Datetime/DateTimePlus.php
@@ -455,7 +455,7 @@ class DateTimePlus {
   /**
    * Detects if there were errors in the processing of this date.
    *
-   * @return boolean
+   * @return bool
    *   TRUE if there were errors in the processing of this date, FALSE
    *   otherwise.
    */
diff --git a/core/lib/Drupal/Component/DependencyInjection/Container.php b/core/lib/Drupal/Component/DependencyInjection/Container.php
index 733490ca3..452a2c84d 100644
--- a/core/lib/Drupal/Component/DependencyInjection/Container.php
+++ b/core/lib/Drupal/Component/DependencyInjection/Container.php
@@ -373,7 +373,7 @@ class Container implements IntrospectableContainerInterface, ResettableContainer
    * {@inheritdoc}
    */
   public function has($id) {
-    return isset($this->services[$id]) || isset($this->serviceDefinitions[$id]);
+    return isset($this->aliases[$id]) || isset($this->services[$id]) || isset($this->serviceDefinitions[$id]);
   }
 
   /**
diff --git a/core/lib/Drupal/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumper.php b/core/lib/Drupal/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumper.php
index d52fb89a0..317f2c49d 100644
--- a/core/lib/Drupal/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumper.php
+++ b/core/lib/Drupal/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumper.php
@@ -60,6 +60,7 @@ class OptimizedPhpArrayDumper extends Dumper {
    */
   public function getArray() {
     $definition = array();
+    $this->aliases = $this->getAliases();
     $definition['aliases'] = $this->getAliases();
     $definition['parameters'] = $this->getParameters();
     $definition['services'] = $this->getServiceDefinitions();
@@ -454,6 +455,9 @@ class OptimizedPhpArrayDumper extends Dumper {
     }
 
     // Private shared service.
+    if (isset($this->aliases[$id])) {
+      $id = $this->aliases[$id];
+    }
     $definition = $this->container->getDefinition($id);
     if (!$definition->isPublic()) {
       // The ContainerBuilder does not share a private service, but this means a
diff --git a/core/lib/Drupal/Component/DependencyInjection/composer.json b/core/lib/Drupal/Component/DependencyInjection/composer.json
index 28dc0312f..8dda45fbe 100644
--- a/core/lib/Drupal/Component/DependencyInjection/composer.json
+++ b/core/lib/Drupal/Component/DependencyInjection/composer.json
@@ -12,8 +12,8 @@
   },
   "require": {
     "php": ">=5.5.9",
-    "symfony/dependency-injection": "2.7.*",
-    "symfony/expression-language": "2.7.*"
+    "symfony/dependency-injection": "~2.8",
+    "symfony/expression-language": "~2.7"
   },
   "autoload": {
     "psr-4": {
diff --git a/core/lib/Drupal/Component/EventDispatcher/composer.json b/core/lib/Drupal/Component/EventDispatcher/composer.json
index 213284103..be6623283 100644
--- a/core/lib/Drupal/Component/EventDispatcher/composer.json
+++ b/core/lib/Drupal/Component/EventDispatcher/composer.json
@@ -6,8 +6,8 @@
   "license": "GPL-2.0+",
   "require": {
     "php": ">=5.5.9",
-    "symfony/dependency-injection": "2.7.*",
-    "symfony/event-dispatcher": "2.7.*"
+    "symfony/dependency-injection": "~2.8",
+    "symfony/event-dispatcher": "~2.7"
   },
   "autoload": {
     "psr-4": {
diff --git a/core/lib/Drupal/Component/HttpFoundation/composer.json b/core/lib/Drupal/Component/HttpFoundation/composer.json
index 57c929d18..f82c0679a 100644
--- a/core/lib/Drupal/Component/HttpFoundation/composer.json
+++ b/core/lib/Drupal/Component/HttpFoundation/composer.json
@@ -6,7 +6,7 @@
   "license": "GPL-2.0+",
   "require": {
     "php": ">=5.5.9",
-    "symfony/http-foundation": "2.7.*"
+    "symfony/http-foundation": "~2.7"
   },
   "autoload": {
     "psr-4": {
diff --git a/core/lib/Drupal/Component/Plugin/Discovery/DiscoveryTrait.php b/core/lib/Drupal/Component/Plugin/Discovery/DiscoveryTrait.php
index b065de959..7d076fa75 100644
--- a/core/lib/Drupal/Component/Plugin/Discovery/DiscoveryTrait.php
+++ b/core/lib/Drupal/Component/Plugin/Discovery/DiscoveryTrait.php
@@ -30,8 +30,8 @@ trait DiscoveryTrait {
    * @param string $plugin_id
    *   A plugin id.
    * @param bool $exception_on_invalid
-   *   (optional) If TRUE, an invalid plugin ID will throw an exception.
-   *   Defaults to FALSE.
+   *   If TRUE, an invalid plugin ID will cause an exception to be thrown; if
+   *   FALSE, NULL will be returned.
    *
    * @return array|null
    *   A plugin definition, or NULL if the plugin ID is invalid and
diff --git a/core/lib/Drupal/Component/Plugin/composer.json b/core/lib/Drupal/Component/Plugin/composer.json
index 1acc8c5e5..4ffeeed3a 100644
--- a/core/lib/Drupal/Component/Plugin/composer.json
+++ b/core/lib/Drupal/Component/Plugin/composer.json
@@ -6,7 +6,7 @@
   "license": "GPL-2.0+",
   "require": {
     "php": ">=5.5.9",
-    "symfony/validator": "2.7.*"
+    "symfony/validator": "~2.7"
   },
   "autoload": {
     "psr-4": {
diff --git a/core/lib/Drupal/Component/Render/OutputStrategyInterface.php b/core/lib/Drupal/Component/Render/OutputStrategyInterface.php
index 3406e8098..3ed9725b8 100644
--- a/core/lib/Drupal/Component/Render/OutputStrategyInterface.php
+++ b/core/lib/Drupal/Component/Render/OutputStrategyInterface.php
@@ -7,7 +7,7 @@ namespace Drupal\Component\Render;
  *
  * Output strategies assist in transforming HTML strings into strings that are
  * appropriate for a given context (e.g. plain-text), through performing the
- * relevant formatting. No santization is applied.
+ * relevant formatting. No sanitization is applied.
  */
 interface OutputStrategyInterface {
 
diff --git a/core/lib/Drupal/Component/Serialization/composer.json b/core/lib/Drupal/Component/Serialization/composer.json
index ff62221bc..5d629cfc1 100644
--- a/core/lib/Drupal/Component/Serialization/composer.json
+++ b/core/lib/Drupal/Component/Serialization/composer.json
@@ -6,7 +6,7 @@
   "license": "GPL-2.0+",
   "require": {
     "php": ">=5.5.9",
-    "symfony/yaml": "2.7.*"
+    "symfony/yaml": "~2.7"
   },
   "autoload": {
     "psr-4": {
diff --git a/core/lib/Drupal/Core/Cache/Cache.php b/core/lib/Drupal/Core/Cache/Cache.php
index 06b4ac2f2..2d0c22075 100644
--- a/core/lib/Drupal/Core/Cache/Cache.php
+++ b/core/lib/Drupal/Core/Cache/Cache.php
@@ -149,7 +149,7 @@ class Cache {
    * Gets all cache bin services.
    *
    * @return array
-   *  An array of cache backend objects keyed by cache bins.
+   *   An array of cache backend objects keyed by cache bins.
    */
   public static function getBins() {
     $bins = array();
diff --git a/core/lib/Drupal/Core/Cache/CacheableDependencyInterface.php b/core/lib/Drupal/Core/Cache/CacheableDependencyInterface.php
index 2bb89ba90..cbce6aac6 100644
--- a/core/lib/Drupal/Core/Cache/CacheableDependencyInterface.php
+++ b/core/lib/Drupal/Core/Cache/CacheableDependencyInterface.php
@@ -37,7 +37,7 @@ interface CacheableDependencyInterface {
    * When this object is modified, these cache tags will be invalidated.
    *
    * @return string[]
-   *  A set of cache tags.
+   *   A set of cache tags.
    */
   public function getCacheTags();
 
diff --git a/core/lib/Drupal/Core/Cache/ChainedFastBackend.php b/core/lib/Drupal/Core/Cache/ChainedFastBackend.php
index 62839c2b0..5c0750d20 100644
--- a/core/lib/Drupal/Core/Cache/ChainedFastBackend.php
+++ b/core/lib/Drupal/Core/Cache/ChainedFastBackend.php
@@ -87,8 +87,16 @@ class ChainedFastBackend implements CacheBackendInterface, CacheTagsInvalidatorI
    *   The fast cache backend.
    * @param string $bin
    *   The cache bin for which the object is created.
+   *
+   * @throws \Exception
+   *   When the consistent cache backend and the fast cache backend are the same
+   *   service.
    */
   public function __construct(CacheBackendInterface $consistent_backend, CacheBackendInterface $fast_backend, $bin) {
+    if ($consistent_backend == $fast_backend) {
+      // @todo: should throw a proper exception. See https://www.drupal.org/node/2751847.
+      trigger_error('Consistent cache backend and fast cache backend cannot use the same service.', E_USER_ERROR);
+    }
     $this->consistentBackend = $consistent_backend;
     $this->fastBackend = $fast_backend;
     $this->bin = 'cache_' . $bin;
diff --git a/core/lib/Drupal/Core/Cache/Context/QueryArgsCacheContext.php b/core/lib/Drupal/Core/Cache/Context/QueryArgsCacheContext.php
index 0926ba60b..a48664468 100644
--- a/core/lib/Drupal/Core/Cache/Context/QueryArgsCacheContext.php
+++ b/core/lib/Drupal/Core/Cache/Context/QueryArgsCacheContext.php
@@ -25,20 +25,22 @@ class QueryArgsCacheContext extends RequestStackCacheContextBase implements Calc
    */
   public function getContext($query_arg = NULL) {
     if ($query_arg === NULL) {
-      return $this->requestStack->getCurrentRequest()->getQueryString();
+      // All arguments requested. Use normalized query string to minimize
+      // variations.
+      $value = $this->requestStack->getCurrentRequest()->getQueryString();
+      return ($value !== NULL) ? $value : '';
     }
     elseif ($this->requestStack->getCurrentRequest()->query->has($query_arg)) {
       $value = $this->requestStack->getCurrentRequest()->query->get($query_arg);
-      if ($value !== '') {
+      if (is_array($value)) {
+        return http_build_query($value);
+      }
+      elseif ($value !== '') {
         return $value;
       }
-      else {
-        return '?valueless?';
-      }
-    }
-    else {
-      return NULL;
+      return '?valueless?';
     }
+    return '';
   }
 
   /**
diff --git a/core/lib/Drupal/Core/Config/ConfigManager.php b/core/lib/Drupal/Core/Config/ConfigManager.php
index 1ab9fdb55..11d7c8439 100644
--- a/core/lib/Drupal/Core/Config/ConfigManager.php
+++ b/core/lib/Drupal/Core/Config/ConfigManager.php
@@ -307,8 +307,9 @@ class ConfigManager implements ConfigManagerInterface {
 
     // Try to fix any dependencies and find out what will happen to the
     // dependency graph. Entities are processed in the order of most dependent
-    // first. For example, this ensures that fields are removed before
-    // field storages.
+    // first. For example, this ensures that Menu UI third party dependencies on
+    // node types are fixed before processing the node type's other
+    // dependencies.
     while ($dependent = array_pop($dependents)) {
       /** @var \Drupal\Core\Config\Entity\ConfigEntityInterface $dependent */
       if ($dry_run) {
@@ -346,7 +347,9 @@ class ConfigManager implements ConfigManagerInterface {
       // If the entity cannot be fixed then it has to be deleted.
       if (!$fixed) {
         $delete_uuids[] = $dependent->uuid();
-        $return['delete'][] = $dependent;
+        // Deletes should occur in the order of the least dependent first. For
+        // example, this ensures that fields are removed before field storages.
+        array_unshift($return['delete'], $dependent);
       }
     }
     // Use the lists of UUIDs to filter the original list to work out which
diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigDependencyManager.php b/core/lib/Drupal/Core/Config/Entity/ConfigDependencyManager.php
index 377f7c4d0..c274f28a1 100644
--- a/core/lib/Drupal/Core/Config/Entity/ConfigDependencyManager.php
+++ b/core/lib/Drupal/Core/Config/Entity/ConfigDependencyManager.php
@@ -173,7 +173,9 @@ class ConfigDependencyManager {
     // dependent is at the top. For example, this ensures that fields are
     // always after field storages. This is because field storages need to be
     // created before a field.
-    return array_reverse(array_intersect_key($this->graph, $dependencies));
+    $graph = $this->getGraph();
+    uasort($graph, array($this, 'sortGraph'));
+    return array_replace(array_intersect_key($graph, $dependencies), $dependencies);
   }
 
   /**
@@ -185,10 +187,32 @@ class ConfigDependencyManager {
    */
   public function sortAll() {
     $graph = $this->getGraph();
-    // Sort by reverse weight and alphabetically. The most dependent entities
+    // Sort by weight and alphabetically. The most dependent entities
     // are last and entities with the same weight are alphabetically ordered.
-    uasort($graph, array($this, 'sortGraph'));
-    return array_keys($graph);
+    uasort($graph, array($this, 'sortGraphByWeight'));
+    // Use array_intersect_key() to exclude modules and themes from the list.
+    return array_keys(array_intersect_key($graph, $this->data));
+  }
+
+  /**
+   * Sorts the dependency graph by weight and alphabetically.
+   *
+   * @param array $a
+   *   First item for comparison. The compared items should be associative
+   *   arrays that include a 'weight' and a 'name' key.
+   * @param array $b
+   *   Second item for comparison.
+   *
+   * @return int
+   *   The comparison result for uasort().
+   */
+  protected function sortGraphByWeight(array $a, array $b) {
+    $weight_cmp = SortArray::sortByKeyInt($a, $b, 'weight');
+
+    if ($weight_cmp === 0) {
+      return SortArray::sortByKeyString($a, $b, 'name');
+    }
+    return $weight_cmp;
   }
 
   /**
@@ -196,7 +220,7 @@ class ConfigDependencyManager {
    *
    * @param array $a
    *   First item for comparison. The compared items should be associative
-   *   arrays that include a 'weight' and a 'component' key.
+   *   arrays that include a 'weight' and a 'name' key.
    * @param array $b
    *   Second item for comparison.
    *
@@ -207,7 +231,7 @@ class ConfigDependencyManager {
     $weight_cmp = SortArray::sortByKeyInt($a, $b, 'weight') * -1;
 
     if ($weight_cmp === 0) {
-      return SortArray::sortByKeyString($a, $b, 'component');
+      return SortArray::sortByKeyString($a, $b, 'name');
     }
     return $weight_cmp;
   }
@@ -228,9 +252,11 @@ class ConfigDependencyManager {
     $graph = $this->getGraph();
 
     foreach ($entities_to_check as $entity) {
-      if (isset($graph[$entity]) && !empty($graph[$entity]['reverse_paths'])) {
-        foreach ($graph[$entity]['reverse_paths'] as $dependency => $value) {
-          $dependent_entities[$dependency] = $this->data[$dependency];
+      if (isset($graph[$entity]) && !empty($graph[$entity]['paths'])) {
+        foreach ($graph[$entity]['paths'] as $dependency => $value) {
+          if (isset($this->data[$dependency])) {
+            $dependent_entities[$dependency] = $this->data[$dependency];
+          }
         }
       }
     }
@@ -248,14 +274,21 @@ class ConfigDependencyManager {
       $graph = array();
       foreach ($this->data as $entity) {
         $graph_key = $entity->getConfigDependencyName();
-        $graph[$graph_key]['edges'] = array();
-        $dependencies = $entity->getDependencies('config');
-        if (!empty($dependencies)) {
-          foreach ($dependencies as $dependency) {
-            $graph[$graph_key]['edges'][$dependency] = TRUE;
-          }
+        if (!isset($graph[$graph_key])) {
+          $graph[$graph_key] = [
+            'edges' => [],
+            'name' => $graph_key,
+          ];
+        }
+        // Include all dependencies in the graph so that topographical sorting
+        // works.
+        foreach (array_merge($entity->getDependencies('config'), $entity->getDependencies('module'), $entity->getDependencies('theme')) as $dependency) {
+          $graph[$dependency]['edges'][$graph_key] = TRUE;
+          $graph[$dependency]['name'] = $dependency;
         }
       }
+      // Ensure that order of the graph is consistent.
+      krsort($graph);
       $graph_object = new Graph($graph);
       $this->graph = $graph_object->searchAndSort();
     }
diff --git a/core/lib/Drupal/Core/Config/StorageInterface.php b/core/lib/Drupal/Core/Config/StorageInterface.php
index 49bc91676..18a712633 100644
--- a/core/lib/Drupal/Core/Config/StorageInterface.php
+++ b/core/lib/Drupal/Core/Config/StorageInterface.php
@@ -93,28 +93,28 @@ interface StorageInterface {
   /**
    * Encodes configuration data into the storage-specific format.
    *
+   * This is a publicly accessible static method to allow for alternative
+   * usages in data conversion scripts and also tests.
+   *
    * @param array $data
    *   The configuration data to encode.
    *
    * @return string
    *   The encoded configuration data.
-   *
-   * This is a publicly accessible static method to allow for alternative
-   * usages in data conversion scripts and also tests.
    */
   public function encode($data);
 
   /**
    * Decodes configuration data from the storage-specific format.
    *
+   * This is a publicly accessible static method to allow for alternative
+   * usages in data conversion scripts and also tests.
+   *
    * @param string $raw
    *   The raw configuration data string to decode.
    *
    * @return array
    *   The decoded configuration data as an associative array.
-   *
-   * This is a publicly accessible static method to allow for alternative
-   * usages in data conversion scripts and also tests.
    */
   public function decode($raw);
 
diff --git a/core/lib/Drupal/Core/Database/Connection.php b/core/lib/Drupal/Core/Database/Connection.php
index 2002e9ebc..791bf7a01 100644
--- a/core/lib/Drupal/Core/Database/Connection.php
+++ b/core/lib/Drupal/Core/Database/Connection.php
@@ -753,14 +753,11 @@ abstract class Connection {
    */
   public function getDriverClass($class) {
     if (empty($this->driverClasses[$class])) {
-      $driver = $this->driver();
-      if (!empty($this->connectionOptions['namespace'])) {
-        $driver_class  = $this->connectionOptions['namespace'] . '\\' . $class;
-      }
-      else {
-        // Fallback for Drupal 7 settings.php.
-        $driver_class = "Drupal\\Core\\Database\\Driver\\{$driver}\\{$class}";
+      if (empty($this->connectionOptions['namespace'])) {
+        // Fallback for Drupal 7 settings.php and the test runner script.
+        $this->connectionOptions['namespace'] = (new \ReflectionObject($this))->getNamespaceName();
       }
+      $driver_class = $this->connectionOptions['namespace'] . '\\' . $class;
       $this->driverClasses[$class] = class_exists($driver_class) ? $driver_class : $class;
     }
     return $this->driverClasses[$class];
diff --git a/core/lib/Drupal/Core/Database/Driver/pgsql/Install/Tasks.php b/core/lib/Drupal/Core/Database/Driver/pgsql/Install/Tasks.php
index a91b24056..95ff52716 100644
--- a/core/lib/Drupal/Core/Database/Driver/pgsql/Install/Tasks.php
+++ b/core/lib/Drupal/Core/Database/Driver/pgsql/Install/Tasks.php
@@ -246,6 +246,9 @@ class Tasks extends InstallTasks {
     // concurrency issues, when both try to update at the same time.
     try {
       $connection = Database::getConnection();
+      // When testing, two installs might try to run the CREATE FUNCTION queries
+      // at the same time. Do not let that happen.
+      $connection->query('SELECT pg_advisory_lock(1)');
       // Don't use {} around pg_proc table.
       if (!$connection->query("SELECT COUNT(*) FROM pg_proc WHERE proname = 'rand'")->fetchField()) {
         $connection->query('CREATE OR REPLACE FUNCTION "rand"() RETURNS float AS
@@ -264,6 +267,7 @@ class Tasks extends InstallTasks {
           [ 'allow_delimiter_in_query' => TRUE ]
         );
       }
+      $connection->query('SELECT pg_advisory_unlock(1)');
 
       $this->pass(t('PostgreSQL has initialized itself.'));
     }
diff --git a/core/lib/Drupal/Core/Database/Driver/sqlite/Install/Tasks.php b/core/lib/Drupal/Core/Database/Driver/sqlite/Install/Tasks.php
index 3a5b97091..f56b26ce4 100644
--- a/core/lib/Drupal/Core/Database/Driver/sqlite/Install/Tasks.php
+++ b/core/lib/Drupal/Core/Database/Driver/sqlite/Install/Tasks.php
@@ -28,7 +28,7 @@ class Tasks extends InstallTasks {
    * {@inheritdoc}
    */
   public function minimumVersion() {
-    return '3.6.8';
+    return '3.7.11';
   }
 
   /**
diff --git a/core/lib/Drupal/Core/Database/Driver/sqlite/Schema.php b/core/lib/Drupal/Core/Database/Driver/sqlite/Schema.php
index f97a6ec67..a3c001cc8 100644
--- a/core/lib/Drupal/Core/Database/Driver/sqlite/Schema.php
+++ b/core/lib/Drupal/Core/Database/Driver/sqlite/Schema.php
@@ -420,8 +420,12 @@ class Schema extends DatabaseSchema {
    *
    * @param $table
    *   Name of the table.
+   *
    * @return
    *   An array representing the schema, from drupal_get_schema().
+   *
+   * @throws \Exception
+   *   If a column of the table could not be parsed.
    */
   protected function introspectSchema($table) {
     $mapped_fields = array_flip($this->getFieldTypeMap());
@@ -459,7 +463,7 @@ class Schema extends DatabaseSchema {
         }
       }
       else {
-        new \Exception("Unable to parse the column type " . $row->type);
+        throw new \Exception("Unable to parse the column type " . $row->type);
       }
     }
     $indexes = array();
@@ -710,7 +714,7 @@ class Schema extends DatabaseSchema {
       // Can't use query placeholders for the schema because the query would
       // have to be :prefixsqlite_master, which does not work. We also need to
       // ignore the internal SQLite tables.
-      $result = db_query("SELECT name FROM " . $schema . ".sqlite_master WHERE type = :type AND name LIKE :table_name AND name NOT LIKE :pattern", array(
+      $result = $this->connection->query("SELECT name FROM " . $schema . ".sqlite_master WHERE type = :type AND name LIKE :table_name AND name NOT LIKE :pattern", array(
         ':type' => 'table',
         ':table_name' => $table_expression,
         ':pattern' => 'sqlite_%',
diff --git a/core/lib/Drupal/Core/Database/Query/ExtendableInterface.php b/core/lib/Drupal/Core/Database/Query/ExtendableInterface.php
index b0d6f762d..d512bd611 100644
--- a/core/lib/Drupal/Core/Database/Query/ExtendableInterface.php
+++ b/core/lib/Drupal/Core/Database/Query/ExtendableInterface.php
@@ -6,11 +6,11 @@ namespace Drupal\Core\Database\Query;
  * Interface for extendable query objects.
  *
  * "Extenders" follow the "Decorator" OOP design pattern.  That is, they wrap
- * and "decorate" another object.  In our case, they implement the same interface
- * as select queries and wrap a select query, to which they delegate almost all
- * operations.  Subclasses of this class may implement additional methods or
- * override existing methods as appropriate.  Extenders may also wrap other
- * extender objects, allowing for arbitrarily complex "enhanced" queries.
+ * and "decorate" another object. In our case, they implement the same
+ * interface as select queries and wrap a select query, to which they delegate
+ * almost all operations. Subclasses of this class may implement additional
+ * methods or override existing methods as appropriate. Extenders may also wrap
+ * other extender objects, allowing for arbitrarily complex "enhanced" queries.
  */
 interface ExtendableInterface {
 
@@ -18,9 +18,12 @@ interface ExtendableInterface {
    * Enhance this object by wrapping it in an extender object.
    *
    * @param $extender_name
-   *   The base name of the extending class.  The base name will be checked
-   *   against the current database connection to allow driver-specific subclasses
-   *   as well, using the same logic as the query objects themselves.
+   *   The fully-qualified name of the extender class, without the leading '\'
+   *   (for example, Drupal\my_module\myExtenderClass). The extender name will
+   *   be checked against the current database connection to allow
+   *   driver-specific subclasses as well, using the same logic as the query
+   *   objects themselves.
+   *
    * @return \Drupal\Core\Database\Query\ExtendableInterface
    *   The extender object, which now contains a reference to this object.
    */
diff --git a/core/lib/Drupal/Core/Database/Query/Select.php b/core/lib/Drupal/Core/Database/Query/Select.php
index a7e340bfc..b269410b8 100644
--- a/core/lib/Drupal/Core/Database/Query/Select.php
+++ b/core/lib/Drupal/Core/Database/Query/Select.php
@@ -39,7 +39,7 @@ class Select extends Query implements SelectInterface {
    *   'type' => $join_type (one of INNER, LEFT OUTER, RIGHT OUTER),
    *   'table' => $table,
    *   'alias' => $alias_of_the_table,
-   *   'condition' => $condition_clause_on_which_to_join,
+   *   'condition' => $join_condition (string or Condition object),
    *   'arguments' => $array_of_arguments_for_placeholders_in_the condition.
    *   'all_fields' => TRUE to SELECT $alias.*, FALSE or NULL otherwise.
    * )
@@ -47,6 +47,10 @@ class Select extends Query implements SelectInterface {
    * If $table is a string, it is taken as the name of a table. If it is
    * a Select query object, it is taken as a subquery.
    *
+   * If $join_condition is a Condition object, any arguments should be
+   * incorporated into the object; a separate array of arguments does not
+   * need to be provided.
+   *
    * @var array
    */
   protected $tables = array();
@@ -196,6 +200,10 @@ class Select extends Query implements SelectInterface {
       if ($table['table'] instanceof SelectInterface) {
         $args += $table['table']->arguments();
       }
+      // If the join condition is an object, grab its arguments recursively.
+      if (!empty($table['condition']) && $table['condition'] instanceof ConditionInterface) {
+        $args += $table['condition']->arguments();
+      }
     }
 
     foreach ($this->expressions as $expression) {
@@ -225,6 +233,10 @@ class Select extends Query implements SelectInterface {
       if ($table['table'] instanceof SelectInterface) {
         $table['table']->compile($connection, $queryPlaceholder);
       }
+      // Make sure join conditions are also compiled.
+      if (!empty($table['condition']) && $table['condition'] instanceof ConditionInterface) {
+        $table['condition']->compile($connection, $queryPlaceholder);
+      }
     }
 
     // If there are any dependent queries to UNION, compile it recursively.
@@ -248,6 +260,11 @@ class Select extends Query implements SelectInterface {
           return FALSE;
         }
       }
+      if (!empty($table['condition']) && $table['condition'] instanceof ConditionInterface) {
+        if (!$table['condition']->compiled()) {
+          return FALSE;
+        }
+      }
     }
 
     foreach ($this->union as $union) {
@@ -822,7 +839,7 @@ class Select extends Query implements SelectInterface {
       $query .= $table_string . ' ' . $this->connection->escapeTable($table['alias']);
 
       if (!empty($table['condition'])) {
-        $query .= ' ON ' . $table['condition'];
+        $query .= ' ON ' . (string) $table['condition'];
       }
     }
 
diff --git a/core/lib/Drupal/Core/Datetime/Element/Datelist.php b/core/lib/Drupal/Core/Datetime/Element/Datelist.php
index 76f61bb04..f39d0a290 100644
--- a/core/lib/Drupal/Core/Datetime/Element/Datelist.php
+++ b/core/lib/Drupal/Core/Datetime/Element/Datelist.php
@@ -268,6 +268,7 @@ class Datelist extends DateElementBase {
         '#options' => $options,
         '#required' => $element['#required'],
         '#error_no_message' => FALSE,
+        '#empty_option' => $title,
       );
     }
 
diff --git a/core/lib/Drupal/Core/DependencyInjection/YamlFileLoader.php b/core/lib/Drupal/Core/DependencyInjection/YamlFileLoader.php
index c0a874749..aa49cf737 100644
--- a/core/lib/Drupal/Core/DependencyInjection/YamlFileLoader.php
+++ b/core/lib/Drupal/Core/DependencyInjection/YamlFileLoader.php
@@ -58,8 +58,6 @@ class YamlFileLoader
     public function load($file)
     {
         // Load from the file cache, fall back to loading the file.
-        // @todo Refactor this to cache parsed definition objects in
-        //   https://www.drupal.org/node/2464053
         $content = $this->fileCache->get($file);
         if (!$content) {
             $content = $this->loadFile($file);
diff --git a/core/lib/Drupal/Core/Entity/Entity.php b/core/lib/Drupal/Core/Entity/Entity.php
index 6e0b4d847..e89ce3164 100644
--- a/core/lib/Drupal/Core/Entity/Entity.php
+++ b/core/lib/Drupal/Core/Entity/Entity.php
@@ -306,7 +306,7 @@ abstract class Entity implements EntityInterface {
       // The entity ID is needed as a route parameter.
       $uri_route_parameters[$this->getEntityTypeId()] = $this->id();
     }
-    if ($rel === 'revision') {
+    if ($rel === 'revision' && $this instanceof RevisionableInterface) {
       $uri_route_parameters[$this->getEntityTypeId() . '_revision'] = $this->getRevisionId();
     }
 
diff --git a/core/lib/Drupal/Core/Entity/EntityInterface.php b/core/lib/Drupal/Core/Entity/EntityInterface.php
index ae436bbaa..3a38e072d 100644
--- a/core/lib/Drupal/Core/Entity/EntityInterface.php
+++ b/core/lib/Drupal/Core/Entity/EntityInterface.php
@@ -339,10 +339,17 @@ interface EntityInterface extends AccessibleInterface, CacheableDependencyInterf
   public static function preCreate(EntityStorageInterface $storage, array &$values);
 
   /**
-   * Acts on an entity after it is created but before hooks are invoked.
+   * Acts on a created entity before hooks are invoked.
+   *
+   * Used after the entity is created, but before saving the entity and before
+   * any of the presave hooks are invoked.
+   *
+   * See the @link entity_crud Entity CRUD topic @endlink for more information.
    *
    * @param \Drupal\Core\Entity\EntityStorageInterface $storage
    *   The entity storage object.
+   *
+   * @see \Drupal\Core\Entity\EntityInterface::create()
    */
   public function postCreate(EntityStorageInterface $storage);
 
diff --git a/core/lib/Drupal/Core/Entity/EntityTypeBundleInfoInterface.php b/core/lib/Drupal/Core/Entity/EntityTypeBundleInfoInterface.php
index 4425d2872..882f98b3d 100644
--- a/core/lib/Drupal/Core/Entity/EntityTypeBundleInfoInterface.php
+++ b/core/lib/Drupal/Core/Entity/EntityTypeBundleInfoInterface.php
@@ -11,7 +11,10 @@ interface EntityTypeBundleInfoInterface {
    * Get the bundle info of all entity types.
    *
    * @return array
-   *   An array of all bundle information.
+   *   An array of bundle information where the outer array is keyed by entity
+   *   type. The next level is keyed by the bundle name. The inner arrays are
+   *   associative arrays of bundle information, such as the label for the
+   *   bundle.
    */
   public function getAllBundleInfo();
 
@@ -22,7 +25,10 @@ interface EntityTypeBundleInfoInterface {
    *   The entity type.
    *
    * @return array
-   *   Returns the bundle information for the specified entity type.
+   *   An array of bundle information where the outer array is keyed by the
+   *   bundle name, or the entity type name if the entity does not have bundles.
+   *   The inner arrays are associative arrays of bundle information, such as
+   *   the label for the bundle.
    */
   public function getBundleInfo($entity_type);
 
diff --git a/core/lib/Drupal/Core/Entity/Query/QueryInterface.php b/core/lib/Drupal/Core/Entity/Query/QueryInterface.php
index e673db1cf..17b266ffc 100644
--- a/core/lib/Drupal/Core/Entity/Query/QueryInterface.php
+++ b/core/lib/Drupal/Core/Entity/Query/QueryInterface.php
@@ -28,24 +28,47 @@ interface QueryInterface extends AlterableInterface {
    * and the Polish 'siema' within a 'greetings' text field:
    * @code
    *   $entity_ids = \Drupal::entityQuery($entity_type)
-   *     ->condition('greetings', 'merhaba', '=', 'tr');
-   *     ->condition('greetings.value', 'siema', '=', 'pl');
+   *     ->condition('greetings', 'merhaba', '=', 'tr')
+   *     ->condition('greetings.value', 'siema', '=', 'pl')
    *     ->execute();
    *   $entity_ids = $query->execute();
    * @endcode
    *
    * @param $field
-   *   Name of the field being queried. It must contain a field name,
-   *   optionally followed by a column name. The column can be "entity" for
-   *   reference fields and that can be followed similarly by a field name
-   *   and so on. Some examples:
+   *   Name of the field being queried. It must contain a field name, optionally
+   *   followed by a column name. The column can be "entity" for reference
+   *   fields and that can be followed similarly by a field name and so on. Some
+   *   examples:
    *   - nid
    *   - tags.value
    *   - tags
    *   - uid.entity.name
    *   "tags" "is the same as "tags.value" as value is the default column.
    *   If two or more conditions have the same field names they apply to the
-   *   same delta within that field.
+   *   same delta within that field. In order to limit the condition to a
+   *   specific item a numeric delta should be added between the field name and
+   *   the column name.
+   *   @code
+   *   ->condition('tags.5.value', 'news')
+   *   @endcode
+   *   This will require condition to be satisfied on a specific delta of the
+   *   field. The condition above will require the 6th value of the field to
+   *   match the provided value. Further, it's possible to create a condition on
+   *   the delta itself by using '%delta'. For example,
+   *   @code
+   *   ->condition('tags.%delta', 5)
+   *   @endcode
+   *   will find only entities which have at least six tags. Finally, the
+   *   condition on the delta itself accompanied with a condition on the value
+   *   will require the value to appear in the specific delta range. For
+   *   example,
+   *   @code
+   *   ->condition('tags.%delta', 0, '>'))
+   *   ->condition('tags.%delta.value', 'news'))
+   *   @endcode
+   *   will only find the "news" tag if it is not the first value. It should be
+   *   noted that conditions on specific deltas and delta ranges are only
+   *   supported when querying content entities.
    * @param $value
    *   The value for $field. In most cases, this is a scalar and it's treated as
    *   case-insensitive. For more complex operators, it is an array. The meaning
diff --git a/core/lib/Drupal/Core/Entity/Query/Sql/Tables.php b/core/lib/Drupal/Core/Entity/Query/Sql/Tables.php
index ca25fb97a..c8bf59d15 100644
--- a/core/lib/Drupal/Core/Entity/Query/Sql/Tables.php
+++ b/core/lib/Drupal/Core/Entity/Query/Sql/Tables.php
@@ -5,6 +5,7 @@ namespace Drupal\Core\Entity\Query\Sql;
 use Drupal\Core\Database\Query\SelectInterface;
 use Drupal\Core\Entity\Query\QueryException;
 use Drupal\Core\Entity\Sql\SqlEntityStorageInterface;
+use Drupal\Core\Entity\Sql\TableMappingInterface;
 
 /**
  * Adds tables and fields to the SQL entity query.
@@ -112,11 +113,37 @@ class Tables implements TablesInterface {
 
       // Check whether this field is stored in a dedicated table.
       if ($field_storage && $table_mapping->requiresDedicatedTableStorage($field_storage)) {
+        $delta = NULL;
         // Find the field column.
         $column = $field_storage->getMainPropertyName();
 
         if ($key < $count) {
           $next = $specifiers[$key + 1];
+          // If this is a numeric specifier we're adding a condition on the
+          // specific delta.
+          if (is_numeric($next)) {
+            $delta = $next;
+            $index_prefix .= ".$delta";
+            // Do not process it again.
+            $key++;
+            $next = $specifiers[$key + 1];
+          }
+          // If this specifier is the reserved keyword "%delta" we're adding a
+          // condition on a delta range.
+          elseif ($next == TableMappingInterface::DELTA) {
+            $index_prefix .= TableMappingInterface::DELTA;
+            // Do not process it again.
+            $key++;
+            // If there are more specifiers to work with then continue
+            // processing. If this is the last specifier then use the reserved
+            // keyword as a column name.
+            if ($key < $count) {
+              $next = $specifiers[$key + 1];
+            }
+            else {
+              $column = TableMappingInterface::DELTA;
+            }
+          }
           // Is this a field column?
           $columns = $field_storage->getColumns();
           if (isset($columns[$next]) || in_array($next, $table_mapping->getReservedColumns())) {
@@ -140,7 +167,7 @@ class Tables implements TablesInterface {
             $next_index_prefix = "$relationship_specifier.$column";
           }
         }
-        $table = $this->ensureFieldTable($index_prefix, $field_storage, $type, $langcode, $base_table, $entity_id_field, $field_id_field);
+        $table = $this->ensureFieldTable($index_prefix, $field_storage, $type, $langcode, $base_table, $entity_id_field, $field_id_field, $delta);
         $sql_column = $table_mapping->getFieldColumnName($field_storage, $column);
         $property_definitions = $field_storage->getPropertyDefinitions();
         if (isset($property_definitions[$column])) {
@@ -173,6 +200,27 @@ class Tables implements TablesInterface {
         // next one is a column of this field.
         if ($key < $count) {
           $next = $specifiers[$key + 1];
+          // If this specifier is the reserved keyword "%delta" we're adding a
+          // condition on a delta range.
+          if ($next == TableMappingInterface::DELTA) {
+            $key++;
+            if ($key < $count) {
+              $next = $specifiers[$key + 1];
+            }
+            else {
+              return 0;
+            }
+          }
+          // If this is a numeric specifier we're adding a condition on the
+          // specific delta. Since we know that this is a single value base
+          // field no other value than 0 makes sense.
+          if (is_numeric($next)) {
+            if ($next > 0) {
+              $this->sqlQuery->condition('1 <> 1');
+            }
+            $key++;
+            $next = $specifiers[$key + 1];
+          }
           // Is this a field column?
           $columns = $field_storage->getColumns();
           if (isset($columns[$next]) || in_array($next, $table_mapping->getReservedColumns())) {
@@ -264,7 +312,7 @@ class Tables implements TablesInterface {
    * @return string
    * @throws \Drupal\Core\Entity\Query\QueryException
    */
-  protected function ensureFieldTable($index_prefix, &$field, $type, $langcode, $base_table, $entity_id_field, $field_id_field) {
+  protected function ensureFieldTable($index_prefix, &$field, $type, $langcode, $base_table, $entity_id_field, $field_id_field, $delta) {
     $field_name = $field->getName();
     if (!isset($this->fieldTables[$index_prefix . $field_name])) {
       $entity_type_id = $this->sqlQuery->getMetaData('entity_type');
@@ -274,12 +322,12 @@ class Tables implements TablesInterface {
       if ($field->getCardinality() != 1) {
         $this->sqlQuery->addMetaData('simple_query', FALSE);
       }
-      $this->fieldTables[$index_prefix . $field_name] = $this->addJoin($type, $table, "%alias.$field_id_field = $base_table.$entity_id_field", $langcode);
+      $this->fieldTables[$index_prefix . $field_name] = $this->addJoin($type, $table, "%alias.$field_id_field = $base_table.$entity_id_field", $langcode, $delta);
     }
     return $this->fieldTables[$index_prefix . $field_name];
   }
 
-  protected function addJoin($type, $table, $join_condition, $langcode) {
+  protected function addJoin($type, $table, $join_condition, $langcode, $delta = NULL) {
     $arguments = array();
     if ($langcode) {
       $entity_type_id = $this->sqlQuery->getMetaData('entity_type');
@@ -291,6 +339,11 @@ class Tables implements TablesInterface {
       $join_condition .= ' AND %alias.' . $langcode_key . ' = ' . $placeholder;
       $arguments[$placeholder] = $langcode;
     }
+    if (isset($delta)) {
+      $placeholder = ':delta' . $this->sqlQuery->nextPlaceholder();
+      $join_condition .= ' AND %alias.delta = ' . $placeholder;
+      $arguments[$placeholder] = $delta;
+    }
     return $this->sqlQuery->addJoin($type, $table, NULL, $join_condition, $arguments);
   }
 
diff --git a/core/lib/Drupal/Core/Entity/Query/Sql/TablesInterface.php b/core/lib/Drupal/Core/Entity/Query/Sql/TablesInterface.php
index 214e130fd..bd8e0de36 100644
--- a/core/lib/Drupal/Core/Entity/Query/Sql/TablesInterface.php
+++ b/core/lib/Drupal/Core/Entity/Query/Sql/TablesInterface.php
@@ -11,8 +11,10 @@ interface TablesInterface {
    * Adds a field to a database query.
    *
    * @param string $field
-   *   If it contains a dot, then field name dot field column. If it doesn't
-   *   then entity property name.
+   *   If it doesn't contain a dot, then an entity base field name. If it
+   *   contains a dot, then either field name dot field column or field name dot
+   *   delta dot field column. Delta can be a numeric value or a "%delta" for
+   *   any value.
    * @param string $type
    *   Join type, can either be INNER or LEFT.
    * @param string $langcode
diff --git a/core/lib/Drupal/Core/Entity/Sql/DefaultTableMapping.php b/core/lib/Drupal/Core/Entity/Sql/DefaultTableMapping.php
index e425fde35..5f20c3f08 100644
--- a/core/lib/Drupal/Core/Entity/Sql/DefaultTableMapping.php
+++ b/core/lib/Drupal/Core/Entity/Sql/DefaultTableMapping.php
@@ -204,7 +204,12 @@ class DefaultTableMapping implements TableMappingInterface {
       $column_name = count($storage_definition->getColumns()) == 1 ? $field_name : $field_name . '__' . $property_name;
     }
     elseif ($this->requiresDedicatedTableStorage($storage_definition)) {
-      $column_name = !in_array($property_name, $this->getReservedColumns()) ? $field_name . '_' . $property_name : $property_name;
+      if ($property_name == TableMappingInterface::DELTA) {
+        $column_name = 'delta';
+      }
+      else {
+        $column_name = !in_array($property_name, $this->getReservedColumns()) ? $field_name . '_' . $property_name : $property_name;
+      }
     }
     else {
       throw new SqlContentEntityStorageException("Column information not available for the '$field_name' field.");
diff --git a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php
index d58445477..391e3444a 100644
--- a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php
+++ b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php
@@ -150,7 +150,7 @@ class SqlContentEntityStorage extends ContentEntityStorageBase implements SqlEnt
    *   The database connection to be used.
    * @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
    *   The entity manager.
-   * @param \Drupal\Core\Cache\CacheBackendInterface $cache_backend
+   * @param \Drupal\Core\Cache\CacheBackendInterface $cache
    *   The cache backend to be used.
    * @param \Drupal\Core\Language\LanguageManagerInterface $language_manager
    *   The language manager.
diff --git a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php
index d76c1329e..ec3ebaf00 100644
--- a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php
+++ b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php
@@ -1837,6 +1837,24 @@ class SqlContentEntityStorageSchema implements DynamicallyFieldableEntityStorage
       }
     }
 
+    // Add unique keys.
+    foreach ($schema['unique keys'] as $index_name => $columns) {
+      $real_name = $this->getFieldIndexName($storage_definition, $index_name);
+      foreach ($columns as $column_name) {
+        // Unique keys can be specified as either a column name or an array with
+        // column name and length. Allow for either case.
+        if (is_array($column_name)) {
+          $data_schema['unique keys'][$real_name][] = array(
+            $table_mapping->getFieldColumnName($storage_definition, $column_name[0]),
+            $column_name[1],
+          );
+        }
+        else {
+          $data_schema['unique keys'][$real_name][] = $table_mapping->getFieldColumnName($storage_definition, $column_name);
+        }
+      }
+    }
+
     // Add foreign keys.
     foreach ($schema['foreign keys'] as $specifier => $specification) {
       $real_name = $this->getFieldIndexName($storage_definition, $specifier);
diff --git a/core/lib/Drupal/Core/Entity/Sql/TableMappingInterface.php b/core/lib/Drupal/Core/Entity/Sql/TableMappingInterface.php
index f21c2700d..3c553bf00 100644
--- a/core/lib/Drupal/Core/Entity/Sql/TableMappingInterface.php
+++ b/core/lib/Drupal/Core/Entity/Sql/TableMappingInterface.php
@@ -19,6 +19,11 @@ use Drupal\Core\Field\FieldStorageDefinitionInterface;
  */
 interface TableMappingInterface {
 
+  /**
+   * A property that represents delta used in entity query conditions.
+   */
+  const DELTA = '%delta';
+
   /**
    * Gets a list of table names for this mapping.
    *
diff --git a/core/lib/Drupal/Core/EventSubscriber/MaintenanceModeSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/MaintenanceModeSubscriber.php
index 873996b02..57d43ec0b 100644
--- a/core/lib/Drupal/Core/EventSubscriber/MaintenanceModeSubscriber.php
+++ b/core/lib/Drupal/Core/EventSubscriber/MaintenanceModeSubscriber.php
@@ -3,7 +3,6 @@
 namespace Drupal\Core\EventSubscriber;
 
 use Drupal\Component\Utility\SafeMarkup;
-use Drupal\Component\Utility\Xss;
 use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\Render\BareHtmlPageRendererInterface;
 use Drupal\Core\Routing\RouteMatch;
@@ -13,6 +12,7 @@ use Drupal\Core\Site\MaintenanceModeInterface;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
 use Drupal\Core\StringTranslation\TranslationInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
 
@@ -90,18 +90,25 @@ class MaintenanceModeSubscriber implements EventSubscriberInterface {
    *   The event to process.
    */
   public function onKernelRequestMaintenance(GetResponseEvent $event) {
-    $route_match = RouteMatch::createFromRequest($event->getRequest());
+    $request = $event->getRequest();
+    $route_match = RouteMatch::createFromRequest($request);
     if ($this->maintenanceMode->applies($route_match)) {
       // Don't cache maintenance mode pages.
       \Drupal::service('page_cache_kill_switch')->trigger();
+
       if (!$this->maintenanceMode->exempt($this->account)) {
         // Deliver the 503 page if the site is in maintenance mode and the
         // logged in user is not allowed to bypass it.
+
+        // If the request format is not 'html' then show default maintenance
+        // mode page else show a text/plain page with maintenance message.
+        if ($request->getRequestFormat() !== 'html') {
+          $response = new Response($this->getSiteMaintenanceMessage(), 503, array('Content-Type' => 'text/plain'));
+          $event->setResponse($response);
+          return;
+        }
         drupal_maintenance_theme();
-        $content = Xss::filterAdmin(SafeMarkup::format($this->config->get('system.maintenance')->get('message'), array(
-          '@site' => $this->config->get('system.site')->get('name'),
-        )));
-        $response = $this->bareHtmlPageRenderer->renderBarePage(['#markup' => $content], $this->t('Site under maintenance'), 'maintenance_page');
+        $response = $this->bareHtmlPageRenderer->renderBarePage(['#markup' => $this->getSiteMaintenanceMessage()], $this->t('Site under maintenance'), 'maintenance_page');
         $response->setStatusCode(503);
         $event->setResponse($response);
       }
@@ -121,6 +128,18 @@ class MaintenanceModeSubscriber implements EventSubscriberInterface {
     }
   }
 
+  /**
+   * Gets the site maintenance message.
+   *
+   * @return \Drupal\Component\Render\MarkupInterface
+   *   The formatted site maintenance message.
+   */
+  protected function getSiteMaintenanceMessage() {
+    return SafeMarkup::format($this->config->get('system.maintenance')->get('message'), array(
+      '@site' => $this->config->get('system.site')->get('name'),
+    ));
+  }
+
   /**
    * Wraps the drupal_set_message function.
    */
diff --git a/core/lib/Drupal/Core/Extension/ModuleHandlerInterface.php b/core/lib/Drupal/Core/Extension/ModuleHandlerInterface.php
index 124efa2ed..e0336dd0a 100644
--- a/core/lib/Drupal/Core/Extension/ModuleHandlerInterface.php
+++ b/core/lib/Drupal/Core/Extension/ModuleHandlerInterface.php
@@ -214,7 +214,7 @@ interface ModuleHandlerInterface {
    *   The name of the module (without the .module extension).
    * @param string $hook
    *   The name of the hook to invoke.
-   * @param ...
+   * @param array $args
    *   Arguments to pass to the hook implementation.
    *
    * @return mixed
diff --git a/core/lib/Drupal/Core/Extension/module.api.php b/core/lib/Drupal/Core/Extension/module.api.php
index 37f8b7759..b73238763 100644
--- a/core/lib/Drupal/Core/Extension/module.api.php
+++ b/core/lib/Drupal/Core/Extension/module.api.php
@@ -72,6 +72,8 @@ use Drupal\Core\Utility\UpdateException;
  * frequently called should be left in the main module file so that they are
  * always available.
  *
+ * See system_hook_info() for all hook groups defined by Drupal core.
+ *
  * @return
  *   An associative array whose keys are hook names and whose values are an
  *   associative array containing:
@@ -79,8 +81,6 @@ use Drupal\Core\Utility\UpdateException;
  *     system will determine whether a file with the name $module.$group.inc
  *     exists, and automatically load it when required.
  *
- * See system_hook_info() for all hook groups defined by Drupal core.
- *
  * @see hook_hook_info_alter()
  */
 function hook_hook_info() {
diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/PasswordItem.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/PasswordItem.php
index 1df00cb4f..f86eac7e5 100644
--- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/PasswordItem.php
+++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/PasswordItem.php
@@ -28,6 +28,8 @@ class PasswordItem extends StringItem {
       ->setSetting('case_sensitive', TRUE);
     $properties['existing'] = DataDefinition::create('string')
       ->setLabel(new TranslatableMarkup('Existing password'));
+    $properties['pre_hashed'] = DataDefinition::create('boolean')
+      ->setLabel(new TranslatableMarkup('Determines if a password needs hashing'));
 
     return $properties;
   }
@@ -40,8 +42,11 @@ class PasswordItem extends StringItem {
 
     $entity = $this->getEntity();
 
-    // Update the user password if it has changed.
-    if ($entity->isNew() || (strlen(trim($this->value)) > 0 && $this->value != $entity->original->{$this->getFieldDefinition()->getName()}->value)) {
+    if ($this->pre_hashed) {
+      // Reset the pre_hashed value since it has now been used.
+      $this->pre_hashed = FALSE;
+    }
+    elseif ($entity->isNew() || (strlen(trim($this->value)) > 0 && $this->value != $entity->original->{$this->getFieldDefinition()->getName()}->value)) {
       // Allow alternate password hashing schemes.
       $this->value = \Drupal::service('password')->hash(trim($this->value));
       // Abort if the hashing failed and returned FALSE.
diff --git a/core/lib/Drupal/Core/Form/FormBase.php b/core/lib/Drupal/Core/Form/FormBase.php
index c33f2a167..4a020dc2a 100644
--- a/core/lib/Drupal/Core/Form/FormBase.php
+++ b/core/lib/Drupal/Core/Form/FormBase.php
@@ -15,7 +15,29 @@ use Symfony\Component\HttpFoundation\RequestStack;
 /**
  * Provides a base class for forms.
  *
+ * This class exists as a mid-point between dependency injection through
+ * ContainerInjectionInterface, and a less-structured use of traits which
+ * default to using the \Drupal accessor for service discovery.
+ *
+ * To properly inject services, override create() and use the setters provided
+ * by the traits to inject the needed services.
+ *
+ * @code
+ * public static function create($container) {
+ *   $form = new static();
+ *   // In this example we only need string translation so we use the
+ *   // setStringTranslation() method provided by StringTranslationTrait.
+ *   $form->setStringTranslation($container->get('string_translation'));
+ *   return $form;
+ * }
+ * @endcode
+ *
+ * Alternately, do not use FormBase. A class can implement FormInterface, use
+ * the traits it needs, and inject services from the container as required.
+ *
  * @ingroup form_api
+ *
+ * @see \Drupal\Core\DependencyInjection\ContainerInjectionInterface
  */
 abstract class FormBase implements FormInterface, ContainerInjectionInterface {
 
diff --git a/core/lib/Drupal/Core/Form/FormBuilderInterface.php b/core/lib/Drupal/Core/Form/FormBuilderInterface.php
index 334e10be4..ca794379d 100644
--- a/core/lib/Drupal/Core/Form/FormBuilderInterface.php
+++ b/core/lib/Drupal/Core/Form/FormBuilderInterface.php
@@ -137,9 +137,9 @@ interface FormBuilderInterface {
    * by calling $form_state->getErrors().
    *
    * @param \Drupal\Core\Form\FormInterface|string $form_arg
-   *   A form object to use to build the form, or the unique string identifying
-   *   the desired form. If $form_arg is a string and a function with that
-   *   name exists, it is called to build the form array.
+   *   The value must be one of the following:
+   *   - The name of a class that implements \Drupal\Core\Form\FormInterface.
+   *   - An instance of a class that implements \Drupal\Core\Form\FormInterface.
    * @param $form_state
    *   The current state of the form. Most important is the
    *   $form_state->getValues() collection, a tree of data used to simulate the
diff --git a/core/lib/Drupal/Core/Plugin/ContextAwarePluginBase.php b/core/lib/Drupal/Core/Plugin/ContextAwarePluginBase.php
index ab7359826..05ba8a83d 100644
--- a/core/lib/Drupal/Core/Plugin/ContextAwarePluginBase.php
+++ b/core/lib/Drupal/Core/Plugin/ContextAwarePluginBase.php
@@ -41,11 +41,11 @@ abstract class ContextAwarePluginBase extends ComponentContextAwarePluginBase im
   /**
    * {@inheritdoc}
    *
-   * @return \Drupal\Core\Plugin\Context\ContextInterface
-   *   The context object.
-   *
    * This code is identical to the Component in order to pick up a different
    * Context class.
+   *
+   * @return \Drupal\Core\Plugin\Context\ContextInterface
+   *   The context object.
    */
   public function getContext($name) {
     // Check for a valid context value.
diff --git a/core/lib/Drupal/Core/Render/Element/Checkboxes.php b/core/lib/Drupal/Core/Render/Element/Checkboxes.php
index 8487a0960..1ca1aea5d 100644
--- a/core/lib/Drupal/Core/Render/Element/Checkboxes.php
+++ b/core/lib/Drupal/Core/Render/Element/Checkboxes.php
@@ -17,7 +17,7 @@ use Drupal\Core\Form\FormStateInterface;
  * @code
  * $form['high_school']['tests_taken'] = array(
  *   '#type' => 'checkboxes',
- *   '#options' => array('SAT' => $this->t('SAT'), 'ACT' => $this->t('ACT'))),
+ *   '#options' => array('SAT' => $this->t('SAT'), 'ACT' => $this->t('ACT')),
  *   '#title' => $this->t('What standardized tests did you take?'),
  *   ...
  * );
diff --git a/core/lib/Drupal/Core/Render/Element/StatusMessages.php b/core/lib/Drupal/Core/Render/Element/StatusMessages.php
index 55990e6b9..f026aa5c5 100644
--- a/core/lib/Drupal/Core/Render/Element/StatusMessages.php
+++ b/core/lib/Drupal/Core/Render/Element/StatusMessages.php
@@ -12,7 +12,7 @@ namespace Drupal\Core\Render\Element;
  * $build['status_messages'] = [
  *   '#type' => 'status_messages',
  * ];
- * @end
+ * @endcode
  *
  * @RenderElement("status_messages")
  */
diff --git a/core/lib/Drupal/Core/Render/RenderCacheInterface.php b/core/lib/Drupal/Core/Render/RenderCacheInterface.php
index f31b33037..86f38d358 100644
--- a/core/lib/Drupal/Core/Render/RenderCacheInterface.php
+++ b/core/lib/Drupal/Core/Render/RenderCacheInterface.php
@@ -64,7 +64,7 @@ interface RenderCacheInterface {
    *   this array.
    *
    * @return bool|null
-   *  Returns FALSE if no cache item could be created, NULL otherwise.
+   *   Returns FALSE if no cache item could be created, NULL otherwise.
    *
    * @see ::get()
    */
diff --git a/core/lib/Drupal/Core/Routing/RouteBuilderInterface.php b/core/lib/Drupal/Core/Routing/RouteBuilderInterface.php
index 83b1d3ed1..d191cb9a6 100644
--- a/core/lib/Drupal/Core/Routing/RouteBuilderInterface.php
+++ b/core/lib/Drupal/Core/Routing/RouteBuilderInterface.php
@@ -2,10 +2,27 @@
 
 namespace Drupal\Core\Routing;
 
+/**
+ * Rebuilds the route information and dumps it.
+ *
+ * Rebuilding the route information is the process of gathering all routing data
+ * from .routing.yml files, creating a
+ * \Symfony\Component\Routing\RouteCollection object out of it, and dispatching
+ * that object as a \Drupal\Core\Routing\RouteBuildEvent to all registered
+ * listeners. After that, the \Symfony\Component\Routing\RouteCollection object
+ * is used to dump the data. Examples of a dump include filling up the routing
+ * table, auto-generating Apache mod_rewrite rules, or auto-generating a PHP
+ * matcher class.
+ *
+ * @see \Drupal\Core\Routing\MatcherDumperInterface
+ * @see \Drupal\Core\Routing\RouteProviderInterface
+ *
+ * @ingroup routing
+ */
 interface RouteBuilderInterface {
 
   /**
-   * Rebuilds the route info and dumps to dumper.
+   * Rebuilds the route information and dumps it.
    *
    * @return bool
    *   Returns TRUE if the rebuild succeeds, FALSE otherwise.
@@ -13,7 +30,7 @@ interface RouteBuilderInterface {
   public function rebuild();
 
   /**
-   * Rebuilds the route info and dumps to dumper if necessary.
+   * Rebuilds the route information if necessary, and dumps it.
    *
    * @return bool
    *   Returns TRUE if the rebuild occurs, FALSE otherwise.
diff --git a/core/lib/Drupal/Core/Routing/UrlGenerator.php b/core/lib/Drupal/Core/Routing/UrlGenerator.php
index 9291c40fd..ccf2b60d8 100644
--- a/core/lib/Drupal/Core/Routing/UrlGenerator.php
+++ b/core/lib/Drupal/Core/Routing/UrlGenerator.php
@@ -229,10 +229,8 @@ class UrlGenerator implements UrlGeneratorInterface {
 
     // Add a query string if needed, including extra parameters.
     $query_params += array_diff_key($parameters, $variables, $defaults);
-    if ($query_params && $query = http_build_query($query_params, '', '&')) {
-      // "/" and "?" can be left decoded for better user experience, see
-      // http://tools.ietf.org/html/rfc3986#section-3.4
-      $url .= '?' . strtr($query, array('%2F' => '/'));
+    if ($query_params && $query = UrlHelper::buildQuery($query_params)) {
+      $url .= '?' . $query;
     }
 
     return $url;
@@ -253,7 +251,7 @@ class UrlGenerator implements UrlGeneratorInterface {
    *   $parameters merged in.
    *
    * @return string
-   *  The url path corresponding to the route, without the base path.
+   *   The url path corresponding to the route, without the base path.
    */
   protected function getInternalPathFromRoute($name, SymfonyRoute $route, $parameters = array(), $query_params = array()) {
     // The Route has a cache of its own and is not recompiled as long as it does
diff --git a/core/lib/Drupal/Core/Routing/UrlGeneratorInterface.php b/core/lib/Drupal/Core/Routing/UrlGeneratorInterface.php
index f5174f1d2..70829cd68 100644
--- a/core/lib/Drupal/Core/Routing/UrlGeneratorInterface.php
+++ b/core/lib/Drupal/Core/Routing/UrlGeneratorInterface.php
@@ -21,7 +21,7 @@ interface UrlGeneratorInterface extends VersatileGeneratorInterface {
    *   \Symfony\Component\Routing\Generator\UrlGeneratorInterface::generate().
    *
    * @return string
-   *  The internal Drupal path corresponding to the route.
+   *   The internal Drupal path corresponding to the route.
    */
   public function getPathFromRoute($name, $parameters = array());
 
diff --git a/core/lib/Drupal/Core/StreamWrapper/PhpStreamWrapperInterface.php b/core/lib/Drupal/Core/StreamWrapper/PhpStreamWrapperInterface.php
index ed8db6465..4c11c8d66 100644
--- a/core/lib/Drupal/Core/StreamWrapper/PhpStreamWrapperInterface.php
+++ b/core/lib/Drupal/Core/StreamWrapper/PhpStreamWrapperInterface.php
@@ -64,7 +64,7 @@ interface PhpStreamWrapperInterface {
   public function stream_cast($cast_as);
 
   /**
-   * @return void
+   * Closes stream.
    */
   public function stream_close();
 
diff --git a/core/lib/Drupal/Core/StringTranslation/Translator/FileTranslation.php b/core/lib/Drupal/Core/StringTranslation/Translator/FileTranslation.php
index d4c46e3ef..abe5e9a7b 100644
--- a/core/lib/Drupal/Core/StringTranslation/Translator/FileTranslation.php
+++ b/core/lib/Drupal/Core/StringTranslation/Translator/FileTranslation.php
@@ -82,7 +82,7 @@ class FileTranslation extends StaticTranslation {
    *   want to find translation files.
    *
    * @return string
-   *  String file pattern.
+   *   String file pattern.
    */
   protected function getTranslationFilesPattern($langcode = NULL) {
     // The file name matches: drupal-[release version].[language code].po
diff --git a/core/lib/Drupal/Core/Url.php b/core/lib/Drupal/Core/Url.php
index f29e14697..6a58319e0 100644
--- a/core/lib/Drupal/Core/Url.php
+++ b/core/lib/Drupal/Core/Url.php
@@ -272,7 +272,11 @@ class Url {
     if ($uri_parts === FALSE) {
       throw new \InvalidArgumentException("The URI '$uri' is malformed.");
     }
-    if (empty($uri_parts['scheme'])) {
+    // We support protocol-relative URLs.
+    if (strpos($uri, '//') === 0) {
+      $uri_parts['scheme'] = '';
+    }
+    elseif (empty($uri_parts['scheme'])) {
       throw new \InvalidArgumentException("The URI '$uri' is invalid. You must use a valid URI scheme.");
     }
     $uri_parts += ['path' => ''];
diff --git a/core/lib/Drupal/Core/Utility/LinkGenerator.php b/core/lib/Drupal/Core/Utility/LinkGenerator.php
index 7acb83815..496100133 100644
--- a/core/lib/Drupal/Core/Utility/LinkGenerator.php
+++ b/core/lib/Drupal/Core/Utility/LinkGenerator.php
@@ -140,6 +140,7 @@ class LinkGenerator implements LinkGeneratorInterface {
 
     // Allow other modules to modify the structure of the link.
     $this->moduleHandler->alter('link', $variables);
+    $url = $variables['url'];
 
     // Move attributes out of options since generateFromRoute() doesn't need
     // them. Include a placeholder for the href.
diff --git a/core/misc/autocomplete.js b/core/misc/autocomplete.js
index 032a15ca3..254e7e509 100644
--- a/core/misc/autocomplete.js
+++ b/core/misc/autocomplete.js
@@ -222,7 +222,7 @@
         });
         // Use jQuery UI Autocomplete on the textfield.
         $autocomplete.autocomplete(autocomplete.options)
-          .each(function() {
+          .each(function () {
             $(this).data('ui-autocomplete')._renderItem = autocomplete.options.renderItem;
           });
       }
diff --git a/core/modules/action/src/Tests/ActionUninstallTest.php b/core/modules/action/tests/src/Functional/ActionUninstallTest.php
similarity index 87%
rename from core/modules/action/src/Tests/ActionUninstallTest.php
rename to core/modules/action/tests/src/Functional/ActionUninstallTest.php
index fd8faa5c9..25dd564a8 100644
--- a/core/modules/action/src/Tests/ActionUninstallTest.php
+++ b/core/modules/action/tests/src/Functional/ActionUninstallTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\action\Tests;
+namespace Drupal\Tests\action\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests that uninstalling actions does not remove other module's actions.
@@ -10,7 +10,7 @@ use Drupal\simpletest\WebTestBase;
  * @group action
  * @see \Drupal\action\Plugin\views\field\BulkForm
  */
-class ActionUninstallTest extends WebTestBase {
+class ActionUninstallTest extends BrowserTestBase {
 
   /**
    * Modules to install.
diff --git a/core/modules/action/src/Tests/BulkFormTest.php b/core/modules/action/tests/src/Functional/BulkFormTest.php
similarity index 95%
rename from core/modules/action/src/Tests/BulkFormTest.php
rename to core/modules/action/tests/src/Functional/BulkFormTest.php
index 773d6050c..c3a3bc1fc 100644
--- a/core/modules/action/src/Tests/BulkFormTest.php
+++ b/core/modules/action/tests/src/Functional/BulkFormTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\action\Tests;
+namespace Drupal\Tests\action\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\views\Views;
 
 /**
@@ -11,7 +11,7 @@ use Drupal\views\Views;
  * @group action
  * @see \Drupal\action\Plugin\views\field\BulkForm
  */
-class BulkFormTest extends WebTestBase {
+class BulkFormTest extends BrowserTestBase {
 
   /**
    * Modules to install.
@@ -123,7 +123,7 @@ class BulkFormTest extends WebTestBase {
     // Check the default title.
     $this->drupalGet('test_bulk_form');
     $result = $this->xpath('//label[@for="edit-action"]');
-    $this->assertEqual('With selection', (string) $result[0]);
+    $this->assertEqual('With selection', $result[0]->getText());
 
     // Setup up a different bulk form title.
     $view = Views::getView('test_bulk_form');
@@ -133,7 +133,7 @@ class BulkFormTest extends WebTestBase {
 
     $this->drupalGet('test_bulk_form');
     $result = $this->xpath('//label[@for="edit-action"]');
-    $this->assertEqual('Test title', (string) $result[0]);
+    $this->assertEqual('Test title', $result[0]->getText());
 
     $this->drupalGet('test_bulk_form');
     // Call the node delete action.
diff --git a/core/modules/action/src/Tests/ConfigurationTest.php b/core/modules/action/tests/src/Functional/ConfigurationTest.php
similarity index 96%
rename from core/modules/action/src/Tests/ConfigurationTest.php
rename to core/modules/action/tests/src/Functional/ConfigurationTest.php
index a6b20502f..17d913de6 100644
--- a/core/modules/action/src/Tests/ConfigurationTest.php
+++ b/core/modules/action/tests/src/Functional/ConfigurationTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\action\Tests;
+namespace Drupal\Tests\action\Functional;
 
 use Drupal\Component\Utility\Crypt;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests complex actions configuration by adding, editing, and deleting a
@@ -11,7 +11,7 @@ use Drupal\simpletest\WebTestBase;
  *
  * @group action
  */
-class ConfigurationTest extends WebTestBase {
+class ConfigurationTest extends BrowserTestBase {
 
   /**
    * Modules to install.
diff --git a/core/modules/aggregator/src/Plugin/migrate/source/AggregatorItem.php b/core/modules/aggregator/src/Plugin/migrate/source/AggregatorItem.php
index 61f42f460..fc1c5c6c7 100644
--- a/core/modules/aggregator/src/Plugin/migrate/source/AggregatorItem.php
+++ b/core/modules/aggregator/src/Plugin/migrate/source/AggregatorItem.php
@@ -20,7 +20,7 @@ class AggregatorItem extends DrupalSqlBase {
   public function query() {
     return $this->select('aggregator_item', 'ai')
       ->fields('ai')
-      ->orderBy('iid');
+      ->orderBy('ai.iid');
   }
 
   /**
diff --git a/core/modules/ban/src/Tests/IpAddressBlockingTest.php b/core/modules/ban/tests/src/Functional/IpAddressBlockingTest.php
similarity index 94%
rename from core/modules/ban/src/Tests/IpAddressBlockingTest.php
rename to core/modules/ban/tests/src/Functional/IpAddressBlockingTest.php
index 9fb9ff850..738bddfb5 100644
--- a/core/modules/ban/src/Tests/IpAddressBlockingTest.php
+++ b/core/modules/ban/tests/src/Functional/IpAddressBlockingTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\ban\Tests;
+namespace Drupal\Tests\ban\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests IP address banning.
  *
  * @group ban
  */
-class IpAddressBlockingTest extends WebTestBase {
+class IpAddressBlockingTest extends BrowserTestBase {
 
   /**
    * Modules to install.
@@ -61,7 +61,7 @@ class IpAddressBlockingTest extends WebTestBase {
 
     // Pass an IP address as a URL parameter and submit it.
     $submit_ip = '1.2.3.4';
-    $this->drupalPostForm('admin/config/people/ban/' . $submit_ip, NULL, t('Add'));
+    $this->drupalPostForm('admin/config/people/ban/' . $submit_ip, array(), t('Add'));
     $ip = db_query("SELECT iid from {ban_ip} WHERE ip = :ip", array(':ip' => $submit_ip))->fetchField();
     $this->assertTrue($ip, 'IP address found in database');
     $this->assertRaw(t('The IP address %ip has been banned.', array('%ip' => $submit_ip)), 'IP address was banned.');
diff --git a/core/modules/big_pipe/src/Render/BigPipe.php b/core/modules/big_pipe/src/Render/BigPipe.php
index 3e67737f5..5e3cc1203 100644
--- a/core/modules/big_pipe/src/Render/BigPipe.php
+++ b/core/modules/big_pipe/src/Render/BigPipe.php
@@ -226,6 +226,13 @@ class BigPipe implements BigPipeInterface {
     $preg_placeholder_strings = array_map($prepare_for_preg_split, array_keys($no_js_placeholders));
     $fragments = preg_split('/' . implode('|', $preg_placeholder_strings) . '/', $html, NULL, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);
 
+    // Determine how many occurrences there are of each no-JS placeholder.
+    $placeholder_occurrences = array_count_values(array_intersect($fragments, array_keys($no_js_placeholders)));
+
+    // Set up a variable to store the content of placeholders that have multiple
+    // occurrences.
+    $multi_occurrence_placeholders_content = [];
+
     foreach ($fragments as $fragment) {
       // If the fragment isn't one of the no-JS placeholders, it is the HTML in
       // between placeholders and it must be printed & flushed immediately. The
@@ -236,6 +243,15 @@ class BigPipe implements BigPipeInterface {
         continue;
       }
 
+      // If there are multiple occurrences of this particular placeholder, and
+      // this is the second occurrence, we can skip all calculations and just
+      // send the same content.
+      if ($placeholder_occurrences[$fragment] > 1 && isset($multi_occurrence_placeholders_content[$fragment])) {
+        print $multi_occurrence_placeholders_content[$fragment];
+        flush();
+        continue;
+      }
+
       $placeholder = $fragment;
       assert('isset($no_js_placeholders[$placeholder])');
       $token = Crypt::randomBytesBase64(55);
@@ -310,6 +326,13 @@ class BigPipe implements BigPipeInterface {
       // they can be sent in ::sendPreBody().
       $cumulative_assets->setAlreadyLoadedLibraries(array_merge($cumulative_assets->getAlreadyLoadedLibraries(), $html_response->getAttachments()['library']));
       $cumulative_assets->setSettings($html_response->getAttachments()['drupalSettings']);
+
+      // If there are multiple occurrences of this particular placeholder, track
+      // the content that was sent, so we can skip all calculations for the next
+      // occurrence.
+      if ($placeholder_occurrences[$fragment] > 1) {
+        $multi_occurrence_placeholders_content[$fragment] = $html_response->getContent();
+      }
     }
   }
 
@@ -508,7 +531,9 @@ EOF;
    *
    * @return array
    *   Indexed array; the order in which the BigPipe placeholders must be sent.
-   *   Values are the BigPipe placeholder IDs.
+   *   Values are the BigPipe placeholder IDs. Note that only unique
+   *   placeholders are kept: if the same placeholder occurs multiple times, we
+   *   only keep the first occurrence.
    */
   protected function getPlaceholderOrder($html) {
     $fragments = explode('<div data-big-pipe-placeholder-id="', $html);
@@ -521,7 +546,7 @@ EOF;
       $order[] = $placeholder;
     }
 
-    return $order;
+    return array_unique($order);
   }
 
 }
diff --git a/core/modules/big_pipe/src/Tests/BigPipeTest.php b/core/modules/big_pipe/src/Tests/BigPipeTest.php
index f947c46bd..370b815df 100644
--- a/core/modules/big_pipe/src/Tests/BigPipeTest.php
+++ b/core/modules/big_pipe/src/Tests/BigPipeTest.php
@@ -269,6 +269,42 @@ class BigPipeTest extends WebTestBase {
     unlink(\Drupal::root() . '/' . $this->siteDirectory . '/error.log');
   }
 
+  /**
+   * Tests BigPipe with a multi-occurrence placeholder.
+   */
+  public function testBigPipeMultiOccurrencePlaceholders() {
+    $this->drupalLogin($this->rootUser);
+    $this->assertSessionCookieExists(TRUE);
+    $this->assertBigPipeNoJsCookieExists(FALSE);
+
+    // By not calling performMetaRefresh() here, we simulate JavaScript being
+    // enabled, because as far as the BigPipe module is concerned, JavaScript is
+    // enabled in the browser as long as the BigPipe no-JS cookie is *not* set.
+    // @see setUp()
+    // @see performMetaRefresh()
+
+    $this->drupalGet(Url::fromRoute('big_pipe_test_multi_occurrence'));
+    $big_pipe_placeholder_id = 'callback=Drupal%5CCore%5CRender%5CElement%5CStatusMessages%3A%3ArenderMessages&amp;args[0]&amp;token=a8c34b5e';
+    $expected_placeholder_replacement = '<script type="application/vnd.drupal-ajax" data-big-pipe-replacement-for-placeholder-with-id="' . $big_pipe_placeholder_id . '">';
+    $this->assertRaw('The count is 1.');
+    $this->assertNoRaw('The count is 2.');
+    $this->assertNoRaw('The count is 3.');
+    $raw_content = $this->getRawContent();
+    $this->assertTrue(substr_count($raw_content, $expected_placeholder_replacement) == 1, 'Only one placeholder replacement was found for the duplicate #lazy_builder arrays.');
+
+    // By calling performMetaRefresh() here, we simulate JavaScript being
+    // disabled, because as far as the BigPipe module is concerned, it is
+    // enabled in the browser when the BigPipe no-JS cookie is set.
+    // @see setUp()
+    // @see performMetaRefresh()
+    $this->performMetaRefresh();
+    $this->assertBigPipeNoJsCookieExists(TRUE);
+    $this->drupalGet(Url::fromRoute('big_pipe_test_multi_occurrence'));
+    $this->assertRaw('The count is 1.');
+    $this->assertNoRaw('The count is 2.');
+    $this->assertNoRaw('The count is 3.');
+  }
+
   protected function assertBigPipeResponseHeadersPresent() {
     $this->pass('Verifying BigPipe response headers…', 'Debug');
     $this->assertTrue(FALSE !== strpos($this->drupalGetHeader('Cache-Control'), 'private'), 'Cache-Control header set to "private".');
diff --git a/core/modules/big_pipe/tests/modules/big_pipe_test/big_pipe_test.routing.yml b/core/modules/big_pipe/tests/modules/big_pipe_test/big_pipe_test.routing.yml
index 4979406d5..710506063 100644
--- a/core/modules/big_pipe/tests/modules/big_pipe_test/big_pipe_test.routing.yml
+++ b/core/modules/big_pipe/tests/modules/big_pipe_test/big_pipe_test.routing.yml
@@ -15,3 +15,12 @@ no_big_pipe:
     _no_big_pipe: TRUE
   requirements:
     _access: 'TRUE'
+
+big_pipe_test_multi_occurrence:
+  path: '/big_pipe_test_multi_occurrence'
+  defaults:
+    _controller: '\Drupal\big_pipe_test\BigPipeTestController::multiOccurrence'
+    _title: 'BigPipe test multiple occurrences of the same placeholder'
+  requirements:
+    _access: 'TRUE'
+
diff --git a/core/modules/big_pipe/tests/modules/big_pipe_test/src/BigPipeTestController.php b/core/modules/big_pipe/tests/modules/big_pipe_test/src/BigPipeTestController.php
index 450a464bd..30594a555 100644
--- a/core/modules/big_pipe/tests/modules/big_pipe_test/src/BigPipeTestController.php
+++ b/core/modules/big_pipe/tests/modules/big_pipe_test/src/BigPipeTestController.php
@@ -52,6 +52,30 @@ class BigPipeTestController {
     return ['#markup' => '<p>Nope.</p>'];
   }
 
+  /**
+   * A page with multiple occurrences of the same placeholder.
+   *
+   * @see \Drupal\big_pipe\Tests\BigPipeTest::testBigPipeMultipleOccurrencePlaceholders()
+   *
+   * @return array
+   */
+  public function multiOccurrence() {
+    return [
+      'item1' => [
+        '#lazy_builder' => [static::class . '::counter', []],
+        '#create_placeholder' => TRUE,
+      ],
+      'item2' => [
+        '#lazy_builder' => [static::class . '::counter', []],
+        '#create_placeholder' => TRUE,
+      ],
+      'item3' => [
+        '#lazy_builder' => [static::class . '::counter', []],
+        '#create_placeholder' => TRUE,
+      ],
+    ];
+  }
+
   /**
    * #lazy_builder callback; builds <time> markup with current time.
    *
@@ -98,4 +122,31 @@ class BigPipeTestController {
     return ['#plain_text' => BigPipeTestSubscriber::CONTENT_TRIGGER_EXCEPTION];
   }
 
+  /**
+   * #lazy_builder callback; returns the current count.
+   *
+   * @see \Drupal\big_pipe\Tests\BigPipeTest::testBigPipeMultipleOccurrencePlaceholders()
+   *
+   * @return array
+   *   The render array.
+   */
+  public static function counter() {
+    // Lazy builders are not allowed to build their own state like this function
+    // does, but in this case we're intentionally doing that for testing
+    // purposes: so we can ensure that each lazy builder is only ever called
+    // once with the same parameters.
+    static $count;
+
+    if (!isset($count)) {
+      $count = 0;
+    }
+
+    $count++;
+
+    return [
+      '#markup' => BigPipeMarkup::create("<p>The count is $count.</p>"),
+      '#cache' => ['max-age' => 0],
+    ];
+  }
+
 }
diff --git a/core/modules/big_pipe/tests/src/FunctionalJavascript/BigPipeRegressionTest.php b/core/modules/big_pipe/tests/src/FunctionalJavascript/BigPipeRegressionTest.php
new file mode 100644
index 000000000..ab2807358
--- /dev/null
+++ b/core/modules/big_pipe/tests/src/FunctionalJavascript/BigPipeRegressionTest.php
@@ -0,0 +1,117 @@
+<?php
+
+namespace Drupal\Tests\big_pipe\FunctionalJavascript;
+
+use Drupal\comment\CommentInterface;
+use Drupal\comment\Entity\Comment;
+use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface;
+use Drupal\comment\Tests\CommentTestTrait;
+use Drupal\editor\Entity\Editor;
+use Drupal\filter\Entity\FilterFormat;
+use Drupal\FunctionalJavascriptTests\JavascriptTestBase;
+use Drupal\simpletest\ContentTypeCreationTrait;
+use Drupal\simpletest\NodeCreationTrait;
+
+/**
+ * BigPipe regression tests.
+ *
+ * @group big_pipe
+ */
+class BigPipeRegressionTest extends JavascriptTestBase {
+
+  use CommentTestTrait;
+  use ContentTypeCreationTrait;
+  use NodeCreationTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = [
+    'node',
+    'comment',
+    'big_pipe',
+    'history',
+    'editor',
+    'ckeditor',
+    'filter',
+  ];
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setUp() {
+    parent::setUp();
+
+    // Use the big_pipe_test_theme theme.
+    $this->container->get('theme_installer')->install(['big_pipe_test_theme']);
+    $this->container->get('config.factory')->getEditable('system.theme')->set('default', 'big_pipe_test_theme')->save();
+  }
+
+  /**
+   * Ensure comment form works with history and big_pipe modules.
+   *
+   * @see https://www.drupal.org/node/2698811
+   */
+  public function testCommentForm_2698811() {
+    // Ensure an `article` node type exists.
+    $this->createContentType(['type' => 'article']);
+    $this->addDefaultCommentField('node', 'article');
+
+    // Enable CKEditor.
+    $format = $this->randomMachineName();
+    FilterFormat::create([
+      'format' => $format,
+      'name' => $this->randomString(),
+      'weight' => 1,
+      'filters' => [],
+    ])->save();
+    $settings['toolbar']['rows'] = [
+      [
+        [
+          'name' => 'Links',
+          'items' => [
+            'DrupalLink',
+            'DrupalUnlink',
+          ],
+        ],
+      ],
+    ];
+    $editor = Editor::create([
+      'format' => $format,
+      'editor' => 'ckeditor',
+    ]);
+    $editor->setSettings($settings);
+    $editor->save();
+
+    $admin_user = $this->drupalCreateUser([
+      'access comments',
+      'post comments',
+      'use text format ' . $format,
+    ]);
+    $this->drupalLogin($admin_user);
+
+    $node = $this->createNode([
+      'type' => 'article',
+      'comment' => CommentItemInterface::OPEN,
+    ]);
+    // Create some comments.
+    foreach (range(1, 5) as $i) {
+      $comment = Comment::create([
+        'status' => CommentInterface::PUBLISHED,
+        'field_name' => 'comment',
+        'entity_type' => 'node',
+        'entity_id' => $node->id(),
+      ]);
+      $comment->save();
+    }
+    $this->drupalGet($node->toUrl()->toString());
+    // Confirm that CKEditor loaded.
+    $javascript = <<<JS
+    (function(){
+      return Object.keys(CKEDITOR.instances).length > 0;
+    }());
+JS;
+    $this->assertJsCondition($javascript);
+  }
+
+}
diff --git a/core/modules/big_pipe/tests/themes/big_pipe_test_theme/big_pipe_test_theme.info.yml b/core/modules/big_pipe/tests/themes/big_pipe_test_theme/big_pipe_test_theme.info.yml
new file mode 100644
index 000000000..2b3c84276
--- /dev/null
+++ b/core/modules/big_pipe/tests/themes/big_pipe_test_theme/big_pipe_test_theme.info.yml
@@ -0,0 +1,5 @@
+name: 'BigPipe test theme'
+type: theme
+description: 'Theme for testing BigPipe edge cases.'
+version: VERSION
+core: 8.x
diff --git a/core/modules/big_pipe/tests/themes/big_pipe_test_theme/templates/field--comment.html.twig b/core/modules/big_pipe/tests/themes/big_pipe_test_theme/templates/field--comment.html.twig
new file mode 100644
index 000000000..a26fa78e4
--- /dev/null
+++ b/core/modules/big_pipe/tests/themes/big_pipe_test_theme/templates/field--comment.html.twig
@@ -0,0 +1,13 @@
+{#
+/**
+ * @file
+ * Test that comments still work with the form above instead of below.
+ *
+ * @see \Drupal\Tests\big_pipe\FunctionalJavascript\BigPipeRegressionTest::testCommentForm_2698811()
+ */
+#}
+<section{{ attributes }}>
+  {{ comment_form }}
+
+  {{ comments }}
+</section>
diff --git a/core/modules/block/migration_templates/d7_block.yml b/core/modules/block/migration_templates/d7_block.yml
index 32e8f5d2a..ff561118e 100644
--- a/core/modules/block/migration_templates/d7_block.yml
+++ b/core/modules/block/migration_templates/d7_block.yml
@@ -19,6 +19,9 @@ process:
         - module
         - delta
       delimiter: _
+    -
+      plugin: machine_name
+      field: id
   plugin:
     -
       plugin: static_map
diff --git a/core/modules/block/src/Entity/Block.php b/core/modules/block/src/Entity/Block.php
index 9c6306fdc..9cbd30b3b 100644
--- a/core/modules/block/src/Entity/Block.php
+++ b/core/modules/block/src/Entity/Block.php
@@ -291,7 +291,6 @@ class Block extends ConfigEntityBase implements BlockInterface, EntityWithPlugin
    *   The condition plugin manager.
    */
   protected function conditionPluginManager() {
-    $this->conditionPluginManager;
     if (!isset($this->conditionPluginManager)) {
       $this->conditionPluginManager = \Drupal::service('plugin.manager.condition');
     }
diff --git a/core/modules/block/src/Plugin/migrate/source/Block.php b/core/modules/block/src/Plugin/migrate/source/Block.php
index 87414a029..b69128369 100644
--- a/core/modules/block/src/Plugin/migrate/source/Block.php
+++ b/core/modules/block/src/Plugin/migrate/source/Block.php
@@ -43,6 +43,13 @@ class Block extends DrupalSqlBase {
    */
   protected $blockRoleTable;
 
+  /**
+   * Table listing user roles.
+   *
+   * @var string
+   */
+  protected $userRoleTable;
+
   /**
    * {@inheritdoc}
    */
@@ -55,6 +62,9 @@ class Block extends DrupalSqlBase {
       $this->blockTable = 'blocks';
       $this->blockRoleTable = 'blocks_roles';
     }
+    // Drupal 6 & 7 both use the same name for the user roles table.
+    $this->userRoleTable = 'role';
+
     return $this->select($this->blockTable, 'b')->fields('b');
   }
 
@@ -106,11 +116,12 @@ class Block extends DrupalSqlBase {
     $module = $row->getSourceProperty('module');
     $delta = $row->getSourceProperty('delta');
 
-    $roles = $this->select($this->blockRoleTable, 'br')
+    $query = $this->select($this->blockRoleTable, 'br')
       ->fields('br', array('rid'))
       ->condition('module', $module)
-      ->condition('delta', $delta)
-      ->execute()
+      ->condition('delta', $delta);
+    $query->join($this->userRoleTable, 'ur', 'br.rid = ur.rid');
+    $roles = $query->execute()
       ->fetchCol();
     $row->setSourceProperty('roles', $roles);
 
diff --git a/core/modules/block/tests/src/Kernel/Migrate/d7/MigrateBlockTest.php b/core/modules/block/tests/src/Kernel/Migrate/d7/MigrateBlockTest.php
index 9c3ff5fc9..571c21099 100644
--- a/core/modules/block/tests/src/Kernel/Migrate/d7/MigrateBlockTest.php
+++ b/core/modules/block/tests/src/Kernel/Migrate/d7/MigrateBlockTest.php
@@ -108,7 +108,7 @@ class MigrateBlockTest extends MigrateDrupal7TestBase {
     $this->assertEntity('bartik_system_main', 'system_main_block', [], '', 'content', 'bartik', 0, '', '0');
     $this->assertEntity('bartik_search_form', 'search_form_block', [], '', 'sidebar_first', 'bartik', -1, '', '0');
     $this->assertEntity('bartik_user_login', 'user_login_block', [], '', 'sidebar_first', 'bartik', 0, '', '0');
-    $this->assertEntity('bartik_system_powered-by', 'system_powered_by_block', [], '', 'footer', 'bartik', 10, '', '0');
+    $this->assertEntity('bartik_system_powered_by', 'system_powered_by_block', [], '', 'footer', 'bartik', 10, '', '0');
     $this->assertEntity('seven_system_main', 'system_main_block', [], '', 'content', 'seven', 0, '', '0');
     $this->assertEntity('seven_user_login', 'user_login_block', [], '', 'content', 'seven', 10, '', '0');
 
diff --git a/core/modules/block/tests/src/Unit/Plugin/migrate/source/BlockTest.php b/core/modules/block/tests/src/Unit/Plugin/migrate/source/BlockTest.php
index 287222cd8..4a60bd19a 100644
--- a/core/modules/block/tests/src/Unit/Plugin/migrate/source/BlockTest.php
+++ b/core/modules/block/tests/src/Unit/Plugin/migrate/source/BlockTest.php
@@ -25,6 +25,39 @@ class BlockTest extends MigrateSqlSourceTestCase {
    * Sample block instance query results from the source.
    */
   protected $expectedResults = array(
+    array(
+      'bid' => 1,
+      'module' => 'block',
+      'delta' => '1',
+      'theme' => 'garland',
+      'status' => 1,
+      'weight' => 0,
+      'region' => 'left',
+      'visibility' => 0,
+      'pages' => '',
+      'title' => 'Test Title 01',
+      'cache' => -1,
+      'roles' => [2]
+    ),
+    array(
+      'bid' => 2,
+      'module' => 'block',
+      'delta' => '2',
+      'theme' => 'garland',
+      'status' => 1,
+      'weight' => 5,
+      'region' => 'right',
+      'visibility' => 0,
+      'pages' => '<front>',
+      'title' => 'Test Title 02',
+      'cache' => -1,
+      'roles' => [2]
+    ),
+  );
+  /**
+   * Sample block table.
+   */
+  protected $expectedBlocks = array(
     array(
       'bid' => 1,
       'module' => 'block',
@@ -62,14 +95,35 @@ class BlockTest extends MigrateSqlSourceTestCase {
       'delta' => 1,
       'rid' => 2,
     ),
+    array(
+      'module' => 'block',
+      'delta' => 2,
+      'rid' => 2,
+    ),
+    array(
+      'module' => 'block',
+      'delta' => 2,
+      'rid' => 100,
+    ),
+  );
+
+  /**
+   * Sample role table.
+   */
+  protected $expectedRole = array(
+    array(
+      'rid' => 2,
+      'name' => 'authenticated user',
+    ),
   );
 
   /**
    * Prepopulate database contents.
    */
   protected function setUp() {
-    $this->databaseContents['blocks'] = $this->expectedResults;
+    $this->databaseContents['blocks'] = $this->expectedBlocks;
     $this->databaseContents['blocks_roles'] = $this->expectedBlocksRoles;
+    $this->databaseContents['role'] = $this->expectedRole;
     $this->databaseContents['system'] = array(
       array(
         'filename' => 'modules/system/system.module',
diff --git a/core/modules/block_content/config/optional/views.view.block_content.yml b/core/modules/block_content/config/optional/views.view.block_content.yml
index fd99c6078..20fe0bf4f 100644
--- a/core/modules/block_content/config/optional/views.view.block_content.yml
+++ b/core/modules/block_content/config/optional/views.view.block_content.yml
@@ -392,7 +392,7 @@ display:
           plugin_id: string
         type:
           id: type
-          table: block_content
+          table: block_content_field_data
           field: type
           relationship: none
           group_type: group
diff --git a/core/modules/block_content/migration_templates/d6_custom_block.yml b/core/modules/block_content/migration_templates/d6_custom_block.yml
index be990723e..8394c6448 100644
--- a/core/modules/block_content/migration_templates/d6_custom_block.yml
+++ b/core/modules/block_content/migration_templates/d6_custom_block.yml
@@ -4,11 +4,8 @@ migration_tags:
   - Drupal 6
 source:
   plugin: d6_box
-  constants:
-    type: basic
 process:
   id: bid
-  type: 'constants/type'
   info: info
   'body/format':
     plugin: migration
@@ -17,6 +14,7 @@ process:
   'body/value': body
 destination:
   plugin: entity:block_content
+  default_bundle: basic
   no_stub: true
 migration_dependencies:
   required:
diff --git a/core/modules/block_content/migration_templates/d7_custom_block.yml b/core/modules/block_content/migration_templates/d7_custom_block.yml
index f63ca936a..42021fb2f 100644
--- a/core/modules/block_content/migration_templates/d7_custom_block.yml
+++ b/core/modules/block_content/migration_templates/d7_custom_block.yml
@@ -4,11 +4,8 @@ migration_tags:
   - Drupal 7
 source:
   plugin: d7_block_custom
-  constants:
-    type: basic
 process:
   id: bid
-  type: 'constants/type'
   info: info
   'body/format':
     plugin: migration
@@ -17,6 +14,7 @@ process:
   'body/value': body
 destination:
   plugin: entity:block_content
+  default_bundle: basic
   no_stub: true
 migration_dependencies:
   required:
diff --git a/core/modules/block_content/src/Plugin/migrate/source/d6/Box.php b/core/modules/block_content/src/Plugin/migrate/source/d6/Box.php
index e98502b9b..41352336b 100644
--- a/core/modules/block_content/src/Plugin/migrate/source/d6/Box.php
+++ b/core/modules/block_content/src/Plugin/migrate/source/d6/Box.php
@@ -19,7 +19,7 @@ class Box extends DrupalSqlBase {
   public function query() {
     $query = $this->select('boxes', 'b')
       ->fields('b', array('bid', 'body', 'info', 'format'));
-    $query->orderBy('bid');
+    $query->orderBy('b.bid');
 
     return $query;
   }
diff --git a/core/modules/block_content/src/Tests/BlockContentListViewsTest.php b/core/modules/block_content/src/Tests/BlockContentListViewsTest.php
index 326f82d6e..de0ff3bde 100644
--- a/core/modules/block_content/src/Tests/BlockContentListViewsTest.php
+++ b/core/modules/block_content/src/Tests/BlockContentListViewsTest.php
@@ -28,6 +28,10 @@ class BlockContentListViewsTest extends BlockContentTestBase {
     // Test for the page title.
     $this->assertTitle(t('Custom block library') . ' | Drupal');
 
+    // Test for the exposed filters.
+    $this->assertFieldByName('info');
+    $this->assertFieldByName('type');
+
     // Test for the table.
     $element = $this->xpath('//div[@class="layout-content"]//table');
     $this->assertTrue($element, 'Views table found.');
diff --git a/core/modules/book/src/BookManagerInterface.php b/core/modules/book/src/BookManagerInterface.php
index fd3cfc107..70d0107c6 100644
--- a/core/modules/book/src/BookManagerInterface.php
+++ b/core/modules/book/src/BookManagerInterface.php
@@ -18,6 +18,8 @@ interface BookManagerInterface {
    * Since this can be the full tree including hidden items, the data returned
    * may be used for generating an an admin interface or a select.
    *
+   * Note: based on menu_tree_all_data().
+   *
    * @param int $bid
    *   The Book ID to find links for.
    * @param array|null $link
@@ -31,8 +33,6 @@ interface BookManagerInterface {
    *
    * @return array
    *   An tree of menu links in an array, in the order they should be rendered.
-   *
-   * Note: based on menu_tree_all_data().
    */
   public function bookTreeAllData($bid, $link = NULL, $max_depth = NULL);
 
diff --git a/core/modules/book/src/Plugin/migrate/source/d6/Book.php b/core/modules/book/src/Plugin/migrate/source/d6/Book.php
index f29a9dac4..76833aa75 100644
--- a/core/modules/book/src/Plugin/migrate/source/d6/Book.php
+++ b/core/modules/book/src/Plugin/migrate/source/d6/Book.php
@@ -23,7 +23,7 @@ class Book extends DrupalSqlBase {
     for ($i = 1; $i <= 9; $i++) {
       $field = "p$i";
       $ml_fields[] = $field;
-      $query->orderBy($field);
+      $query->orderBy('ml.' . $field);
     }
     $query->fields('ml', $ml_fields);
     return $query;
diff --git a/core/modules/comment/src/Plugin/migrate/source/d7/CommentType.php b/core/modules/comment/src/Plugin/migrate/source/d7/CommentType.php
index 0ff0c3600..fc194b2a6 100644
--- a/core/modules/comment/src/Plugin/migrate/source/d7/CommentType.php
+++ b/core/modules/comment/src/Plugin/migrate/source/d7/CommentType.php
@@ -30,7 +30,7 @@ class CommentType extends DrupalSqlBase {
     return $this->select('field_config_instance', 'fci')
       ->distinct()
       ->fields('fci', array('bundle'))
-      ->condition('entity_type', 'comment');
+      ->condition('fci.entity_type', 'comment');
   }
 
   /**
diff --git a/core/modules/config_translation/migration_templates/d6_i18n_system_maintenance.yml b/core/modules/config_translation/migration_templates/d6_i18n_system_maintenance.yml
new file mode 100644
index 000000000..c22701928
--- /dev/null
+++ b/core/modules/config_translation/migration_templates/d6_i18n_system_maintenance.yml
@@ -0,0 +1,14 @@
+id: d6_i18n_system_maintenance
+label: Maintenance page configuration
+migration_tags:
+  - Drupal 6
+source:
+  plugin: i18n_variable
+  variables:
+    - site_offline_message
+process:
+  langcode: language
+  message: site_offline_message
+destination:
+  plugin: config
+  config_name: system.maintenance
diff --git a/core/modules/config_translation/migration_templates/d6_i18n_system_site.yml b/core/modules/config_translation/migration_templates/d6_i18n_system_site.yml
new file mode 100644
index 000000000..9c9337c42
--- /dev/null
+++ b/core/modules/config_translation/migration_templates/d6_i18n_system_site.yml
@@ -0,0 +1,38 @@
+id: d6_i18n_system_site
+label: Site configuration
+migration_tags:
+  - Drupal 6
+source:
+  plugin: i18n_variable
+  constants:
+    slash: '/'
+  variables:
+    - site_name
+    - site_mail
+    - site_slogan
+    - site_frontpage
+    - site_403
+    - site_404
+process:
+  langcode: language
+  name: site_name
+  mail: site_mail
+  slogan: site_slogan
+  'page/front':
+    plugin: concat
+    source:
+      - constants/slash
+      - site_frontpage
+  'page/403':
+    plugin: concat
+    source:
+      - constants/slash
+      - site_403
+  'page/404':
+    plugin: concat
+    source:
+      - constants/slash
+      - site_404
+destination:
+  plugin: config
+  config_name: system.site
diff --git a/core/modules/config_translation/migration_templates/d6_i18n_user_mail.yml b/core/modules/config_translation/migration_templates/d6_i18n_user_mail.yml
new file mode 100644
index 000000000..b3c916f78
--- /dev/null
+++ b/core/modules/config_translation/migration_templates/d6_i18n_user_mail.yml
@@ -0,0 +1,68 @@
+id: d6_i18n_user_mail
+label: User mail configuration
+migration_tags:
+  - Drupal 6
+source:
+  plugin: i18n_variable
+  variables:
+    - user_mail_status_activated_subject
+    - user_mail_status_activated_body
+    - user_mail_password_reset_subject
+    - user_mail_password_reset_body
+    - user_mail_status_deleted_subject
+    - user_mail_status_deleted_body
+    - user_mail_register_admin_created_subject
+    - user_mail_register_admin_created_body
+    - user_mail_register_no_approval_required_subject
+    - user_mail_register_no_approval_required_body
+    - user_mail_register_pending_approval_subject
+    - user_mail_register_pending_approval_body
+    - user_mail_status_blocked_subject
+    - user_mail_status_blocked_body
+process:
+  langcode: language
+  'status_activated/subject':
+    plugin: convert_tokens
+    source: user_mail_status_activated_subject
+  'status_activated/body':
+    plugin: convert_tokens
+    source: user_mail_status_activated_body
+  'password_reset/subject':
+    plugin: convert_tokens
+    source: user_mail_password_reset_subject
+  'password_reset/body':
+    plugin: convert_tokens
+    source: user_mail_password_reset_body
+  'cancel_confirm/subject':
+    plugin: convert_tokens
+    source: user_mail_status_deleted_subject
+  'cancel_confirm/body':
+    plugin: convert_tokens
+    source: user_mail_status_deleted_body
+  'register_admin_created/subject':
+    plugin: convert_tokens
+    source: user_mail_register_admin_created_subject
+  'register_admin_created/body':
+    plugin: convert_tokens
+    source: user_mail_register_admin_created_body
+  'register_no_approval_required/subject':
+    plugin: convert_tokens
+    source: user_mail_register_no_approval_required_subject
+  'register_no_approval_required/body':
+    plugin: convert_tokens
+    source: user_mail_register_no_approval_required_body
+  'register_pending_approval/subject':
+    plugin: convert_tokens
+    source: user_mail_register_pending_approval_subject
+  'register_pending_approval/body':
+    plugin: convert_tokens
+    source: user_mail_register_pending_approval_body
+  'status_blocked/subject':
+    plugin: convert_tokens
+    source: user_mail_status_blocked_subject
+  'status_blocked/body':
+    plugin: convert_tokens
+    source: user_mail_status_blocked_body
+destination:
+  plugin: config
+  config_name: user.mail
diff --git a/core/modules/config_translation/migration_templates/d6_i18n_user_settings.yml b/core/modules/config_translation/migration_templates/d6_i18n_user_settings.yml
new file mode 100644
index 000000000..979a74a4e
--- /dev/null
+++ b/core/modules/config_translation/migration_templates/d6_i18n_user_settings.yml
@@ -0,0 +1,29 @@
+id: d6_i18n_user_settings
+label: User configuration
+migration_tags:
+  - Drupal 6
+source:
+  plugin: i18n_variable
+  variables:
+    - user_mail_status_blocked_notify
+    - user_mail_status_activated_notify
+    - user_email_verification
+    - user_register
+    - anonymous
+process:
+  langcode: language
+  'notify/status_blocked': user_mail_status_blocked_notify
+  'notify/status_activated': user_mail_status_activated_notify
+  verify_mail: user_email_verification
+  register:
+    plugin: static_map
+    source: user_register
+    default_value: visitors_admin_approval
+    map:
+      2: visitors_admin_approval
+      1: visitors
+      0: admin_only
+  anonymous: anonymous
+destination:
+  plugin: config
+  config_name: user.settings
diff --git a/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateI18nSystemMaintenanceTest.php b/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateI18nSystemMaintenanceTest.php
new file mode 100644
index 000000000..d1c586715
--- /dev/null
+++ b/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateI18nSystemMaintenanceTest.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Drupal\Tests\config_translation\Kernel\Migrate\d6;
+
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Upgrade i18n maintenance variables to system.*.yml.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateI18nSystemMaintenanceTest extends MigrateDrupal6TestBase {
+
+  public static $modules = ['language', 'config_translation'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->executeMigration('d6_i18n_system_maintenance');
+  }
+
+  /**
+   * Tests migration of system (maintenance) variables to system.maintenance.yml.
+   */
+  public function testSystemMaintenance() {
+    $config = \Drupal::service('language_manager')->getLanguageConfigOverride('fr', 'system.maintenance');
+    $this->assertIdentical('fr - Drupal is currently under maintenance. We should be back shortly. Thank you for your patience.', $config->get('message'));
+  }
+
+}
diff --git a/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateI18nSystemSiteTest.php b/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateI18nSystemSiteTest.php
new file mode 100644
index 000000000..770b33ca1
--- /dev/null
+++ b/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateI18nSystemSiteTest.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace Drupal\Tests\config_translation\Kernel\Migrate\d6;
+
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Upgrade i18n_strings site variables to system.*.yml.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateI18nSystemSiteTest extends MigrateDrupal6TestBase {
+
+  public static $modules = ['language', 'config_translation'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->executeMigration('d6_i18n_system_site');
+  }
+
+  /**
+   * Tests migration of system (site) variables to system.site.yml.
+   */
+  public function testSystemSite() {
+    $config_translation = \Drupal::service('language_manager')->getLanguageConfigOverride('fr', 'system.site');
+    $this->assertIdentical('fr site name', $config_translation->get('name'));
+    $this->assertIdentical('fr_site_mail@example.com', $config_translation->get('mail'));
+    $this->assertIdentical('fr Migrate rocks', $config_translation->get('slogan'));
+    $this->assertIdentical('/fr-user', $config_translation->get('page.403'));
+    $this->assertIdentical('/fr-page-not-found', $config_translation->get('page.404'));
+    $this->assertIdentical('/node', $config_translation->get('page.front'));
+    $this->assertIdentical(NULL, $config_translation->get('admin_compact_mode'));
+
+    $config_translation = \Drupal::service('language_manager')->getLanguageConfigOverride('zu', 'system.site');
+    $this->assertIdentical('zu - site_name', $config_translation->get('name'));
+    $this->assertIdentical('site_mail@example.com', $config_translation->get('mail'));
+    $this->assertIdentical('Migrate rocks', $config_translation->get('slogan'));
+    $this->assertIdentical('/zu-user', $config_translation->get('page.403'));
+    $this->assertIdentical('/zu-page-not-found', $config_translation->get('page.404'));
+    $this->assertIdentical('/node', $config_translation->get('page.front'));
+    $this->assertIdentical(NULL, $config_translation->get('admin_compact_mode'));
+  }
+
+}
diff --git a/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateI18nUserConfigsTest.php b/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateI18nUserConfigsTest.php
new file mode 100644
index 000000000..b36a5473d
--- /dev/null
+++ b/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateI18nUserConfigsTest.php
@@ -0,0 +1,74 @@
+<?php
+
+namespace Drupal\Tests\config_translation\Kernel\Migrate\d6;
+
+use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Upgrade i18n variables to user.*.yml.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateI18nUserConfigsTest extends MigrateDrupal6TestBase {
+
+  use SchemaCheckTestTrait;
+
+  public static $modules = ['language', 'locale', 'config_translation'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installSchema('locale',
+      ['locales_source', 'locales_target', 'locales_location']);
+    $this->executeMigrations(['d6_i18n_user_mail', 'd6_i18n_user_settings']);
+  }
+
+  /**
+   * Tests migration of i18n user variables to user.mail.yml.
+   */
+  public function testUserMail() {
+    $config = \Drupal::service('language_manager')->getLanguageConfigOverride('fr', 'user.mail');
+    $this->assertIdentical('fr - Account details for [user:name] at [site:name] (approved)', $config->get('status_activated.subject'));
+    $this->assertIdentical("fr - [user:name],\r\n\r\nYour account at [site:name] has been activated.\r\n\r\nYou may now log in by clicking on this link or copying and pasting it in your browser:\r\n\r\n[user:one-time-login-url]\r\n\r\nThis is a one-time login, so it can be used only once.\r\n\r\nAfter logging in, you will be redirected to [user:edit-url] so you can change your password.\r\n\r\nOnce you have set your own password, you will be able to log in to [site:login-url] in the future using:\r\n\r\nusername: [user:name]\r\n", $config->get('status_activated.body'));
+    $this->assertIdentical('fr - Replacement login information for [user:name] at [site:name]', $config->get('password_reset.subject'));
+    $this->assertIdentical("fr - [user:name],\r\n\r\nA request to reset the password for your account has been made at [site:name].\r\n\r\nYou may now log in to [site:url-brief] by clicking on this link or copying and pasting it in your browser:\r\n\r\n[user:one-time-login-url]\r\n\r\nThis is a one-time login, so it can be used only once. It expires after one day and nothing will happen if it's not used.\r\n\r\nAfter logging in, you will be redirected to [user:edit-url] so you can change your password.", $config->get('password_reset.body'));
+    $this->assertIdentical('fr - Account details for [user:name] at [site:name] (deleted)', $config->get('cancel_confirm.subject'));
+    $this->assertIdentical("fr - [user:name],\r\n\r\nYour account on [site:name] has been deleted.", $config->get('cancel_confirm.body'));
+    $this->assertIdentical('fr - An administrator created an account for you at [site:name]', $config->get('register_admin_created.subject'));
+    $this->assertIdentical("fr - [user:name],\r\n\r\nA site administrator at [site:name] has created an account for you. You may now log in to [site:login-url] using the following username and password:\r\n\r\nusername: [user:name]\r\npassword: \r\n\r\nYou may also log in by clicking on this link or copying and pasting it in your browser:\r\n\r\n[user:one-time-login-url]\r\n\r\nThis is a one-time login, so it can be used only once.\r\n\r\nAfter logging in, you will be redirected to [user:edit-url] so you can change your password.\r\n\r\n\r\n--  [site:name] team", $config->get('register_admin_created.body'));
+    $this->assertIdentical('fr - Account details for [user:name] at [site:name]', $config->get('register_no_approval_required.subject'));
+    $this->assertIdentical("fr - [user:name],\r\n\r\nThank you for registering at [site:name]. You may now log in to [site:login-url] using the following username and password:\r\n\r\nusername: [user:name]\r\npassword: \r\n\r\nYou may also log in by clicking on this link or copying and pasting it in your browser:\r\n\r\n[user:one-time-login-url]\r\n\r\nThis is a one-time login, so it can be used only once.\r\n\r\nAfter logging in, you will be redirected to [user:edit-url] so you can change your password.\r\n\r\n\r\n--  [site:name] team", $config->get('register_no_approval_required.body'));
+    $this->assertIdentical('fr - Account details for [user:name] at [site:name] (pending admin approval)', $config->get('register_pending_approval.subject'));
+    $this->assertIdentical("fr - [user:name],\r\n\r\nThank you for registering at [site:name]. Your application for an account is currently pending approval. Once it has been approved, you will receive another email containing information about how to log in, set your password, and other details.\r\n\r\n\r\n--  [site:name] team", $config->get('register_pending_approval.body'));
+    $this->assertIdentical('fr - Account details for [user:name] at [site:name] (blocked)', $config->get('status_blocked.subject'));
+    $this->assertIdentical("fr - [user:name],\r\n\r\nYour account on [site:name] has been blocked.", $config->get('status_blocked.body'));
+    $this->assertConfigSchema(\Drupal::service('config.typed'), 'user.mail', $config->get());
+
+    $config = \Drupal::service('language_manager')->getLanguageConfigOverride('zu', 'user.mail');
+    $this->assertIdentical('zu - An administrator created an account for you at [site:name]', $config->get('register_admin_created.subject'));
+    $this->assertIdentical("zu - [user:name],\r\n\r\nA site administrator at [site:name] has created an account for you. You may now log in to [site:login-url] using the following username and password:\r\n\r\nusername: [user:name]\r\npassword: \r\n\r\nYou may also log in by clicking on this link or copying and pasting it in your browser:\r\n\r\n[user:one-time-login-url]\r\n\r\nThis is a one-time login, so it can be used only once.\r\n\r\nAfter logging in, you will be redirected to [user:edit-url] so you can change your password.\r\n\r\n\r\n--  [site:name] team", $config->get('register_admin_created.body'));
+  }
+
+  /**
+   * Tests migration of i18n user variables to user.settings.yml.
+   */
+  public function testUserSettings() {
+    $config = \Drupal::service('language_manager')->getLanguageConfigOverride('fr', 'user.settings');
+    $this->assertIdentical(1, $config->get('notify.status_blocked'));
+    $this->assertIdentical(0, $config->get('notify.status_activated'));
+    $this->assertIdentical(0, $config->get('verify_mail'));
+    $this->assertIdentical('admin_only', $config->get('register'));
+    $this->assertIdentical('fr Guest', $config->get('anonymous'));
+
+    $config = \Drupal::service('language_manager')->getLanguageConfigOverride('zu', 'user.settings');
+    $this->assertIdentical(1, $config->get('notify.status_blocked'));
+    $this->assertIdentical(0, $config->get('notify.status_activated'));
+    $this->assertIdentical(0, $config->get('verify_mail'));
+    $this->assertIdentical('admin_only', $config->get('register'));
+    $this->assertIdentical('Guest', $config->get('anonymous'));
+  }
+
+}
diff --git a/core/modules/contact/src/ContactFormInterface.php b/core/modules/contact/src/ContactFormInterface.php
index f4222fbac..eb24fcf2c 100644
--- a/core/modules/contact/src/ContactFormInterface.php
+++ b/core/modules/contact/src/ContactFormInterface.php
@@ -21,7 +21,7 @@ interface ContactFormInterface extends ConfigEntityInterface {
    * Returns an auto-reply message to send to the message author.
    *
    * @return string
-   *  An auto-reply message
+   *   An auto-reply message
    */
   public function getReply();
 
diff --git a/core/modules/contact/src/Plugin/migrate/source/ContactCategory.php b/core/modules/contact/src/Plugin/migrate/source/ContactCategory.php
index bc13102db..2975431ad 100644
--- a/core/modules/contact/src/Plugin/migrate/source/ContactCategory.php
+++ b/core/modules/contact/src/Plugin/migrate/source/ContactCategory.php
@@ -29,7 +29,7 @@ class ContactCategory extends DrupalSqlBase {
         'selected',
       )
     );
-    $query->orderBy('cid');
+    $query->orderBy('c.cid');
     return $query;
   }
 
diff --git a/core/modules/contact/src/Plugin/migrate/source/ContactSettings.php b/core/modules/contact/src/Plugin/migrate/source/ContactSettings.php
index 69a674150..911f3bd9c 100644
--- a/core/modules/contact/src/Plugin/migrate/source/ContactSettings.php
+++ b/core/modules/contact/src/Plugin/migrate/source/ContactSettings.php
@@ -18,7 +18,7 @@ class ContactSettings extends Variable {
   protected function initializeIterator() {
     $default_category = $this->select('contact', 'c')
       ->fields('c', ['cid'])
-      ->condition('selected', 1)
+      ->condition('c.selected', 1)
       ->execute()
       ->fetchField();
     return new \ArrayIterator([$this->values() + ['default_category' => $default_category]]);
diff --git a/core/modules/content_translation/src/Controller/ContentTranslationController.php b/core/modules/content_translation/src/Controller/ContentTranslationController.php
index a5cc1b5a6..efd5953f0 100644
--- a/core/modules/content_translation/src/Controller/ContentTranslationController.php
+++ b/core/modules/content_translation/src/Controller/ContentTranslationController.php
@@ -77,8 +77,8 @@ class ContentTranslationController extends ControllerBase {
    *   The route match.
    * @param string $entity_type_id
    *   (optional) The entity type ID.
-   * @return array Array of page elements to render.
-   * Array of page elements to render.
+   * @return array
+   *   Array of page elements to render.
    */
   public function overview(RouteMatchInterface $route_match, $entity_type_id = NULL) {
     /** @var \Drupal\Core\Entity\ContentEntityInterface $entity */
diff --git a/core/modules/datetime/src/Tests/DateTimeFieldTest.php b/core/modules/datetime/src/Tests/DateTimeFieldTest.php
index bd9e3af38..3ed9df9ad 100644
--- a/core/modules/datetime/src/Tests/DateTimeFieldTest.php
+++ b/core/modules/datetime/src/Tests/DateTimeFieldTest.php
@@ -446,17 +446,23 @@ class DateTimeFieldTest extends WebTestBase {
 
     $this->assertFieldByXPath("//*[@id=\"edit-$field_name-0-value-year\"]", NULL, 'Year element found.');
     $this->assertOptionSelected("edit-$field_name-0-value-year", '', 'No year selected.');
+    $this->assertOptionByText("edit-$field_name-0-value-year", t('Year'));
     $this->assertFieldByXPath("//*[@id=\"edit-$field_name-0-value-month\"]", NULL, 'Month element found.');
     $this->assertOptionSelected("edit-$field_name-0-value-month", '', 'No month selected.');
+    $this->assertOptionByText("edit-$field_name-0-value-month", t('Month'));
     $this->assertFieldByXPath("//*[@id=\"edit-$field_name-0-value-day\"]", NULL, 'Day element found.');
     $this->assertOptionSelected("edit-$field_name-0-value-day", '', 'No day selected.');
+    $this->assertOptionByText("edit-$field_name-0-value-day", t('Day'));
     $this->assertFieldByXPath("//*[@id=\"edit-$field_name-0-value-hour\"]", NULL, 'Hour element found.');
     $this->assertOptionSelected("edit-$field_name-0-value-hour", '', 'No hour selected.');
+    $this->assertOptionByText("edit-$field_name-0-value-hour", t('Hour'));
     $this->assertFieldByXPath("//*[@id=\"edit-$field_name-0-value-minute\"]", NULL, 'Minute element found.');
     $this->assertOptionSelected("edit-$field_name-0-value-minute", '', 'No minute selected.');
+    $this->assertOptionByText("edit-$field_name-0-value-minute", t('Minute'));
     $this->assertNoFieldByXPath("//*[@id=\"edit-$field_name-0-value-second\"]", NULL, 'Second element not found.');
     $this->assertFieldByXPath("//*[@id=\"edit-$field_name-0-value-ampm\"]", NULL, 'AMPM element found.');
     $this->assertOptionSelected("edit-$field_name-0-value-ampm", '', 'No ampm selected.');
+    $this->assertOptionByText("edit-$field_name-0-value-ampm", t('AM/PM'));
 
     // Submit a valid date and ensure it is accepted.
     $date_value = array('year' => 2012, 'month' => 12, 'day' => 31, 'hour' => 5, 'minute' => 15);
diff --git a/core/modules/dynamic_page_cache/src/EventSubscriber/DynamicPageCacheSubscriber.php b/core/modules/dynamic_page_cache/src/EventSubscriber/DynamicPageCacheSubscriber.php
index 30ca60a01..33af2285c 100644
--- a/core/modules/dynamic_page_cache/src/EventSubscriber/DynamicPageCacheSubscriber.php
+++ b/core/modules/dynamic_page_cache/src/EventSubscriber/DynamicPageCacheSubscriber.php
@@ -173,13 +173,13 @@ class DynamicPageCacheSubscriber implements EventSubscriberInterface {
 
     // Don't cache the response if Dynamic Page Cache's request subscriber did
     // not fire, because that means it is impossible to have a Dynamic Page
-    // Cache hit. (This can happen when the master request is for example a 403
+    // Cache hit. This can happen when the master request is for example a 403
     // or 404, in which case a subrequest is performed by the router. In that
     // case, it is the subrequest's response that is cached by Dynamic Page
     // Cache, because the routing happens in a request subscriber earlier than
     // Dynamic Page Cache's and immediately sets a response, i.e. the one
     // returned by the subrequest, and thus causes Dynamic Page Cache's request
-    // subscriber to not fire for the master request.)
+    // subscriber to not fire for the master request.
     // @see \Drupal\Core\Routing\AccessAwareRouter::checkAccess()
     // @see \Drupal\Core\EventSubscriber\DefaultExceptionHtmlSubscriber::on403()
     $request = $event->getRequest();
@@ -218,7 +218,7 @@ class DynamicPageCacheSubscriber implements EventSubscriberInterface {
    * is automatically placeholdered, and consequently the cacheability metadata
    * of the placeholdered content does not bubble up to the response level.
    *
-   * @param \Drupal\Core\Cache\CacheableResponseInterface
+   * @param \Drupal\Core\Cache\CacheableResponseInterface $response
    *   The response whose cacheability to analyze.
    *
    * @return bool
diff --git a/core/modules/field/migration_templates/d7_field.yml b/core/modules/field/migration_templates/d7_field.yml
index 3b01f54c7..18135affb 100644
--- a/core/modules/field/migration_templates/d7_field.yml
+++ b/core/modules/field/migration_templates/d7_field.yml
@@ -2,6 +2,8 @@ id: d7_field
 label: Field configuration
 migration_tags:
   - Drupal 7
+class: Drupal\migrate_drupal\Plugin\migrate\CckMigration
+cck_plugin_method: processField
 source:
   plugin: d7_field
   constants:
@@ -13,7 +15,7 @@ process:
   langcode: 'constants/langcode'
   field_name: field_name
   type:
-    plugin: static_map
+    plugin: field_type
     source: type
     map:
       date: datetime
@@ -30,8 +32,6 @@ process:
       number_decimal: decimal
       number_float: float
       phone: telephone
-      taxonomy_term_reference: entity_reference
-      text: text
       text_long: text_long
       text_with_summary: text_with_summary
   translatable: translatable
diff --git a/core/modules/field/migration_templates/d7_field_formatter_settings.yml b/core/modules/field/migration_templates/d7_field_formatter_settings.yml
index 2eb8ec872..ee07ec4be 100644
--- a/core/modules/field/migration_templates/d7_field_formatter_settings.yml
+++ b/core/modules/field/migration_templates/d7_field_formatter_settings.yml
@@ -2,6 +2,8 @@ id: d7_field_formatter_settings
 label: Field formatter configuration
 migration_tags:
   - Drupal 7
+class: Drupal\migrate_drupal\Plugin\migrate\CckMigration
+cck_plugin_method: processFieldFormatter
 source:
   plugin: d7_field_instance_per_view_mode
   constants:
diff --git a/core/modules/field/migration_templates/d7_field_instance.yml b/core/modules/field/migration_templates/d7_field_instance.yml
index 62ec9ce6b..b6d2497e5 100644
--- a/core/modules/field/migration_templates/d7_field_instance.yml
+++ b/core/modules/field/migration_templates/d7_field_instance.yml
@@ -2,6 +2,8 @@ id: d7_field_instance
 label: Field instance configuration
 migration_tags:
   - Drupal 7
+class: Drupal\migrate_drupal\Plugin\migrate\CckMigration
+cck_plugin_method: processFieldInstance
 source:
   plugin: d7_field_instance
   constants:
diff --git a/core/modules/field/migration_templates/d7_field_instance_widget_settings.yml b/core/modules/field/migration_templates/d7_field_instance_widget_settings.yml
index e710fbeca..f88f2d205 100644
--- a/core/modules/field/migration_templates/d7_field_instance_widget_settings.yml
+++ b/core/modules/field/migration_templates/d7_field_instance_widget_settings.yml
@@ -2,6 +2,8 @@ id: d7_field_instance_widget_settings
 label: Field instance widget configuration
 migration_tags:
   - Drupal 7
+class: Drupal\migrate_drupal\Plugin\migrate\CckMigration
+cck_plugin_method: processFieldWidget
 source:
   plugin: d7_field_instance_per_form_display
   constants:
diff --git a/core/modules/field/src/Plugin/migrate/process/d6/FieldType.php b/core/modules/field/src/Plugin/migrate/process/FieldType.php
similarity index 71%
rename from core/modules/field/src/Plugin/migrate/process/d6/FieldType.php
rename to core/modules/field/src/Plugin/migrate/process/FieldType.php
index 3511a3af8..129694006 100644
--- a/core/modules/field/src/Plugin/migrate/process/d6/FieldType.php
+++ b/core/modules/field/src/Plugin/migrate/process/FieldType.php
@@ -1,11 +1,12 @@
 <?php
 
-namespace Drupal\field\Plugin\migrate\process\d6;
+namespace Drupal\field\Plugin\migrate\process;
 
 use Drupal\Component\Plugin\Exception\PluginNotFoundException;
 use Drupal\Component\Plugin\PluginManagerInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\migrate\MigrateExecutableInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\Plugin\migrate\process\StaticMap;
 use Drupal\migrate\Row;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -24,6 +25,13 @@ class FieldType extends StaticMap implements ContainerFactoryPluginInterface {
    */
   protected $cckPluginManager;
 
+  /**
+   * The migration object.
+   *
+   * @var \Drupal\migrate\Plugin\MigrationInterface
+   */
+  protected $migration;
+
   /**
    * Constructs a FieldType plugin.
    *
@@ -35,21 +43,25 @@ class FieldType extends StaticMap implements ContainerFactoryPluginInterface {
    *   The plugin definition.
    * @param \Drupal\Component\Plugin\PluginManagerInterface $cck_plugin_manager
    *   The cckfield plugin manager.
+   * @param \Drupal\migrate\Plugin\MigrationInterface $migration
+   *   The migration being run.
    */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, PluginManagerInterface $cck_plugin_manager) {
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, PluginManagerInterface $cck_plugin_manager, MigrationInterface $migration = NULL) {
     parent::__construct($configuration, $plugin_id, $plugin_definition);
     $this->cckPluginManager = $cck_plugin_manager;
+    $this->migration = $migration;
   }
 
   /**
    * {@inheritdoc}
    */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
+  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition, MigrationInterface $migration = NULL) {
     return new static(
       $configuration,
       $plugin_id,
       $plugin_definition,
-      $container->get('plugin.manager.migrate.cckfield')
+      $container->get('plugin.manager.migrate.cckfield'),
+      $migration
     );
   }
 
@@ -57,11 +69,10 @@ class FieldType extends StaticMap implements ContainerFactoryPluginInterface {
    * {@inheritdoc}
    */
   public function transform($value, MigrateExecutableInterface $migrate_executable, Row $row, $destination_property) {
-    list ($field_type, $widget_type) = $value;
+    $field_type = is_array($value) ? $value[0] : $value;
 
     try {
-      return $this->cckPluginManager->createInstance($field_type)
-        ->getFieldType($row);
+      return $this->cckPluginManager->createInstance($field_type, [], $this->migration)->getFieldType($row);
     }
     catch (PluginNotFoundException $e) {
       return parent::transform($value, $migrate_executable, $row, $destination_property);
diff --git a/core/modules/field/src/Plugin/migrate/source/d6/FieldInstancePerFormDisplay.php b/core/modules/field/src/Plugin/migrate/source/d6/FieldInstancePerFormDisplay.php
index ab1f25184..8c2f31940 100644
--- a/core/modules/field/src/Plugin/migrate/source/d6/FieldInstancePerFormDisplay.php
+++ b/core/modules/field/src/Plugin/migrate/source/d6/FieldInstancePerFormDisplay.php
@@ -62,7 +62,7 @@ class FieldInstancePerFormDisplay extends DrupalSqlBase {
         'module',
       ));
     $query->join('content_node_field', 'cnf', 'cnfi.field_name = cnf.field_name');
-    $query->orderBy('weight');
+    $query->orderBy('cnfi.weight');
 
     return $query;
   }
diff --git a/core/modules/field/src/Plugin/migrate/source/d6/FieldInstancePerViewMode.php b/core/modules/field/src/Plugin/migrate/source/d6/FieldInstancePerViewMode.php
index 198886a3b..93ba4efad 100644
--- a/core/modules/field/src/Plugin/migrate/source/d6/FieldInstancePerViewMode.php
+++ b/core/modules/field/src/Plugin/migrate/source/d6/FieldInstancePerViewMode.php
@@ -65,7 +65,7 @@ class FieldInstancePerViewMode extends ViewModeBase {
         'module',
     ));
     $query->join('content_node_field', 'cnf', 'cnfi.field_name = cnf.field_name');
-    $query->orderBy('weight');
+    $query->orderBy('cnfi.weight');
 
     return $query;
   }
diff --git a/core/modules/field/src/Plugin/migrate/source/d7/FieldInstance.php b/core/modules/field/src/Plugin/migrate/source/d7/FieldInstance.php
index 3c076e57d..7aa281f4e 100644
--- a/core/modules/field/src/Plugin/migrate/source/d7/FieldInstance.php
+++ b/core/modules/field/src/Plugin/migrate/source/d7/FieldInstance.php
@@ -31,10 +31,10 @@ class FieldInstance extends DrupalSqlBase {
 
     // Optionally filter by entity type and bundle.
     if (isset($this->configuration['entity_type'])) {
-      $query->condition('entity_type', $this->configuration['entity_type']);
+      $query->condition('fci.entity_type', $this->configuration['entity_type']);
 
       if (isset($this->configuration['bundle'])) {
-        $query->condition('bundle', $this->configuration['bundle']);
+        $query->condition('fci.bundle', $this->configuration['bundle']);
       }
     }
 
diff --git a/core/modules/field/src/Tests/FieldTestBase.php b/core/modules/field/src/Tests/FieldTestBase.php
index 2b1b020b4..18259f66c 100644
--- a/core/modules/field/src/Tests/FieldTestBase.php
+++ b/core/modules/field/src/Tests/FieldTestBase.php
@@ -17,7 +17,7 @@ abstract class FieldTestBase extends WebTestBase {
    * @param $cardinality
    *   Number of values to generate.
    * @return
-   *  An array of random values, in the format expected for field values.
+   *   An array of random values, in the format expected for field values.
    */
   function _generateTestFieldValues($cardinality) {
     $values = array();
diff --git a/core/modules/field/src/Tests/FieldUnitTestBase.php b/core/modules/field/src/Tests/FieldUnitTestBase.php
index 33a644dbc..42f75d9cf 100644
--- a/core/modules/field/src/Tests/FieldUnitTestBase.php
+++ b/core/modules/field/src/Tests/FieldUnitTestBase.php
@@ -142,8 +142,6 @@ abstract class FieldUnitTestBase extends KernelTestBase {
    *
    * @param \Drupal\Core\Entity\EntityInterface $entity
    *   The entity to save.
-   *
-   * @return void
    */
   protected function entityValidateAndSave(EntityInterface $entity) {
     $violations = $entity->validate();
@@ -161,7 +159,7 @@ abstract class FieldUnitTestBase extends KernelTestBase {
    * @param $cardinality
    *   Number of values to generate.
    * @return
-   *  An array of random values, in the format expected for field values.
+   *   An array of random values, in the format expected for field values.
    */
   protected function _generateTestFieldValues($cardinality) {
     $values = array();
diff --git a/core/modules/field/src/Tests/Views/FieldUITest.php b/core/modules/field/src/Tests/Views/FieldUITest.php
index b51abb231..b818da60f 100644
--- a/core/modules/field/src/Tests/Views/FieldUITest.php
+++ b/core/modules/field/src/Tests/Views/FieldUITest.php
@@ -81,6 +81,16 @@ class FieldUITest extends FieldTestBase {
     $this->assertEqual($view->field['field_name_0']->options['type'], 'text_trimmed');
     $this->assertEqual($view->field['field_name_0']->options['settings']['trim_length'], $random_number);
 
+    // Now change the formatter back to 'default' which doesn't have any
+    // settings. We want to ensure that the settings are empty then.
+    $edit['options[type]'] = 'text_default';
+    $this->drupalPostForm('admin/structure/views/nojs/handler/test_view_fieldapi/default/field/field_name_0', $edit, t('Apply'));
+    $this->drupalPostForm('admin/structure/views/view/test_view_fieldapi', [], t('Save'));
+    $view = Views::getView('test_view_fieldapi');
+    $view->initHandlers();
+    $this->assertEqual($view->field['field_name_0']->options['type'], 'text_default');
+    $this->assertEqual($view->field['field_name_0']->options['settings'], []);
+
     // Ensure that the view depends on the field storage.
     $dependencies = \Drupal::service('config.manager')->findConfigEntityDependents('config', [$this->fieldStorages[0]->getConfigDependencyName()]);
     $this->assertTrue(isset($dependencies['views.view.test_view_fieldapi']), 'The view is dependent on the field storage.');
diff --git a/core/modules/field/tests/src/Kernel/FieldKernelTestBase.php b/core/modules/field/tests/src/Kernel/FieldKernelTestBase.php
index c864de8a7..a780895e2 100644
--- a/core/modules/field/tests/src/Kernel/FieldKernelTestBase.php
+++ b/core/modules/field/tests/src/Kernel/FieldKernelTestBase.php
@@ -139,8 +139,6 @@ abstract class FieldKernelTestBase extends KernelTestBase {
    *
    * @param \Drupal\Core\Entity\EntityInterface $entity
    *   The entity to save.
-   *
-   * @return void
    */
   protected function entityValidateAndSave(EntityInterface $entity) {
     $violations = $entity->validate();
@@ -158,7 +156,7 @@ abstract class FieldKernelTestBase extends KernelTestBase {
    * @param $cardinality
    *   Number of values to generate.
    * @return
-   *  An array of random values, in the format expected for field values.
+   *   An array of random values, in the format expected for field values.
    */
   protected function _generateTestFieldValues($cardinality) {
     $values = array();
diff --git a/core/modules/field/tests/src/Unit/Plugin/migrate/source/d7/FieldInstanceTest.php b/core/modules/field/tests/src/Unit/Plugin/migrate/source/d7/FieldInstanceTest.php
index 071a8109a..eca7f27f5 100644
--- a/core/modules/field/tests/src/Unit/Plugin/migrate/source/d7/FieldInstanceTest.php
+++ b/core/modules/field/tests/src/Unit/Plugin/migrate/source/d7/FieldInstanceTest.php
@@ -27,7 +27,13 @@ class FieldInstanceTest extends MigrateSqlSourceTestCase {
       'bundle' => 'page',
       'label' => 'Body',
       'widget_settings' => array(
+        'module' => 'text',
+        'settings' => array(
+          'rows' => 20,
+          'summary_rows' => 5,
+        ),
         'type' => 'text_textarea_with_summary',
+        'weight' => -4,
       ),
       'display_settings' => array(
       ),
diff --git a/core/modules/field/tests/src/Unit/Plugin/migrate/source/d7/FieldTest.php b/core/modules/field/tests/src/Unit/Plugin/migrate/source/d7/FieldTest.php
index 331d48da0..a440f39f7 100644
--- a/core/modules/field/tests/src/Unit/Plugin/migrate/source/d7/FieldTest.php
+++ b/core/modules/field/tests/src/Unit/Plugin/migrate/source/d7/FieldTest.php
@@ -26,8 +26,28 @@ class FieldTest extends MigrateSqlSourceTestCase {
       'type' => 'file',
       'global_settings' => '',
       'storage' => array(
-        'type' => 'field_sql_storage',
+        'active' => 1,
+        'details' => array(
+          'sql' => array(
+            'FIELD_LOAD_CURRENT' => array(
+              'field_data_field_file' => array(
+                'description' => 'field_file_description',
+                'display' => 'field_file_display',
+                'fid' => 'field_file_fid',
+              ),
+            ),
+            'FIELD_LOAD_REVISION' => array(
+              'field_revision_field_file' => array(
+                'description' => 'field_file_description',
+                'display' => 'field_file_display',
+                'fid' => 'field_file_fid',
+              ),
+            ),
+          ),
+        ),
         'module' => 'field_sql_storage',
+        'settings' => array(),
+        'type' => 'field_sql_storage',
       ),
       'module' => 'file',
       'db_columns' => '',
@@ -39,8 +59,28 @@ class FieldTest extends MigrateSqlSourceTestCase {
       'type' => 'file',
       'global_settings' => '',
       'storage' => array(
-        'type' => 'field_sql_storage',
+        'active' => 1,
+        'details' => array(
+          'sql' => array(
+            'FIELD_LOAD_CURRENT' => array(
+              'field_data_field_file' => array(
+                'description' => 'field_file_description',
+                'display' => 'field_file_display',
+                'fid' => 'field_file_fid',
+              ),
+            ),
+            'FIELD_LOAD_REVISION' => array(
+              'field_revision_field_file' => array(
+                'description' => 'field_file_description',
+                'display' => 'field_file_display',
+                'fid' => 'field_file_fid',
+              ),
+            ),
+          ),
+        ),
         'module' => 'field_sql_storage',
+        'settings' => array(),
+        'type' => 'field_sql_storage',
       ),
       'module' => 'file',
       'db_columns' => '',
diff --git a/core/modules/field_ui/src/Form/FieldStorageConfigEditForm.php b/core/modules/field_ui/src/Form/FieldStorageConfigEditForm.php
index 1f4f94a85..bbaeb6332 100644
--- a/core/modules/field_ui/src/Form/FieldStorageConfigEditForm.php
+++ b/core/modules/field_ui/src/Form/FieldStorageConfigEditForm.php
@@ -148,10 +148,27 @@ class FieldStorageConfigEditForm extends EntityForm {
   public function validateForm(array &$form, FormStateInterface $form_state) {
     parent::validateForm($form, $form_state);
 
+    $field_storage_definitions = \Drupal::service('entity_field.manager')->getFieldStorageDefinitions($this->entity->getTargetEntityTypeId());
+
     // Validate field cardinality.
     if ($form_state->getValue('cardinality') === 'number' && !$form_state->getValue('cardinality_number')) {
       $form_state->setErrorByName('cardinality_number', $this->t('Number of values is required.'));
     }
+    // If a specific cardinality is used, validate that there are no entities
+    // with a higher delta.
+    elseif (!$this->entity->isNew() && isset($field_storage_definitions[$this->entity->getName()]) && $form_state->getValue('cardinality') != FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED) {
+
+      // Get a count of entities that have a value in a delta higher than the
+      // one selected. Deltas start with 0, so the selected value does not
+      // need to be incremented.
+      $entities_with_higher_delta = \Drupal::entityQuery($this->entity->getTargetEntityTypeId())
+        ->condition($this->entity->getName() . '.%delta', $form_state->getValue('cardinality'))
+        ->count()
+        ->execute();
+      if ($entities_with_higher_delta) {
+        $form_state->setErrorByName('cardinality_number', $this->formatPlural($entities_with_higher_delta, 'There is @count entity with @delta or more values in this field.', 'There are @count entities with @delta or more values in this field.', ['@delta' => $form_state->getValue('cardinality') + 1]));
+      }
+    }
   }
 
   /**
diff --git a/core/modules/field_ui/src/Tests/ManageFieldsTest.php b/core/modules/field_ui/src/Tests/ManageFieldsTest.php
index 673b7319e..cbe9f53e9 100644
--- a/core/modules/field_ui/src/Tests/ManageFieldsTest.php
+++ b/core/modules/field_ui/src/Tests/ManageFieldsTest.php
@@ -267,6 +267,23 @@ class ManageFieldsTest extends WebTestBase {
     $this->assertLink(t('Field settings'));
     $this->assertLinkByHref($field_edit_path);
 
+    // Add two entries in the body.
+    $edit = ['title[0][value]' => 'Cardinality', 'body[0][value]' => 'Body 1', 'body[1][value]' => 'Body 2'];
+    $this->drupalPostForm('node/add/article', $edit, 'Save');
+
+    // Assert that you can't set the cardinality to a lower number than the
+    // highest delta of this field.
+    $edit = [
+      'cardinality' => 'number',
+      'cardinality_number' => 1,
+    ];
+    $this->drupalPostForm($field_edit_path, $edit, t('Save field settings'));
+    $this->assertRaw(t('There is @count entity with @delta or more values in this field.', ['@count' => 1, '@delta' => 2]), 'Correctly failed to set cardinality lower than highest delta.');
+
+    // Create a second entity with three values.
+    $edit = ['title[0][value]' => 'Cardinality 3', 'body[0][value]' => 'Body 1', 'body[1][value]' => 'Body 2', 'body[2][value]' => 'Body 3'];
+    $this->drupalPostForm('node/add/article', $edit, 'Save');
+
     // Set to unlimited.
     $edit = array(
       'cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED,
@@ -276,6 +293,28 @@ class ManageFieldsTest extends WebTestBase {
     $this->drupalGet($field_edit_path);
     $this->assertFieldByXPath("//select[@name='cardinality']", FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED);
     $this->assertFieldByXPath("//input[@name='cardinality_number']", 1);
+
+    // Assert that you can't set the cardinality to a lower number then the
+    // highest delta of this field but can set it to the same.
+    $edit = [
+      'cardinality' => 'number',
+      'cardinality_number' => 1,
+    ];
+    $this->drupalPostForm($field_edit_path, $edit, t('Save field settings'));
+    $this->assertRaw(t('There are @count entities with @delta or more values in this field.', ['@count' => 2, '@delta' => 2]), 'Correctly failed to set cardinality lower than highest delta.');
+
+    $edit = [
+      'cardinality' => 'number',
+      'cardinality_number' => 2,
+    ];
+    $this->drupalPostForm($field_edit_path, $edit, t('Save field settings'));
+    $this->assertRaw(t('There is @count entity with @delta or more values in this field.', ['@count' => 1, '@delta' => 3]), 'Correctly failed to set cardinality lower than highest delta.');
+
+    $edit = [
+      'cardinality' => 'number',
+      'cardinality_number' => 3,
+    ];
+    $this->drupalPostForm($field_edit_path, $edit, t('Save field settings'));
   }
 
   /**
diff --git a/core/modules/file/file.module b/core/modules/file/file.module
index a10645bad..2a438a2cf 100644
--- a/core/modules/file/file.module
+++ b/core/modules/file/file.module
@@ -185,8 +185,6 @@ function file_copy(FileInterface $source, $destination = NULL, $replace = FILE_E
 /**
  * Moves a file to a new location and update the file's database entry.
  *
- * Moving a file is performed by copying the file to the new location and then
- * deleting the original.
  * - Checks if $source and $destination are valid and readable/writable.
  * - Performs a file move if $source is not equal to $destination.
  * - If file already exists in $destination either the call will error out,
@@ -1177,7 +1175,7 @@ function file_managed_file_save_upload($element, FormStateInterface $form_state)
 
   $destination = isset($element['#upload_location']) ? $element['#upload_location'] : NULL;
   if (isset($destination) && !file_prepare_directory($destination, FILE_CREATE_DIRECTORY)) {
-    \Drupal::logger('file')->notice('The upload directory %directory for the file field !name could not be created or is not accessible. A newly uploaded file could not be saved in this directory as a consequence, and the upload was canceled.', array('%directory' => $destination, '!name' => $element['#field_name']));
+    \Drupal::logger('file')->notice('The upload directory %directory for the file field %name could not be created or is not accessible. A newly uploaded file could not be saved in this directory as a consequence, and the upload was canceled.', array('%directory' => $destination, '%name' => $element['#field_name']));
     $form_state->setError($element, t('The file could not be uploaded.'));
     return FALSE;
   }
diff --git a/core/modules/file/src/Plugin/migrate/cckfield/d6/FileField.php b/core/modules/file/src/Plugin/migrate/cckfield/d6/FileField.php
index 066d6e10e..d63b9c290 100644
--- a/core/modules/file/src/Plugin/migrate/cckfield/d6/FileField.php
+++ b/core/modules/file/src/Plugin/migrate/cckfield/d6/FileField.php
@@ -8,7 +8,8 @@ use Drupal\migrate_drupal\Plugin\migrate\cckfield\CckFieldPluginBase;
 
 /**
  * @MigrateCckField(
- *   id = "filefield"
+ *   id = "filefield",
+ *   core = {6}
  * )
  */
 class FileField extends CckFieldPluginBase {
diff --git a/core/modules/file/src/Plugin/migrate/cckfield/d7/FileField.php b/core/modules/file/src/Plugin/migrate/cckfield/d7/FileField.php
index 6e3780e81..d0b1335e8 100644
--- a/core/modules/file/src/Plugin/migrate/cckfield/d7/FileField.php
+++ b/core/modules/file/src/Plugin/migrate/cckfield/d7/FileField.php
@@ -9,6 +9,7 @@ use Drupal\migrate_drupal\Plugin\migrate\cckfield\CckFieldPluginBase;
 /**
  * @MigrateCckField(
  *   id = "file",
+ *   core = {7}
  * )
  */
 class FileField extends CckFieldPluginBase {
diff --git a/core/modules/file/src/Plugin/migrate/cckfield/d7/ImageField.php b/core/modules/file/src/Plugin/migrate/cckfield/d7/ImageField.php
index 7a82a1533..7f47caa96 100644
--- a/core/modules/file/src/Plugin/migrate/cckfield/d7/ImageField.php
+++ b/core/modules/file/src/Plugin/migrate/cckfield/d7/ImageField.php
@@ -7,7 +7,8 @@ use Drupal\migrate_drupal\Plugin\migrate\cckfield\CckFieldPluginBase;
 
 /**
  * @MigrateCckField(
- *   id = "image"
+ *   id = "image",
+ *   core = {7}
  * )
  */
 class ImageField extends CckFieldPluginBase {
diff --git a/core/modules/file/src/Plugin/migrate/destination/EntityFile.php b/core/modules/file/src/Plugin/migrate/destination/EntityFile.php
index 981706f63..900db6a89 100644
--- a/core/modules/file/src/Plugin/migrate/destination/EntityFile.php
+++ b/core/modules/file/src/Plugin/migrate/destination/EntityFile.php
@@ -147,7 +147,7 @@ class EntityFile extends EntityContentBase {
    *   (optional) FILE_EXISTS_REPLACE (default) or FILE_EXISTS_RENAME.
    *
    * @return bool
-   *  TRUE on success, FALSE on failure.
+   *   TRUE on success, FALSE on failure.
    */
   protected function writeFile($source, $destination, $replace = FILE_EXISTS_REPLACE) {
     if ($this->configuration['move']) {
@@ -190,8 +190,8 @@ class EntityFile extends EntityContentBase {
    *   The URI or path.
    *
    * @return string|false
-   *  The directory component of the path or URI, or FALSE if it could not
-   *  be determined.
+   *   The directory component of the path or URI, or FALSE if it could not
+   *   be determined.
    */
   protected function getDirectory($uri) {
     $dir = $this->fileSystem->dirname($uri);
@@ -213,8 +213,8 @@ class EntityFile extends EntityContentBase {
    *   The destination URI.
    *
    * @return bool
-   *  TRUE if the source and destination URIs refer to the same physical path,
-   *  otherwise FALSE.
+   *   TRUE if the source and destination URIs refer to the same physical path,
+   *   otherwise FALSE.
    */
   protected function isLocationUnchanged($source, $destination) {
     if ($this->isLocalUri($source) && $this->isLocalUri($destination)) {
diff --git a/core/modules/file/src/Plugin/migrate/source/d6/File.php b/core/modules/file/src/Plugin/migrate/source/d6/File.php
index 9a90fc80f..13aee57bf 100644
--- a/core/modules/file/src/Plugin/migrate/source/d6/File.php
+++ b/core/modules/file/src/Plugin/migrate/source/d6/File.php
@@ -45,7 +45,7 @@ class File extends DrupalSqlBase {
       // If two or more files have the same timestamp, they'll end up in a
       // non-deterministic order. Ordering by fid (or any other unique field)
       // will prevent this.
-      ->orderBy('fid');
+      ->orderBy('f.fid');
   }
 
   /**
diff --git a/core/modules/file/src/Plugin/migrate/source/d6/UploadInstance.php b/core/modules/file/src/Plugin/migrate/source/d6/UploadInstance.php
index 00d189003..ec178392e 100644
--- a/core/modules/file/src/Plugin/migrate/source/d6/UploadInstance.php
+++ b/core/modules/file/src/Plugin/migrate/source/d6/UploadInstance.php
@@ -33,7 +33,7 @@ class UploadInstance extends DrupalSqlBase {
     $return = array();
     $values = $this->select('variable', 'v')
       ->fields('v', ['name', 'value'])
-      ->condition('name', $variables, 'IN')
+      ->condition('v.name', $variables, 'IN')
       ->execute()
       ->fetchAllKeyed();
     foreach ($node_types as $node_type) {
diff --git a/core/modules/file/src/Plugin/migrate/source/d7/File.php b/core/modules/file/src/Plugin/migrate/source/d7/File.php
index aa920bd35..db55a6596 100644
--- a/core/modules/file/src/Plugin/migrate/source/d7/File.php
+++ b/core/modules/file/src/Plugin/migrate/source/d7/File.php
@@ -42,7 +42,7 @@ class File extends DrupalSqlBase {
   public function query() {
     $query = $this->select('file_managed', 'f')
       ->fields('f')
-      ->orderBy('timestamp');
+      ->orderBy('f.timestamp');
 
     // Filter by scheme(s), if configured.
     if (isset($this->configuration['scheme'])) {
diff --git a/core/modules/file/src/Tests/FileListingTest.php b/core/modules/file/src/Tests/FileListingTest.php
index 78a760249..708f1385f 100644
--- a/core/modules/file/src/Tests/FileListingTest.php
+++ b/core/modules/file/src/Tests/FileListingTest.php
@@ -4,6 +4,7 @@ namespace Drupal\file\Tests;
 
 use Drupal\node\Entity\Node;
 use Drupal\file\Entity\File;
+use Drupal\entity_test\Entity\EntityTestConstraints;
 
 /**
  * Tests file listing page functionality.
@@ -17,7 +18,7 @@ class FileListingTest extends FileFieldTestBase {
    *
    * @var array
    */
-  public static $modules = array('views', 'file', 'image');
+  public static $modules = array('views', 'file', 'image', 'entity_test');
 
   /**
    * An authenticated user.
@@ -144,11 +145,60 @@ class FileListingTest extends FileFieldTestBase {
     }
   }
 
+  /**
+   * Tests file listing usage page for entities with no canonical link template.
+   */
+  function testFileListingUsageNoLink() {
+    // Login with user with right permissions and test listing.
+    $this->drupalLogin($this->adminUser);
+
+    // Create a bundle and attach a File field to the bundle.
+    $bundle = $this->randomMachineName();
+    entity_test_create_bundle($bundle, NULL, 'entity_test_constraints');
+    $this->createFileField('field_test_file', 'entity_test_constraints', $bundle, array(), array('file_extensions' => 'txt png'));
+
+    // Create file to attach to entity.
+    $file = File::create([
+      'filename' => 'druplicon.txt',
+      'uri' => 'public://druplicon.txt',
+      'filemime' => 'text/plain',
+    ]);
+    $file->setPermanent();
+    file_put_contents($file->getFileUri(), 'hello world');
+    $file->save();
+
+    // Create entity and attach the created file.
+    $entity_name = $this->randomMachineName();
+    $entity = EntityTestConstraints::create(array(
+      'uid' => 1,
+      'name' => $entity_name,
+      'type' => $bundle,
+      'field_test_file' => array(
+        'target_id' => $file->id(),
+      ),
+    ));
+    $entity->save();
+
+    // Create node entity and attach the created file.
+    $node = $this->drupalCreateNode(array('type' => 'article', 'file' => $file));
+    $node->save();
+
+    // Load the file usage page for the created and attached file.
+    $this->drupalGet('admin/content/files/usage/' . $file->id());
+
+    $this->assertResponse(200);
+    // Entity name should be displayed, but not linked if Entity::toUrl
+    // throws an exception
+    $this->assertText($entity_name, 'Entity name is added to file usage listing.');
+    $this->assertNoLink($entity_name, 'Linked entity name not added to file usage listing.');
+    $this->assertLink($node->getTitle());
+  }
+
   /**
    * Creates and saves a test file.
    *
    * @return \Drupal\Core\Entity\EntityInterface
-   *  A file entity.
+   *   A file entity.
    */
   protected function createFile() {
     // Create a new file entity.
diff --git a/core/modules/filter/migration_templates/d7_filter_format.yml b/core/modules/filter/migration_templates/d7_filter_format.yml
index c671b75ef..2b44a80c0 100644
--- a/core/modules/filter/migration_templates/d7_filter_format.yml
+++ b/core/modules/filter/migration_templates/d7_filter_format.yml
@@ -8,6 +8,7 @@ process:
   format: format
   name: name
   cache: cache
+  weight: weight
   filters:
     plugin: iterator
     source: filters
@@ -25,5 +26,6 @@ process:
       status:
         plugin: default_value
         default_value: true
+      weight: weight
 destination:
   plugin: entity:filter_format
diff --git a/core/modules/filter/tests/src/Kernel/Migrate/d7/MigrateFilterFormatTest.php b/core/modules/filter/tests/src/Kernel/Migrate/d7/MigrateFilterFormatTest.php
index 0ab5d056f..8eb13b9d8 100644
--- a/core/modules/filter/tests/src/Kernel/Migrate/d7/MigrateFilterFormatTest.php
+++ b/core/modules/filter/tests/src/Kernel/Migrate/d7/MigrateFilterFormatTest.php
@@ -35,25 +35,31 @@ class MigrateFilterFormatTest extends MigrateDrupal7TestBase {
    * @param string $label
    *   The expected label of the format.
    * @param array $enabled_filters
-   *   The expected filters in the format, keyed by ID.
+   *   The expected filters in the format, keyed by ID with weight as values.
+   * @param int $weight
+   *   The weight of the filter.
    */
-  protected function assertEntity($id, $label, array $enabled_filters) {
+  protected function assertEntity($id, $label, array $enabled_filters, $weight) {
     /** @var \Drupal\filter\FilterFormatInterface $entity */
     $entity = FilterFormat::load($id);
     $this->assertTrue($entity instanceof FilterFormatInterface);
     $this->assertIdentical($label, $entity->label());
     // get('filters') will return enabled filters only, not all of them.
-    $this->assertIdentical($enabled_filters, array_keys($entity->get('filters')));
+    $this->assertIdentical(array_keys($enabled_filters), array_keys($entity->get('filters')));
+    $this->assertIdentical($weight, $entity->get('weight'));
+    foreach ($entity->get('filters') as $filter_id => $filter) {
+      $this->assertIdentical($filter['weight'], $enabled_filters[$filter_id]);
+    }
   }
 
   /**
    * Tests the Drupal 7 filter format to Drupal 8 migration.
    */
   public function testFilterFormat() {
-    $this->assertEntity('custom_text_format', 'Custom Text format', ['filter_autop', 'filter_html']);
-    $this->assertEntity('filtered_html', 'Filtered HTML', ['filter_autop', 'filter_html', 'filter_htmlcorrector', 'filter_url']);
-    $this->assertEntity('full_html', 'Full HTML', ['filter_autop', 'filter_htmlcorrector', 'filter_url']);
-    $this->assertEntity('plain_text', 'Plain text', ['filter_html_escape', 'filter_url', 'filter_autop']);
+    $this->assertEntity('custom_text_format', 'Custom Text format', ['filter_autop' => 0, 'filter_html' => -10], 0);
+    $this->assertEntity('filtered_html', 'Filtered HTML', ['filter_autop' => 2, 'filter_html' => 1, 'filter_htmlcorrector' => 10, 'filter_url' => 0], 0);
+    $this->assertEntity('full_html', 'Full HTML', ['filter_autop' => 1, 'filter_htmlcorrector' => 10, 'filter_url' => 0], 1);
+    $this->assertEntity('plain_text', 'Plain text', ['filter_html_escape' => 0, 'filter_url' => 1, 'filter_autop' => 2], 10);
     // This assertion covers issue #2555089. Drupal 7 formats are identified
     // by machine names, so migrated formats should be merged into existing
     // ones.
diff --git a/core/modules/filter/tests/src/Unit/Plugin/migrate/source/d6/FilterFormatTest.php b/core/modules/filter/tests/src/Unit/Plugin/migrate/source/d6/FilterFormatTest.php
index a50a069ad..018c03323 100644
--- a/core/modules/filter/tests/src/Unit/Plugin/migrate/source/d6/FilterFormatTest.php
+++ b/core/modules/filter/tests/src/Unit/Plugin/migrate/source/d6/FilterFormatTest.php
@@ -32,16 +32,19 @@ class FilterFormatTest extends MigrateSqlSourceTestCase {
           'module' => 'filter',
           'delta' => 2,
           'weight' => 0,
+          'settings' => array(),
         ),
         array(
           'module' => 'filter',
           'delta' => 0,
           'weight' => 1,
+          'settings' => array(),
         ),
         array(
           'module' => 'filter',
           'delta' => 1,
           'weight' => 2,
+          'settings' => array(),
         ),
       ),
     ),
@@ -55,16 +58,19 @@ class FilterFormatTest extends MigrateSqlSourceTestCase {
           'module' => 'filter',
           'delta' => 2,
           'weight' => 0,
+          'settings' => array(),
         ),
         array(
           'module' => 'filter',
           'delta' => 1,
           'weight' => 1,
+          'settings' => array(),
         ),
         array(
           'module' => 'filter',
           'delta' => 3,
           'weight' => 10,
+          'settings' => array(),
         ),
       ),
     ),
@@ -79,6 +85,7 @@ class FilterFormatTest extends MigrateSqlSourceTestCase {
           'module' => 'markdown',
           'delta' => 1,
           'weight' => 10,
+          'settings' => array(),
         ),
       ),
     ),
@@ -89,9 +96,11 @@ class FilterFormatTest extends MigrateSqlSourceTestCase {
    */
   protected function setUp() {
     $fid = 1;
+    $empty_array = serialize(array());
     foreach ($this->expectedResults as $k => $row) {
       $row['roles'] = ',' . implode(',', $row['roles']) . ',';
       foreach ($row['filters'] as $filter) {
+        $filter['settings'] = $empty_array;
         $this->databaseContents['filters'][$fid] = $filter;
         $this->databaseContents['filters'][$fid]['format'] = $row['format'];
         $this->databaseContents['filters'][$fid]['fid'] = $fid;
diff --git a/core/modules/filter/tests/src/Unit/Plugin/migrate/source/d7/FilterFormatTest.php b/core/modules/filter/tests/src/Unit/Plugin/migrate/source/d7/FilterFormatTest.php
index 2684c226b..2616ad1c9 100644
--- a/core/modules/filter/tests/src/Unit/Plugin/migrate/source/d7/FilterFormatTest.php
+++ b/core/modules/filter/tests/src/Unit/Plugin/migrate/source/d7/FilterFormatTest.php
@@ -29,6 +29,7 @@ class FilterFormatTest extends MigrateSqlSourceTestCase {
       'weight' => 0,
       'filters' => array(
         'filter_autop' => array(
+          'format' => 'custom_text_format',
           'module' => 'filter',
           'name' => 'filter_autop',
           'weight' => 0,
@@ -36,6 +37,7 @@ class FilterFormatTest extends MigrateSqlSourceTestCase {
           'settings' => array(),
         ),
         'filter_html' => array(
+          'format' => 'custom_text_format',
           'module' => 'filter',
           'name' => 'filter_html',
           'weight' => 1,
@@ -52,6 +54,7 @@ class FilterFormatTest extends MigrateSqlSourceTestCase {
       'weight' => 1,
       'filters' => array(
         'filter_url' => array(
+          'format' => 'full_html',
           'module' => 'filter',
           'name' => 'filter_url',
           'weight' => 0,
diff --git a/core/modules/forum/config/install/core.entity_form_display.taxonomy_term.forums.default.yml b/core/modules/forum/config/install/core.entity_form_display.taxonomy_term.forums.default.yml
index a2f890d30..b18c869be 100644
--- a/core/modules/forum/config/install/core.entity_form_display.taxonomy_term.forums.default.yml
+++ b/core/modules/forum/config/install/core.entity_form_display.taxonomy_term.forums.default.yml
@@ -2,6 +2,7 @@ langcode: en
 status: true
 dependencies:
   config:
+    - field.field.taxonomy_term.forums.forum_container
     - taxonomy.vocabulary.forums
   module:
     - text
diff --git a/core/modules/forum/config/install/core.entity_view_display.taxonomy_term.forums.default.yml b/core/modules/forum/config/install/core.entity_view_display.taxonomy_term.forums.default.yml
index 07b131a64..d1242d99b 100644
--- a/core/modules/forum/config/install/core.entity_view_display.taxonomy_term.forums.default.yml
+++ b/core/modules/forum/config/install/core.entity_view_display.taxonomy_term.forums.default.yml
@@ -2,6 +2,7 @@ langcode: en
 status: true
 dependencies:
   config:
+    - field.field.taxonomy_term.forums.forum_container
     - taxonomy.vocabulary.forums
   module:
     - text
diff --git a/core/modules/help/src/Tests/ExperimentalHelpTest.php b/core/modules/help/tests/src/Functional/ExperimentalHelpTest.php
similarity index 90%
rename from core/modules/help/src/Tests/ExperimentalHelpTest.php
rename to core/modules/help/tests/src/Functional/ExperimentalHelpTest.php
index 416b69fc5..9d1a74eec 100644
--- a/core/modules/help/src/Tests/ExperimentalHelpTest.php
+++ b/core/modules/help/tests/src/Functional/ExperimentalHelpTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\help\Tests;
+namespace Drupal\Tests\help\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Verifies help for experimental modules.
  *
  * @group help
  */
-class ExperimentalHelpTest extends WebTestBase {
+class ExperimentalHelpTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/help/src/Tests/HelpBlockTest.php b/core/modules/help/tests/src/Functional/HelpBlockTest.php
similarity index 90%
rename from core/modules/help/src/Tests/HelpBlockTest.php
rename to core/modules/help/tests/src/Functional/HelpBlockTest.php
index f1ba62295..81c4fc153 100644
--- a/core/modules/help/src/Tests/HelpBlockTest.php
+++ b/core/modules/help/tests/src/Functional/HelpBlockTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\help\Tests;
+namespace Drupal\Tests\help\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests display of help block.
  *
  * @group help
  */
-class HelpBlockTest extends WebTestBase {
+class HelpBlockTest extends BrowserTestBase {
 
   /**
    * {@inheritdoc}
diff --git a/core/modules/help/src/Tests/HelpTest.php b/core/modules/help/tests/src/Functional/HelpTest.php
similarity index 95%
rename from core/modules/help/src/Tests/HelpTest.php
rename to core/modules/help/tests/src/Functional/HelpTest.php
index 76e2ee3a3..2e8249939 100644
--- a/core/modules/help/src/Tests/HelpTest.php
+++ b/core/modules/help/tests/src/Functional/HelpTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\help\Tests;
+namespace Drupal\Tests\help\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Verify help display and user access to help based on permissions.
  *
  * @group help
  */
-class HelpTest extends WebTestBase {
+class HelpTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
@@ -40,8 +40,6 @@ class HelpTest extends WebTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $this->getModuleList();
-
     // Create users.
     $this->adminUser = $this->drupalCreateUser(array('access administration pages', 'view the administration theme', 'administer permissions'));
     $this->anyUser = $this->drupalCreateUser(array());
@@ -122,7 +120,7 @@ class HelpTest extends WebTestBase {
       $this->assertResponse($response);
       if ($response == 200) {
         $this->assertTitle($name . ' | Drupal', format_string('%module title was displayed', array('%module' => $module)));
-        $this->assertEqual($this->cssSelect('h1.page-title')[0], t($name), format_string('%module heading was displayed', array('%module' => $module)));
+        $this->assertEquals($name, $this->cssSelect('h1.page-title')[0]->getText(), "$module heading was displayed");
         $admin_tasks = system_get_module_admin_tasks($module, system_get_info('module', $module));
         if (!empty($admin_tasks)) {
           $this->assertText(t('@module administration pages', array('@module' => $name)));
diff --git a/core/modules/help/src/Tests/NoHelpTest.php b/core/modules/help/tests/src/Functional/NoHelpTest.php
similarity index 91%
rename from core/modules/help/src/Tests/NoHelpTest.php
rename to core/modules/help/tests/src/Functional/NoHelpTest.php
index 7a6fb7a4c..49c768d7b 100644
--- a/core/modules/help/src/Tests/NoHelpTest.php
+++ b/core/modules/help/tests/src/Functional/NoHelpTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\help\Tests;
+namespace Drupal\Tests\help\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Verify no help is displayed for modules not providing any help.
  *
  * @group help
  */
-class NoHelpTest extends WebTestBase {
+class NoHelpTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/image/src/Plugin/Field/FieldFormatter/ImageFormatter.php b/core/modules/image/src/Plugin/Field/FieldFormatter/ImageFormatter.php
index 232f1a8e8..4c3a27db4 100644
--- a/core/modules/image/src/Plugin/Field/FieldFormatter/ImageFormatter.php
+++ b/core/modules/image/src/Plugin/Field/FieldFormatter/ImageFormatter.php
@@ -188,14 +188,14 @@ class ImageFormatter extends ImageFormatterBase implements ContainerFactoryPlugi
     $image_style_setting = $this->getSetting('image_style');
 
     // Collect cache tags to be added for each item in the field.
-    $cache_tags = array();
+    $base_cache_tags = [];
     if (!empty($image_style_setting)) {
       $image_style = $this->imageStyleStorage->load($image_style_setting);
-      $cache_tags = $image_style->getCacheTags();
+      $base_cache_tags = $image_style->getCacheTags();
     }
 
     foreach ($files as $delta => $file) {
-      $cache_contexts = array();
+      $cache_contexts = [];
       if (isset($link_file)) {
         $image_uri = $file->getFileUri();
         // @todo Wrap in file_url_transform_relative(). This is currently
@@ -206,7 +206,7 @@ class ImageFormatter extends ImageFormatterBase implements ContainerFactoryPlugi
         $url = Url::fromUri(file_create_url($image_uri));
         $cache_contexts[] = 'url.site';
       }
-      $cache_tags = Cache::mergeTags($cache_tags, $file->getCacheTags());
+      $cache_tags = Cache::mergeTags($base_cache_tags, $file->getCacheTags());
 
       // Extract field item attributes for the theme function, and unset them
       // from the $item so that the field template does not re-render them.
diff --git a/core/modules/image/src/Plugin/Field/FieldType/ImageItem.php b/core/modules/image/src/Plugin/Field/FieldType/ImageItem.php
index fb6559326..c83e143aa 100644
--- a/core/modules/image/src/Plugin/Field/FieldType/ImageItem.php
+++ b/core/modules/image/src/Plugin/Field/FieldType/ImageItem.php
@@ -343,7 +343,7 @@ class ImageItem extends FileItem {
         $image = File::create();
         $image->setFileUri($path);
         $image->setOwnerId(\Drupal::currentUser()->id());
-        $image->setMimeType('image/' . pathinfo($path, PATHINFO_EXTENSION));
+        $image->setMimeType(\Drupal::service('file.mime_type.guesser')->guess($path));
         $image->setFileName(drupal_basename($path));
         $destination_dir = static::doGetUploadLocation($settings);
         file_prepare_directory($destination_dir, FILE_CREATE_DIRECTORY);
diff --git a/core/modules/image/tests/src/Kernel/ImageFormatterTest.php b/core/modules/image/tests/src/Kernel/ImageFormatterTest.php
new file mode 100644
index 000000000..d1b132ecc
--- /dev/null
+++ b/core/modules/image/tests/src/Kernel/ImageFormatterTest.php
@@ -0,0 +1,102 @@
+<?php
+
+namespace Drupal\Tests\image\Kernel;
+
+use Drupal\Component\Utility\Unicode;
+use Drupal\Core\Field\FieldStorageDefinitionInterface;
+use Drupal\entity_test\Entity\EntityTest;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\Tests\field\Kernel\FieldKernelTestBase;
+
+/**
+ * Tests the image field rendering using entity fields of the image field type.
+ *
+ * @group image
+ */
+class ImageFormatterTest extends FieldKernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('file', 'image');
+
+  /**
+   * @var string
+   */
+  protected $entityType;
+
+  /**
+   * @var string
+   */
+  protected $bundle;
+
+  /**
+   * @var string
+   */
+  protected $fieldName;
+
+  /**
+   * @var \Drupal\Core\Entity\Display\EntityViewDisplayInterface
+   */
+  protected $display;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->installConfig(['field']);
+    $this->installEntitySchema('entity_test');
+    $this->installEntitySchema('file');
+    $this->installSchema('file', array('file_usage'));
+
+    $this->entityType = 'entity_test';
+    $this->bundle = $this->entityType;
+    $this->fieldName = Unicode::strtolower($this->randomMachineName());
+
+    FieldStorageConfig::create(array(
+      'entity_type' => $this->entityType,
+      'field_name' => $this->fieldName,
+      'type' => 'image',
+      'cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED,
+    ))->save();
+    FieldConfig::create([
+      'entity_type' => $this->entityType,
+      'field_name' => $this->fieldName,
+      'bundle' => $this->bundle,
+      'settings' => [
+        'file_extensions' => 'jpg',
+      ],
+    ])->save();
+
+    $this->display = entity_get_display($this->entityType, $this->bundle, 'default')
+      ->setComponent($this->fieldName, [
+        'type' => 'image',
+        'label' => 'hidden',
+      ]);
+    $this->display->save();
+  }
+
+  /**
+   * Tests the cache tags from image formatters.
+   */
+  function testImageFormatterCacheTags() {
+    // Create a test entity with the image field set.
+    $entity = EntityTest::create([
+      'name' => $this->randomMachineName(),
+    ]);
+    $entity->{$this->fieldName}->generateSampleItems(2);
+    $entity->save();
+
+    // Generate the render array to verify if the cache tags are as expected.
+    $build = $this->display->build($entity);
+
+    $this->assertEquals($entity->{$this->fieldName}[0]->entity->getCacheTags(), $build[$this->fieldName][0]['#cache']['tags'], 'First image cache tags is as expected');
+    $this->assertEquals($entity->{$this->fieldName}[1]->entity->getCacheTags(), $build[$this->fieldName][1]['#cache']['tags'], 'Second image cache tags is as expected');
+  }
+
+}
diff --git a/core/modules/image/tests/src/Kernel/ImageItemTest.php b/core/modules/image/tests/src/Kernel/ImageItemTest.php
index 3321b2072..4094f72e5 100644
--- a/core/modules/image/tests/src/Kernel/ImageItemTest.php
+++ b/core/modules/image/tests/src/Kernel/ImageItemTest.php
@@ -53,6 +53,9 @@ class ImageItemTest extends FieldKernelTestBase {
       'entity_type' => 'entity_test',
       'field_name' => 'image_test',
       'bundle' => 'entity_test',
+      'settings' => [
+        'file_extensions' => 'jpg',
+      ],
     ])->save();
     file_unmanaged_copy(\Drupal::root() . '/core/misc/druplicon.png', 'public://example.jpg');
     $this->image = File::create([
@@ -123,6 +126,7 @@ class ImageItemTest extends FieldKernelTestBase {
     $entity = EntityTest::create();
     $entity->image_test->generateSampleItems();
     $this->entityValidateAndSave($entity);
+    $this->assertEqual($entity->image_test->entity->get('filemime')->value, 'image/jpeg');
   }
 
 }
diff --git a/core/modules/image/tests/src/Unit/ImageStyleTest.php b/core/modules/image/tests/src/Unit/ImageStyleTest.php
index 652c149ff..96c50c442 100644
--- a/core/modules/image/tests/src/Unit/ImageStyleTest.php
+++ b/core/modules/image/tests/src/Unit/ImageStyleTest.php
@@ -41,7 +41,7 @@ class ImageStyleTest extends UnitTestCase {
    * @param \Drupal\image\ImageEffectInterface|\PHPUnit_Framework_MockObject_MockObject $image_effect
    *   The image effect used for testing.
    *
-   * @return \Drupal\image\ImageStyleInterface|\Drupal\image\ImageStyleInterface
+   * @return \Drupal\image\ImageStyleInterface
    *   The mocked image style.
    */
   protected function getImageStyleMock($image_effect_id, $image_effect, $stubs = array()) {
diff --git a/core/modules/language/migration_templates/d6_language_content_settings.yml b/core/modules/language/migration_templates/d6_language_content_settings.yml
new file mode 100644
index 000000000..e5dc7509c
--- /dev/null
+++ b/core/modules/language/migration_templates/d6_language_content_settings.yml
@@ -0,0 +1,44 @@
+id: d6_language_content_settings
+label: Drupal 6 language content settings
+migration_tags:
+  - Drupal 6
+source:
+  plugin: d6_language_content_settings
+  constants:
+    target_type: 'node'
+process:
+# Ignore i18n_node_options_[node_type] options not available in Drupal 8,
+# i18n_required_node and i18n_newnode_current
+  target_bundle: type
+  target_entity_type_id: 'constants/target_type'
+  default_langcode:
+    -
+      plugin: static_map
+      source: language_content_type
+      map:
+        0: NULL
+        1: 'current_interface'
+        2: 'current_interface'
+    -
+      plugin: skip_on_empty
+      method: row
+  language_alterable:
+    plugin: static_map
+    source: i18n_lock_node
+    map:
+      0: true
+      1: false
+  'third_party_settings/content_translation/enabled':
+    plugin: static_map
+    source: language_content_type
+    map:
+      # In the case of being 0, it will be skipped. We are not actually setting
+      # a null value.
+      0: NULL
+      1: false
+      2: true
+destination:
+  plugin: entity:language_content_settings
+migration_dependencies:
+  required:
+    - d6_node_type
diff --git a/core/modules/language/migration_templates/d7_language_content_settings.yml b/core/modules/language/migration_templates/d7_language_content_settings.yml
new file mode 100644
index 000000000..cbe935a33
--- /dev/null
+++ b/core/modules/language/migration_templates/d7_language_content_settings.yml
@@ -0,0 +1,44 @@
+id: d7_language_content_settings
+label: Drupal 7 language content settings
+migration_tags:
+  - Drupal 7
+source:
+  plugin: d7_language_content_settings
+  constants:
+    target_type: 'node'
+process:
+# Ignore i18n_node_options_[node_type] options not available in Drupal 8,
+# i18n_required_node and i18n_newnode_current
+  target_bundle: type
+  target_entity_type_id: 'constants/target_type'
+  default_langcode:
+    -
+      plugin: static_map
+      source: language_content_type
+      map:
+        0: NULL
+        1: 'current_interface'
+        2: 'current_interface'
+    -
+      plugin: skip_on_empty
+      method: row
+  language_alterable:
+    plugin: static_map
+    source: i18n_lock_node
+    map:
+      0: true
+      1: false
+  'third_party_settings/content_translation/enabled':
+    plugin: static_map
+    source: language_content_type
+    map:
+      # In the case of being 0, it will be skipped. We are not actually setting
+      # a null value.
+      0: NULL
+      1: false
+      2: true
+destination:
+  plugin: entity:language_content_settings
+migration_dependencies:
+  required:
+    - d7_node_type
diff --git a/core/modules/language/src/DefaultLanguageItem.php b/core/modules/language/src/DefaultLanguageItem.php
index 3710afd75..0e3889050 100644
--- a/core/modules/language/src/DefaultLanguageItem.php
+++ b/core/modules/language/src/DefaultLanguageItem.php
@@ -40,7 +40,7 @@ class DefaultLanguageItem extends LanguageItem {
    *   The entity whose language code to be loaded.
    *
    * @return string
-   *  A string language code.
+   *   A string language code.
    */
   public function getDefaultLangcode(EntityInterface $entity) {
     return language_get_default_langcode($entity->getEntityTypeId(), $entity->bundle());
diff --git a/core/modules/language/src/Plugin/migrate/source/d6/LanguageContentSettings.php b/core/modules/language/src/Plugin/migrate/source/d6/LanguageContentSettings.php
new file mode 100644
index 000000000..c41b635c3
--- /dev/null
+++ b/core/modules/language/src/Plugin/migrate/source/d6/LanguageContentSettings.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace Drupal\language\Plugin\migrate\source\d6;
+
+use Drupal\migrate\Row;
+use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
+
+/**
+ * Drupal multilingual node settings from database.
+ *
+ * @MigrateSource(
+ *   id = "d6_language_content_settings",
+ * )
+ */
+class LanguageContentSettings extends DrupalSqlBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function query() {
+    return $this->select('node_type', 't')
+      ->fields('t', array(
+        'type',
+      ));
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function fields() {
+    $fields = array(
+      'type' => $this->t('Type'),
+      'language_content_type' => $this->t('Multilingual support.'),
+      'i18n_lock_node' => $this->t('Lock language.'),
+    );
+    return $fields;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function prepareRow(Row $row) {
+    $type = $row->getSourceProperty('type');
+    $row->setSourceProperty('language_content_type', $this->variableGet('language_content_type_' . $type, NULL));
+    $row->setSourceProperty('i18n_lock_node', $this->variableGet('i18n_lock_node_' . $type, 0));
+    return parent::prepareRow($row);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getIds() {
+    $ids['type']['type'] = 'string';
+    return $ids;
+  }
+
+}
diff --git a/core/modules/language/src/Plugin/migrate/source/d7/LanguageContentSettings.php b/core/modules/language/src/Plugin/migrate/source/d7/LanguageContentSettings.php
new file mode 100644
index 000000000..91ed020a3
--- /dev/null
+++ b/core/modules/language/src/Plugin/migrate/source/d7/LanguageContentSettings.php
@@ -0,0 +1,63 @@
+<?php
+
+namespace Drupal\language\Plugin\migrate\source\d7;
+
+use Drupal\migrate\Row;
+use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
+
+/**
+ * Drupal multilingual node settings from database.
+ *
+ * @MigrateSource(
+ *   id = "d7_language_content_settings",
+ * )
+ */
+class LanguageContentSettings extends DrupalSqlBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function query() {
+    return $this->select('node_type', 't')
+      ->fields('t', array(
+        'type',
+      ));
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function fields() {
+    $fields = array(
+      'type' => $this->t('Type'),
+      'language_content_type' => $this->t('Multilingual support.'),
+      'i18n_lock_node' => $this->t('Lock language.'),
+    );
+    return $fields;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function prepareRow(Row $row) {
+    $type = $row->getSourceProperty('type');
+    $row->setSourceProperty('language_content_type', $this->variableGet('language_content_type_' . $type, NULL));
+    $i18n_node_options = $this->variableGet('i18n_node_options_' . $type, NULL);
+    if ($i18n_node_options && in_array('lock', $i18n_node_options)) {
+      $row->setSourceProperty('i18n_lock_node', 1);
+    }
+    else {
+      $row->setSourceProperty('i18n_lock_node', 0);
+    }
+    return parent::prepareRow($row);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getIds() {
+    $ids['type']['type'] = 'string';
+    return $ids;
+  }
+
+}
diff --git a/core/modules/language/tests/src/Kernel/Migrate/d6/MigrateLanguageContentSettingsTest.php b/core/modules/language/tests/src/Kernel/Migrate/d6/MigrateLanguageContentSettingsTest.php
new file mode 100644
index 000000000..0420d70e0
--- /dev/null
+++ b/core/modules/language/tests/src/Kernel/Migrate/d6/MigrateLanguageContentSettingsTest.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace Drupal\Tests\language\Kernel\Migrate\d6;
+
+use Drupal\language\Entity\ContentLanguageSettings;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Tests migration of language content setting variables,
+ * language_content_type_$type, i18n_node_options_* and i18n_lock_node_*.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateLanguageContentSettingsTest extends MigrateDrupal6TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['node', 'text', 'language', 'content_translation'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->installConfig(['node']);
+    $this->executeMigrations(['d6_node_type', 'd6_language_content_settings']);
+  }
+
+  /**
+   * Tests migration of content language settings.
+   */
+  public function testLanguageContent() {
+    // Assert that a translatable content is still translatable.
+    $config = $this->config('language.content_settings.node.article');
+    $this->assertSame($config->get('target_entity_type_id'), 'node');
+    $this->assertSame($config->get('target_bundle'), 'article');
+    $this->assertSame($config->get('default_langcode'), 'current_interface');
+    $this->assertTrue($config->get('third_party_settings.content_translation.enabled'));
+
+    // Assert that a non-translatable content is not translatable.
+    $config = ContentLanguageSettings::loadByEntityTypeBundle('node', 'company');
+    $this->assertTrue($config->isDefaultConfiguration());
+    $this->assertFalse($config->isLanguageAlterable());
+    $this->assertSame($config->getDefaultLangcode(), 'site_default');
+  }
+
+  /**
+   * Tests migration of content language settings when there is no language lock.
+   */
+  public function testLanguageContentWithNoLanguageLock() {
+    // Assert that a we can assign a language.
+    $config = ContentLanguageSettings::loadByEntityTypeBundle('node', 'employee');
+    $this->assertSame($config->getDefaultLangcode(), 'current_interface');
+    $this->assertTrue($config->isLanguageAlterable());
+  }
+
+}
diff --git a/core/modules/language/tests/src/Kernel/Migrate/d7/MigrateLanguageContentSettingsTest.php b/core/modules/language/tests/src/Kernel/Migrate/d7/MigrateLanguageContentSettingsTest.php
new file mode 100644
index 000000000..defc6cd26
--- /dev/null
+++ b/core/modules/language/tests/src/Kernel/Migrate/d7/MigrateLanguageContentSettingsTest.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace Drupal\Tests\language\Kernel\Migrate\d7;
+
+use Drupal\language\Entity\ContentLanguageSettings;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
+
+/**
+ * Tests migration of language content setting variables,
+ * language_content_type_$type, i18n_node_options_* and i18n_lock_node_*.
+ *
+ * @group migrate_drupal_7
+ */
+class MigrateLanguageContentSettingsTest extends MigrateDrupal7TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['node', 'text', 'language', 'content_translation'];
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->installConfig(['node']);
+    $this->executeMigrations(['d7_node_type', 'd7_language_content_settings']);
+  }
+
+  /**
+   * Tests migration of content language settings.
+   */
+  public function testLanguageContent() {
+    // Assert that a translatable content is still translatable.
+    $config = $this->config('language.content_settings.node.blog');
+    $this->assertIdentical($config->get('target_entity_type_id'), 'node');
+    $this->assertIdentical($config->get('target_bundle'), 'blog');
+    $this->assertIdentical($config->get('default_langcode'), 'current_interface');
+    $this->assertFalse($config->get('language_alterable'));
+    $this->assertTrue($config->get('third_party_settings.content_translation.enabled'));
+
+    // Assert that a non-translatable content is not translatable.
+    $config = ContentLanguageSettings::loadByEntityTypeBundle('node', 'page');
+    $this->assertTrue($config->isDefaultConfiguration());
+    $this->assertFalse($config->isLanguageAlterable());
+    $this->assertSame($config->getDefaultLangcode(), 'site_default');
+
+  }
+
+}
diff --git a/core/modules/link/src/Plugin/migrate/cckfield/LinkField.php b/core/modules/link/src/Plugin/migrate/cckfield/LinkField.php
index f3b5d1483..47b383084 100644
--- a/core/modules/link/src/Plugin/migrate/cckfield/LinkField.php
+++ b/core/modules/link/src/Plugin/migrate/cckfield/LinkField.php
@@ -7,7 +7,11 @@ use Drupal\migrate_drupal\Plugin\migrate\cckfield\CckFieldPluginBase;
 
 /**
  * @MigrateCckField(
- *   id = "link"
+ *   id = "link",
+ *   core = {6},
+ *   type_map = {
+ *     "link_field" = "link"
+ *   }
  * )
  */
 class LinkField extends CckFieldPluginBase {
diff --git a/core/modules/link/src/Plugin/migrate/process/d6/CckLink.php b/core/modules/link/src/Plugin/migrate/process/d6/CckLink.php
index 47c2f8b7f..2c03412c6 100644
--- a/core/modules/link/src/Plugin/migrate/process/d6/CckLink.php
+++ b/core/modules/link/src/Plugin/migrate/process/d6/CckLink.php
@@ -36,6 +36,32 @@ class CckLink extends ProcessPluginBase implements ContainerFactoryPluginInterfa
     );
   }
 
+  /**
+   * Turn a Drupal 6 URI into a Drupal 8-compatible format.
+   *
+   * @param string $uri
+   *   The 'url' value from Drupal 6.
+   *
+   * @return string
+   *   The Drupal 8-compatible URI.
+   *
+   * @see \Drupal\link\Plugin\Field\FieldWidget\LinkWidget::getUserEnteredStringAsUri()
+   */
+  protected function canonicalizeUri($uri) {
+    // If we already have a scheme, we're fine.
+    if (empty($uri) || !is_null(parse_url($uri, PHP_URL_SCHEME))) {
+      return $uri;
+    }
+
+    // Remove the <front> component of the URL.
+    if (strpos($uri, '<front>') === 0) {
+      $uri = substr($uri, strlen('<front>'));
+    }
+
+    // Add the internal: scheme and ensure a leading slash.
+    return 'internal:/' . ltrim($uri, '/');
+  }
+
   /**
    * {@inheritdoc}
    */
@@ -51,7 +77,7 @@ class CckLink extends ProcessPluginBase implements ContainerFactoryPluginInterfa
     }
 
     // Massage the values into the correct form for the link.
-    $route['uri'] = $value['url'];
+    $route['uri'] = $this->canonicalizeUri($value['url']);
     $route['options']['attributes'] = $attributes;
     $route['title'] = $value['title'];
     return $route;
diff --git a/core/modules/link/tests/src/Unit/Plugin/migrate/process/d6/CckLinkTest.php b/core/modules/link/tests/src/Unit/Plugin/migrate/process/d6/CckLinkTest.php
new file mode 100644
index 000000000..a96287aeb
--- /dev/null
+++ b/core/modules/link/tests/src/Unit/Plugin/migrate/process/d6/CckLinkTest.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace Drupal\Tests\link\Unit\Plugin\migrate\process\d6;
+
+use Drupal\link\Plugin\migrate\process\d6\CckLink;
+use Drupal\Tests\UnitTestCase;
+
+/**
+ * @group Link
+ */
+class CckLinkTest extends UnitTestCase {
+
+  /**
+   * Test the url transformations in the CckLink process plugin.
+   *
+   * @dataProvider canonicalizeUriDataProvider
+   */
+  public function testCanonicalizeUri($url, $expected) {
+    $link_plugin = new CckLink([], '', [], $this->getMock('\Drupal\migrate\Plugin\MigrationInterface'));
+    $transformed = $link_plugin->transform([
+      'url' => $url,
+      'title' => '',
+      'attributes' => serialize([]),
+    ], $this->getMock('\Drupal\migrate\MigrateExecutableInterface'), $this->getMockBuilder('\Drupal\migrate\Row')->disableOriginalConstructor()->getMock(), NULL);
+    $this->assertEquals($expected, $transformed['uri']);
+  }
+
+  /**
+   * Data provider for testCanonicalizeUri.
+   */
+  public function canonicalizeUriDataProvider() {
+    return [
+      'Simple front-page' => [
+        '<front>',
+        'internal:/',
+      ],
+      'Front page with query' => [
+        '<front>?query=1',
+        'internal:/?query=1',
+      ],
+      'No leading forward slash' => [
+        'node/10',
+        'internal:/node/10',
+      ],
+      'Leading forward slash' => [
+        '/node/10',
+        'internal:/node/10',
+      ],
+      'Existing scheme' => [
+        'scheme:test',
+        'scheme:test',
+      ],
+    ];
+  }
+
+}
diff --git a/core/modules/menu_link_content/migration_templates/menu_links.yml b/core/modules/menu_link_content/migration_templates/menu_links.yml
index 7b818c693..b70314a39 100644
--- a/core/modules/menu_link_content/migration_templates/menu_links.yml
+++ b/core/modules/menu_link_content/migration_templates/menu_links.yml
@@ -5,11 +5,8 @@ migration_tags:
   - Drupal 7
 source:
   plugin: menu_link
-  constants:
-    bundle: menu_link_content
 process:
   id: mlid
-  bundle: 'constants/bundle'
   title: link_title
   description: description
   menu_name:
@@ -49,6 +46,7 @@ process:
   changed: updated
 destination:
   plugin: entity:menu_link_content
+  default_bundle: menu_link_content
   no_stub: true
 migration_dependencies:
   required:
diff --git a/core/modules/migrate/migrate.api.php b/core/modules/migrate/migrate.api.php
index fa55b7d9a..d5e14f4b4 100644
--- a/core/modules/migrate/migrate.api.php
+++ b/core/modules/migrate/migrate.api.php
@@ -17,33 +17,30 @@ use Drupal\migrate\Row;
  * @section overview Overview of migration
  * Migration is an
  * @link http://wikipedia.org/wiki/Extract,_transform,_load Extract, Transform, Load @endlink
- * (ETL) process. For historical reasons, in the Drupal migration tool the
- * extract phase is called "source", the transform phase is called "process",
- * and the load phase is called "destination".
+ * (ETL) process. In the Drupal migration API the extract phase is called
+ * "source", the transform phase is called "process", and the load phase is
+ * called "destination". It is important to understand that the "load" in ETL
+ * means to load data into storage, while traditionally Drupal uses "load" to
+ * mean load data from storage into memory.
  *
- * Source, process, and destination phases are each provided by plugins. Source
- * plugins extract data from a data source in "rows", containing "properties".
- * Each row is handed off to one or more series of process plugins, where each
- * series operates to transform the row data into one result property. After all
- * the properties are processed, the resulting row is handed off to a
- * destination plugin, which saves the data.
+ * Source, process, and destination phases are each provided by plugins.
+ * Source plugins extract data from a data source in "rows", containing
+ * "properties". Each row is handed off to one or more process plugins which
+ * transform the row's properties. After all the properties are processed, the
+ * resulting row is handed off to a destination plugin, which saves the data.
  *
- * The Migrate module provides process plugins for common operations (setting
- * default values, mapping values, etc.), and destination plugins for Drupal
- * core objects (configuration, entity, URL alias, etc.). The Migrate Drupal
- * module provides source plugins to extract data from various versions of
- * Drupal. Custom and contributed modules can provide additional plugins; see
- * the @link plugin_api Plugin API topic @endlink for generic information about
- * providing plugins, and sections below for details about the plugin types.
+ * A source plugin, one or more process plugins, and a destination plugin are
+ * brought together to extract, transform, and load (in the ETL sense) a specific
+ * type of data by a migration plugin.
  *
- * The configuration of migrations is stored in configuration entities, which
- * list the IDs and configurations of the plugins that are involved. See
- * @ref sec_entity below for details. To migrate an entire site, you'll need to
- * create a migration manifest; see @ref sec_manifest for details.
- *
- * https://www.drupal.org/node/2127611 has more complete information on the
- * Migration API, including information on load plugins, which are only used
- * in Drupal 6 migration.
+ * @section sec_migrations Migration plugins
+ * Migration plugin definitions are stored in a module's 'migrations' directory.
+ * For backwards compatibility we also scan the 'migration_templates' directory.
+ * Examples of migration plugin definitions can be found in
+ * 'core/modules/action/migration_templates'. The plugin class is
+ * \Drupal\migrate\Plugin\Migration, with interface
+ * \Drupal\migrate\Plugin\MigrationInterface. Migration plugins are managed by
+ * the \Drupal\migrate\Plugin\MigrationPluginManager class.
  *
  * @section sec_source Source plugins
  * Migration source plugins implement
@@ -61,7 +58,9 @@ use Drupal\migrate\Row;
  * with \Drupal\migrate\Annotation\MigrateProcessPlugin annotation, and must be
  * in namespace subdirectory Plugin\migrate\process under the namespace of the
  * module that defines them. Migration process plugins are managed by the
- * \Drupal\migrate\Plugin\MigratePluginManager class.
+ * \Drupal\migrate\Plugin\MigratePluginManager class. The Migrate module
+ * provides process plugins for common operations (setting default values,
+ * mapping values, etc.).
  *
  * @section sec_destination Destination plugins
  * Migration destination plugins implement
@@ -70,34 +69,12 @@ use Drupal\migrate\Row;
  * annotated with \Drupal\migrate\Annotation\MigrateDestination annotation, and
  * must be in namespace subdirectory Plugin\migrate\destination under the
  * namespace of the module that defines them. Migration destination plugins
- * are managed by the
- * \Drupal\migrate\Plugin\MigrateDestinationPluginManager class.
+ * are managed by the \Drupal\migrate\Plugin\MigrateDestinationPluginManager
+ * class. The Migrate module provides destination plugins for Drupal core
+ * objects (configuration and entity).
  *
- * @section sec_entity Migration configuration entities
- * The definition of how to migrate each type of data is stored in configuration
- * entities. The migration configuration entity class is
- * \Drupal\migrate\Entity\Migration, with interface
- * \Drupal\migrate\Entity\MigrationInterface; the configuration schema can be
- * found in the migrate.schema.yml file. Migration configuration consists of IDs
- * and configuration for the source, process, and destination plugins, as well
- * as information on dependencies. Process configuration consists of sections,
- * each of which defines the series of process plugins needed for one
- * destination property. You can find examples of migration configuration files
- * in the core/modules/migrate_drupal/config/install directory.
- *
- * @section sec_manifest Migration manifests
- * You can run a migration with the "drush migrate-manifest" command, providing
- * a migration manifest file. This file lists the configuration names of the
- * migrations you want to execute, as well as any dependencies they have (you
- * can find these in the "migration_dependencies" sections of the individual
- * configuration files). For example, to migrate blocks from a Drupal 6 site,
- * you would list:
- * @code
- * # Migrate blocks from Drupal 6 to 8
- * - d6_filter_format
- * - d6_custom_block
- * - d6_block
- * @endcode
+ * @section sec_more_info More information
+ * @link https://www.drupal.org/node/2127611 Migration API documentation. @endlink
  *
  * @see update_api
  * @}
diff --git a/core/modules/migrate/src/Plugin/Migration.php b/core/modules/migrate/src/Plugin/Migration.php
index 86294b540..abad54f4d 100644
--- a/core/modules/migrate/src/Plugin/Migration.php
+++ b/core/modules/migrate/src/Plugin/Migration.php
@@ -662,7 +662,7 @@ class Migration extends PluginBase implements MigrationInterface, RequirementsIn
    * {@inheritdoc}
    */
   public function getMigrationDependencies() {
-    return $this->migration_dependencies + ['required' => [], 'optional' => []];
+    return ($this->migration_dependencies ?: []) + ['required' => [], 'optional' => []];
   }
 
   /**
@@ -703,14 +703,14 @@ class Migration extends PluginBase implements MigrationInterface, RequirementsIn
    * {@inheritdoc}
    */
   public function getTrackLastImported() {
-    $this->trackLastImported;
+    return $this->trackLastImported;
   }
 
   /**
    * {@inheritdoc}
    */
   public function getDestinationIds() {
-    $this->destinationIds;
+    return $this->destinationIds;
   }
 
 }
diff --git a/core/modules/migrate/src/Plugin/migrate/destination/Entity.php b/core/modules/migrate/src/Plugin/migrate/destination/Entity.php
index 55c59fc75..abf2dc9ae 100644
--- a/core/modules/migrate/src/Plugin/migrate/destination/Entity.php
+++ b/core/modules/migrate/src/Plugin/migrate/destination/Entity.php
@@ -88,6 +88,21 @@ abstract class Entity extends DestinationBase implements ContainerFactoryPluginI
     return substr($plugin_id, 7);
   }
 
+  /**
+   * Gets the bundle for the row taking into account the default.
+   *
+   * @param \Drupal\migrate\Row $row
+   *   The current row we're importing.
+   *
+   * @return string
+   *   The bundle for this row.
+   */
+  public function getBundle(Row $row) {
+    $default_bundle = isset($this->configuration['default_bundle']) ? $this->configuration['default_bundle'] : '';
+    $bundle_key = $this->getKey('bundle');
+    return $row->getDestinationProperty($bundle_key) ?: $default_bundle;
+  }
+
   /**
    * {@inheritdoc}
    */
@@ -112,6 +127,11 @@ abstract class Entity extends DestinationBase implements ContainerFactoryPluginI
       $this->updateEntity($entity, $row);
     }
     else {
+      // Attempt to ensure we always have a bundle.
+      if ($bundle = $this->getBundle($row)) {
+        $row->setDestinationProperty($this->getKey('bundle'), $bundle);
+      }
+
       // Stubs might need some required fields filled in.
       if ($row->isStub()) {
         $this->processStubRow($row);
diff --git a/core/modules/migrate/src/Plugin/migrate/source/SourcePluginBase.php b/core/modules/migrate/src/Plugin/migrate/source/SourcePluginBase.php
index 03f81737e..6df555e46 100644
--- a/core/modules/migrate/src/Plugin/migrate/source/SourcePluginBase.php
+++ b/core/modules/migrate/src/Plugin/migrate/source/SourcePluginBase.php
@@ -143,7 +143,7 @@ abstract class SourcePluginBase extends PluginBase implements MigrateSourceInter
     // Set up some defaults based on the source configuration.
     $this->cacheCounts = !empty($configuration['cache_counts']);
     $this->skipCount = !empty($configuration['skip_count']);
-    $this->cacheKey = !empty($configuration['cache_key']) ? !empty($configuration['cache_key']) : NULL;
+    $this->cacheKey = !empty($configuration['cache_key']) ? $configuration['cache_key'] : NULL;
     $this->trackChanges = !empty($configuration['track_changes']) ? $configuration['track_changes'] : FALSE;
     $this->idMap = $this->migration->getIdMap();
 
diff --git a/core/modules/migrate/tests/modules/template_test/migration_templates/migrate.migration.node_template.yml b/core/modules/migrate/tests/modules/template_test/migration_templates/migrate.migration.node_template.yml
deleted file mode 100644
index 6eead8b70..000000000
--- a/core/modules/migrate/tests/modules/template_test/migration_templates/migrate.migration.node_template.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-id: node_template
-label: Template test - node
-migration_tags:
-  - Template Test
-source:
-  plugin: empty
-process:
-  src: barfoo
-destination:
-  plugin: entity:node
diff --git a/core/modules/migrate/tests/modules/template_test/migration_templates/migrate.migration.other_template.yml b/core/modules/migrate/tests/modules/template_test/migration_templates/migrate.migration.other_template.yml
deleted file mode 100644
index 3d974f007..000000000
--- a/core/modules/migrate/tests/modules/template_test/migration_templates/migrate.migration.other_template.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-id: other_template
-label: Template with a different tag
-migration_tags:
-  - Different Template Test
-source:
-  plugin: empty
-process:
-  src: raboof
-destination:
-  plugin: entity:user
diff --git a/core/modules/migrate/tests/modules/template_test/migration_templates/migrate.migration.url_template.yml b/core/modules/migrate/tests/modules/template_test/migration_templates/migrate.migration.url_template.yml
deleted file mode 100644
index 020404684..000000000
--- a/core/modules/migrate/tests/modules/template_test/migration_templates/migrate.migration.url_template.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-id: url_template
-label: Template test - URL
-migration_tags:
-  - Template Test
-source:
-  plugin: empty
-process:
-  src: foobar
-destination:
-  plugin: url_alias
diff --git a/core/modules/migrate/tests/modules/template_test/template_test.info.yml b/core/modules/migrate/tests/modules/template_test/template_test.info.yml
deleted file mode 100644
index d396c63d2..000000000
--- a/core/modules/migrate/tests/modules/template_test/template_test.info.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-name: 'Migration template test'
-type: module
-package: Testing
-version: VERSION
-core: 8.x
diff --git a/core/modules/migrate/tests/src/Kernel/MigrateBundleTest.php b/core/modules/migrate/tests/src/Kernel/MigrateBundleTest.php
new file mode 100644
index 000000000..746329596
--- /dev/null
+++ b/core/modules/migrate/tests/src/Kernel/MigrateBundleTest.php
@@ -0,0 +1,155 @@
+<?php
+
+namespace Drupal\Tests\migrate\Kernel;
+
+use Drupal\migrate\MigrateExecutable;
+use Drupal\taxonomy\Entity\Term;
+use Drupal\taxonomy\Entity\Vocabulary;
+
+/**
+ * Tests setting of bundles on content entity migrations.
+ *
+ * @group migrate
+ */
+class MigrateBundleTest extends MigrateTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['taxonomy', 'text'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installEntitySchema('taxonomy_vocabulary');
+    $this->installEntitySchema('taxonomy_term');
+    $this->installConfig(['taxonomy']);
+    // Set up two vocabularies (taxonomy bundles).
+    Vocabulary::create(['vid' => 'tags', 'name' => 'Tags']);
+    Vocabulary::create(['vid' => 'categories', 'name' => 'Categories']);
+  }
+
+  /**
+   * Tests setting the bundle in the destination.
+   */
+  public function testDestinationBundle() {
+    $term_data_rows = [
+      ['id' => 1, 'name' => 'Category 1'],
+    ];
+    $ids = ['id' => ['type' => 'integer']];
+    $definition = [
+      'id' => 'terms',
+      'migration_tags' => ['Bundle test'],
+      'source' => [
+        'plugin' => 'embedded_data',
+        'data_rows' => $term_data_rows,
+        'ids' => $ids,
+      ],
+      'process' => [
+        'tid' => 'id',
+        'name' => 'name',
+      ],
+      'destination' => [
+        'plugin' => 'entity:taxonomy_term',
+        'default_bundle' => 'categories',
+      ],
+      'migration_dependencies' => [],
+    ];
+
+    $term_migration = \Drupal::service('plugin.manager.migration')->createStubMigration($definition);
+
+    // Import and validate the term entity was created with the correct bundle.
+    $term_executable = new MigrateExecutable($term_migration, $this);
+    $term_executable->import();
+    /** @var Term $term */
+    $term = Term::load(1);
+    $this->assertEquals($term->bundle(), 'categories');
+  }
+
+  /**
+   * Tests setting the bundle in the process pipeline.
+   */
+  public function testProcessBundle() {
+    $term_data_rows = [
+      ['id' => 1, 'vocab' => 'categories', 'name' => 'Category 1'],
+      ['id' => 2, 'vocab' => 'tags', 'name' => 'Tag 1'],
+    ];
+    $ids = ['id' => ['type' => 'integer']];
+    $definition = [
+      'id' => 'terms',
+      'migration_tags' => ['Bundle test'],
+      'source' => [
+        'plugin' => 'embedded_data',
+        'data_rows' => $term_data_rows,
+        'ids' => $ids,
+      ],
+      'process' => [
+        'tid' => 'id',
+        'vid' => 'vocab',
+        'name' => 'name',
+      ],
+      'destination' => [
+        'plugin' => 'entity:taxonomy_term',
+      ],
+      'migration_dependencies' => [],
+    ];
+
+    $term_migration = \Drupal::service('plugin.manager.migration')->createStubMigration($definition);
+
+    // Import and validate the term entities were created with the correct bundle.
+    $term_executable = new MigrateExecutable($term_migration, $this);
+    $term_executable->import();
+    /** @var Term $term */
+    $term = Term::load(1);
+    $this->assertEquals($term->bundle(), 'categories');
+    $term = Term::load(2);
+    $this->assertEquals($term->bundle(), 'tags');
+  }
+
+  /**
+   * Tests setting bundles both in process and destination.
+   */
+  public function testMixedBundles() {
+    $term_data_rows = [
+      ['id' => 1, 'vocab' => 'categories', 'name' => 'Category 1'],
+      ['id' => 2, 'name' => 'Tag 1'],
+    ];
+    $ids = ['id' => ['type' => 'integer']];
+    $definition = [
+      'id' => 'terms',
+      'migration_tags' => ['Bundle test'],
+      'source' => [
+        'plugin' => 'embedded_data',
+        'data_rows' => $term_data_rows,
+        'ids' => $ids,
+      ],
+      'process' => [
+        'tid' => 'id',
+        'vid' => 'vocab',
+        'name' => 'name',
+      ],
+      'destination' => [
+        'plugin' => 'entity:taxonomy_term',
+        // When no vocab is provided, the destination bundle is applied.
+        'default_bundle' => 'tags',
+      ],
+      'migration_dependencies' => [],
+    ];
+
+    $term_migration = \Drupal::service('plugin.manager.migration')->createStubMigration($definition);
+
+    // Import and validate the term entities were created with the correct bundle.
+    $term_executable = new MigrateExecutable($term_migration, $this);
+    $term_executable->import();
+    /** @var Term $term */
+    $term = Term::load(1);
+    $this->assertEquals($term->bundle(), 'categories');
+    $term = Term::load(2);
+    $this->assertEquals($term->bundle(), 'tags');
+  }
+
+}
diff --git a/core/modules/migrate/tests/src/Kernel/Plugin/MigrationTest.php b/core/modules/migrate/tests/src/Kernel/Plugin/MigrationTest.php
index a380dac6a..83bf24dff 100644
--- a/core/modules/migrate/tests/src/Kernel/Plugin/MigrationTest.php
+++ b/core/modules/migrate/tests/src/Kernel/Plugin/MigrationTest.php
@@ -27,4 +27,41 @@ class MigrationTest extends KernelTestBase {
     $this->assertEquals([], $migration->getProcessPlugins([]));
   }
 
+  /**
+   * Tests Migration::getMigrationDependencies()
+   *
+   * @covers ::getMigrationDependencies
+   */
+  public function testGetMigrationDependencies() {
+    $migration = \Drupal::service('plugin.manager.migration')->createStubMigration([
+        'migration_dependencies' => NULL
+    ]);
+    $this->assertNotEmpty($migration->getMigrationDependencies(), 'Migration dependencies is not empty');
+  }
+
+  /**
+   * Tests Migration::getDestinationIds()
+   *
+   * @covers ::getDestinationIds
+   */
+  public function testGetDestinationIds() {
+    $migration = \Drupal::service('plugin.manager.migration')->createStubMigration(['destinationIds' => ['foo' => 'bar']]);
+    $destination_ids = $migration->getDestinationIds();
+    $this->assertNotEmpty($destination_ids, 'Destination ids are not empty');
+    $this->assertEquals(['foo' => 'bar'], $destination_ids, 'Destination ids match the expected values.');
+  }
+
+  /**
+   * Tests Migration::getTrackLastImported()
+   *
+   * @covers ::getTrackLastImported
+   * @covers ::isTrackLastImported
+   */
+  public function testGetTrackLastImported() {
+    $migration = \Drupal::service('plugin.manager.migration')->createStubMigration([]);
+    $migration->setTrackLastImported(TRUE);
+    $this->assertEquals(TRUE, $migration->getTrackLastImported());
+    $this->assertEquals(TRUE, $migration->isTrackLastImported());
+  }
+
 }
diff --git a/core/modules/migrate/tests/src/Unit/MigrateSourceTest.php b/core/modules/migrate/tests/src/Unit/MigrateSourceTest.php
index 65edd559b..5e2a06e3f 100644
--- a/core/modules/migrate/tests/src/Unit/MigrateSourceTest.php
+++ b/core/modules/migrate/tests/src/Unit/MigrateSourceTest.php
@@ -170,6 +170,25 @@ class MigrateSourceTest extends MigrateTestCase {
     $this->assertEquals(-1, $source->count());
   }
 
+   /**
+   * Test that the key can be set for the count cache.
+   *
+   * @covers ::count
+   */
+  public function testCountCacheKey() {
+    // Mock the cache to validate set() receives appropriate arguments.
+    $container = new ContainerBuilder();
+    $cache = $this->getMock(CacheBackendInterface::class);
+    $cache->expects($this->any())->method('set')
+        ->with('test_key', $this->isType('int'), $this->isType('int'));
+    $container->set('cache.migrate', $cache);
+    \Drupal::setContainer($container);
+
+    // Test caching the count with a configured key works.
+    $source = $this->getSource(['cache_counts' => TRUE, 'cache_key' => 'test_key']);
+    $this->assertEquals(1, $source->count());
+  }
+
   /**
    * Test that we don't get a row if prepareRow() is false.
    */
diff --git a/core/modules/migrate/tests/src/Unit/MigrateTestCase.php b/core/modules/migrate/tests/src/Unit/MigrateTestCase.php
index 705eed469..b16fef2c8 100644
--- a/core/modules/migrate/tests/src/Unit/MigrateTestCase.php
+++ b/core/modules/migrate/tests/src/Unit/MigrateTestCase.php
@@ -199,9 +199,11 @@ abstract class MigrateTestCase extends UnitTestCase {
    */
   protected function retrievalAssertHelper($expected_value, $actual_value, $message) {
     if (is_array($expected_value)) {
-      foreach ($expected_value as $k => $v) {
-        $this->retrievalAssertHelper($v, $actual_value[$k], $message . '[' . $k . ']');
+      // If the expected and actual values are empty, no need to array compare.
+      if (empty($expected_value && $actual_value)) {
+        return;
       }
+      $this->assertArrayEquals($expected_value, $actual_value, $message);
     }
     else {
       $this->assertSame((string) $expected_value, (string) $actual_value, $message);
diff --git a/core/modules/migrate_drupal/migrate_drupal.services.yml b/core/modules/migrate_drupal/migrate_drupal.services.yml
index 2807b5f4b..71a0b2778 100644
--- a/core/modules/migrate_drupal/migrate_drupal.services.yml
+++ b/core/modules/migrate_drupal/migrate_drupal.services.yml
@@ -1,6 +1,6 @@
 services:
   plugin.manager.migrate.cckfield:
-    class: Drupal\migrate\Plugin\MigratePluginManager
+    class: Drupal\migrate_drupal\Plugin\MigrateCckFieldPluginManager
     arguments:
       - cckfield
       - '@container.namespaces'
diff --git a/core/modules/migrate_drupal/src/Annotation/MigrateCckField.php b/core/modules/migrate_drupal/src/Annotation/MigrateCckField.php
index 39b545f9d..5e5a50046 100644
--- a/core/modules/migrate_drupal/src/Annotation/MigrateCckField.php
+++ b/core/modules/migrate_drupal/src/Annotation/MigrateCckField.php
@@ -8,9 +8,10 @@ use Drupal\Component\Annotation\Plugin;
  * Defines a cckfield plugin annotation object.
  *
  * cckfield plugins are variously responsible for handling the migration of
- * CCK fields from Drupal 6 to Drupal 8. They are allowed to alter CCK-related
- * migrations when migrations are being generated, and can compute destination
- * field types for individual fields during the actual migration process.
+ * CCK fields from Drupal 6 to Drupal 8, and Field API fields from Drupal 7
+ * to Drupal 8. They are allowed to alter CCK-related migrations when migrations
+ * are being generated, and can compute destination field types for individual
+ * fields during the actual migration process.
  *
  * Plugin Namespace: Plugin\migrate\cckfield
  *
@@ -18,6 +19,17 @@ use Drupal\Component\Annotation\Plugin;
  */
 class MigrateCckField extends Plugin {
 
+  /**
+   * @inheritdoc
+   */
+  public function __construct($values) {
+    parent::__construct($values);
+    // Provide default value for core property, in case it's missing.
+    if (empty($this->definition['core'])) {
+      $this->definition['core'] = [6];
+    }
+  }
+
   /**
    * The plugin ID.
    *
@@ -32,4 +44,11 @@ class MigrateCckField extends Plugin {
    */
   public $type_map = [];
 
+  /**
+   * The Drupal core version(s) this plugin applies to.
+   *
+   * @var int[]
+   */
+  public $core = [];
+
 }
diff --git a/core/modules/migrate_drupal/src/MigrationConfigurationTrait.php b/core/modules/migrate_drupal/src/MigrationConfigurationTrait.php
new file mode 100644
index 000000000..a7aab64a1
--- /dev/null
+++ b/core/modules/migrate_drupal/src/MigrationConfigurationTrait.php
@@ -0,0 +1,170 @@
+<?php
+
+namespace Drupal\migrate_drupal;
+
+use Drupal\Core\Database\Connection;
+use Drupal\Core\Database\Database;
+use Drupal\migrate\Exception\RequirementsException;
+use Drupal\migrate\Plugin\RequirementsInterface;
+
+/**
+ * Configures the appropriate migrations for a given source Drupal database.
+ */
+trait MigrationConfigurationTrait {
+
+  /**
+   * Gets the database connection for the source Drupal database.
+   *
+   * @param array $database
+   *   Database array representing the source Drupal database.
+   *
+   * @return \Drupal\Core\Database\Connection
+   *   The database connection for the source Drupal database.
+   */
+  protected function getConnection(array $database) {
+    // Set up the connection.
+    Database::addConnectionInfo('upgrade', 'default', $database);
+    $connection = Database::getConnection('default', 'upgrade');
+    return $connection;
+  }
+
+  /**
+   * Gets the system data from the system table of the source Drupal database.
+   *
+   * @param \Drupal\Core\Database\Connection $connection
+   *   Database connection to the source Drupal database.
+   *
+   * @return array
+   *   The system data from the system table of the source Drupal database.
+   */
+  protected function getSystemData(Connection $connection) {
+    $system_data = [];
+    try {
+      $results = $connection->select('system', 's', [
+        'fetch' => \PDO::FETCH_ASSOC,
+      ])
+        ->fields('s')
+        ->execute();
+      foreach ($results as $result) {
+        $system_data[$result['type']][$result['name']] = $result;
+      }
+    }
+    catch (\Exception $e) {
+      // The table might not exist for example in tests.
+    }
+    return $system_data;
+  }
+
+  /**
+   * Creates the necessary state entries for SqlBase::getDatabase() to work.
+   *
+   * The state entities created here have to exist before migration plugin
+   * instances are created so that derivers such as
+   * \Drupal\taxonomy\Plugin\migrate\D6TermNodeDeriver can access the source
+   * database.
+   *
+   * @param array $database
+   *   The source database settings.
+   * @param string $drupal_version
+   *   The Drupal version.
+   *
+   * @see \Drupal\migrate\Plugin\migrate\source\SqlBase::getDatabase()
+   */
+  protected function createDatabaseStateSettings(array $database, $drupal_version) {
+    $database_state['key'] = 'upgrade';
+    $database_state['database'] = $database;
+    $database_state_key = 'migrate_drupal_' . $drupal_version;
+    \Drupal::state()->set($database_state_key, $database_state);
+    \Drupal::state()->set('migrate.fallback_state_key', $database_state_key);
+  }
+
+  /**
+   * Gets the migrations for import.
+   *
+   * @param string $database_state_key
+   *   The state key.
+   * @param int $drupal_version
+   *   The version of Drupal we're getting the migrations for.
+   *
+   * @return \Drupal\migrate\Plugin\MigrationInterface[]
+   *   The migrations for import.
+   */
+  protected function getMigrations($database_state_key, $drupal_version) {
+    $version_tag = 'Drupal ' . $drupal_version;
+    $plugin_manager = \Drupal::service('plugin.manager.migration');
+    /** @var \Drupal\migrate\Plugin\Migration[] $all_migrations */
+    $all_migrations = $plugin_manager->createInstancesByTag($version_tag);
+    $migrations = [];
+    foreach ($all_migrations as $migration) {
+      try {
+        // @todo https://drupal.org/node/2681867 We should be able to validate
+        //   the entire migration at this point.
+        $source_plugin = $migration->getSourcePlugin();
+        if ($source_plugin instanceof RequirementsInterface) {
+          $source_plugin->checkRequirements();
+        }
+        $destination_plugin = $migration->getDestinationPlugin();
+        if ($destination_plugin instanceof RequirementsInterface) {
+          $destination_plugin->checkRequirements();
+        }
+        $migrations[] = $migration;
+      }
+      catch (RequirementsException $e) {
+        // Migrations which are not applicable given the source and destination
+        // site configurations (e.g., what modules are enabled) will be silently
+        // ignored.
+      }
+    }
+
+    return $migrations;
+  }
+
+  /**
+   * Determines what version of Drupal the source database contains.
+   *
+   * @param \Drupal\Core\Database\Connection $connection
+   *   The database connection object.
+   *
+   * @return int|FALSE
+   *   An integer representing the major branch of Drupal core (e.g. '6' for
+   *   Drupal 6.x), or FALSE if no valid version is matched.
+   */
+  protected function getLegacyDrupalVersion(Connection $connection) {
+    // Don't assume because a table of that name exists, that it has the columns
+    // we're querying. Catch exceptions and report that the source database is
+    // not Drupal.
+    // Drupal 5/6/7 can be detected by the schema_version in the system table.
+    if ($connection->schema()->tableExists('system')) {
+      try {
+        $version_string = $connection
+          ->query('SELECT schema_version FROM {system} WHERE name = :module', [':module' => 'system'])
+          ->fetchField();
+        if ($version_string && $version_string[0] == '1') {
+          if ((int) $version_string >= 1000) {
+            $version_string = '5';
+          }
+          else {
+            $version_string = FALSE;
+          }
+        }
+      }
+      catch (\PDOException $e) {
+        $version_string = FALSE;
+      }
+    }
+    // For Drupal 8 (and we're predicting beyond) the schema version is in the
+    // key_value store.
+    elseif ($connection->schema()->tableExists('key_value')) {
+      $result = $connection
+        ->query("SELECT value FROM {key_value} WHERE collection = :system_schema  and name = :module", [':system_schema' => 'system.schema', ':module' => 'system'])
+        ->fetchField();
+      $version_string = unserialize($result);
+    }
+    else {
+      $version_string = FALSE;
+    }
+
+    return $version_string ? substr($version_string, 0, 1) : FALSE;
+  }
+
+}
diff --git a/core/modules/migrate_drupal/src/MigrationCreationTrait.php b/core/modules/migrate_drupal/src/MigrationCreationTrait.php
index 6446c729d..7fa44bb1c 100644
--- a/core/modules/migrate_drupal/src/MigrationCreationTrait.php
+++ b/core/modules/migrate_drupal/src/MigrationCreationTrait.php
@@ -2,172 +2,12 @@
 
 namespace Drupal\migrate_drupal;
 
-use Drupal\Core\Database\Connection;
-use Drupal\Core\Database\Database;
-use Drupal\migrate\Exception\RequirementsException;
-use Drupal\migrate\Plugin\RequirementsInterface;
 
 /**
- * Creates the appropriate migrations for a given source Drupal database.
- *
- * @todo https://www.drupal.org/node/2682585 The trait no longer creates
- *   migrations.
+ * @deprecated in Drupal 8.1.x, will be removed before Drupal 9.0.0. Use
+ *   \Drupal\migrate_drupal\MigrationConfigurationTrait instead.
  */
 trait MigrationCreationTrait {
-
-  /**
-   * Gets the database connection for the source Drupal database.
-   *
-   * @param array $database
-   *   Database array representing the source Drupal database.
-   *
-   * @return \Drupal\Core\Database\Connection
-   *   The database connection for the source Drupal database.
-   */
-  protected function getConnection(array $database) {
-    // Set up the connection.
-    Database::addConnectionInfo('upgrade', 'default', $database);
-    $connection = Database::getConnection('default', 'upgrade');
-    return $connection;
-  }
-
-  /**
-   * Gets the system data from the system table of the source Drupal database.
-   *
-   * @param \Drupal\Core\Database\Connection $connection
-   *   Database connection to the source Drupal database.
-   *
-   * @return array
-   *   The system data from the system table of the source Drupal database.
-   */
-  protected function getSystemData(Connection $connection) {
-    $system_data = [];
-    try {
-      $results = $connection->select('system', 's', [
-        'fetch' => \PDO::FETCH_ASSOC,
-      ])
-        ->fields('s')
-        ->execute();
-      foreach ($results as $result) {
-        $system_data[$result['type']][$result['name']] = $result;
-      }
-    }
-    catch (\Exception $e) {
-      // The table might not exist for example in tests.
-    }
-    return $system_data;
-  }
-
-  /**
-   * Creates the necessary state entries for SqlBase::getDatabase() to work.
-   *
-   * The state entities created here have to exist before migration plugin
-   * instances are created so that derivers such as
-   * \Drupal\taxonomy\Plugin\migrate\D6TermNodeDeriver can access the source
-   * database.
-   *
-   * @param array $database
-   *   The source database settings.
-   * @param string $drupal_version
-   *   The Drupal version.
-   *
-   * @see \Drupal\migrate\Plugin\migrate\source\SqlBase::getDatabase()
-   */
-  protected function createDatabaseStateSettings(array $database, $drupal_version) {
-    $database_state['key'] = 'upgrade';
-    $database_state['database'] = $database;
-    $database_state_key = 'migrate_drupal_' . $drupal_version;
-    \Drupal::state()->set($database_state_key, $database_state);
-    \Drupal::state()->set('migrate.fallback_state_key', $database_state_key);
-  }
-
-  /**
-   * Gets the migrations for import.
-   *
-   * @param string $database_state_key
-   *   The state key.
-   * @param int $drupal_version
-   *   The version of Drupal we're getting the migrations for.
-   *
-   * @return \Drupal\migrate\Plugin\MigrationInterface[]
-   *   The migrations for import.
-   */
-  protected function getMigrations($database_state_key, $drupal_version) {
-    $version_tag = 'Drupal ' . $drupal_version;
-    $plugin_manager = \Drupal::service('plugin.manager.migration');
-    /** @var \Drupal\migrate\Plugin\Migration[] $all_migrations */
-    $all_migrations = $plugin_manager->createInstancesByTag($version_tag);
-    $migrations = [];
-    foreach ($all_migrations as $migration) {
-      try {
-        // @todo https://drupal.org/node/2681867 We should be able to validate
-        //   the entire migration at this point.
-        $source_plugin = $migration->getSourcePlugin();
-        if ($source_plugin instanceof RequirementsInterface) {
-          $source_plugin->checkRequirements();
-        }
-        $destination_plugin = $migration->getDestinationPlugin();
-        if ($destination_plugin instanceof RequirementsInterface) {
-          $destination_plugin->checkRequirements();
-        }
-        $migrations[] = $migration;
-      }
-      catch (RequirementsException $e) {
-        // Migrations which are not applicable given the source and destination
-        // site configurations (e.g., what modules are enabled) will be silently
-        // ignored.
-      }
-    }
-
-    return $migrations;
-  }
-
-  /**
-   * Determines what version of Drupal the source database contains.
-   *
-   * @param \Drupal\Core\Database\Connection $connection
-   *   The database connection object.
-   *
-   * @return int|FALSE
-   *   An integer representing the major branch of Drupal core (e.g. '6' for
-   *   Drupal 6.x), or FALSE if no valid version is matched.
-   */
-  protected function getLegacyDrupalVersion(Connection $connection) {
-    // Don't assume because a table of that name exists, that it has the columns
-    // we're querying. Catch exceptions and report that the source database is
-    // not Drupal.
-    // Drupal 5/6/7 can be detected by the schema_version in the system table.
-    if ($connection->schema()->tableExists('system')) {
-      try {
-        $version_string = $connection
-          ->query('SELECT schema_version FROM {system} WHERE name = :module', [':module' => 'system'])
-          ->fetchField();
-        if ($version_string && $version_string[0] == '1') {
-          if ((int) $version_string >= 1000) {
-            $version_string = '5';
-          }
-          else {
-            $version_string = FALSE;
-          }
-        }
-      }
-      catch (\PDOException $e) {
-        $version_string = FALSE;
-      }
-    }
-    // For Drupal 8 (and we're predicting beyond) the schema version is in the
-    // key_value store.
-    elseif ($connection->schema()->tableExists('key_value')) {
-      $result = $connection
-        ->query("SELECT value FROM {key_value} WHERE collection = :system_schema  and name = :module", [':system_schema' => 'system.schema', ':module' => 'system'])
-        ->fetchField();
-      $version_string = unserialize($result);
-    }
-    else {
-      $version_string = FALSE;
-    }
-
-    return $version_string ? substr($version_string, 0, 1) : FALSE;
-  }
+  use MigrationConfigurationTrait;
 
 }
diff --git a/core/modules/migrate_drupal/src/Plugin/MigrateCckFieldPluginManager.php b/core/modules/migrate_drupal/src/Plugin/MigrateCckFieldPluginManager.php
new file mode 100644
index 000000000..44151ccfa
--- /dev/null
+++ b/core/modules/migrate_drupal/src/Plugin/MigrateCckFieldPluginManager.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace Drupal\migrate_drupal\Plugin;
+
+use Drupal\Component\Plugin\Exception\PluginNotFoundException;
+use Drupal\migrate\Plugin\MigratePluginManager;
+use Drupal\migrate\Plugin\MigrationInterface;
+
+/**
+ * Plugin manager for migrate cckfield plugins.
+ *
+ * @see \Drupal\migrate_drupal\Plugin\MigrateCckFieldInterface
+ * @see \Drupal\migrate\Annotation\MigrateCckField
+ * @see plugin_api
+ *
+ * @ingroup migration
+ */
+class MigrateCckFieldPluginManager extends MigratePluginManager {
+
+  /**
+   * The default version of core to use for cck field plugins.
+   *
+   * These plugins were initially only built and used for Drupal 6 fields.
+   * Having been extended for Drupal 7 with a "core" annotation, we fall back to
+   * Drupal 6 where none exists.
+   */
+  const DEFAULT_CORE_VERSION = 6;
+
+  /**
+   * {@inheritdoc}
+   */
+  public function createInstance($field_type, array $configuration = array(), MigrationInterface $migration = NULL) {
+    $core = static::DEFAULT_CORE_VERSION;
+    if (!empty($configuration['core'])) {
+      $core = $configuration['core'];
+    }
+    elseif (!empty($migration->getPluginDefinition()['migration_tags'])) {
+      foreach ($migration->getPluginDefinition()['migration_tags'] as $tag) {
+        if ($tag == 'Drupal 7') {
+          $core = 7;
+        }
+      }
+    }
+
+    foreach ($this->getDefinitions() as $plugin_id => $definition) {
+      if (in_array($core, $definition['core'])) {
+        if (array_key_exists($field_type, $definition['type_map']) || $field_type === $plugin_id) {
+          return parent::createInstance($plugin_id, $configuration, $migration);
+        }
+      }
+    }
+    throw new PluginNotFoundException($field_type);
+  }
+
+}
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/cckfield/CckFieldPluginBase.php b/core/modules/migrate_drupal/src/Plugin/migrate/cckfield/CckFieldPluginBase.php
index 87d545730..d942bce2c 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/cckfield/CckFieldPluginBase.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/cckfield/CckFieldPluginBase.php
@@ -10,7 +10,7 @@ use Drupal\migrate_drupal\Plugin\MigrateCckFieldInterface;
 /**
  * The base class for all cck field plugins.
  *
- * @see \Drupal\migrate_drupal\Plugin\MigratePluginManager
+ * @see \Drupal\migrate\Plugin\MigratePluginManager
  * @see \Drupal\migrate_drupal\Annotation\MigrateCckField
  * @see \Drupal\migrate_drupal\Plugin\MigrateCckFieldInterface
  * @see plugin_api
diff --git a/core/modules/migrate_drupal/tests/fixtures/drupal6.php b/core/modules/migrate_drupal/tests/fixtures/drupal6.php
index 1ca67a5c9..97ed43ec7 100644
--- a/core/modules/migrate_drupal/tests/fixtures/drupal6.php
+++ b/core/modules/migrate_drupal/tests/fixtures/drupal6.php
@@ -3089,24 +3089,6 @@ $connection->schema()->createTable('content_type_page', array(
   'mysql_character_set' => 'utf8',
 ));
 
-$connection->insert('content_type_page')
-->fields(array(
-  'vid',
-  'nid',
-  'field_text_field_value',
-))
-->values(array(
-  'vid' => '1',
-  'nid' => '1',
-  'field_text_field_value' => NULL,
-))
-->values(array(
-  'vid' => '3',
-  'nid' => '1',
-  'field_text_field_value' => NULL,
-))
-->execute();
-
 $connection->schema()->createTable('content_type_story', array(
   'fields' => array(
     'nid' => array(
@@ -3420,9 +3402,9 @@ $connection->insert('content_type_story')
   'field_test_three_value' => '101.00',
   'field_test_identical1_value' => NULL,
   'field_test_identical2_value' => NULL,
-  'field_test_link_url' => 'http://www.example.com/buy-one-upon-a-time',
+  'field_test_link_url' => 'node/10',
   'field_test_link_title' => 'Buy it now',
-  'field_test_link_attributes' => 'a:1:{s:6:"target";s:6:"_blank";}',
+  'field_test_link_attributes' => 's:32:"a:1:{s:6:"target";s:6:"_blank";}";',
   'field_test_date_value' => NULL,
   'field_test_datestamp_value' => NULL,
   'field_test_datetime_value' => NULL,
@@ -45551,6 +45533,14 @@ $connection->insert('variable')
   'name' => 'language_content_type_article',
   'value' => 's:1:"2";',
 ))
+->values(array(
+  'name' => 'language_content_type_employee',
+  'value' => 's:1:"2";',
+))
+->values(array(
+  'name' => 'i18n_lock_node_article',
+  'value' => 'i:1;',
+))
 ->values(array(
   'name' => 'language_count',
   'value' => 'i:11;',
diff --git a/core/modules/migrate_drupal/tests/fixtures/drupal7.php b/core/modules/migrate_drupal/tests/fixtures/drupal7.php
index fb307f053..258821f78 100644
--- a/core/modules/migrate_drupal/tests/fixtures/drupal7.php
+++ b/core/modules/migrate_drupal/tests/fixtures/drupal7.php
@@ -40789,7 +40789,7 @@ $connection->insert('users')
 ->values(array(
   'uid' => '2',
   'name' => 'Odo',
-  'pass' => '$S$DZ4P7zZOh92vgrgZDBbv8Pu6lQB337OJ1wsOy21602G4A5F7.M9K',
+  'pass' => '$S$DGFZUE.FhrXbe4y52eC7p0ZVRGD/gOPtVctDlmC89qkujnBokAlJ',
   'mail' => 'odo@local.host',
   'theme' => '',
   'signature' => '',
@@ -41322,6 +41322,10 @@ $connection->insert('variable')
   'name' => 'language_content_type_test_content_type',
   'value' => 's:1:"0";',
 ))
+->values(array(
+  'name' => 'i18n_node_options_blog',
+  'value' => 'a:2:{i:0;s:8:"required";i:1;s:4:"lock";}',
+))
 ->values(array(
   'name' => 'language_count',
   'value' => 'i:2;',
diff --git a/core/modules/migrate_drupal/tests/modules/migrate_cckfield_plugin_manager_test/migrate_cckfield_plugin_manager_test.info.yml b/core/modules/migrate_drupal/tests/modules/migrate_cckfield_plugin_manager_test/migrate_cckfield_plugin_manager_test.info.yml
new file mode 100644
index 000000000..8449e1ade
--- /dev/null
+++ b/core/modules/migrate_drupal/tests/modules/migrate_cckfield_plugin_manager_test/migrate_cckfield_plugin_manager_test.info.yml
@@ -0,0 +1,6 @@
+name: 'Migrate cck field plugin manager test'
+type: module
+description: 'Example module demonstrating the cck field plugin manager in the Migrate API.'
+package: Testing
+version: VERSION
+core: 8.x
diff --git a/core/modules/migrate_drupal/tests/modules/migrate_cckfield_plugin_manager_test/src/Plugin/migrate/cckfield/D6FileField.php b/core/modules/migrate_drupal/tests/modules/migrate_cckfield_plugin_manager_test/src/Plugin/migrate/cckfield/D6FileField.php
new file mode 100644
index 000000000..529907a35
--- /dev/null
+++ b/core/modules/migrate_drupal/tests/modules/migrate_cckfield_plugin_manager_test/src/Plugin/migrate/cckfield/D6FileField.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Drupal\migrate_cckfield_plugin_manager_test\Plugin\migrate\cckfield;
+
+use Drupal\migrate_drupal\Plugin\migrate\cckfield\CckFieldPluginBase;
+use Drupal\migrate\Plugin\MigrationInterface;
+
+/**
+ * @MigrateCckField(
+ *   id = "d6_file",
+ *   core = {6},
+ *   type_map = {
+ *     "file" = "file"
+ *   }
+ * )
+ */
+class D6FileField extends CckFieldPluginBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getFieldFormatterMap() {}
+
+  /**
+   * {@inheritdoc}
+   */
+  public function processCckFieldValues(MigrationInterface $migration, $field_name, $data) {}
+
+}
diff --git a/core/modules/migrate_drupal/tests/modules/migrate_cckfield_plugin_manager_test/src/Plugin/migrate/cckfield/D6NoCoreVersionSpecified.php b/core/modules/migrate_drupal/tests/modules/migrate_cckfield_plugin_manager_test/src/Plugin/migrate/cckfield/D6NoCoreVersionSpecified.php
new file mode 100644
index 000000000..16967db97
--- /dev/null
+++ b/core/modules/migrate_drupal/tests/modules/migrate_cckfield_plugin_manager_test/src/Plugin/migrate/cckfield/D6NoCoreVersionSpecified.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace Drupal\migrate_cckfield_plugin_manager_test\Plugin\migrate\cckfield;
+
+use Drupal\migrate_drupal\Plugin\migrate\cckfield\CckFieldPluginBase;
+use Drupal\migrate\Plugin\MigrationInterface;
+
+/**
+ * @MigrateCckField(
+ *   id = "d6_no_core_version_specified"
+ * )
+ */
+class D6NoCoreVersionSpecified extends CckFieldPluginBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getFieldFormatterMap() {}
+
+  /**
+   * {@inheritdoc}
+   */
+  public function processCckFieldValues(MigrationInterface $migration, $field_name, $data) {}
+
+}
diff --git a/core/modules/migrate_drupal/tests/src/Kernel/MigrateCckFieldPluginManagerTest.php b/core/modules/migrate_drupal/tests/src/Kernel/MigrateCckFieldPluginManagerTest.php
new file mode 100644
index 000000000..8cea74c4d
--- /dev/null
+++ b/core/modules/migrate_drupal/tests/src/Kernel/MigrateCckFieldPluginManagerTest.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace Drupal\Tests\migrate_drupal\Kernel;
+
+use Drupal\Component\Plugin\Exception\PluginNotFoundException;
+
+/**
+ * Tests the cck field plugin manager.
+ *
+ * @group migrate_drupal
+ */
+class MigrateCckFieldPluginManagerTest extends MigrateDrupalTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = array('system', 'user', 'field', 'migrate_drupal', 'options', 'file', 'text', 'migrate_cckfield_plugin_manager_test');
+
+  /**
+   * Tests that the correct MigrateCckField plugins are used.
+   */
+  public function testPluginSelection() {
+    $plugin_manager = \Drupal::service('plugin.manager.migrate.cckfield');
+
+    $this->assertIdentical('Drupal\\file\\Plugin\\migrate\\cckfield\\d6\\FileField', get_class($plugin_manager->createInstance('filefield', ['core' => 6])));
+
+    try {
+      // If this test passes, createInstance will raise a
+      // PluginNotFoundException and we'll never reach fail().
+      $plugin_manager->createInstance('filefield', ['core' => 7]);
+      $this->fail('Expected Drupal\Component\Plugin\Exception\PluginNotFoundException.');
+    }
+    catch (PluginNotFoundException $e) {
+      $this->assertIdentical($e->getMessage(), "Plugin ID 'filefield' was not found.");
+    }
+
+    $this->assertIdentical('Drupal\\file\\Plugin\\migrate\\cckfield\\d7\\ImageField', get_class($plugin_manager->createInstance('image', ['core' => 7])));
+    $this->assertIdentical('Drupal\\file\\Plugin\\migrate\\cckfield\\d7\\FileField', get_class($plugin_manager->createInstance('file', ['core' => 7])));
+    $this->assertIdentical('Drupal\\migrate_cckfield_plugin_manager_test\\Plugin\\migrate\\cckfield\\D6FileField', get_class($plugin_manager->createInstance('file', ['core' => 6])));
+
+    $this->assertIdentical('Drupal\\text\\Plugin\\migrate\\cckfield\\TextField', get_class($plugin_manager->createInstance('text', ['core' => 6])));
+    $this->assertIdentical('Drupal\\text\\Plugin\\migrate\\cckfield\\TextField', get_class($plugin_manager->createInstance('text', ['core' => 7])));
+
+    // Test fallback when no core version is specified.
+    $this->assertIdentical('Drupal\\migrate_cckfield_plugin_manager_test\\Plugin\\migrate\\cckfield\\D6NoCoreVersionSpecified', get_class($plugin_manager->createInstance('d6_no_core_version_specified', ['core' => 6])));
+
+    try {
+      // If this test passes, createInstance will raise a
+      // PluginNotFoundException and we'll never reach fail().
+      $plugin_manager->createInstance('d6_no_core_version_specified', ['core' => 7]);
+      $this->fail('Expected Drupal\Component\Plugin\Exception\PluginNotFoundException.');
+    }
+    catch (PluginNotFoundException $e) {
+      $this->assertIdentical($e->getMessage(), "Plugin ID 'd6_no_core_version_specified' was not found.");
+    }
+  }
+
+}
diff --git a/core/modules/migrate_drupal/tests/src/Kernel/d6/MigrateDrupal6TestBase.php b/core/modules/migrate_drupal/tests/src/Kernel/d6/MigrateDrupal6TestBase.php
index 761e71891..72a80950a 100644
--- a/core/modules/migrate_drupal/tests/src/Kernel/d6/MigrateDrupal6TestBase.php
+++ b/core/modules/migrate_drupal/tests/src/Kernel/d6/MigrateDrupal6TestBase.php
@@ -28,7 +28,14 @@ abstract class MigrateDrupal6TestBase extends MigrateDrupalTestBase {
    */
   protected function setUp() {
     parent::setUp();
-    $this->loadFixture( __DIR__ . '/../../../fixtures/drupal6.php');
+    $this->loadFixture($this->getFixtureFilePath());
+  }
+
+  /**
+   * Gets the path to the fixture file.
+   */
+  protected function getFixtureFilePath() {
+    return __DIR__ . '/../../../fixtures/drupal6.php';
   }
 
   /**
diff --git a/core/modules/migrate_drupal/tests/src/Kernel/d7/MigrateDrupal7TestBase.php b/core/modules/migrate_drupal/tests/src/Kernel/d7/MigrateDrupal7TestBase.php
index 1ae92c448..3afa82dd0 100644
--- a/core/modules/migrate_drupal/tests/src/Kernel/d7/MigrateDrupal7TestBase.php
+++ b/core/modules/migrate_drupal/tests/src/Kernel/d7/MigrateDrupal7TestBase.php
@@ -14,7 +14,14 @@ abstract class MigrateDrupal7TestBase extends MigrateDrupalTestBase {
    */
   protected function setUp() {
     parent::setUp();
-    $this->loadFixture(__DIR__ . '/../../../fixtures/drupal7.php');
+    $this->loadFixture($this->getFixtureFilePath());
+  }
+
+  /**
+   * Gets the path to the fixture file.
+   */
+  protected function getFixtureFilePath() {
+    return __DIR__ . '/../../../fixtures/drupal7.php';
   }
 
 }
diff --git a/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php
index 643c11636..8ef5f4858 100644
--- a/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php
+++ b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php
@@ -10,7 +10,7 @@ use Drupal\Core\State\StateInterface;
 use Drupal\Core\Url;
 use Drupal\migrate\Plugin\MigrationPluginManagerInterface;
 use Drupal\migrate_drupal_ui\MigrateUpgradeRunBatch;
-use Drupal\migrate_drupal\MigrationCreationTrait;
+use Drupal\migrate_drupal\MigrationConfigurationTrait;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -18,7 +18,7 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
  */
 class MigrateUpgradeForm extends ConfirmFormBase {
 
-  use MigrationCreationTrait;
+  use MigrationConfigurationTrait;
 
   /**
    * Mapping of known migrations and their source and destination modules.
diff --git a/core/modules/migrate_drupal_ui/src/Tests/MigrateUpgradeTestBase.php b/core/modules/migrate_drupal_ui/src/Tests/MigrateUpgradeTestBase.php
index 5398c48d8..7a2d2c2b8 100644
--- a/core/modules/migrate_drupal_ui/src/Tests/MigrateUpgradeTestBase.php
+++ b/core/modules/migrate_drupal_ui/src/Tests/MigrateUpgradeTestBase.php
@@ -4,14 +4,14 @@ namespace Drupal\migrate_drupal_ui\Tests;
 
 use Drupal\Core\Database\Database;
 use Drupal\migrate\Plugin\MigrateIdMapInterface;
-use Drupal\migrate_drupal\MigrationCreationTrait;
+use Drupal\migrate_drupal\MigrationConfigurationTrait;
 use Drupal\simpletest\WebTestBase;
 
 /**
  * Provides a base class for testing migration upgrades in the UI.
  */
 abstract class MigrateUpgradeTestBase extends WebTestBase {
-  use MigrationCreationTrait;
+  use MigrationConfigurationTrait;
 
   /**
    * Use the Standard profile to test help implementations of many core modules.
diff --git a/core/modules/migrate_drupal_ui/src/Tests/d6/MigrateUpgrade6Test.php b/core/modules/migrate_drupal_ui/src/Tests/d6/MigrateUpgrade6Test.php
index d073c186d..ea0b58804 100644
--- a/core/modules/migrate_drupal_ui/src/Tests/d6/MigrateUpgrade6Test.php
+++ b/core/modules/migrate_drupal_ui/src/Tests/d6/MigrateUpgrade6Test.php
@@ -3,6 +3,7 @@
 namespace Drupal\migrate_drupal_ui\Tests\d6;
 
 use Drupal\migrate_drupal_ui\Tests\MigrateUpgradeTestBase;
+use Drupal\user\Entity\User;
 
 /**
  * Tests Drupal 6 upgrade using the migrate UI.
@@ -70,4 +71,16 @@ class MigrateUpgrade6Test extends MigrateUpgradeTestBase {
     ];
   }
 
+  /**
+   * Executes all steps of migrations upgrade.
+   */
+  protected function testMigrateUpgrade() {
+    parent::testMigrateUpgrade();
+
+    // Ensure migrated users can log in.
+    $user = User::load(2);
+    $user->pass_raw = 'john.doe_pass';
+    $this->drupalLogin($user);
+  }
+
 }
diff --git a/core/modules/migrate_drupal_ui/src/Tests/d7/MigrateUpgrade7Test.php b/core/modules/migrate_drupal_ui/src/Tests/d7/MigrateUpgrade7Test.php
index 084f8ba97..1d3ce61f7 100644
--- a/core/modules/migrate_drupal_ui/src/Tests/d7/MigrateUpgrade7Test.php
+++ b/core/modules/migrate_drupal_ui/src/Tests/d7/MigrateUpgrade7Test.php
@@ -3,6 +3,7 @@
 namespace Drupal\migrate_drupal_ui\Tests\d7;
 
 use Drupal\migrate_drupal_ui\Tests\MigrateUpgradeTestBase;
+use Drupal\user\Entity\User;
 
 /**
  * Tests Drupal 7 upgrade using the migrate UI.
@@ -70,4 +71,16 @@ class MigrateUpgrade7Test extends MigrateUpgradeTestBase {
     ];
   }
 
+  /**
+   * Executes all steps of migrations upgrade.
+   */
+  protected function testMigrateUpgrade() {
+    parent::testMigrateUpgrade();
+
+    // Ensure migrated users can log in.
+    $user = User::load(2);
+    $user->pass_raw = 'a password';
+    $this->drupalLogin($user);
+  }
+
 }
diff --git a/core/modules/node/migration_templates/d6_node.yml b/core/modules/node/migration_templates/d6_node.yml
index 82571b808..ec1474ae1 100644
--- a/core/modules/node/migration_templates/d6_node.yml
+++ b/core/modules/node/migration_templates/d6_node.yml
@@ -8,7 +8,6 @@ source:
 process:
   nid: nid
   vid: vid
-  type: type
   langcode:
     plugin: default_value
     source: language
diff --git a/core/modules/node/migration_templates/d6_node_revision.yml b/core/modules/node/migration_templates/d6_node_revision.yml
index cd32ea08f..b7826a18b 100644
--- a/core/modules/node/migration_templates/d6_node_revision.yml
+++ b/core/modules/node/migration_templates/d6_node_revision.yml
@@ -8,7 +8,6 @@ source:
 process:
   nid: nid
   vid: vid
-  type: type
   langcode:
     plugin: default_value
     source: language
diff --git a/core/modules/node/migration_templates/d7_node.yml b/core/modules/node/migration_templates/d7_node.yml
index 18e01d11e..b763534dd 100644
--- a/core/modules/node/migration_templates/d7_node.yml
+++ b/core/modules/node/migration_templates/d7_node.yml
@@ -8,7 +8,6 @@ source:
 process:
   nid: nid
   vid: vid
-  type: type
   langcode:
     plugin: default_value
     source: language
diff --git a/core/modules/node/migration_templates/d7_node_revision.yml b/core/modules/node/migration_templates/d7_node_revision.yml
index 11f9d0a37..0ee8bca6e 100644
--- a/core/modules/node/migration_templates/d7_node_revision.yml
+++ b/core/modules/node/migration_templates/d7_node_revision.yml
@@ -8,7 +8,6 @@ source:
 process:
   nid: nid
   vid: vid
-  type: type
   langcode:
     plugin: default_value
     source: language
diff --git a/core/modules/node/node.api.php b/core/modules/node/node.api.php
index e347423dc..ae36aa0bb 100644
--- a/core/modules/node/node.api.php
+++ b/core/modules/node/node.api.php
@@ -64,6 +64,8 @@ use Drupal\Core\Access\AccessResult;
  * sure to restore your {node_access} record after node_access_rebuild() is
  * called.
  *
+ * For a detailed example, see node_access_example.module.
+ *
  * @param \Drupal\Core\Session\AccountInterface $account
  *   The account object whose grants are requested.
  * @param string $op
@@ -73,8 +75,6 @@ use Drupal\Core\Access\AccessResult;
  *   An array whose keys are "realms" of grants, and whose values are arrays of
  *   the grant IDs within this realm that this user is being granted.
  *
- * For a detailed example, see node_access_example.module.
- *
  * @see node_access_view_all_nodes()
  * @see node_access_rebuild()
  * @ingroup node_access
diff --git a/core/modules/node/node.module b/core/modules/node/node.module
index fa9d3e9a3..aade3e833 100644
--- a/core/modules/node/node.module
+++ b/core/modules/node/node.module
@@ -463,14 +463,11 @@ function node_revision_load($vid = NULL) {
 /**
  * Deletes a node revision.
  *
- * @param $revision_id
+ * @param int $revision_id
  *   The revision ID to delete.
- *
- * @return bool
- *   TRUE if the revision deletion was successful; otherwise, FALSE.
  */
 function node_revision_delete($revision_id) {
-  entity_revision_delete('node', $revision_id);
+  \Drupal::entityTypeManager()->getStorage('node')->deleteRevision($revision_id);
 }
 
 /**
@@ -1081,8 +1078,9 @@ function node_query_node_access_alter(AlterableInterface $query) {
 
   // Bubble the 'user.node_grants:$op' cache context to the current render
   // context.
+  $request = \Drupal::requestStack()->getCurrentRequest();
   $renderer = \Drupal::service('renderer');
-  if ($renderer->hasRenderContext()) {
+  if ($request->isMethodSafe() && $renderer->hasRenderContext()) {
     $build = ['#cache' => ['contexts' => ['user.node_grants:' . $op]]];
     $renderer->render($build);
   }
diff --git a/core/modules/node/src/Controller/NodePreviewController.php b/core/modules/node/src/Controller/NodePreviewController.php
index fab222e52..1a1c3cac5 100644
--- a/core/modules/node/src/Controller/NodePreviewController.php
+++ b/core/modules/node/src/Controller/NodePreviewController.php
@@ -22,26 +22,6 @@ class NodePreviewController extends EntityViewController {
     // Don't render cache previews.
     unset($build['#cache']);
 
-    foreach ($node_preview->uriRelationships() as $rel) {
-      // Set the node path as the canonical URL to prevent duplicate content.
-      $build['#attached']['html_head_link'][] = array(
-        array(
-        'rel' => $rel,
-        'href' => $node_preview->url($rel),
-        )
-        , TRUE);
-
-      if ($rel == 'canonical') {
-        // Set the non-aliased canonical path as a default shortlink.
-        $build['#attached']['html_head_link'][] = array(
-          array(
-            'rel' => 'shortlink',
-            'href' => $node_preview->url($rel, array('alias' => TRUE)),
-          )
-        , TRUE);
-      }
-    }
-
     return $build;
   }
 
diff --git a/core/modules/node/src/Plugin/migrate/D6NodeDeriver.php b/core/modules/node/src/Plugin/migrate/D6NodeDeriver.php
index d586efd84..c8a13973d 100644
--- a/core/modules/node/src/Plugin/migrate/D6NodeDeriver.php
+++ b/core/modules/node/src/Plugin/migrate/D6NodeDeriver.php
@@ -98,6 +98,7 @@ class D6NodeDeriver extends DeriverBase implements ContainerDeriverInterface {
           '@type' => $node_type,
         ]);
         $values['source']['node_type'] = $node_type;
+        $values['destination']['default_bundle'] = $node_type;
 
         // If this migration is based on the d6_node_revision migration, it
         // should explicitly depend on the corresponding d6_node variant.
@@ -111,7 +112,7 @@ class D6NodeDeriver extends DeriverBase implements ContainerDeriverInterface {
             $field_type = $info['type'];
             if ($this->cckPluginManager->hasDefinition($info['type'])) {
               if (!isset($this->cckPluginCache[$field_type])) {
-                $this->cckPluginCache[$field_type] = $this->cckPluginManager->createInstance($field_type, [], $migration);
+                $this->cckPluginCache[$field_type] = $this->cckPluginManager->createInstance($field_type, ['core' => 6], $migration);
               }
               $this->cckPluginCache[$field_type]
                 ->processCckFieldValues($migration, $field_name, $info);
diff --git a/core/modules/node/src/Plugin/migrate/D7NodeDeriver.php b/core/modules/node/src/Plugin/migrate/D7NodeDeriver.php
index 3809c0379..6efa1c746 100644
--- a/core/modules/node/src/Plugin/migrate/D7NodeDeriver.php
+++ b/core/modules/node/src/Plugin/migrate/D7NodeDeriver.php
@@ -92,6 +92,7 @@ class D7NodeDeriver extends DeriverBase implements ContainerDeriverInterface {
           '@type' => $row->getSourceProperty('name'),
         ]);
         $values['source']['node_type'] = $node_type;
+        $values['destination']['default_bundle'] = $node_type;
 
         $migration = \Drupal::service('plugin.manager.migration')->createStubMigration($values);
         if (isset($fields[$node_type])) {
@@ -99,7 +100,7 @@ class D7NodeDeriver extends DeriverBase implements ContainerDeriverInterface {
             $field_type = $info['type'];
             if ($this->cckPluginManager->hasDefinition($field_type)) {
               if (!isset($this->cckPluginCache[$field_type])) {
-                $this->cckPluginCache[$field_type] = $this->cckPluginManager->createInstance($field_type, [], $migration);
+                $this->cckPluginCache[$field_type] = $this->cckPluginManager->createInstance($field_type, ['core' => 7], $migration);
               }
               $this->cckPluginCache[$field_type]
                 ->processCckFieldValues($migration, $field_name, $info);
diff --git a/core/modules/node/src/Plugin/migrate/source/d6/Node.php b/core/modules/node/src/Plugin/migrate/source/d6/Node.php
index c70fd2761..1ed96f9a9 100644
--- a/core/modules/node/src/Plugin/migrate/source/d6/Node.php
+++ b/core/modules/node/src/Plugin/migrate/source/d6/Node.php
@@ -67,7 +67,7 @@ class Node extends DrupalSqlBase {
     $query->innerJoin('node', 'n', static::JOIN);
 
     if (isset($this->configuration['node_type'])) {
-      $query->condition('type', $this->configuration['node_type']);
+      $query->condition('n.type', $this->configuration['node_type']);
     }
 
     return $query;
diff --git a/core/modules/node/src/Plugin/migrate/source/d7/Node.php b/core/modules/node/src/Plugin/migrate/source/d7/Node.php
index a0a3a7dc7..6286d5fa4 100644
--- a/core/modules/node/src/Plugin/migrate/source/d7/Node.php
+++ b/core/modules/node/src/Plugin/migrate/source/d7/Node.php
@@ -50,7 +50,7 @@ class Node extends FieldableEntity {
     $query->innerJoin('node', 'n', static::JOIN);
 
     if (isset($this->configuration['node_type'])) {
-      $query->condition('type', $this->configuration['node_type']);
+      $query->condition('n.type', $this->configuration['node_type']);
     }
 
     return $query;
diff --git a/core/modules/node/src/Tests/PagePreviewTest.php b/core/modules/node/src/Tests/PagePreviewTest.php
index 9777ccccb..2bfd2e71f 100644
--- a/core/modules/node/src/Tests/PagePreviewTest.php
+++ b/core/modules/node/src/Tests/PagePreviewTest.php
@@ -296,6 +296,24 @@ class PagePreviewTest extends NodeTestBase {
 
     // Check that the revision log field has the correct value.
     $this->assertFieldByName('revision_log[0][value]', $edit['revision_log[0][value]'], 'Revision log field displayed.');
+
+    // Save the node after coming back from the preview page so we can create a
+    // forward revision for it.
+    $this->drupalPostForm(NULL, [], t('Save'));
+    $node = $this->drupalGetNodeByTitle($edit[$title_key]);
+
+    // Check that previewing a forward revision of a node works. This can not be
+    // accomplished through the UI so we have to use API calls.
+    // @todo Change this test to use the UI when we will be able to create
+    // forward revisions in core.
+    // @see https://www.drupal.org/node/2725533
+    $node->setNewRevision(TRUE);
+    $node->isDefaultRevision(FALSE);
+
+    /** @var \Drupal\Core\Controller\ControllerResolverInterface $controller_resolver */
+    $controller_resolver = \Drupal::service('controller_resolver');
+    $node_preview_controller = $controller_resolver->getControllerFromDefinition('\Drupal\node\Controller\NodePreviewController::view');
+    $node_preview_controller($node, 'default');
   }
 
   /**
diff --git a/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeTest.php b/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeTest.php
index 29bc9dcaf..d96deb422 100644
--- a/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeTest.php
+++ b/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeTest.php
@@ -74,12 +74,19 @@ class MigrateNodeTest extends MigrateNodeTestBase {
     $this->assertIdentical('test rev 3', $node->body->value);
     $this->assertIdentical('filtered_html', $node->body->format);
 
-    // Test that link fields are migrated.
+    // Test that a link field with an external link is migrated.
     $this->assertIdentical('http://groups.drupal.org/', $node->field_test_link->uri);
     $this->assertIdentical('Drupal Groups', $node->field_test_link->title);
     $this->assertIdentical([], $node->field_test_link->options['attributes']);
 
-    // Rerun migration with invalid link attributes and a different URL and
+    // Test that a link field with an internal link is migrated.
+    $node = Node::load(9);
+    $this->assertSame('internal:/node/10', $node->field_test_link->uri);
+    $this->assertSame('Buy it now', $node->field_test_link->title);
+    $this->assertSame(['attributes' => ['target' => '_blank']], $node->field_test_link->options);
+
+    // Rerun migration with two source database changes.
+    // 1. Add an invalid link attributes and a different URL and
     // title. If only the attributes are changed the error does not occur.
     Database::getConnection('default', 'migrate')
       ->update('content_type_story')
@@ -92,12 +99,27 @@ class MigrateNodeTest extends MigrateNodeTestBase {
       ->condition('vid', '3')
       ->execute();
 
+    // 2. Add a leading slash to an internal link.
+    Database::getConnection('default', 'migrate')
+      ->update('content_type_story')
+      ->fields([
+        'field_test_link_url' => '/node/10',
+      ])
+      ->condition('nid', '9')
+      ->condition('vid', '12')
+      ->execute();
+
     $this->rerunMigration();
     $node = Node::load(2);
     $this->assertIdentical('https://www.drupal.org/node/2127611', $node->field_test_link->uri);
     $this->assertIdentical('Migrate API in Drupal 8', $node->field_test_link->title);
     $this->assertIdentical([], $node->field_test_link->options['attributes']);
 
+    $node = Node::load(9);
+    $this->assertSame('internal:/node/10', $node->field_test_link->uri);
+    $this->assertSame('Buy it now', $node->field_test_link->title);
+    $this->assertSame(['attributes' => ['target' => '_blank']], $node->field_test_link->options);
+
     // Test that we can re-import using the EntityContentBase destination.
     $title = $this->rerunMigration();
     $node = Node::load(2);
diff --git a/core/modules/node/tests/src/Unit/Plugin/migrate/source/d6/NodeTest.php b/core/modules/node/tests/src/Unit/Plugin/migrate/source/d6/NodeTest.php
index 79f2bace4..ce55d528b 100644
--- a/core/modules/node/tests/src/Unit/Plugin/migrate/source/d6/NodeTest.php
+++ b/core/modules/node/tests/src/Unit/Plugin/migrate/source/d6/NodeTest.php
@@ -92,7 +92,10 @@ class NodeTest extends MigrateSqlSourceTestCase {
       'timestamp' => 1279308993,
       'format' => 1,
       'field_test_four' => array(
-        array('value' => '3.14159'),
+        array(
+          'value' => '3.14159',
+          'delta' => 0,
+        ),
       ),
     ),
   );
diff --git a/core/modules/responsive_image/responsive_image.post_update.php b/core/modules/responsive_image/responsive_image.post_update.php
new file mode 100644
index 000000000..d6767f729
--- /dev/null
+++ b/core/modules/responsive_image/responsive_image.post_update.php
@@ -0,0 +1,32 @@
+<?php
+
+/**
+ * @file
+ * Post update functions for Responsive Image.
+ */
+
+use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
+use Drupal\Core\Entity\Entity\EntityViewDisplay;
+
+/**
+ * @addtogroup updates-8.1.x
+ * @{
+ */
+
+/**
+ * Make responsive image formatters dependent on responsive image styles.
+ */
+function responsive_image_post_update_recreate_dependencies() {
+  $displays = EntityViewDisplay::loadMultiple();
+  array_walk($displays, function(EntityViewDisplayInterface $entity_view_display) {
+    $old_dependencies = $entity_view_display->getDependencies();
+    $new_dependencies = $entity_view_display->calculateDependencies()->getDependencies();
+    if ($old_dependencies !== $new_dependencies) {
+      $entity_view_display->save();
+    }
+  });
+}
+
+/**
+ * @} End of "addtogroup updates-8.1.x".
+ */
diff --git a/core/modules/responsive_image/src/Plugin/Field/FieldFormatter/ResponsiveImageFormatter.php b/core/modules/responsive_image/src/Plugin/Field/FieldFormatter/ResponsiveImageFormatter.php
index b91ef1860..ff91e686c 100644
--- a/core/modules/responsive_image/src/Plugin/Field/FieldFormatter/ResponsiveImageFormatter.php
+++ b/core/modules/responsive_image/src/Plugin/Field/FieldFormatter/ResponsiveImageFormatter.php
@@ -10,6 +10,7 @@ use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\Core\Url;
 use Drupal\image\Plugin\Field\FieldFormatter\ImageFormatterBase;
+use Drupal\responsive_image\Entity\ResponsiveImageStyle;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\Core\Utility\LinkGeneratorInterface;
@@ -247,4 +248,18 @@ class ResponsiveImageFormatter extends ImageFormatterBase implements ContainerFa
     return $elements;
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function calculateDependencies() {
+    $dependencies = parent::calculateDependencies();
+    $style_id = $this->getSetting('responsive_image_style');
+    /** @var \Drupal\responsive_image\ResponsiveImageStyleInterface $style */
+    if ($style_id && $style = ResponsiveImageStyle::load($style_id)) {
+      // Add the responsive image style as dependency.
+      $dependencies[$style->getConfigDependencyKey()][] = $style->getConfigDependencyName();
+    }
+    return $dependencies;
+  }
+
 }
diff --git a/core/modules/responsive_image/src/Tests/Update/ResponsiveImageUpdateTest.php b/core/modules/responsive_image/src/Tests/Update/ResponsiveImageUpdateTest.php
new file mode 100644
index 000000000..9427d471f
--- /dev/null
+++ b/core/modules/responsive_image/src/Tests/Update/ResponsiveImageUpdateTest.php
@@ -0,0 +1,77 @@
+<?php
+
+namespace Drupal\responsive_image\Tests\Update;
+
+use Drupal\Component\Serialization\Yaml;
+use Drupal\Core\Entity\Entity\EntityViewDisplay;
+use Drupal\system\Tests\Update\UpdatePathTestBase;
+
+/**
+ * Tests responsive image module updates.
+ *
+ * @group responsive_image
+ */
+class ResponsiveImageUpdateTest extends UpdatePathTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setDatabaseDumpFiles() {
+    $this->databaseDumpFiles = [
+      __DIR__ . '/../../../../system/tests/fixtures/update/drupal-8-rc1.bare.standard.php.gz',
+    ];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    /** @var \Drupal\Core\State\StateInterface $state */
+    $state = $this->container->get('state');
+
+    // Enable responsive_image module without using the module installer to
+    // avoid installation of configuration shipped in module.
+    $system_module_files = $state->get('system.module.files', []);
+    $system_module_files += ['responsive_image' => 'core/modules/responsive_image/responsive_image.info.yml'];
+    $state->set('system.module.files', $system_module_files);
+    $this->config('core.extension')->set('module.responsive_image', 0)->save();
+    $this->container->get('module_handler')->addModule('responsive_image', 'core/modules/responsive_image');
+  }
+
+  /**
+   * Tests post-update responsive_image_post_update_dependency().
+   *
+   * @see responsive_image_post_update_dependency()
+   */
+  public function testPostUpdateDependency() {
+    // Installing the 'wide' responsive image style.
+    $wide_image_style = Yaml::decode(file_get_contents(__DIR__ . '/../../../../../profiles/standard/config/optional/responsive_image.styles.wide.yml'));
+    $this->config('responsive_image.styles.wide')->setData($wide_image_style)->save(TRUE);
+
+    // Change 'field_image' formatter to a responsive image formatter.
+    $options = [
+      'type' => 'responsive_image',
+      'label' => 'hidden',
+      'settings' => ['responsive_image_style' => 'wide', 'image_link' => ''],
+      'third_party_settings' => [],
+    ];
+    $display = $this->config('core.entity_view_display.node.article.default');
+    $display->set('content.field_image', $options)->save(TRUE);
+
+    // Check that there's no dependency to 'responsive_image.styles.wide'.
+    $dependencies = $display->get('dependencies.config') ?: [];
+    $this->assertFalse(in_array('responsive_image.styles.wide', $dependencies));
+
+    // Run updates.
+    $this->runUpdates();
+
+    /** @var \Drupal\Core\Entity\Display\EntityViewDisplayInterface $view_display */
+    $view_display = EntityViewDisplay::load('node.article.default');
+    $dependencies = $view_display->getDependencies() + ['config' => []];
+    // Check that post-update added a 'responsive_image.styles.wide' dependency.
+    $this->assertTrue(in_array('responsive_image.styles.wide', $dependencies['config']));
+  }
+
+}
diff --git a/core/modules/responsive_image/tests/src/Kernel/ResponsiveImageIntegrationTest.php b/core/modules/responsive_image/tests/src/Kernel/ResponsiveImageIntegrationTest.php
new file mode 100644
index 000000000..d48129122
--- /dev/null
+++ b/core/modules/responsive_image/tests/src/Kernel/ResponsiveImageIntegrationTest.php
@@ -0,0 +1,72 @@
+<?php
+
+namespace Drupal\Tests\responsive_image\Kernel;
+
+use Drupal\Core\Entity\Entity\EntityViewDisplay;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\KernelTests\KernelTestBase;
+use Drupal\responsive_image\Entity\ResponsiveImageStyle;
+
+/**
+ * Tests the integration of responsive image with other components.
+ *
+ * @group responsive_image
+ */
+class ResponsiveImageIntegrationTest extends KernelTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['responsive_image', 'field', 'image', 'file', 'entity_test', 'breakpoint', 'responsive_image_test_module'];
+
+  /**
+   * Tests integration with entity view display.
+   */
+  public function testEntityViewDisplayDependency() {
+    // Create a responsive image style.
+    ResponsiveImageStyle::create([
+      'id' => 'foo',
+      'label' => 'Foo',
+      'breakpoint_group' => 'responsive_image_test_module',
+    ])->save();
+    // Create an image field to be used with a responsive image formatter.
+    FieldStorageConfig::create([
+      'type' => 'image',
+      'entity_type' => 'entity_test',
+      'field_name' => 'bar',
+    ])->save();
+    FieldConfig::create([
+      'entity_type' => 'entity_test',
+      'bundle' => 'entity_test',
+      'field_name' => 'bar',
+    ])->save();
+    /** @var \Drupal\Core\Entity\Display\EntityViewDisplayInterface $display */
+    $display = EntityViewDisplay::create([
+      'targetEntityType' => 'entity_test',
+      'bundle' => 'entity_test',
+      'mode' => 'default',
+    ]);
+    $display->setComponent('bar', [
+      'type' => 'responsive_image',
+      'label' => 'hidden',
+      'settings' => ['responsive_image_style' => 'foo', 'image_link' => ''],
+      'third_party_settings' => [],
+    ])->save();
+
+    // Check that the 'foo' field is on the display.
+    $this->assertNotNull($display = EntityViewDisplay::load('entity_test.entity_test.default'));
+    $this->assertTrue($display->getComponent('bar'));
+    $this->assertArrayNotHasKey('bar', $display->get('hidden'));
+
+    // Delete the responsive image style.
+    ResponsiveImageStyle::load('foo')->delete();
+
+    // Check that the view display was not deleted.
+    $this->assertNotNull($display = EntityViewDisplay::load('entity_test.entity_test.default'));
+    // Check that the 'foo' field was disabled.
+    $this->assertNull($display->getComponent('bar'));
+    $this->assertArrayHasKey('bar', $display->get('hidden'));
+  }
+
+}
diff --git a/core/modules/rest/src/Tests/Views/StyleSerializerTest.php b/core/modules/rest/src/Tests/Views/StyleSerializerTest.php
index a8843428e..399f99f3b 100644
--- a/core/modules/rest/src/Tests/Views/StyleSerializerTest.php
+++ b/core/modules/rest/src/Tests/Views/StyleSerializerTest.php
@@ -182,6 +182,22 @@ class StyleSerializerTest extends PluginTestBase {
     $this->assertIdentical($actual_xml, $expected, 'The expected XML output was found.');
   }
 
+  /**
+   * Verifies site maintenance mode functionality.
+   */
+  protected function testSiteMaintenance() {
+    $view = Views::getView('test_serializer_display_field');
+    $view->initDisplay();
+    $this->executeView($view);
+
+    // Set the site to maintenance mode.
+    $this->container->get('state')->set('system.maintenance_mode', TRUE);
+
+    $this->drupalGetWithFormat('test/serialize/entity', 'json');
+    // Verify that the endpoint is unavailable for anonymous users.
+    $this->assertResponse(503);
+  }
+
   /**
    * Sets up a request on the request stack with a specified format.
    *
diff --git a/core/modules/search/src/SearchPageInterface.php b/core/modules/search/src/SearchPageInterface.php
index b3ed0b157..67d57c31b 100644
--- a/core/modules/search/src/SearchPageInterface.php
+++ b/core/modules/search/src/SearchPageInterface.php
@@ -45,7 +45,7 @@ interface SearchPageInterface extends ConfigEntityInterface {
    * Returns the path for the search.
    *
    * @return string
-   *  The part of the path for this search page that comes after 'search'.
+   *   The part of the path for this search page that comes after 'search'.
    */
   public function getPath();
 
diff --git a/core/modules/shortcut/src/Plugin/migrate/source/d7/Shortcut.php b/core/modules/shortcut/src/Plugin/migrate/source/d7/Shortcut.php
index 033faa068..c964e5c46 100644
--- a/core/modules/shortcut/src/Plugin/migrate/source/d7/Shortcut.php
+++ b/core/modules/shortcut/src/Plugin/migrate/source/d7/Shortcut.php
@@ -22,7 +22,7 @@ class Shortcut extends DrupalSqlBase {
       ->fields('ml', array('mlid', 'menu_name', 'link_path', 'link_title', 'weight'))
       ->condition('hidden', '0')
       ->condition('menu_name', 'shortcut-set-%', 'LIKE')
-      ->orderBy('mlid');
+      ->orderBy('ml.mlid');
   }
 
   /**
diff --git a/core/modules/simpletest/simpletest.module b/core/modules/simpletest/simpletest.module
index d8b653e87..751a729e5 100644
--- a/core/modules/simpletest/simpletest.module
+++ b/core/modules/simpletest/simpletest.module
@@ -122,23 +122,23 @@ function _simpletest_format_summary_line($summary) {
  *   The test ID.
  */
 function simpletest_run_tests($test_list) {
+  // We used to separate PHPUnit and Simpletest tests for a performance
+  // optimization. In order to support backwards compatibility check if these
+  // keys are set and create a single test list.
+  // @todo https://www.drupal.org/node/2748967 Remove BC support in Drupal 9.
+  if (isset($test_list['simpletest'])) {
+    $test_list = array_merge($test_list, $test_list['simpletest']);
+    unset($test_list['simpletest']);
+  }
+  if (isset($test_list['phpunit'])) {
+    $test_list = array_merge($test_list, $test_list['phpunit']);
+    unset($test_list['phpunit']);
+  }
+
   $test_id = db_insert('simpletest_test_id')
     ->useDefaults(array('test_id'))
     ->execute();
 
-  if (!empty($test_list['phpunit'])) {
-    $phpunit_results = simpletest_run_phpunit_tests($test_id, $test_list['phpunit']);
-    simpletest_process_phpunit_results($phpunit_results);
-  }
-
-  // Early return if there are no further tests to run.
-  if (empty($test_list['simpletest'])) {
-    return $test_id;
-  }
-
-  // Continue with SimpleTests only.
-  $test_list = $test_list['simpletest'];
-
   // Clear out the previous verbose files.
   file_unmanaged_delete_recursive('public://simpletest/verbose');
 
@@ -190,7 +190,7 @@ function simpletest_run_phpunit_tests($test_id, array $unescaped_test_classnames
     // Something broke during the execution of phpunit.
     // Return an error record of all failed classes.
     $rows[] = [
-      'test_id' => '1',
+      'test_id' => $test_id,
       'test_class' => implode(",", $unescaped_test_classnames),
       'status' => 'fail',
       'message' => 'PHPunit Test failed to complete',
@@ -223,6 +223,48 @@ function simpletest_process_phpunit_results($phpunit_results) {
   }
 }
 
+/**
+ * Maps phpunit results to a data structure for batch messages and run-tests.sh.
+ *
+ * @param array $results
+ *   The output from simpletest_run_phpunit_tests().
+ *
+ * @return array
+ *   The test result summary. A row per test class.
+ */
+function simpletest_summarize_phpunit_result($results) {
+  $summaries = [];
+  foreach ($results as $result) {
+    if (!isset($summaries[$result['test_class']])) {
+      $summaries[$result['test_class']] = array(
+        '#pass' => 0,
+        '#fail' => 0,
+        '#exception' => 0,
+        '#debug' => 0,
+      );
+    }
+
+    switch ($result['status']) {
+      case 'pass':
+        $summaries[$result['test_class']]['#pass']++;
+        break;
+
+      case 'fail':
+        $summaries[$result['test_class']]['#fail']++;
+        break;
+
+      case 'exception':
+        $summaries[$result['test_class']]['#exception']++;
+        break;
+
+      case 'debug':
+        $summaries[$result['test_class']]['#debug']++;
+        break;
+    }
+  }
+  return $summaries;
+}
+
 /**
  * Returns the path to use for PHPUnit's --log-junit option.
  *
@@ -259,12 +301,21 @@ function simpletest_phpunit_configuration_filepath() {
  *   this variable.
  *
  * @return string
- *  The results as returned by exec().
+ *   The results as returned by exec().
  */
 function simpletest_phpunit_run_command(array $unescaped_test_classnames, $phpunit_file, &$status = NULL) {
+  global $base_url;
   // Setup an environment variable containing the database connection so that
   // functional tests can connect to the database.
   putenv('SIMPLETEST_DB=' . Database::getConnectionInfoAsUrl());
+
+  // Setup an environment variable containing the base URL, if it is available.
+  // This allows functional tests to browse the site under test. When running
+  // tests via CLI, core/phpunit.xml.dist or core/scripts/run-tests.sh can set
+  // this variable.
+  if ($base_url) {
+    putenv('SIMPLETEST_BASE_URL=' . $base_url);
+  }
   $phpunit_bin = simpletest_phpunit_command();
 
   $command = array(
@@ -302,6 +353,9 @@ function simpletest_phpunit_run_command(array $unescaped_test_classnames, $phpun
 
   chdir($old_cwd);
   putenv('SIMPLETEST_DB=');
+  if ($base_url) {
+    putenv('SIMPLETEST_BASE_URL=');
+  }
   return $ret;
 }
 
@@ -352,15 +406,21 @@ function _simpletest_batch_operation($test_list_init, $test_id, &$context) {
 
   // Perform the next test.
   $test_class = array_shift($test_list);
-  $test = new $test_class($test_id);
-  $test->run();
+  if (is_subclass_of($test_class, \PHPUnit_Framework_TestCase::class)) {
+    $phpunit_results = simpletest_run_phpunit_tests($test_id, [$test_class]);
+    simpletest_process_phpunit_results($phpunit_results);
+    $test_results[$test_class] = simpletest_summarize_phpunit_result($phpunit_results)[$test_class];
+  }
+  else {
+    $test = new $test_class($test_id);
+    $test->run();
+    \Drupal::moduleHandler()->invokeAll('test_finished', array($test->results));
+    $test_results[$test_class] = $test->results;
+  }
   $size = count($test_list);
   $info = TestDiscovery::getTestInfo($test_class);
 
-  \Drupal::moduleHandler()->invokeAll('test_finished', array($test->results));
-
   // Gather results and compose the report.
-  $test_results[$test_class] = $test->results;
   foreach ($test_results[$test_class] as $key => $value) {
     $test_results[$key] += $value;
   }
diff --git a/core/modules/simpletest/src/AssertContentTrait.php b/core/modules/simpletest/src/AssertContentTrait.php
index e8da02ce8..e428e71f2 100644
--- a/core/modules/simpletest/src/AssertContentTrait.php
+++ b/core/modules/simpletest/src/AssertContentTrait.php
@@ -1241,6 +1241,24 @@ trait AssertContentTrait {
     return $this->assertTrue(isset($options[0]), $message ? $message : SafeMarkup::format('Option @option for field @id exists.', array('@option' => $option, '@id' => $id)), $group);
   }
 
+  /**
+   * Asserts that a select option with the visible text exists.
+   *
+   * @param string $id
+   *   The ID of the select field to assert.
+   * @param string $text
+   *   The text for the option tag to assert.
+   * @param string $message
+   *   (optional) A message to display with the assertion.
+   *
+   * @return bool
+   *   TRUE on pass, FALSE on fail.
+   */
+  protected function assertOptionByText($id, $text, $message = '') {
+    $options = $this->xpath('//select[@id=:id]//option[normalize-space(text())=:text]', [':id' => $id, ':text' => $text]);
+    return $this->assertTrue(isset($options[0]), $message ?: 'Option with text label ' . $text . ' for select field ' . $id . ' exits.');
+  }
+
   /**
    * Asserts that a select option in the current page exists.
    *
diff --git a/core/modules/simpletest/src/BrowserTestBase.php b/core/modules/simpletest/src/BrowserTestBase.php
index f17a04301..d4b73ef25 100644
--- a/core/modules/simpletest/src/BrowserTestBase.php
+++ b/core/modules/simpletest/src/BrowserTestBase.php
@@ -9,7 +9,7 @@ use Drupal\Tests\BrowserTestBase as BaseBrowserTestBase;
  *
  * Tests extending BrowserTestBase must exist in the
  * Drupal\Tests\yourmodule\Functional namespace and live in the
- * modules/yourmodule/Tests/Functional directory.
+ * modules/yourmodule/tests/src/Functional directory.
  *
  * @ingroup testing
  *
diff --git a/core/modules/simpletest/src/Form/SimpletestResultsForm.php b/core/modules/simpletest/src/Form/SimpletestResultsForm.php
index d2a84d6ca..c22c0a7d0 100644
--- a/core/modules/simpletest/src/Form/SimpletestResultsForm.php
+++ b/core/modules/simpletest/src/Form/SimpletestResultsForm.php
@@ -214,7 +214,7 @@ class SimpletestResultsForm extends FormBase {
    *   The test_id to retrieve results of.
    *
    * @return array
-   *  Array of results grouped by test_class.
+   *   Array of results grouped by test_class.
    */
   protected function getResults($test_id) {
     return $this->database->select('simpletest')
diff --git a/core/modules/simpletest/src/Form/SimpletestTestForm.php b/core/modules/simpletest/src/Form/SimpletestTestForm.php
index 1c58efe21..8ad5fe2ab 100644
--- a/core/modules/simpletest/src/Form/SimpletestTestForm.php
+++ b/core/modules/simpletest/src/Form/SimpletestTestForm.php
@@ -199,7 +199,6 @@ class SimpletestTestForm extends FormBase {
    * {@inheritdoc}
    */
   public function submitForm(array &$form, FormStateInterface $form_state) {
-    global $base_url;
     // Test discovery does not run upon form submission.
     simpletest_classloader_register();
 
@@ -217,20 +216,8 @@ class SimpletestTestForm extends FormBase {
       $form_state->setValue('tests', $user_input['tests']);
     }
 
-    $tests_list = array();
-    foreach ($form_state->getValue('tests') as $class_name => $value) {
-      if ($value === $class_name) {
-        if (is_subclass_of($class_name, 'PHPUnit_Framework_TestCase')) {
-          $test_type = 'phpunit';
-        }
-        else {
-          $test_type = 'simpletest';
-        }
-        $tests_list[$test_type][] = $class_name;
-      }
-    }
+    $tests_list = array_filter($form_state->getValue('tests'));
     if (!empty($tests_list)) {
-      putenv('SIMPLETEST_BASE_URL=' . $base_url);
       $test_id = simpletest_run_tests($tests_list, 'drupal');
       $form_state->setRedirect(
         'simpletest.result_form',
diff --git a/core/modules/simpletest/src/TestBase.php b/core/modules/simpletest/src/TestBase.php
index 6bb84fda7..6fa40a3ba 100644
--- a/core/modules/simpletest/src/TestBase.php
+++ b/core/modules/simpletest/src/TestBase.php
@@ -20,8 +20,7 @@ use Drupal\Tests\SessionTestTrait;
 /**
  * Base class for Drupal tests.
  *
- * Do not extend this class directly; use either
- * \Drupal\simpletest\WebTestBase or \Drupal\simpletest\KernelTestBase.
+ * Do not extend this class directly; use \Drupal\simpletest\WebTestBase.
  */
 abstract class TestBase {
 
diff --git a/core/modules/simpletest/src/Tests/MissingDependentModuleUnitTest.php b/core/modules/simpletest/src/Tests/MissingDependentModuleUnitTest.php
index e93d85e97..9c707b869 100644
--- a/core/modules/simpletest/src/Tests/MissingDependentModuleUnitTest.php
+++ b/core/modules/simpletest/src/Tests/MissingDependentModuleUnitTest.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\simpletest\Tests;
 
-use Drupal\simpletest\KernelTestBase;
+use Drupal\simpletest\WebTestBase;
 
 /**
  * This test should not load since it requires a module that is not found.
@@ -10,7 +10,7 @@ use Drupal\simpletest\KernelTestBase;
  * @group simpletest
  * @dependencies simpletest_missing_module
  */
-class MissingDependentModuleUnitTest extends KernelTestBase {
+class MissingDependentModuleUnitTest extends WebTestBase {
 
   /**
    * Ensure that this test will not be loaded despite its dependency.
diff --git a/core/modules/simpletest/src/Tests/SimpleTestBrowserTest.php b/core/modules/simpletest/src/Tests/SimpleTestBrowserTest.php
index 89ed6d2f6..5d1854b6c 100644
--- a/core/modules/simpletest/src/Tests/SimpleTestBrowserTest.php
+++ b/core/modules/simpletest/src/Tests/SimpleTestBrowserTest.php
@@ -127,7 +127,7 @@ class SimpleTestBrowserTest extends WebTestBase {
 
     $tests = array(
       // A KernelTestBase test.
-      'Drupal\system\Tests\DrupalKernel\DrupalKernelTest',
+      'Drupal\KernelTests\KernelTestBaseTest',
       // A PHPUnit unit test.
       'Drupal\Tests\action\Unit\Menu\ActionLocalTasksTest',
       // A PHPUnit functional test.
diff --git a/core/modules/simpletest/src/WebTestBase.php b/core/modules/simpletest/src/WebTestBase.php
index cb454a1bd..04d1927f2 100644
--- a/core/modules/simpletest/src/WebTestBase.php
+++ b/core/modules/simpletest/src/WebTestBase.php
@@ -2680,7 +2680,7 @@ abstract class WebTestBase extends TestBase {
    *   Options to be passed to Url::fromUri().
    *
    * @return string
-   *   An absolute URL stsring.
+   *   An absolute URL string.
    */
   protected function buildUrl($path, array $options = array()) {
     if ($path instanceof Url) {
diff --git a/core/modules/simpletest/tests/src/Functional/BrowserTestBaseTest.php b/core/modules/simpletest/tests/src/Functional/BrowserTestBaseTest.php
index d321a4b5b..796360f9b 100644
--- a/core/modules/simpletest/tests/src/Functional/BrowserTestBaseTest.php
+++ b/core/modules/simpletest/tests/src/Functional/BrowserTestBaseTest.php
@@ -33,6 +33,9 @@ class BrowserTestBaseTest extends BrowserTestBase {
     // Test page contains some text.
     $this->assertSession()->pageTextContains('Test page text.');
 
+    // Response includes cache tags that we can assert.
+    $this->assertSession()->responseHeaderEquals('X-Drupal-Cache-Tags', 'rendered');
+
     // Test drupalGet with a url object.
     $url = Url::fromRoute('test_page_test.render_title');
     $this->drupalGet($url);
diff --git a/core/modules/simpletest/tests/src/Unit/TestBaseTest.php b/core/modules/simpletest/tests/src/Unit/TestBaseTest.php
index 877d6e558..3baa1d752 100644
--- a/core/modules/simpletest/tests/src/Unit/TestBaseTest.php
+++ b/core/modules/simpletest/tests/src/Unit/TestBaseTest.php
@@ -5,6 +5,7 @@ namespace Drupal\Tests\simpletest\Unit;
 use Drupal\Tests\UnitTestCase;
 
 /**
+ * @requires extension curl
  * @coversDefaultClass \Drupal\simpletest\TestBase
  * @group simpletest
  */
diff --git a/core/modules/simpletest/tests/src/Unit/WebTestBaseTest.php b/core/modules/simpletest/tests/src/Unit/WebTestBaseTest.php
index 619ee747a..1c087a6fd 100644
--- a/core/modules/simpletest/tests/src/Unit/WebTestBaseTest.php
+++ b/core/modules/simpletest/tests/src/Unit/WebTestBaseTest.php
@@ -5,6 +5,7 @@ namespace Drupal\Tests\simpletest\Unit;
 use Drupal\Tests\UnitTestCase;
 
 /**
+ * @requires extension curl
  * @coversDefaultClass \Drupal\simpletest\WebTestBase
  * @group simpletest
  */
diff --git a/core/modules/system/src/Controller/AdminController.php b/core/modules/system/src/Controller/AdminController.php
index d3186d080..57c13f653 100644
--- a/core/modules/system/src/Controller/AdminController.php
+++ b/core/modules/system/src/Controller/AdminController.php
@@ -13,7 +13,7 @@ class AdminController extends ControllerBase {
    * Prints a listing of admin tasks, organized by module.
    *
    * @return array
-   *  A render array containing the listing.
+   *   A render array containing the listing.
    */
   public function index() {
     $module_info = system_get_info('module');
diff --git a/core/modules/system/src/Plugin/views/field/BulkForm.php b/core/modules/system/src/Plugin/views/field/BulkForm.php
index 5160a7a06..d5842bc2c 100644
--- a/core/modules/system/src/Plugin/views/field/BulkForm.php
+++ b/core/modules/system/src/Plugin/views/field/BulkForm.php
@@ -394,7 +394,7 @@ class BulkForm extends FieldPluginBase implements CacheableDependencyInterface {
    * Returns the message to be displayed when there are no selected items.
    *
    * @return string
-   *  Message displayed when no items are selected.
+   *   Message displayed when no items are selected.
    */
   protected function emptySelectedMessage() {
     return $this->t('No items selected.');
diff --git a/core/modules/system/src/Tests/Cache/ApcuBackendUnitTest.php b/core/modules/system/src/Tests/Cache/ApcuBackendUnitTest.php
index 33050570d..a4ae08fdc 100644
--- a/core/modules/system/src/Tests/Cache/ApcuBackendUnitTest.php
+++ b/core/modules/system/src/Tests/Cache/ApcuBackendUnitTest.php
@@ -9,7 +9,7 @@ use Drupal\Core\Cache\ApcuBackend;
  * Tests the APCu cache backend.
  *
  * @group Cache
- * @requires extension apc
+ * @requires extension apcu
  */
 class ApcuBackendUnitTest extends GenericCacheBackendUnitTestBase {
 
diff --git a/core/modules/system/src/Tests/Entity/EntityCacheTagsTestBase.php b/core/modules/system/src/Tests/Entity/EntityCacheTagsTestBase.php
index e02917de7..f8a014435 100644
--- a/core/modules/system/src/Tests/Entity/EntityCacheTagsTestBase.php
+++ b/core/modules/system/src/Tests/Entity/EntityCacheTagsTestBase.php
@@ -229,7 +229,7 @@ abstract class EntityCacheTagsTestBase extends PageCacheTagsTestBase {
    *   The entity that the referencing entity should reference.
    *
    * @return \Drupal\Core\Entity\EntityInterface[]
-   *  An array containing a referencing entity and a non-referencing entity.
+   *   An array containing a referencing entity and a non-referencing entity.
    */
   protected function createReferenceTestEntities($referenced_entity) {
     // All referencing entities should be of the type 'entity_test'.
diff --git a/core/modules/system/src/Tests/System/SiteMaintenanceTest.php b/core/modules/system/src/Tests/System/SiteMaintenanceTest.php
index 6a86083b3..49aff66e4 100644
--- a/core/modules/system/src/Tests/System/SiteMaintenanceTest.php
+++ b/core/modules/system/src/Tests/System/SiteMaintenanceTest.php
@@ -36,7 +36,7 @@ class SiteMaintenanceTest extends WebTestBase {
   }
 
   /**
-   * Verify site maintenance mode functionality.
+   * Verifies site maintenance mode functionality.
    */
   protected function testSiteMaintenance() {
     $this->drupalGet(Url::fromRoute('user.page'));
@@ -131,4 +131,20 @@ class SiteMaintenanceTest extends WebTestBase {
     $this->assertEqual('Site under maintenance', $this->cssSelect('main h1')[0]);
   }
 
+  /**
+   * Tests responses to non-HTML requests when in maintenance mode.
+   */
+  public function testNonHtmlRequest() {
+    $this->drupalLogout();
+    \Drupal::state()->set('system.maintenance_mode', TRUE);
+    $formats = ['json', 'xml', 'non-existing'];
+    foreach ($formats as $format) {
+      $this->pass('Testing format ' . $format);
+      $this->drupalGet('<front>', ['query' => ['_format' => $format]]);
+      $this->assertResponse(503);
+      $this->assertRaw('Drupal is currently under maintenance. We should be back shortly. Thank you for your patience.');
+      $this->assertHeader('Content-Type', 'text/plain; charset=UTF-8');
+    }
+  }
+
 }
diff --git a/core/modules/system/src/Tests/Theme/StableLibraryOverrideTest.php b/core/modules/system/src/Tests/Theme/StableLibraryOverrideTest.php
index d7a6541a7..82aabeb89 100644
--- a/core/modules/system/src/Tests/Theme/StableLibraryOverrideTest.php
+++ b/core/modules/system/src/Tests/Theme/StableLibraryOverrideTest.php
@@ -61,9 +61,9 @@ class StableLibraryOverrideTest extends KernelTestBase {
     // Enable all core modules.
     $all_modules = system_rebuild_module_data();
     $all_modules = array_filter($all_modules, function ($module) {
-      // Filter contrib, hidden, already enabled modules and modules in the
-      // Testing package.
-      if ($module->origin !== 'core' || !empty($module->info['hidden']) || $module->status == TRUE || $module->info['package'] == 'Testing') {
+      // Filter contrib, hidden, experimental, already enabled modules, and
+      // modules in the Testing package.
+      if ($module->origin !== 'core' || !empty($module->info['hidden']) || $module->status == TRUE || $module->info['package'] == 'Testing' || $module->info['package'] == 'Core (Experimental)') {
         return FALSE;
       }
       return TRUE;
diff --git a/core/modules/system/system.install b/core/modules/system/system.install
index cdaeba680..5bc7d2ab9 100644
--- a/core/modules/system/system.install
+++ b/core/modules/system/system.install
@@ -671,7 +671,7 @@ function system_requirements($phase) {
         ];
       }
 
-      $entity_update_issues = \Drupal::service('renderer')->render($build);
+      $entity_update_issues = \Drupal::service('renderer')->renderPlain($build);
       $requirements['entity_update']['severity'] = REQUIREMENT_ERROR;
       $requirements['entity_update']['value'] = t('Mismatched entity and/or field definitions');
       $requirements['entity_update']['description'] = t('The following changes were detected in the entity type and field definitions. @updates', ['@updates' => $entity_update_issues]);
diff --git a/core/modules/system/templates/html.html.twig b/core/modules/system/templates/html.html.twig
index 39702c20d..f7516fde2 100644
--- a/core/modules/system/templates/html.html.twig
+++ b/core/modules/system/templates/html.html.twig
@@ -34,6 +34,10 @@
     <js-placeholder token="{{ placeholder_token|raw }}">
   </head>
   <body{{ attributes }}>
+    {#
+      Keyboard navigation/accessibility link to main content section in
+      page.html.twig.
+    #}
     <a href="#main-content" class="visually-hidden focusable">
       {{ 'Skip to main content'|t }}
     </a>
diff --git a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMultiValueBasefield.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMultiValueBasefield.php
new file mode 100644
index 000000000..b5bf2c252
--- /dev/null
+++ b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMultiValueBasefield.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace Drupal\entity_test\Entity;
+
+use Drupal\Core\Entity\EntityTypeInterface;
+
+/**
+ * Defines an entity type with a multivalue base field.
+ *
+ * @ContentEntityType(
+ *   id = "entity_test_multivalue_basefield",
+ *   label = @Translation("Entity Test with a multivalue base field"),
+ *   base_table = "entity_test_multivalue_basefield",
+ *   data_table = "entity_test_multivalue_basefield_field_data",
+ *   handlers = {
+ *     "views_data" = "Drupal\views\EntityViewsData",
+ *   },
+ *   entity_keys = {
+ *     "id" = "id",
+ *     "uuid" = "uuid",
+ *     "bundle" = "type",
+ *     "label" = "name",
+ *     "langcode" = "langcode",
+ *   }
+ * )
+ */
+class EntityTestMultiValueBasefield extends EntityTest {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
+    $fields = parent::baseFieldDefinitions($entity_type);
+    $fields['name']->setCardinality(2);
+
+    return $fields;
+  }
+
+}
diff --git a/core/modules/taxonomy/migration_templates/d6_taxonomy_term.yml b/core/modules/taxonomy/migration_templates/d6_taxonomy_term.yml
index 0c41c6d27..44f9f7fb6 100644
--- a/core/modules/taxonomy/migration_templates/d6_taxonomy_term.yml
+++ b/core/modules/taxonomy/migration_templates/d6_taxonomy_term.yml
@@ -13,10 +13,19 @@ process:
   name: name
   description: description
   weight: weight
+  # Only attempt to stub real (non-zero) parents.
+  parent_id:
+    -
+      plugin: skip_on_empty
+      method: process
+      source: parent
+    -
+      plugin: migration
+      migration: d6_taxonomy_term
   parent:
-    plugin: migration
-    migration: d6_taxonomy_term
-    source: parent
+    plugin: default_value
+    default_value: 0
+    source: '@parent_id'
   changed: timestamp
 destination:
   plugin: entity:taxonomy_term
diff --git a/core/modules/taxonomy/migration_templates/d7_taxonomy_term.yml b/core/modules/taxonomy/migration_templates/d7_taxonomy_term.yml
index 7546660c0..8d4adbbed 100644
--- a/core/modules/taxonomy/migration_templates/d7_taxonomy_term.yml
+++ b/core/modules/taxonomy/migration_templates/d7_taxonomy_term.yml
@@ -11,12 +11,22 @@ process:
     migration: d7_taxonomy_vocabulary
     source: vid
   name: name
-  description: description
+  'description/value': description
+  'description/format': format
   weight: weight
+  # Only attempt to stub real (non-zero) parents.
+  parent_id:
+    -
+      plugin: skip_on_empty
+      method: process
+      source: parent
+    -
+      plugin: migration
+      migration: d7_taxonomy_term
   parent:
-    plugin: migration
-    migration: d7_taxonomy_term
-    source: parent
+    plugin: default_value
+    default_value: 0
+    source: '@parent_id'
   changed: timestamp
 destination:
   plugin: entity:taxonomy_term
diff --git a/core/modules/taxonomy/src/Plugin/migrate/cckfield/TaxonomyTermReference.php b/core/modules/taxonomy/src/Plugin/migrate/cckfield/TaxonomyTermReference.php
index 6971b5404..c3035c431 100644
--- a/core/modules/taxonomy/src/Plugin/migrate/cckfield/TaxonomyTermReference.php
+++ b/core/modules/taxonomy/src/Plugin/migrate/cckfield/TaxonomyTermReference.php
@@ -7,7 +7,11 @@ use Drupal\migrate_drupal\Plugin\migrate\cckfield\CckFieldPluginBase;
 
 /**
  * @MigrateCckField(
- *   id = "taxonomy_term_reference"
+ *   id = "taxonomy_term_reference",
+ *   type_map = {
+ *     "taxonomy_term_reference" = "entity_reference"
+ *   },
+ *   core = {6,7}
  * )
  */
 class TaxonomyTermReference extends CckFieldPluginBase {
diff --git a/core/modules/taxonomy/src/Plugin/migrate/source/Term.php b/core/modules/taxonomy/src/Plugin/migrate/source/Term.php
index f1364af1a..0b2a5c319 100644
--- a/core/modules/taxonomy/src/Plugin/migrate/source/Term.php
+++ b/core/modules/taxonomy/src/Plugin/migrate/source/Term.php
@@ -47,10 +47,10 @@ class Term extends DrupalSqlBase {
     $query = $this->select($this->termDataTable, 'td')
       ->fields('td')
       ->distinct()
-      ->orderBy('tid');
+      ->orderBy('td.tid');
 
     if (isset($this->configuration['vocabulary'])) {
-      $query->condition('vid', $this->configuration['vocabulary'], 'IN');
+      $query->condition('td.vid', $this->configuration['vocabulary'], 'IN');
     }
 
     return $query;
diff --git a/core/modules/taxonomy/taxonomy.module b/core/modules/taxonomy/taxonomy.module
index 30a9ca224..32df678b0 100644
--- a/core/modules/taxonomy/taxonomy.module
+++ b/core/modules/taxonomy/taxonomy.module
@@ -377,7 +377,7 @@ function taxonomy_term_load_multiple(array $tids = NULL) {
  *   (optional) An array of entity IDs. If omitted, all entities are loaded.
  *
  * @return array
- *  An array of vocabulary objects, indexed by vid.
+ *   An array of vocabulary objects, indexed by vid.
  */
 function taxonomy_vocabulary_load_multiple(array $vids = NULL) {
   return Vocabulary::loadMultiple($vids);
@@ -532,7 +532,11 @@ function taxonomy_build_node_index($node) {
  * Implements hook_ENTITY_TYPE_update() for node entities.
  */
 function taxonomy_node_update(EntityInterface $node) {
-  // Always rebuild the node's taxonomy index entries on node save.
+  // If we're not dealing with the default revision of the node, do not make any
+  // change to the taxonomy index.
+  if (!$node->isDefaultRevision()) {
+    return;
+  }
   taxonomy_delete_node_index($node);
   taxonomy_build_node_index($node);
 }
diff --git a/core/modules/taxonomy/tests/src/Kernel/ForwardRevisionTest.php b/core/modules/taxonomy/tests/src/Kernel/ForwardRevisionTest.php
new file mode 100644
index 000000000..6f751b12a
--- /dev/null
+++ b/core/modules/taxonomy/tests/src/Kernel/ForwardRevisionTest.php
@@ -0,0 +1,121 @@
+<?php
+
+namespace Drupal\Tests\taxonomy\Kernel;
+
+use Drupal\field\Entity\FieldConfig;
+use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\KernelTests\KernelTestBase;
+use Drupal\node\Entity\Node;
+use Drupal\node\Entity\NodeType;
+use Drupal\taxonomy\Entity\Term;
+use Drupal\taxonomy\Entity\Vocabulary;
+
+/**
+ * Kernel tests for taxonomy forward revisions.
+ *
+ * @group taxonomy
+ */
+class ForwardRevisionTest extends KernelTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['taxonomy', 'node', 'user', 'text', 'field', 'system'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->installEntitySchema('user');
+    $this->installEntitySchema('node');
+    $this->installEntitySchema('taxonomy_term');
+    $this->installSchema('node', 'node_access');
+  }
+
+  /**
+   * Tests that the taxonomy index work correctly with forward revisions.
+   */
+  public function testTaxonomyIndexWithForwardRevision() {
+    \Drupal::configFactory()->getEditable('taxonomy.settings')->set('maintain_index_table', TRUE)->save();
+
+    Vocabulary::create([
+      'name' => 'test',
+      'vid' => 'test',
+    ])->save();
+    $term = Term::create([
+      'name' => 'term1',
+      'vid' => 'test',
+    ]);
+    $term->save();
+    $term2 = Term::create([
+      'name' => 'term2',
+      'vid' => 'test',
+    ]);
+    $term2->save();
+
+    NodeType::create([
+      'type' => 'page',
+    ])->save();
+
+    FieldStorageConfig::create([
+      'entity_type' => 'node',
+      'field_name' => 'field_tags',
+      'type' => 'entity_reference',
+      'settings' => [
+        'target_type' => 'taxonomy_term',
+      ],
+    ])->save();
+
+    FieldConfig::create([
+      'field_name' => 'field_tags',
+      'entity_type' => 'node',
+      'bundle' => 'page',
+    ])->save();
+    $node = Node::create([
+      'type' => 'page',
+      'title' => 'test_title',
+      'field_tags' => [$term->id()],
+    ]);
+    $node->save();
+
+    $taxonomy_index = $this->getTaxonomyIndex();
+    $this->assertEquals($term->id(), $taxonomy_index[$node->id()]->tid);
+
+    // Normal new revision.
+    $node->setNewRevision(TRUE);
+    $node->isDefaultRevision(TRUE);
+    $node->field_tags->target_id = $term2->id();
+    $node->save();
+
+    $taxonomy_index = $this->getTaxonomyIndex();
+    $this->assertEquals($term2->id(), $taxonomy_index[$node->id()]->tid);
+
+    // Check that saving a forward (non-default) revision does not affect the
+    // taxonomy index.
+    $node->setNewRevision(TRUE);
+    $node->isDefaultRevision(FALSE);
+    $node->field_tags->target_id = $term->id();
+    $node->save();
+
+    $taxonomy_index = $this->getTaxonomyIndex();
+    $this->assertEquals($term2->id(), $taxonomy_index[$node->id()]->tid);
+
+    // Check that making the previously created forward-revision the default
+    // revision updates the taxonomy index correctly.
+    $node->isDefaultRevision(TRUE);
+    $node->save();
+
+    $taxonomy_index = $this->getTaxonomyIndex();
+    $this->assertEquals($term->id(), $taxonomy_index[$node->id()]->tid);
+  }
+
+  protected function getTaxonomyIndex() {
+    return \Drupal::database()->select('taxonomy_index')
+     ->fields('taxonomy_index')
+     ->execute()
+     ->fetchAllAssoc('nid');
+  }
+
+}
diff --git a/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTaxonomyTermTest.php b/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTaxonomyTermTest.php
index 399c3ed0c..b0311f3da 100644
--- a/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTaxonomyTermTest.php
+++ b/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTaxonomyTermTest.php
@@ -69,6 +69,17 @@ class MigrateTaxonomyTermTest extends MigrateDrupal6TestBase {
       ),
     );
     $terms = Term::loadMultiple(array_keys($expected_results));
+
+    // Find each term in the tree.
+    $storage = \Drupal::entityTypeManager()->getStorage('taxonomy_term');
+    $vids = array_unique(array_column($expected_results, 'vid'));
+    $tree_terms = [];
+    foreach ($vids as $vid) {
+      foreach ($storage->loadTree($vid) as $term) {
+        $tree_terms[$term->tid] = $term;
+      }
+    }
+
     foreach ($expected_results as $tid => $values) {
       /** @var Term $term */
       $term = $terms[$tid];
@@ -86,6 +97,10 @@ class MigrateTaxonomyTermTest extends MigrateDrupal6TestBase {
         }
         $this->assertIdentical($parents, $values['parent']);
       }
+
+      $this->assertArrayHasKey($tid, $tree_terms, "Term $tid exists in vocabulary tree");
+      $tree_term = $tree_terms[$tid];
+      $this->assertEquals($values['parent'], $tree_term->parents, "Term $tid has correct parents in vocabulary tree");
     }
   }
 
diff --git a/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTaxonomyTermTest.php b/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTaxonomyTermTest.php
index 8a2ea1142..c7e7828a5 100644
--- a/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTaxonomyTermTest.php
+++ b/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTaxonomyTermTest.php
@@ -15,6 +15,13 @@ class MigrateTaxonomyTermTest extends MigrateDrupal7TestBase {
 
   public static $modules = array('taxonomy', 'text');
 
+  /**
+   * The cached taxonomy tree items, keyed by vid and tid.
+   *
+   * @var array
+   */
+  protected $treeData = [];
+
   /**
    * {@inheritdoc}
    */
@@ -35,34 +42,38 @@ class MigrateTaxonomyTermTest extends MigrateDrupal7TestBase {
    *   The parent vocabulary the migrated entity should have.
    * @param string $expected_description
    *   The description the migrated entity should have.
+   * @param string $expected_format
+   *   The format the migrated entity should have.
    * @param int $expected_weight
    *   The weight the migrated entity should have.
    * @param array $expected_parents
    *   The parent terms the migrated entity should have.
    */
-  protected function assertEntity($id, $expected_label, $expected_vid, $expected_description = '', $expected_weight = 0, $expected_parents = []) {
+  protected function assertEntity($id, $expected_label, $expected_vid, $expected_description = '', $expected_format = NULL, $expected_weight = 0, $expected_parents = []) {
     /** @var \Drupal\taxonomy\TermInterface $entity */
     $entity = Term::load($id);
     $this->assertTrue($entity instanceof TermInterface);
     $this->assertIdentical($expected_label, $entity->label());
     $this->assertIdentical($expected_vid, $entity->getVocabularyId());
     $this->assertEqual($expected_description, $entity->getDescription());
+    $this->assertEquals($expected_format, $entity->getFormat());
     $this->assertEqual($expected_weight, $entity->getWeight());
     $this->assertIdentical($expected_parents, $this->getParentIDs($id));
+    $this->assertHierarchy($expected_vid, $id, $expected_parents);
   }
 
   /**
    * Tests the Drupal 7 taxonomy term to Drupal 8 migration.
    */
   public function testTaxonomyTerms() {
-    $this->assertEntity(1, 'General discussion', 'forums', '', 2);
-    $this->assertEntity(2, 'Term1', 'test_vocabulary', 'The first term.');
-    $this->assertEntity(3, 'Term2', 'test_vocabulary', 'The second term.');
-    $this->assertEntity(4, 'Term3', 'test_vocabulary', 'The third term.', 0, [3]);
-    $this->assertEntity(5, 'Custom Forum', 'forums', 'Where the cool kids are.', 3);
-    $this->assertEntity(6, 'Games', 'forums', '', 4);
-    $this->assertEntity(7, 'Minecraft', 'forums', '', 1, [6]);
-    $this->assertEntity(8, 'Half Life 3', 'forums', '', 0, [6]);
+    $this->assertEntity(1, 'General discussion', 'forums', '', NULL, 2);
+    $this->assertEntity(2, 'Term1', 'test_vocabulary', 'The first term.', 'filtered_html');
+    $this->assertEntity(3, 'Term2', 'test_vocabulary', 'The second term.', 'filtered_html');
+    $this->assertEntity(4, 'Term3', 'test_vocabulary', 'The third term.', 'full_html', 0, [3]);
+    $this->assertEntity(5, 'Custom Forum', 'forums', 'Where the cool kids are.', NULL, 3);
+    $this->assertEntity(6, 'Games', 'forums', '', NULL, 4);
+    $this->assertEntity(7, 'Minecraft', 'forums', '', NULL, 1, [6]);
+    $this->assertEntity(8, 'Half Life 3', 'forums', '', NULL, 0, [6]);
   }
 
   /**
@@ -78,4 +89,28 @@ class MigrateTaxonomyTermTest extends MigrateDrupal7TestBase {
     return array_keys(\Drupal::entityManager()->getStorage('taxonomy_term')->loadParents($tid));
   }
 
+  /**
+   * Assert that a term is present in the tree storage, with the right parents.
+   *
+   * @param string $vid
+   *   Vocabular ID.
+   * @param int $tid
+   *   ID of the term to check.
+   * @param array $parent_ids
+   *   The expected parent term IDs.
+   */
+  protected function assertHierarchy($vid, $tid, array $parent_ids) {
+    if (!isset($this->treeData[$vid])) {
+      $tree = \Drupal::entityTypeManager()->getStorage('taxonomy_term')->loadTree($vid);
+      $this->treeData[$vid] = [];
+      foreach ($tree as $item) {
+        $this->treeData[$vid][$item->tid] = $item;
+      }
+    }
+
+    $this->assertArrayHasKey($tid, $this->treeData[$vid], "Term $tid exists in taxonomy tree");
+    $term = $this->treeData[$vid][$tid];
+    $this->assertEquals($parent_ids, array_filter($term->parents), "Term $tid has correct parents in taxonomy tree");
+  }
+
 }
diff --git a/core/modules/text/src/Plugin/migrate/cckfield/TextField.php b/core/modules/text/src/Plugin/migrate/cckfield/TextField.php
index 523ffca4a..cc4c1ecf7 100644
--- a/core/modules/text/src/Plugin/migrate/cckfield/TextField.php
+++ b/core/modules/text/src/Plugin/migrate/cckfield/TextField.php
@@ -8,7 +8,13 @@ use Drupal\migrate_drupal\Plugin\migrate\cckfield\CckFieldPluginBase;
 
 /**
  * @MigrateCckField(
- *   id = "text"
+ *   id = "text",
+ *   type_map = {
+ *     "text" = "text",
+ *     "text_long" = "text_long",
+ *     "text_with_summary" = "text_with_summary"
+ *   },
+ *   core = {6,7}
  * )
  */
 class TextField extends CckFieldPluginBase {
@@ -113,6 +119,7 @@ class TextField extends CckFieldPluginBase {
         case 'text_textarea':
           return 'text_long';
         default:
+          return parent::getFieldType($row);
           break;
       }
     }
diff --git a/core/modules/toolbar/src/Element/Toolbar.php b/core/modules/toolbar/src/Element/Toolbar.php
index 707737292..69a53dbd8 100644
--- a/core/modules/toolbar/src/Element/Toolbar.php
+++ b/core/modules/toolbar/src/Element/Toolbar.php
@@ -59,7 +59,7 @@ class Toolbar extends RenderElement {
    *   A renderable array.
    *
    * @return array
-   *  A renderable array.
+   *   A renderable array.
    *
    * @see toolbar_page_top()
    */
diff --git a/core/modules/tracker/tracker.module b/core/modules/tracker/tracker.module
index 54d490d93..1b2f648df 100644
--- a/core/modules/tracker/tracker.module
+++ b/core/modules/tracker/tracker.module
@@ -155,7 +155,7 @@ function _tracker_myrecent_access(AccountInterface $account) {
  * @param int $account
  *   The user account ID to track.
  *
- * @return boolean
+ * @return bool
  *   TRUE if a user has permission to access the account for $account and
  *   has permission to access the content.
  *
diff --git a/core/modules/user/src/MigratePassword.php b/core/modules/user/src/MigratePassword.php
deleted file mode 100644
index 4116c167a..000000000
--- a/core/modules/user/src/MigratePassword.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-
-namespace Drupal\user;
-
-use Drupal\Core\Password\PasswordInterface;
-
-/**
- * Replaces the original 'password' service in order to prefix the MD5 re-hashed
- * passwords with the 'U' flag. The new salted hash is recreated on first login
- * similarly to the D6->D7 upgrade path.
- */
-class MigratePassword implements PasswordInterface {
-
-  /**
-   * The original password service.
-   *
-   * @var \Drupal\Core\Password\PasswordInterface
-   */
-  protected $originalPassword;
-
-  /**
-   * Indicates if MD5 password prefixing is enabled.
-   */
-  protected $enabled = FALSE;
-
-  /**
-   * Builds the replacement password service class.
-   *
-   * @param \Drupal\Core\Password\PasswordInterface $original_password
-   *   The password object.
-   */
-  public function __construct(PasswordInterface $original_password) {
-    $this->originalPassword = $original_password;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function check($password, $hash) {
-    return $this->originalPassword->check($password, $hash);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function needsRehash($hash) {
-    return $this->originalPassword->needsRehash($hash);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function hash($password) {
-    $hash = $this->originalPassword->hash($password);
-
-    // Allow prefixing only if the service was asked to prefix. Check also if
-    // the $password pattern is conforming to a MD5 result.
-    if ($this->enabled && preg_match('/^[0-9a-f]{32}$/', $password)) {
-      $hash = 'U' . $hash;
-    }
-
-    return $hash;
-  }
-
-  /**
-   * Enables the MD5 password prefixing.
-   */
-  public function enableMd5Prefixing() {
-    $this->enabled = TRUE;
-  }
-
-  /**
-   * Disables the MD5 password prefixing.
-   */
-  public function disableMd5Prefixing() {
-    $this->enabled = FALSE;
-  }
-
-  /**
-   * Implements the PhpassHashedPassword::getCountLog2() method.
-   *
-   * @todo: Revisit this whole alternate password service:
-   *   https://www.drupal.org/node/2540594.
-   */
-  public function getCountLog2($setting) {
-    return $this->originalPassword->getCountLog2($setting);
-  }
-
-}
diff --git a/core/modules/user/src/Plugin/migrate/destination/EntityUser.php b/core/modules/user/src/Plugin/migrate/destination/EntityUser.php
index 4187121af..6ec88adb8 100644
--- a/core/modules/user/src/Plugin/migrate/destination/EntityUser.php
+++ b/core/modules/user/src/Plugin/migrate/destination/EntityUser.php
@@ -3,14 +3,13 @@
 namespace Drupal\user\Plugin\migrate\destination;
 
 use Drupal\Component\Utility\Unicode;
+use Drupal\Core\Entity\ContentEntityInterface;
 use Drupal\Core\Entity\EntityManagerInterface;
 use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Field\FieldTypePluginManagerInterface;
 use Drupal\Core\Field\Plugin\Field\FieldType\EmailItem;
 use Drupal\Core\Password\PasswordInterface;
 use Drupal\migrate\Plugin\MigrationInterface;
-use Drupal\migrate\MigrateException;
-use Drupal\user\MigratePassword;
 use Drupal\migrate\Plugin\migrate\destination\EntityContentBase;
 use Drupal\migrate\Row;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -55,9 +54,7 @@ class EntityUser extends EntityContentBase {
    */
   public function __construct(array $configuration, $plugin_id, $plugin_definition, MigrationInterface $migration, EntityStorageInterface $storage, array $bundles, EntityManagerInterface $entity_manager, FieldTypePluginManagerInterface $field_type_manager, PasswordInterface $password) {
     parent::__construct($configuration, $plugin_id, $plugin_definition, $migration, $storage, $bundles, $entity_manager, $field_type_manager);
-    if (isset($configuration['md5_passwords'])) {
-      $this->password = $password;
-    }
+    $this->password = $password;
   }
 
   /**
@@ -83,24 +80,29 @@ class EntityUser extends EntityContentBase {
    * @throws \Drupal\migrate\MigrateException
    */
   public function import(Row $row, array $old_destination_id_values = array()) {
-    if ($this->password) {
-      if ($this->password instanceof MigratePassword) {
-        $this->password->enableMd5Prefixing();
-      }
-      else {
-        throw new MigrateException('Password service has been altered by another module, aborting.');
-      }
-    }
     // Do not overwrite the root account password.
     if ($row->getDestinationProperty('uid') == 1) {
       $row->removeDestinationProperty('pass');
     }
-    $ids = parent::import($row, $old_destination_id_values);
-    if ($this->password) {
-      $this->password->disableMd5Prefixing();
-    }
+    return parent::import($row, $old_destination_id_values);
+  }
 
-    return $ids;
+  /**
+   * {@inheritdoc}
+   */
+  protected function save(ContentEntityInterface $entity, array $old_destination_id_values = array()) {
+    // Do not overwrite the root account password.
+    if ($entity->id() != 1) {
+      // Set the pre_hashed password so that the PasswordItem field does not hash
+      // already hashed passwords. If the md5_passwords configuration option is
+      // set we need to rehash the password and prefix with a U.
+      // @see \Drupal\Core\Field\Plugin\Field\FieldType\PasswordItem::preSave()
+      $entity->pass->pre_hashed = TRUE;
+      if (isset($this->configuration['md5_passwords'])) {
+        $entity->pass->value = 'U' . $this->password->hash($entity->pass->value);
+      }
+    }
+    return parent::save($entity, $old_destination_id_values);
   }
 
   /**
diff --git a/core/modules/user/src/Plugin/migrate/source/d6/Role.php b/core/modules/user/src/Plugin/migrate/source/d6/Role.php
index 79ce021a4..f7bac99c2 100644
--- a/core/modules/user/src/Plugin/migrate/source/d6/Role.php
+++ b/core/modules/user/src/Plugin/migrate/source/d6/Role.php
@@ -27,7 +27,7 @@ class Role extends DrupalSqlBase {
   public function query() {
     $query = $this->select('role', 'r')
       ->fields('r', array('rid', 'name'))
-      ->orderBy('rid');
+      ->orderBy('r.rid');
     return $query;
   }
 
diff --git a/core/modules/user/src/Plugin/migrate/source/d6/User.php b/core/modules/user/src/Plugin/migrate/source/d6/User.php
index 58d8182b8..1260ca75e 100644
--- a/core/modules/user/src/Plugin/migrate/source/d6/User.php
+++ b/core/modules/user/src/Plugin/migrate/source/d6/User.php
@@ -20,7 +20,7 @@ class User extends DrupalSqlBase {
   public function query() {
     return $this->select('users', 'u')
       ->fields('u', array_keys($this->baseFields()))
-      ->condition('uid', 0, '>');
+      ->condition('u.uid', 0, '>');
   }
 
   /**
diff --git a/core/modules/user/src/Plugin/migrate/source/d6/UserPicture.php b/core/modules/user/src/Plugin/migrate/source/d6/UserPicture.php
index 4e638befd..13ae4f31d 100644
--- a/core/modules/user/src/Plugin/migrate/source/d6/UserPicture.php
+++ b/core/modules/user/src/Plugin/migrate/source/d6/UserPicture.php
@@ -22,7 +22,7 @@ class UserPicture extends DrupalSqlBase {
     $query = $this->select('users', 'u')
       ->condition('picture', '', '<>')
       ->fields('u', array('uid', 'access', 'picture'))
-      ->orderBy('access');
+      ->orderBy('u.access');
     return $query;
   }
 
diff --git a/core/modules/user/src/Plugin/migrate/source/d6/UserPictureFile.php b/core/modules/user/src/Plugin/migrate/source/d6/UserPictureFile.php
index 7883aeac4..d394e9c08 100644
--- a/core/modules/user/src/Plugin/migrate/source/d6/UserPictureFile.php
+++ b/core/modules/user/src/Plugin/migrate/source/d6/UserPictureFile.php
@@ -33,7 +33,7 @@ class UserPictureFile extends DrupalSqlBase {
    */
   public function query() {
     $query = $this->select('users', 'u')
-      ->condition('picture', '', '<>')
+      ->condition('u.picture', '', '<>')
       ->fields('u', array('uid', 'picture'));
     return $query;
   }
diff --git a/core/modules/user/src/Plugin/migrate/source/d7/User.php b/core/modules/user/src/Plugin/migrate/source/d7/User.php
index 63cabc18f..717e12028 100644
--- a/core/modules/user/src/Plugin/migrate/source/d7/User.php
+++ b/core/modules/user/src/Plugin/migrate/source/d7/User.php
@@ -20,7 +20,7 @@ class User extends FieldableEntity {
   public function query() {
     return $this->select('users', 'u')
       ->fields('u')
-      ->condition('uid', 0, '>');
+      ->condition('u.uid', 0, '>');
   }
 
   /**
diff --git a/core/modules/user/src/SharedTempStore.php b/core/modules/user/src/SharedTempStore.php
index 8e7fcfe77..d6295266c 100644
--- a/core/modules/user/src/SharedTempStore.php
+++ b/core/modules/user/src/SharedTempStore.php
@@ -163,7 +163,7 @@ class SharedTempStore {
    *
    * @return bool
    *   TRUE if the data was set, or FALSE if it already exists and is not owned
-   * by $this->user.
+   *   by $this->user.
    */
   public function setIfOwner($key, $value) {
     if ($this->setIfNotExists($key, $value)) {
diff --git a/core/modules/user/src/UserDataInterface.php b/core/modules/user/src/UserDataInterface.php
index eb20167e9..24cd45de1 100644
--- a/core/modules/user/src/UserDataInterface.php
+++ b/core/modules/user/src/UserDataInterface.php
@@ -42,8 +42,6 @@ interface UserDataInterface {
    *   The name of the data key.
    * @param mixed $value
    *   The value to store. Non-scalar values are serialized automatically.
-   *
-   * @return void
    */
   public function set($module, $uid, $name, $value);
 
@@ -60,8 +58,6 @@ interface UserDataInterface {
    * @param string $name
    *   (optional) The name of the data key. If omitted, all data associated with
    *   $module and $uid is deleted.
-   *
-   * @return void
    */
   public function delete($module = NULL, $uid = NULL, $name = NULL);
 
diff --git a/core/modules/user/src/UserServiceProvider.php b/core/modules/user/src/UserServiceProvider.php
deleted file mode 100644
index ae3c7eddf..000000000
--- a/core/modules/user/src/UserServiceProvider.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-namespace Drupal\user;
-
-use Drupal\Core\DependencyInjection\ServiceModifierInterface;
-use Drupal\Core\DependencyInjection\ContainerBuilder;
-
-/**
- * Swaps the original 'password' service in order to handle password hashing for
- * user migrations that have passwords hashed to MD5.
- *
- * @see \Drupal\migrate\MigratePassword
- * @see \Drupal\Core\Password\PhpassHashedPassword
- */
-class UserServiceProvider implements ServiceModifierInterface {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function alter(ContainerBuilder $container) {
-    $container->setDefinition('password_original', $container->getDefinition('password'));
-    $container->setDefinition('password', $container->getDefinition('password_migrate'));
-  }
-
-}
diff --git a/core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserTest.php b/core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserTest.php
index 61ff80004..2e0965d20 100644
--- a/core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserTest.php
+++ b/core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserTest.php
@@ -44,6 +44,8 @@ class MigrateUserTest extends MigrateDrupal7TestBase {
    *   The username.
    * @param string $mail
    *   The user's email address.
+   * @param string $password
+   *   The password for this user.
    * @param int $access
    *   The last access time.
    * @param int $login
@@ -59,7 +61,7 @@ class MigrateUserTest extends MigrateDrupal7TestBase {
    * @param bool $has_picture
    *   Whether the user is expected to have a picture attached.
    */
-  protected function assertEntity($id, $label, $mail, $access, $login, $blocked, $langcode, $init, array $roles = [RoleInterface::AUTHENTICATED_ID], $has_picture = FALSE) {
+  protected function assertEntity($id, $label, $mail, $password, $access, $login, $blocked, $langcode, $init, array $roles = [RoleInterface::AUTHENTICATED_ID], $has_picture = FALSE) {
     /** @var \Drupal\user\UserInterface $user */
     $user = User::load($id);
     $this->assertTrue($user instanceof UserInterface);
@@ -77,13 +79,29 @@ class MigrateUserTest extends MigrateDrupal7TestBase {
     $this->assertIdentical($init, $user->getInitialEmail());
     $this->assertIdentical($roles, $user->getRoles());
     $this->assertIdentical($has_picture, !$user->user_picture->isEmpty());
+    $this->assertIdentical($password, $user->getPassword());
   }
 
   /**
    * Tests the Drupal 7 user to Drupal 8 migration.
    */
   public function testUser() {
-    $this->assertEntity(2, 'Odo', 'odo@local.host', '0', '0', FALSE, '', 'odo@local.host');
+    $password = '$S$DGFZUE.FhrXbe4y52eC7p0ZVRGD/gOPtVctDlmC89qkujnBokAlJ';
+    $this->assertEntity(2, 'Odo', 'odo@local.host', $password, '0', '0', FALSE, '', 'odo@local.host');
+
+    // Ensure that the user can authenticate.
+    $this->assertEquals(2, \Drupal::service('user.auth')->authenticate('Odo', 'a password'));
+    // After authenticating the password will be rehashed because the password
+    // stretching iteration count has changed from 15 in Drupal 7 to 16 in
+    // Drupal 8.
+    $user = User::load(2);
+    $rehash = $user->getPassword();
+    $this->assertNotEquals($password, $rehash);
+
+    // Authenticate again and there should be no re-hash.
+    $this->assertEquals(2, \Drupal::service('user.auth')->authenticate('Odo', 'a password'));
+    $user = User::load(2);
+    $this->assertEquals($rehash, $user->getPassword());
   }
 
 }
diff --git a/core/modules/user/user.services.yml b/core/modules/user/user.services.yml
index 8fc9bf54b..c273cb344 100644
--- a/core/modules/user/user.services.yml
+++ b/core/modules/user/user.services.yml
@@ -66,9 +66,6 @@ services:
     arguments: ['@current_user', '@entity.manager']
     tags:
       - { name: 'context_provider' }
-  password_migrate:
-    class: Drupal\user\MigratePassword
-    arguments: ['@password_original']
 
 parameters:
   user.tempstore.expire: 604800
diff --git a/core/modules/views/config/schema/views.display.schema.yml b/core/modules/views/config/schema/views.display.schema.yml
index 511b0b933..d17c48cf5 100644
--- a/core/modules/views/config/schema/views.display.schema.yml
+++ b/core/modules/views/config/schema/views.display.schema.yml
@@ -34,6 +34,12 @@ views.display.page:
         weight:
           type: integer
           label: 'Weight'
+        enabled:
+          type: boolean
+          label: 'Enabled'
+        expanded:
+          type: boolean
+          label: 'Expanded'
         menu_name:
           type: string
           label: 'Menu name'
diff --git a/core/modules/views/src/Controller/ViewAjaxController.php b/core/modules/views/src/Controller/ViewAjaxController.php
index 022f4d7d3..7993d2a58 100644
--- a/core/modules/views/src/Controller/ViewAjaxController.php
+++ b/core/modules/views/src/Controller/ViewAjaxController.php
@@ -104,7 +104,7 @@ class ViewAjaxController implements ContainerInjectionInterface {
    *   The current request object.
    *
    * @return \Drupal\views\Ajax\ViewAjaxResponse
-   *  The view response as ajax response.
+   *   The view response as ajax response.
    *
    * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
    *   Thrown when the view was not found.
diff --git a/core/modules/views/src/EntityViewsData.php b/core/modules/views/src/EntityViewsData.php
index cc7b7be90..61def5acd 100644
--- a/core/modules/views/src/EntityViewsData.php
+++ b/core/modules/views/src/EntityViewsData.php
@@ -57,6 +57,13 @@ class EntityViewsData implements EntityHandlerInterface, EntityViewsDataInterfac
    */
   protected $fieldStorageDefinitions;
 
+  /**
+   * The entity manager.
+   *
+   * @var \Drupal\Core\Entity\EntityManagerInterface
+   */
+  protected $entityManager;
+
   /**
    * Constructs an EntityViewsData object.
    *
@@ -112,6 +119,7 @@ class EntityViewsData implements EntityHandlerInterface, EntityViewsDataInterfac
     $data = [];
 
     $base_table = $this->entityType->getBaseTable() ?: $this->entityType->id();
+    $views_revision_base_table = NULL;
     $revisionable = $this->entityType->isRevisionable();
     $base_field = $this->entityType->getKey('id');
 
@@ -235,6 +243,7 @@ class EntityViewsData implements EntityHandlerInterface, EntityViewsDataInterfac
     // Load all typed data definitions of all fields. This should cover each of
     // the entity base, revision, data tables.
     $field_definitions = $this->entityManager->getBaseFieldDefinitions($this->entityType->id());
+    /** @var \Drupal\Core\Entity\Sql\DefaultTableMapping $table_mapping */
     if ($table_mapping = $this->storage->getTableMapping($field_definitions)) {
       // Fetch all fields that can appear in both the base table and the data
       // table.
@@ -257,6 +266,36 @@ class EntityViewsData implements EntityHandlerInterface, EntityViewsDataInterfac
           $this->mapFieldDefinition($table, $field_name, $field_definitions[$field_name], $table_mapping, $data[$table]);
         }
       }
+
+      foreach ($field_definitions as $field_definition) {
+        if ($table_mapping->requiresDedicatedTableStorage($field_definition->getFieldStorageDefinition())) {
+          $table = $table_mapping->getDedicatedDataTableName($field_definition->getFieldStorageDefinition());
+
+          $data[$table]['table']['group'] = $this->entityType->getLabel();
+          $data[$table]['table']['provider'] = $this->entityType->getProvider();
+          $data[$table]['table']['join'][$views_base_table] = [
+            'left_field' => $base_field,
+            'field' => 'entity_id',
+            'extra' => [
+              ['field' => 'deleted', 'value' => 0, 'numeric' => TRUE],
+            ],
+          ];
+
+          if ($revisionable) {
+            $revision_table = $table_mapping->getDedicatedRevisionTableName($field_definition->getFieldStorageDefinition());
+
+            $data[$revision_table]['table']['group'] = $this->t('@entity_type revision', ['@entity_type' => $this->entityType->getLabel()]);
+            $data[$revision_table]['table']['provider'] = $this->entityType->getProvider();
+            $data[$revision_table]['table']['join'][$views_revision_base_table] = [
+              'left_field' => $revision_field,
+              'field' => 'entity_id',
+              'extra' => [
+                ['field' => 'deleted', 'value' => 0, 'numeric' => TRUE],
+              ],
+            ];
+          }
+        }
+      }
     }
 
     // Add the entity type key to each table generated.
diff --git a/core/modules/views/src/Plugin/Menu/ViewsMenuLink.php b/core/modules/views/src/Plugin/Menu/ViewsMenuLink.php
index 33a2fd24c..b484c24b1 100644
--- a/core/modules/views/src/Plugin/Menu/ViewsMenuLink.php
+++ b/core/modules/views/src/Plugin/Menu/ViewsMenuLink.php
@@ -26,7 +26,6 @@ class ViewsMenuLink extends MenuLinkBase implements ContainerFactoryPluginInterf
     'enabled' => 1,
     'title' => 1,
     'description' => 1,
-    'metadata' => 1,
   );
 
   /**
@@ -140,9 +139,9 @@ class ViewsMenuLink extends MenuLinkBase implements ContainerFactoryPluginInterf
       $display = &$view->storage->getDisplay($view->current_display);
       // Just save the title to the original view.
       $changed = FALSE;
-      foreach ($new_definition_values as $key => $new_definition_value) {
-        if (isset($display['display_options']['menu'][$key]) && $display['display_options']['menu'][$key] != $new_definition_values[$key]) {
-          $display['display_options']['menu'][$key] = $new_definition_values[$key];
+      foreach ($overrides as $key => $new_definition_value) {
+        if (empty($display['display_options']['menu'][$key]) || $display['display_options']['menu'][$key] != $new_definition_value) {
+          $display['display_options']['menu'][$key] = $new_definition_value;
           $changed = TRUE;
         }
       }
diff --git a/core/modules/views/src/Plugin/ViewsHandlerManager.php b/core/modules/views/src/Plugin/ViewsHandlerManager.php
index d138d72d0..d918696d6 100644
--- a/core/modules/views/src/Plugin/ViewsHandlerManager.php
+++ b/core/modules/views/src/Plugin/ViewsHandlerManager.php
@@ -86,7 +86,7 @@ class ViewsHandlerManager extends DefaultPluginManager implements FallbackPlugin
 
     if (isset($data[$field][$this->handlerType])) {
       $definition = $data[$field][$this->handlerType];
-      foreach (array('group', 'title', 'title short', 'help', 'real field', 'real table', 'entity type', 'entity field') as $key) {
+      foreach (array('group', 'title', 'title short', 'label', 'help', 'real field', 'real table', 'entity type', 'entity field') as $key) {
         if (!isset($definition[$key])) {
           // First check the field level.
           if (!empty($data[$field][$key])) {
diff --git a/core/modules/views/src/Plugin/views/HandlerBase.php b/core/modules/views/src/Plugin/views/HandlerBase.php
index 12cd72bcc..b6b5a5bea 100644
--- a/core/modules/views/src/Plugin/views/HandlerBase.php
+++ b/core/modules/views/src/Plugin/views/HandlerBase.php
@@ -816,4 +816,19 @@ abstract class HandlerBase extends PluginBase implements ViewsHandlerInterface {
     $view->cacheSet();
   }
 
+  /**
+   * Calculates options stored on the handler
+   *
+   * @param array $options
+   *   The options stored in the handler
+   * @param array $form_state_options
+   *   The newly submitted form state options.
+   *
+   * @return array
+   *   The new options
+   */
+  public function submitFormCalculateOptions(array $options, array $form_state_options) {
+    return $form_state_options + $options;
+  }
+
 }
diff --git a/core/modules/views/src/Plugin/views/PluginBase.php b/core/modules/views/src/Plugin/views/PluginBase.php
index c876f6db6..6d5aec184 100644
--- a/core/modules/views/src/Plugin/views/PluginBase.php
+++ b/core/modules/views/src/Plugin/views/PluginBase.php
@@ -336,7 +336,7 @@ abstract class PluginBase extends ComponentPluginBase implements ContainerFactor
    * @param $tokens
    *   Array of token => replacement_value items.
    *
-   * @return String
+   * @return string
    */
   protected function viewsTokenReplace($text, $tokens) {
     if (!strlen($text)) {
@@ -373,7 +373,8 @@ abstract class PluginBase extends ComponentPluginBase implements ContainerFactor
         assert('preg_match(\'/^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*$/\', $top) === 1', 'Tokens need to be valid Twig variables.');
         $token_array = array(array_pop($parts) => $replacement);
         foreach (array_reverse($parts) as $key) {
-          assert('preg_match(\'/^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*$/\', $key) === 1', 'Tokens need to be valid Twig variables.');
+          // The key could also be numeric (array index) so allow that.
+          assert('is_numeric($key) || (preg_match(\'/^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*$/\', $key) === 1)', 'Tokens need to be valid Twig variables.');
           $token_array = array($key => $token_array);
         }
         if (!isset($twig_tokens[$top])) {
diff --git a/core/modules/views/src/Plugin/views/display/DisplayPluginInterface.php b/core/modules/views/src/Plugin/views/display/DisplayPluginInterface.php
index 28f13b3a2..982b4ce28 100644
--- a/core/modules/views/src/Plugin/views/display/DisplayPluginInterface.php
+++ b/core/modules/views/src/Plugin/views/display/DisplayPluginInterface.php
@@ -568,7 +568,7 @@ interface DisplayPluginInterface {
    * Renders the exposed form as block.
    *
    * @return string|null
-   *  The rendered exposed form as string or NULL otherwise.
+   *   The rendered exposed form as string or NULL otherwise.
    */
   public function viewExposedFormBlocks();
 
diff --git a/core/modules/views/src/Plugin/views/display/Page.php b/core/modules/views/src/Plugin/views/display/Page.php
index 8ca7f1c16..cf23f93d6 100644
--- a/core/modules/views/src/Plugin/views/display/Page.php
+++ b/core/modules/views/src/Plugin/views/display/Page.php
@@ -124,6 +124,7 @@ class Page extends PathPluginBase {
         'title' => array('default' => ''),
         'description' => array('default' => ''),
         'weight' => array('default' => 0),
+        'enabled' => array('default' => TRUE),
         'menu_name' => array('default' => 'main'),
         'parent' => array('default' => ''),
         'context' => array('default' => ''),
diff --git a/core/modules/views/src/Plugin/views/display/PathPluginBase.php b/core/modules/views/src/Plugin/views/display/PathPluginBase.php
index da230c4ac..60bfec5b5 100644
--- a/core/modules/views/src/Plugin/views/display/PathPluginBase.php
+++ b/core/modules/views/src/Plugin/views/display/PathPluginBase.php
@@ -322,6 +322,8 @@ abstract class PathPluginBase extends DisplayPluginBase implements DisplayRouter
         $links[$menu_link_id]['title'] = $menu['title'];
         $links[$menu_link_id]['description'] = $menu['description'];
         $links[$menu_link_id]['parent'] = $menu['parent'];
+        $links[$menu_link_id]['enabled'] = $menu['enabled'];
+        $links[$menu_link_id]['expanded'] = $menu['expanded'];
 
         if (isset($menu['weight'])) {
           $links[$menu_link_id]['weight'] = intval($menu['weight']);
diff --git a/core/modules/views/src/Plugin/views/field/EntityLabel.php b/core/modules/views/src/Plugin/views/field/EntityLabel.php
index 3691d0637..967fd526b 100644
--- a/core/modules/views/src/Plugin/views/field/EntityLabel.php
+++ b/core/modules/views/src/Plugin/views/field/EntityLabel.php
@@ -2,7 +2,9 @@
 
 namespace Drupal\views\Plugin\views\field;
 
+use Drupal\Core\Entity\EntityMalformedException;
 use Drupal\Core\Entity\EntityManagerInterface;
+use Drupal\Core\Entity\Exception\UndefinedLinkTemplateException;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\views\ResultRow;
 use Drupal\views\ViewExecutable;
@@ -105,8 +107,16 @@ class EntityLabel extends FieldPluginBase {
     $entity = $this->loadedReferencers[$type][$value];
 
     if (!empty($this->options['link_to_entity'])) {
-      $this->options['alter']['make_link'] = TRUE;
-      $this->options['alter']['url'] = $entity->urlInfo();
+      try {
+        $this->options['alter']['url'] = $entity->toUrl();
+        $this->options['alter']['make_link'] = TRUE;
+      }
+      catch (UndefinedLinkTemplateException $e) {
+        $this->options['alter']['make_link'] = FALSE;
+      }
+      catch (EntityMalformedException $e) {
+        $this->options['alter']['make_link'] = FALSE;
+      }
     }
 
     return $this->sanitizeValue($entity->label());
diff --git a/core/modules/views/src/Plugin/views/field/Field.php b/core/modules/views/src/Plugin/views/field/Field.php
index 35dcb6463..c4003b4e4 100644
--- a/core/modules/views/src/Plugin/views/field/Field.php
+++ b/core/modules/views/src/Plugin/views/field/Field.php
@@ -472,7 +472,8 @@ class Field extends FieldPluginBase implements CacheableDependencyInterface, Mul
 
     // Get the settings form.
     $settings_form = array('#value' => array());
-    if ($formatter = $this->getFormatterInstance()) {
+    $format = isset($form_state->getUserInput()['options']['type']) ? $form_state->getUserInput()['options']['type'] : $this->options['type'];
+    if ($formatter = $this->getFormatterInstance($format)) {
       $settings_form = $formatter->settingsForm($form, $form_state);
       // Convert field UI selector states to work in the Views field form.
       FormHelper::rewriteStatesSelector($settings_form, "fields[{$field->getName()}][settings_edit_form]", 'options');
@@ -480,6 +481,21 @@ class Field extends FieldPluginBase implements CacheableDependencyInterface, Mul
     $form['settings'] = $settings_form;
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function submitFormCalculateOptions(array $options, array $form_state_options) {
+    // When we change the formatter type we don't want to keep any of the
+    // previous configured formatter settings, as there might be schema
+    // conflict.
+    unset($options['settings']);
+    $options = $form_state_options + $options;
+    if (!isset($options['settings'])) {
+      $options['settings'] = [];
+    }
+    return $options;
+  }
+
   /**
    * Provide options for multiple value fields.
    */
@@ -937,13 +953,16 @@ class Field extends FieldPluginBase implements CacheableDependencyInterface, Mul
    * @return \Drupal\Core\Field\FormatterInterface|null
    *   The field formatter instance.
    */
-  protected function getFormatterInstance() {
-    $settings = $this->options['settings'] + $this->formatterPluginManager->getDefaultSettings($this->options['type']);
+  protected function getFormatterInstance($format = NULL) {
+    if (!isset($format)) {
+      $format = $this->options['type'];
+    }
+    $settings = $this->options['settings'] + $this->formatterPluginManager->getDefaultSettings($format);
 
     $options = [
       'field_definition' => $this->getFieldDefinition(),
       'configuration' => [
-        'type' => $this->options['type'],
+        'type' => $format,
         'settings' => $settings,
         'label' => '',
         'weight' => 0,
diff --git a/core/modules/views/src/Plugin/views/field/FieldHandlerInterface.php b/core/modules/views/src/Plugin/views/field/FieldHandlerInterface.php
index d1115a94a..d7389c937 100644
--- a/core/modules/views/src/Plugin/views/field/FieldHandlerInterface.php
+++ b/core/modules/views/src/Plugin/views/field/FieldHandlerInterface.php
@@ -140,7 +140,7 @@ interface FieldHandlerInterface extends ViewsHandlerInterface {
    * by in the style settings.
    *
    * @return bool
-   *  TRUE if this field handler is groupable, otherwise FALSE.
+   *   TRUE if this field handler is groupable, otherwise FALSE.
    */
   public function useStringGroupBy();
 
@@ -215,7 +215,7 @@ interface FieldHandlerInterface extends ViewsHandlerInterface {
    *   Whether or not to use empty() to check the value.
    *
    * @return bool
-   * TRUE if the value is considered empty, FALSE otherwise.
+   *   TRUE if the value is considered empty, FALSE otherwise.
    */
   public function isValueEmpty($value, $empty_zero, $no_skip_empty = TRUE);
 
diff --git a/core/modules/views/src/Plugin/views/filter/BooleanOperator.php b/core/modules/views/src/Plugin/views/filter/BooleanOperator.php
index 616666be4..7078032e8 100644
--- a/core/modules/views/src/Plugin/views/filter/BooleanOperator.php
+++ b/core/modules/views/src/Plugin/views/filter/BooleanOperator.php
@@ -93,9 +93,14 @@ class BooleanOperator extends FilterPluginBase {
     parent::init($view, $display, $options);
 
     $this->value_value = $this->t('True');
+
     if (isset($this->definition['label'])) {
       $this->value_value = $this->definition['label'];
     }
+    elseif (isset($this->definition['title'])) {
+      $this->value_value = $this->definition['title'];
+    }
+
     if (isset($this->definition['accept null'])) {
       $this->accept_null = (bool) $this->definition['accept null'];
     }
diff --git a/core/modules/views/src/Plugin/views/join/JoinPluginBase.php b/core/modules/views/src/Plugin/views/join/JoinPluginBase.php
index 36b6e42b7..37c1e064b 100644
--- a/core/modules/views/src/Plugin/views/join/JoinPluginBase.php
+++ b/core/modules/views/src/Plugin/views/join/JoinPluginBase.php
@@ -303,24 +303,18 @@ class JoinPluginBase extends PluginBase implements JoinPluginInterface {
           if (is_array($info['value']) && count($info['value']) == 1) {
             $info['value'] = array_shift($info['value']);
           }
-
           if (is_array($info['value'])) {
-            // With an array of values, we need multiple placeholders and the
-            // 'IN' operator is implicit.
-            $local_arguments = array();
-            foreach ($info['value'] as $value) {
-              $placeholder_i = ':views_join_condition_' . $select_query->nextPlaceholder();
-              $local_arguments[$placeholder_i] = $value;
-            }
-
+            // We use an SA-CORE-2014-005 conformant placeholder for our array
+            // of values. Also, note that the 'IN' operator is implicit.
+            // @see https://www.drupal.org/node/2401615.
             $operator = !empty($info['operator']) ? $info['operator'] : 'IN';
-            $placeholder = '( ' . implode(', ', array_keys($local_arguments)) . ' )';
-            $arguments += $local_arguments;
+            $placeholder = ':views_join_condition_' . $select_query->nextPlaceholder() . '[]';
+            $placeholder_sql = "( $placeholder )";
           }
           else {
             // With a single value, the '=' operator is implicit.
             $operator = !empty($info['operator']) ? $info['operator'] : '=';
-            $placeholder = ':views_join_condition_' . $select_query->nextPlaceholder();
+            $placeholder = $placeholder_sql = ':views_join_condition_' . $select_query->nextPlaceholder();
           }
           // Set 'field' as join table field if available or set 'left field' as
           // join table field is not set.
@@ -329,7 +323,7 @@ class JoinPluginBase extends PluginBase implements JoinPluginInterface {
             // Allow the value to be set either with the 'value' element or
             // with 'left_field'.
             if (isset($info['left_field'])) {
-              $placeholder = "$left[alias].$info[left_field]";
+              $placeholder_sql = "$left[alias].$info[left_field]";
             }
             else {
               $arguments[$placeholder] = $info['value'];
@@ -340,7 +334,8 @@ class JoinPluginBase extends PluginBase implements JoinPluginInterface {
             $join_table_field = "$left[alias].$info[left_field]";
             $arguments[$placeholder] = $info['value'];
           }
-          $extras[] = "$join_table_field $operator $placeholder";
+          // Render out the SQL fragment with parameters.
+          $extras[] = "$join_table_field $operator $placeholder_sql";
         }
 
         if ($extras) {
diff --git a/core/modules/views/src/Plugin/views/query/Sql.php b/core/modules/views/src/Plugin/views/query/Sql.php
index 321ebf5a5..3e2cbbcda 100644
--- a/core/modules/views/src/Plugin/views/query/Sql.php
+++ b/core/modules/views/src/Plugin/views/query/Sql.php
@@ -5,6 +5,7 @@ namespace Drupal\views\Plugin\views\query;
 use Drupal\Component\Utility\NestedArray;
 use Drupal\Core\Cache\Cache;
 use Drupal\Core\Database\Database;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\views\Plugin\views\display\DisplayPluginBase;
 use Drupal\Core\Database\DatabaseExceptionWrapper;
@@ -13,6 +14,7 @@ use Drupal\views\Plugin\views\HandlerBase;
 use Drupal\views\ResultRow;
 use Drupal\views\ViewExecutable;
 use Drupal\views\Views;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Views query plugin for an SQL query.
@@ -106,6 +108,40 @@ class Sql extends QueryPluginBase {
    */
   protected $noDistinct;
 
+  /**
+   * The entity type manager.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
+   */
+  protected $entityTypeManager;
+
+  /**
+   * Constructs a Sql object.
+   *
+   * @param array $configuration
+   *   A configuration array containing information about the plugin instance.
+   * @param string $plugin_id
+   *   The plugin_id for the plugin instance.
+   * @param mixed $plugin_definition
+   *   The plugin implementation definition.
+   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
+   *   The entity type manager.
+   */
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityTypeManagerInterface $entity_type_manager) {
+    parent::__construct($configuration, $plugin_id, $plugin_definition);
+
+    $this->entityTypeManager = $entity_type_manager;
+  }
+
+  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
+    return new static(
+      $configuration,
+      $plugin_id,
+      $plugin_definition,
+      $container->get('entity_type.manager')
+    );
+  }
+
   /**
    * {@inheritdoc}
    */
@@ -1482,63 +1518,97 @@ class Sql extends QueryPluginBase {
     foreach ($entity_information as $info) {
       $entity_type = $info['entity_type'];
       if (!isset($entity_types[$entity_type])) {
-        $entity_types[$entity_type] = \Drupal::entityManager()->getDefinition($entity_type);
+        $entity_types[$entity_type] = $this->entityTypeManager->getDefinition($entity_type);
       }
     }
 
     // Assemble a list of entities to load.
-    $ids_by_type = array();
+    $entity_ids_by_type = [];
+    $revision_ids_by_type = [];
     foreach ($entity_information as $info) {
       $relationship_id = $info['relationship_id'];
       $entity_type = $info['entity_type'];
+      /** @var \Drupal\Core\Entity\EntityTypeInterface $entity_info */
       $entity_info = $entity_types[$entity_type];
-      $id_key = !$info['revision'] ? $entity_info->getKey('id') : $entity_info->getKey('revision');
+      $revision = $info['revision'];
+      $id_key = !$revision ? $entity_info->getKey('id') : $entity_info->getKey('revision');
       $id_alias = $this->getFieldAlias($info['alias'], $id_key);
 
       foreach ($results as $index => $result) {
         // Store the entity id if it was found.
         if (isset($result->{$id_alias}) && $result->{$id_alias} != '') {
-          $ids_by_type[$entity_type][$index][$relationship_id] = $result->$id_alias;
+          if ($revision) {
+            $revision_ids_by_type[$entity_type][$index][$relationship_id] = $result->$id_alias;
+          }
+          else {
+            $entity_ids_by_type[$entity_type][$index][$relationship_id] = $result->$id_alias;
+          }
         }
       }
     }
 
     // Load all entities and assign them to the correct result row.
-    foreach ($ids_by_type as $entity_type => $ids) {
+    foreach ($entity_ids_by_type as $entity_type => $ids) {
+      $entity_storage = $this->entityTypeManager->getStorage($entity_type);
       $flat_ids = iterator_to_array(new \RecursiveIteratorIterator(new \RecursiveArrayIterator($ids)), FALSE);
 
-      // Drupal core currently has no way to load multiple revisions. Sad.
-      if (isset($entity_information[$entity_type]['revision']) && $entity_information[$entity_type]['revision'] === TRUE) {
-        $entities = array();
-        foreach ($flat_ids as $revision_id) {
-          $entity = entity_revision_load($entity_type, $revision_id);
-          if ($entity) {
-            $entities[$revision_id] = $entity;
-          }
+      $entities = $entity_storage->loadMultiple(array_unique($flat_ids));
+      $results = $this->_assignEntitiesToResult($ids, $entities, $results);
+    }
+
+    // Now load all revisions.
+    foreach ($revision_ids_by_type as $entity_type => $revision_ids) {
+      $entity_storage = $this->entityTypeManager->getStorage($entity_type);
+      $entities = [];
+
+      foreach ($revision_ids as $index => $revision_id_by_relationship) {
+        foreach ($revision_id_by_relationship as $revision => $revision_id) {
+          // Drupal core currently has no way to load multiple revisions.
+          $entity = $entity_storage->loadRevision($revision_id);
+          $entities[$revision_id] = $entity;
         }
       }
-      else {
-        $entities = entity_load_multiple($entity_type, $flat_ids);
-      }
 
-      foreach ($ids as $index => $relationships) {
-        foreach ($relationships as $relationship_id => $entity_id) {
-          if (isset($entities[$entity_id])) {
-            $entity = $entities[$entity_id];
-          }
-          else {
-            $entity = NULL;
-          }
+      $results = $this->_assignEntitiesToResult($revision_ids, $entities, $results);
+    }
+  }
 
-          if ($relationship_id == 'none') {
-            $results[$index]->_entity = $entity;
-          }
-          else {
-            $results[$index]->_relationship_entities[$relationship_id] = $entity;
-          }
+  /**
+   * Sets entities onto the view result row objects.
+   *
+   * This method takes into account the relationship in which the entity was
+   * needed in the first place.
+   *
+   * @param mixed[][] $ids
+   *   A two dimensional array of identifiers (entity ID / revision ID) keyed by
+   *   relationship.
+   * @param \Drupal\Core\Entity\EntityInterface[] $entities
+   *   An array of entities keyed by their identified (entity ID / revision ID).
+   * @param \Drupal\views\ResultRow[] $results
+   *   The entire views result.
+   *
+   * @return \Drupal\views\ResultRow[]
+   *   The changed views results.
+   */
+  protected function _assignEntitiesToResult($ids, array $entities, array $results) {
+    foreach ($ids as $index => $relationships) {
+      foreach ($relationships as $relationship_id => $id) {
+        if (isset($entities[$id])) {
+          $entity = $entities[$id];
+        }
+        else {
+          $entity = NULL;
+        }
+
+        if ($relationship_id == 'none') {
+          $results[$index]->_entity = $entity;
+        }
+        else {
+          $results[$index]->_relationship_entities[$relationship_id] = $entity;
         }
       }
     }
+    return $results;
   }
 
   /**
diff --git a/core/modules/views/src/Tests/Plugin/DisplayPageWebTest.php b/core/modules/views/src/Tests/Plugin/DisplayPageWebTest.php
index bac35fd3a..acb3af86f 100644
--- a/core/modules/views/src/Tests/Plugin/DisplayPageWebTest.php
+++ b/core/modules/views/src/Tests/Plugin/DisplayPageWebTest.php
@@ -152,7 +152,7 @@ class DisplayPageWebTest extends PluginTestBase {
    * @param string $path
    *   Path that will be set as the view page display path.
    *
-   * @return boolean
+   * @return bool
    *   Assertion result.
    */
   public function assertPagePath($path) {
diff --git a/core/modules/views/src/Tests/Plugin/NumericFormatPluralTest.php b/core/modules/views/src/Tests/Plugin/NumericFormatPluralTest.php
index 94f752b0b..bb0632875 100644
--- a/core/modules/views/src/Tests/Plugin/NumericFormatPluralTest.php
+++ b/core/modules/views/src/Tests/Plugin/NumericFormatPluralTest.php
@@ -136,7 +136,7 @@ class NumericFormatPluralTest extends ViewTestBase {
    * Creates and saves a test file.
    *
    * @return \Drupal\Core\Entity\EntityInterface
-   *  A file entity.
+   *   A file entity.
    */
   protected function createFile() {
     // Create a new file entity.
diff --git a/core/modules/views/src/ViewExecutable.php b/core/modules/views/src/ViewExecutable.php
index fe81f5fce..cba3948ac 100644
--- a/core/modules/views/src/ViewExecutable.php
+++ b/core/modules/views/src/ViewExecutable.php
@@ -2374,7 +2374,7 @@ class ViewExecutable implements \Serializable {
    * Returns whether admin links should be rendered on the view.
    *
    * @return bool
-   *  TRUE if admin links should be rendered, else FALSE.
+   *   TRUE if admin links should be rendered, else FALSE.
    */
   public function getShowAdminLinks() {
     if (!isset($this->showAdminLinks)) {
diff --git a/core/modules/views/src/Views.php b/core/modules/views/src/Views.php
index 10d824080..468947998 100644
--- a/core/modules/views/src/Views.php
+++ b/core/modules/views/src/Views.php
@@ -295,8 +295,8 @@ class Views {
    *   If TRUE, the list of views is sorted ascending.
    *
    * @return array
-   *  an associative array for use in select.
-   *  - key: view name and display id separated by ':', or the view name only
+   *   An associative array for use in select.
+   *   - key: view name and display id separated by ':', or the view name only.
    */
   public static function getViewsAsOptions($views_only = FALSE, $filter = 'all', $exclude_view = NULL, $optgroup = FALSE, $sort = FALSE) {
 
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.base_and_revision.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.base_and_revision.yml
new file mode 100644
index 000000000..d7d616297
--- /dev/null
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.base_and_revision.yml
@@ -0,0 +1,346 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - node
+    - user
+id: base_and_revision
+label: base_and_revision
+module: views
+description: ''
+tag: ''
+base_table: node_field_revision
+base_field: vid
+core: 8.x
+display:
+  default:
+    display_plugin: default
+    id: default
+    display_title: Master
+    position: 0
+    display_options:
+      access:
+        type: perm
+        options:
+          perm: 'view all revisions'
+      cache:
+        type: none
+        options: {  }
+      query:
+        type: views_query
+        options:
+          disable_sql_rewrite: false
+          distinct: false
+          replica: false
+          query_comment: ''
+          query_tags: {  }
+      exposed_form:
+        type: basic
+        options:
+          submit_button: Apply
+          reset_button: false
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          expose_sort_order: true
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      pager:
+        type: mini
+        options:
+          items_per_page: 10
+          offset: 0
+          id: 0
+          total_pages: null
+          expose:
+            items_per_page: false
+            items_per_page_label: 'Items per page'
+            items_per_page_options: '5, 10, 25, 50'
+            items_per_page_options_all: false
+            items_per_page_options_all_label: '- All -'
+            offset: false
+            offset_label: Offset
+          tags:
+            previous: ‹‹
+            next: ››
+      style:
+        type: default
+        options:
+          grouping: {  }
+          row_class: ''
+          default_row_class: true
+          uses_fields: false
+      row:
+        type: fields
+        options:
+          inline: {  }
+          separator: ''
+          hide_empty: false
+          default_field_elements: true
+      fields:
+        nid:
+          id: nid
+          table: node_field_revision
+          field: nid
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: ''
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: number_integer
+          settings:
+            thousand_separator: ''
+            prefix_suffix: true
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          entity_type: node
+          entity_field: nid
+          plugin_id: field
+        vid:
+          id: vid
+          table: node_field_revision
+          field: vid
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: ''
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: number_integer
+          settings:
+            thousand_separator: ''
+            prefix_suffix: true
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          entity_type: node
+          entity_field: vid
+          plugin_id: field
+        vid_1:
+          id: vid_1
+          table: node_field_data
+          field: vid
+          relationship: nid
+          group_type: group
+          admin_label: ''
+          label: ''
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: number_integer
+          settings:
+            thousand_separator: ''
+            prefix_suffix: true
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          entity_type: node
+          entity_field: vid
+          plugin_id: field
+      filters:
+        vid:
+          id: vid
+          table: node_field_revision
+          field: vid
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: '='
+          value:
+            min: ''
+            max: ''
+            value: '3'
+          group: 1
+          exposed: false
+          expose:
+            operator_id: ''
+            label: ''
+            description: ''
+            use_operator: false
+            operator: ''
+            identifier: ''
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          entity_type: node
+          entity_field: vid
+          plugin_id: numeric
+      sorts: {  }
+      header: {  }
+      footer: {  }
+      empty: {  }
+      relationships:
+        nid:
+          id: nid
+          table: node_field_revision
+          field: nid
+          relationship: none
+          group_type: group
+          admin_label: Node
+          required: false
+          entity_type: node
+          entity_field: nid
+          plugin_id: standard
+      arguments: {  }
+      display_extenders: {  }
+      rendering_language: en
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_interface'
+        - url.query_args
+        - 'user.node_grants:view'
+        - user.permissions
+      tags: {  }
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_multivalue_basefield.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_multivalue_basefield.yml
new file mode 100644
index 000000000..478071dfa
--- /dev/null
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_multivalue_basefield.yml
@@ -0,0 +1,45 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - entity_test
+id: test_entity_multivalue_basefield
+label: ''
+module: views
+description: ''
+tag: ''
+base_table: entity_test_multivalue_basefield
+base_field: id
+core: '8'
+display:
+  default:
+    display_plugin: default
+    id: default
+    display_title: Master
+    position: 0
+    display_options:
+      fields:
+        id:
+          id: id
+          table: entity_test_multivalue_basefield
+          field: nid
+          relationship: none
+          plugin_id: field
+          entity_type: entity_test_multivalue_basefield
+          entity_field: id
+        name:
+          id: name
+          table: entity_test_multivalue_basefield__name
+          field: name
+          plugin_id: field
+          entity_type: entity_test_multivalue_basefield
+          entity_field: name
+      defaults:
+        fields: false
+        filters: false
+      sorts:
+        id:
+          id: id
+          table: entity_test_multivalue_basefield
+          field: id
+          order: asc
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_body.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_body.yml
new file mode 100644
index 000000000..10163c952
--- /dev/null
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_body.yml
@@ -0,0 +1,188 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.node.body
+  module:
+    - node
+    - text
+    - user
+id: test_field_body
+label: test_field_body
+module: views
+description: ''
+tag: ''
+base_table: node_field_data
+base_field: nid
+core: 8.x
+display:
+  default:
+    display_plugin: default
+    id: default
+    display_title: Master
+    position: 0
+    display_options:
+      access:
+        type: perm
+        options:
+          perm: 'access content'
+      cache:
+        type: tag
+        options: {  }
+      query:
+        type: views_query
+        options:
+          disable_sql_rewrite: false
+          distinct: false
+          replica: false
+          query_comment: ''
+          query_tags: {  }
+      exposed_form:
+        type: basic
+        options:
+          submit_button: Apply
+          reset_button: false
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          expose_sort_order: true
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      pager:
+        type: mini
+        options:
+          items_per_page: 10
+          offset: 0
+          id: 0
+          total_pages: null
+          expose:
+            items_per_page: false
+            items_per_page_label: 'Items per page'
+            items_per_page_options: '5, 10, 25, 50'
+            items_per_page_options_all: false
+            items_per_page_options_all_label: '- All -'
+            offset: false
+            offset_label: Offset
+          tags:
+            previous: ‹‹
+            next: ››
+      style:
+        type: default
+        options:
+          grouping: {  }
+          row_class: ''
+          default_row_class: true
+          uses_fields: false
+      row:
+        type: fields
+        options:
+          inline: {  }
+          separator: ''
+          hide_empty: false
+          default_field_elements: true
+      fields:
+        body:
+          id: body
+          table: node__body
+          field: body
+          relationship: none
+          group_type: group
+          admin_label: 'Body field'
+          label: ''
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: text_default
+          settings: {  }
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          plugin_id: field
+      filters:
+        status:
+          value: true
+          table: node_field_data
+          field: status
+          plugin_id: boolean
+          entity_type: node
+          entity_field: status
+          id: status
+          expose:
+            operator: ''
+          group: 1
+      sorts:
+        created:
+          id: created
+          table: node_field_data
+          field: created
+          order: DESC
+          entity_type: node
+          entity_field: created
+          plugin_id: date
+          relationship: none
+          group_type: group
+          admin_label: ''
+          exposed: false
+          expose:
+            label: ''
+          granularity: second
+      header: {  }
+      footer: {  }
+      empty: {  }
+      relationships: {  }
+      arguments: {  }
+      display_extenders: {  }
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url.query_args
+        - 'user.node_grants:view'
+        - user.permissions
+      tags:
+        - 'config:field.storage.node.body'
diff --git a/core/modules/views/tests/src/FunctionalJavascript/Plugin/views/Handler/FieldTest.php b/core/modules/views/tests/src/FunctionalJavascript/Plugin/views/Handler/FieldTest.php
new file mode 100644
index 000000000..6676daf1e
--- /dev/null
+++ b/core/modules/views/tests/src/FunctionalJavascript/Plugin/views/Handler/FieldTest.php
@@ -0,0 +1,105 @@
+<?php
+
+namespace Drupal\Tests\views\FunctionalJavascript\Plugin\views\Handler;
+
+use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\FunctionalJavascriptTests\JavascriptTestBase;
+use Drupal\node\Entity\NodeType;
+use Drupal\views\Tests\ViewTestData;
+
+/**
+ * Tests the field field handler UI.
+ *
+ * @group views
+ */
+class FieldTest extends JavascriptTestBase {
+  use SchemaCheckTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['node', 'views', 'views_ui', 'views_test_config'];
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = ['test_field_body'];
+
+  /**
+   * The account.
+   *
+   * @var \Drupal\user\UserInterface
+   */
+  protected $account;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    ViewTestData::createTestViews(get_class($this), ['views_test_config']);
+
+    // Disable automatic live preview to make the sequence of calls clearer.
+    \Drupal::configFactory()->getEditable('views.settings')->set('ui.always_live_preview', FALSE)->save();
+
+    $this->account = $this->drupalCreateUser(['administer views']);
+    $this->drupalLogin($this->account);
+
+    NodeType::create([
+      'type' => 'page',
+    ])->save();
+
+    FieldConfig::create([
+      'entity_type' => 'node',
+      'field_name' => 'body',
+      'bundle' => 'page',
+    ])->save();
+  }
+
+  public function testFormatterChanging() {
+    $web_assert = $this->assertSession();
+    $url = '/admin/structure/views/view/test_field_body';
+    $this->drupalGet($url);
+
+    $page = $this->getSession()->getPage();
+
+    $page->clickLink('Body field');
+    $web_assert->assertWaitOnAjaxRequest();
+
+    $page->fillField('options[type]', 'text_trimmed');
+    // Add a value to the trim_length setting.
+    $web_assert->assertWaitOnAjaxRequest();
+    $page->fillField('options[settings][trim_length]', '700');
+    $apply_button = $page->find('css', '.views-ui-dialog button.button--primary');
+    $this->assertTrue(!empty($apply_button));
+    $apply_button->press();
+    $web_assert->assertWaitOnAjaxRequest();
+
+    // Save the page.
+    $save_button = $page->find('css', '#edit-actions-submit');
+    $save_button->press();
+
+    // Set the body field back to 'default' and test that the trim_length
+    // settings are not in the config.
+    $this->drupalGet($url);
+    $page->clickLink('Body field');
+    $web_assert->assertWaitOnAjaxRequest();
+
+    $page->fillField('options[type]', 'text_default');
+    $web_assert->assertWaitOnAjaxRequest();
+    $apply_button = $page->find('css', '.views-ui-dialog button.button--primary');
+    $apply_button->press();
+    $web_assert->assertWaitOnAjaxRequest();
+
+    // Save the page.
+    $save_button = $page->find('css', '#edit-actions-submit');
+    $save_button->press();
+
+    $this->assertConfigSchemaByName('views.view.test_field_body');
+  }
+
+}
diff --git a/core/modules/views/tests/src/Kernel/Entity/EntityViewsWithMultivalueBasefieldTest.php b/core/modules/views/tests/src/Kernel/Entity/EntityViewsWithMultivalueBasefieldTest.php
new file mode 100644
index 000000000..edf0fb0e1
--- /dev/null
+++ b/core/modules/views/tests/src/Kernel/Entity/EntityViewsWithMultivalueBasefieldTest.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace Drupal\Tests\views\Kernel\Entity;
+
+use Drupal\entity_test\Entity\EntityTestMultiValueBasefield;
+use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
+use Drupal\views\Views;
+
+/**
+ * Tests entity views with multivalue base fields.
+ *
+ * @group views
+ */
+class EntityViewsWithMultivalueBasefieldTest extends ViewsKernelTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['entity_test'];
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $testViews = ['test_entity_multivalue_basefield'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp($import_test_views = TRUE) {
+    parent::setUp($import_test_views);
+
+    $this->installEntitySchema('entity_test_multivalue_basefield');
+  }
+
+  /**
+   * Tests entity views with multivalue base fields.
+   */
+  public function testView() {
+    EntityTestMultiValueBasefield::create([
+      'name' => 'test',
+    ])->save();
+    EntityTestMultiValueBasefield::create([
+      'name' => ['test2', 'test3'],
+    ])->save();
+
+    $view = Views::getView('test_entity_multivalue_basefield');
+    $view->execute();
+    $this->assertIdenticalResultset($view, [
+      ['name' => ['test']],
+      ['name' => ['test2', 'test3']],
+    ], ['name' => 'name']);
+  }
+
+}
diff --git a/core/modules/views/tests/src/Kernel/Plugin/Display/ViewsMenuLinkTest.php b/core/modules/views/tests/src/Kernel/Plugin/Display/ViewsMenuLinkTest.php
new file mode 100644
index 000000000..9e05ebcfb
--- /dev/null
+++ b/core/modules/views/tests/src/Kernel/Plugin/Display/ViewsMenuLinkTest.php
@@ -0,0 +1,98 @@
+<?php
+
+namespace Drupal\Tests\views\Kernel\Plugin\Display;
+
+use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
+
+/**
+ * Menu link test.
+ *
+ * @group views
+ */
+class ViewsMenuLinkTest extends ViewsKernelTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = [
+    'menu_ui',
+    'user',
+    'views'
+  ];
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $testViews = ['test_page_display_menu'];
+
+  /**
+   * The entity manager.
+   *
+   * @var \Drupal\Core\Entity\EntityManagerInterface
+   */
+  protected $entityManger;
+
+  /**
+   * The menu link manager.
+   *
+   * @var \Drupal\Core\Menu\MenuLinkManagerInterface
+   */
+  protected $menuLinkManager;
+
+  /**
+   * The menu link overrides.
+   *
+   * @var \Drupal\Core\Menu\StaticMenuLinkOverridesInterface
+   */
+  protected $menuLinkOverrides;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp($import_test_views = TRUE) {
+    parent::setUp($import_test_views);
+
+    $this->entityManger = $this->container->get('entity.manager');
+    $this->menuLinkManager = $this->container->get('plugin.manager.menu.link');
+    $this->menuLinkOverrides = $this->container->get('menu_link.static.overrides');
+  }
+
+  /**
+   * Test views internal menu link options.
+   */
+  public function testMenuLinkOverrides() {
+    // Link from views module.
+    $views_link = $this->menuLinkManager->getDefinition('views_view:views.test_page_display_menu.page_3');
+    $this->assertTrue($views_link['enabled'], 'Menu link is enabled.');
+    $this->assertFalse($views_link['expanded'], 'Menu link is not expanded.');
+    $views_link['enabled'] = 0;
+    $views_link['expanded'] = 1;
+    $this->menuLinkManager->updateDefinition($views_link['id'], $views_link);
+    $views_link = $this->menuLinkManager->getDefinition($views_link['id']);
+    $this->assertFalse($views_link['enabled'], 'Menu link is disabled.');
+    $this->assertTrue($views_link['expanded'], 'Menu link is expanded.');
+    $this->menuLinkManager->rebuild();
+    $this->assertFalse($views_link['enabled'], 'Menu link is disabled.');
+    $this->assertTrue($views_link['expanded'], 'Menu link is expanded.');
+
+    // Link from user module.
+    $user_link = $this->menuLinkManager->getDefinition('user.page');
+    $this->assertTrue($user_link['enabled'], 'Menu link is enabled.');
+    $user_link['enabled'] = 0;
+    $views_link['expanded'] = 1;
+    $this->menuLinkManager->updateDefinition($user_link['id'], $user_link);
+    $this->assertFalse($user_link['enabled'], 'Menu link is disabled.');
+    $this->menuLinkManager->rebuild();
+    $this->assertFalse($user_link['enabled'], 'Menu link is disabled.');
+
+    $this->menuLinkOverrides->reload();
+
+    $views_link = $this->menuLinkManager->getDefinition('views_view:views.test_page_display_menu.page_3');
+    $this->assertFalse($views_link['enabled'], 'Menu link is disabled.');
+    $this->assertTrue($views_link['expanded'], 'Menu link is expanded.');
+
+    $user_link = $this->menuLinkManager->getDefinition('user.page');
+    $this->assertFalse($user_link['enabled'], 'Menu link is disabled.');
+  }
+
+}
diff --git a/core/modules/views/tests/src/Kernel/Plugin/JoinTest.php b/core/modules/views/tests/src/Kernel/Plugin/JoinTest.php
index 2b6994864..db0262a1d 100644
--- a/core/modules/views/tests/src/Kernel/Plugin/JoinTest.php
+++ b/core/modules/views/tests/src/Kernel/Plugin/JoinTest.php
@@ -172,7 +172,8 @@ class JoinTest extends RelationshipJoinTestBase {
     $join_info = $tables['users4'];
     $this->assertTrue(strpos($join_info['condition'], "views_test_data.uid = users4.uid") !== FALSE, 'Make sure the join condition appears in the query.');
     $this->assertTrue(strpos($join_info['condition'], "users4.name = :views_join_condition_2") !== FALSE, 'Make sure the first extra join condition appears in the query.');
-    $this->assertTrue(strpos($join_info['condition'], "users4.name IN ( :views_join_condition_3, :views_join_condition_4, :views_join_condition_5 )") !== FALSE, 'The IN condition for the join is properly formed.');
+    $this->assertTrue(strpos($join_info['condition'], "users4.name IN ( :views_join_condition_3[] )") !== FALSE, 'The IN condition for the join is properly formed.');
+    $this->assertEqual($join_info['arguments'][':views_join_condition_3[]'], array($random_name_2, $random_name_3, $random_name_4), 'Make sure the IN arguments are still part of an array.');
 
     // Test that all the conditions are properly built.
     $configuration['extra'] = array(
@@ -197,8 +198,8 @@ class JoinTest extends RelationshipJoinTestBase {
     $tables = $query->getTables();
     $join_info = $tables['users5'];
     $this->assertTrue(strpos($join_info['condition'], "views_test_data.uid = users5.uid") !== FALSE, 'Make sure the join condition appears in the query.');
-    $this->assertTrue(strpos($join_info['condition'], "users5.langcode = :views_join_condition_6") !== FALSE, 'Make sure the first extra join condition appears in the query.');
-    $this->assertTrue(strpos($join_info['condition'], "views_test_data.status = :views_join_condition_7") !== FALSE, 'Make sure the second extra join condition appears in the query.');
+    $this->assertTrue(strpos($join_info['condition'], "users5.langcode = :views_join_condition_4") !== FALSE, 'Make sure the first extra join condition appears in the query.');
+    $this->assertTrue(strpos($join_info['condition'], "views_test_data.status = :views_join_condition_5") !== FALSE, 'Make sure the second extra join condition appears in the query.');
     $this->assertTrue(strpos($join_info['condition'], "users5.name = views_test_data.name") !== FALSE, 'Make sure the third extra join condition appears in the query.');
     $this->assertEqual(array_values($join_info['arguments']), array('en', 0), 'Make sure the arguments are in the right order');
   }
diff --git a/core/modules/views/src/Tests/Plugin/PluginBaseTest.php b/core/modules/views/tests/src/Kernel/Plugin/PluginBaseTest.php
similarity index 79%
rename from core/modules/views/src/Tests/Plugin/PluginBaseTest.php
rename to core/modules/views/tests/src/Kernel/Plugin/PluginBaseTest.php
index c9ba78fc1..681cf3905 100644
--- a/core/modules/views/src/Tests/Plugin/PluginBaseTest.php
+++ b/core/modules/views/tests/src/Kernel/Plugin/PluginBaseTest.php
@@ -5,11 +5,11 @@
  * Contains \Drupal\views\Tests\Plugin\PluginBaseTest.
  */
 
-namespace Drupal\views\Tests\Plugin;
+namespace Drupal\Tests\views\Kernel\Plugin;
 
 use Drupal\Core\Render\RenderContext;
 use Drupal\Core\Render\Markup;
-use Drupal\simpletest\KernelTestBase;
+use Drupal\KernelTests\KernelTestBase;
 use Drupal\views\Plugin\views\PluginBase;
 
 /**
@@ -55,6 +55,16 @@ class PluginBaseTest extends KernelTestBase {
     });
 
     $this->assertIdentical($result, 'first comes before second');
+
+    // Test tokens with numeric indexes.
+    $text = '{{ argument.0.first }} comes before {{ argument.1.second }}';
+    $tokens = ['{{ argument.0.first }}' => 'first', '{{ argument.1.second }}' => 'second'];
+
+    $result = \Drupal::service('renderer')->executeInRenderContext(new RenderContext(), function () use ($text, $tokens) {
+      return $this->testPluginBase->viewsTokenReplace($text, $tokens);
+    });
+
+    $this->assertIdentical($result, 'first comes before second');
   }
 
   /**
diff --git a/core/modules/views/tests/src/Kernel/Plugin/SqlEntityLoadingTest.php b/core/modules/views/tests/src/Kernel/Plugin/SqlEntityLoadingTest.php
new file mode 100644
index 000000000..339638ceb
--- /dev/null
+++ b/core/modules/views/tests/src/Kernel/Plugin/SqlEntityLoadingTest.php
@@ -0,0 +1,83 @@
+<?php
+
+namespace Drupal\Tests\views\Kernel\Plugin;
+
+use Drupal\node\Entity\Node;
+use Drupal\node\Entity\NodeType;
+use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
+use Drupal\views\Views;
+
+/**
+ * Tests the loading of entities and entity revisions.
+ *
+ * @group views
+ *
+ * @see \Drupal\views\Plugin\views\query\Sql
+ */
+class SqlEntityLoadingTest extends ViewsKernelTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['node', 'user'];
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $testViews = ['base_and_revision'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp($import_test_views = TRUE) {
+    parent::setUp($import_test_views);
+
+    $this->installEntitySchema('node');
+    $this->installEntitySchema('user');
+    $this->installSchema('node', 'node_access');
+  }
+
+  public function testViewWithNonDefaultForwardRevision() {
+    $node_type = NodeType::create([
+      'type' => 'page',
+    ]);
+    $node_type->save();
+
+    $node = Node::create([
+      'type' => 'page',
+      'title' => 'test title',
+    ]);
+    $node->save();
+
+    // Creates the first revision, which is set as default.
+    $revision = clone $node;
+    $revision->setNewRevision(TRUE);
+    $revision->isDefaultRevision(TRUE);
+    $revision->save();
+
+    // Creates the second revision, which is not set as default.
+    $revision2 = clone $node;
+    $revision2->setNewRevision(TRUE);
+    $revision2->isDefaultRevision(FALSE);
+    $revision2->save();
+
+    $view = Views::getView('base_and_revision');
+    $view->execute();
+
+    $expected = [
+      [
+        'nid' => $node->id(),
+        // The default revision ID.
+        'vid_1' => $revision->getRevisionId(),
+        // THe latest revision ID.
+        'vid' => $revision2->getRevisionId(),
+      ],
+    ];
+    $this->assertIdenticalResultset($view, $expected, [
+      'node_field_data_node_field_revision_nid' => 'nid',
+      'vid_1' => 'vid_1',
+      'vid' => 'vid',
+    ]);
+  }
+
+}
diff --git a/core/modules/views/tests/src/Kernel/ViewsKernelTestBase.php b/core/modules/views/tests/src/Kernel/ViewsKernelTestBase.php
index f53309bd0..f149b7fba 100644
--- a/core/modules/views/tests/src/Kernel/ViewsKernelTestBase.php
+++ b/core/modules/views/tests/src/Kernel/ViewsKernelTestBase.php
@@ -11,7 +11,7 @@ use Drupal\views\Tests\ViewTestData;
 /**
  * Defines a base class for Views kernel testing.
  */
-class ViewsKernelTestBase extends KernelTestBase {
+abstract class ViewsKernelTestBase extends KernelTestBase {
 
   use ViewResultAssertionTrait;
 
diff --git a/core/modules/views/tests/src/Unit/EntityViewsDataTest.php b/core/modules/views/tests/src/Unit/EntityViewsDataTest.php
index c1db0cfee..245b8f169 100644
--- a/core/modules/views/tests/src/Unit/EntityViewsDataTest.php
+++ b/core/modules/views/tests/src/Unit/EntityViewsDataTest.php
@@ -11,6 +11,7 @@ use Drupal\Core\Config\Entity\ConfigEntityType;
 use Drupal\Core\Entity\ContentEntityType;
 use Drupal\Core\Entity\EntityType;
 use Drupal\Core\Entity\EntityTypeInterface;
+use Drupal\Core\Entity\Sql\DefaultTableMapping;
 use Drupal\Core\Field\BaseFieldDefinition;
 use Drupal\Core\Field\Plugin\Field\FieldType\EntityReferenceItem;
 use Drupal\Core\Field\Plugin\Field\FieldType\IntegerItem;
@@ -160,6 +161,12 @@ class EntityViewsDataTest extends UnitTestCase {
       ->setTranslatable(TRUE)
       ->setSetting('max_length', 255);
 
+    // A base field with cardinality > 1
+    $base_fields['string']  = BaseFieldDefinition::create('string')
+      ->setLabel('Strong')
+      ->setTranslatable(TRUE)
+      ->setCardinality(2);
+
     foreach ($base_fields as $name => $base_field) {
       $base_field->setName($name);
     }
@@ -376,6 +383,10 @@ class EntityViewsDataTest extends UnitTestCase {
     $homepage_field_storage_definition->expects($this->any())
       ->method('getSchema')
       ->willReturn(UriItem::schema($homepage_field_storage_definition));
+    $string_field_storage_definition = $this->getMock('Drupal\Core\Field\FieldStorageDefinitionInterface');
+    $string_field_storage_definition->expects($this->any())
+      ->method('getSchema')
+      ->willReturn(StringItem::schema($string_field_storage_definition));
 
     // Setup the user_id entity reference field.
     $this->entityManager->expects($this->any())
@@ -411,6 +422,7 @@ class EntityViewsDataTest extends UnitTestCase {
         'name' => $name_field_storage_definition,
         'description' => $description_field_storage_definition,
         'homepage' => $homepage_field_storage_definition,
+        'string' => $string_field_storage_definition,
         'user_id' => $user_id_field_storage_definition,
         'revision_id' => $revision_id_field_storage_definition,
       ]);
@@ -435,10 +447,12 @@ class EntityViewsDataTest extends UnitTestCase {
         ['entity_test', $base_field_definitions],
       ]));
     // Setup the table mapping.
-    $table_mapping = $this->getMock('Drupal\Core\Entity\Sql\TableMappingInterface');
+    $table_mapping = $this->getMockBuilder(DefaultTableMapping::class)
+      ->disableOriginalConstructor()
+      ->getMock();
     $table_mapping->expects($this->any())
       ->method('getTableNames')
-      ->willReturn(['entity_test']);
+      ->willReturn(['entity_test', 'entity_test__string']);
     $table_mapping->expects($this->any())
       ->method('getColumnNames')
       ->willReturnMap([
@@ -450,12 +464,26 @@ class EntityViewsDataTest extends UnitTestCase {
         ['description', ['value' => 'description__value', 'format' => 'description__format']],
         ['homepage', ['value' => 'homepage']],
         ['user_id', ['target_id' => 'user_id']],
+        ['string', ['value' => 'value']],
       ]);
     $table_mapping->expects($this->any())
       ->method('getFieldNames')
       ->willReturnMap([
-        ['entity_test', ['id', 'uuid', 'type', 'langcode', 'name', 'description', 'homepage', 'user_id']]
+        ['entity_test', ['id', 'uuid', 'type', 'langcode', 'name', 'description', 'homepage', 'user_id']],
+        ['entity_test__string', ['string']],
       ]);
+    $table_mapping->expects($this->any())
+      ->method('requiresDedicatedTableStorage')
+      ->willReturnCallback(function (BaseFieldDefinition $base_field) {
+        return $base_field->getName() === 'string';
+      });
+    $table_mapping->expects($this->any())
+      ->method('getDedicatedDataTableName')
+      ->willReturnCallback(function (BaseFieldDefinition $base_field) {
+        if ($base_field->getName() === 'string') {
+          return 'entity_test__string';
+        }
+      });
 
     $this->entityStorage->expects($this->once())
       ->method('getTableMapping')
@@ -492,6 +520,18 @@ class EntityViewsDataTest extends UnitTestCase {
     $relationship = $data['entity_test']['user_id']['relationship'];
     $this->assertEquals('users_field_data', $relationship['base']);
     $this->assertEquals('uid', $relationship['base field']);
+
+    $this->assertStringField($data['entity_test__string']['string']);
+    $this->assertField($data['entity_test__string']['string'], 'string');
+    $this->assertEquals([
+      'left_field' => 'id',
+      'field' => 'entity_id',
+      'extra' => [[
+        'field' => 'deleted',
+        'value' => 0,
+        'numeric' => TRUE,
+      ]],
+    ], $data['entity_test__string']['table']['join']['entity_test']);
   }
 
   /**
@@ -529,10 +569,12 @@ class EntityViewsDataTest extends UnitTestCase {
     $this->viewsData->setEntityType($entity_type);
 
      // Setup the table mapping.
-    $table_mapping = $this->getMock('Drupal\Core\Entity\Sql\TableMappingInterface');
+    $table_mapping = $this->getMockBuilder(DefaultTableMapping::class)
+      ->disableOriginalConstructor()
+      ->getMock();
     $table_mapping->expects($this->any())
       ->method('getTableNames')
-      ->willReturn(['entity_test_mul', 'entity_test_mul_property_data']);
+      ->willReturn(['entity_test_mul', 'entity_test_mul_property_data', 'entity_test_mul__string']);
     $table_mapping->expects($this->any())
       ->method('getColumnNames')
       ->willReturnMap([
@@ -544,12 +586,14 @@ class EntityViewsDataTest extends UnitTestCase {
         ['description', ['value' => 'description__value', 'format' => 'description__format']],
         ['homepage', ['value' => 'homepage']],
         ['user_id', ['target_id' => 'user_id']],
+        ['string', ['value' => 'value']],
       ]);
     $table_mapping->expects($this->any())
       ->method('getFieldNames')
       ->willReturnMap([
         ['entity_test_mul', ['uuid']],
         ['entity_test_mul_property_data', ['id', 'type', 'langcode', 'name', 'description', 'homepage', 'user_id']],
+        ['entity_test_mul__string', ['string']],
       ]);
 
     $table_mapping->expects($this->any())
@@ -560,6 +604,18 @@ class EntityViewsDataTest extends UnitTestCase {
         }
         return 'entity_test_mul_property_data';
       });
+    $table_mapping->expects($this->any())
+      ->method('requiresDedicatedTableStorage')
+      ->willReturnCallback(function (BaseFieldDefinition $base_field) {
+        return $base_field->getName() === 'string';
+      });
+    $table_mapping->expects($this->any())
+      ->method('getDedicatedDataTableName')
+      ->willReturnCallback(function (BaseFieldDefinition $base_field) {
+        if ($base_field->getName() === 'string') {
+          return 'entity_test_mul__string';
+        }
+      });
 
     $this->entityStorage->expects($this->once())
       ->method('getTableMapping')
@@ -619,6 +675,18 @@ class EntityViewsDataTest extends UnitTestCase {
     $relationship = $data['entity_test_mul_property_data']['user_id']['relationship'];
     $this->assertEquals('users_field_data', $relationship['base']);
     $this->assertEquals('uid', $relationship['base field']);
+
+    $this->assertStringField($data['entity_test_mul__string']['string']);
+    $this->assertField($data['entity_test_mul__string']['string'], 'string');
+    $this->assertEquals([
+      'left_field' => 'id',
+      'field' => 'entity_id',
+      'extra' => [[
+        'field' => 'deleted',
+        'value' => 0,
+        'numeric' => TRUE,
+      ]],
+    ], $data['entity_test_mul__string']['table']['join']['entity_test_mul']);
   }
 
   /**
@@ -650,10 +718,12 @@ class EntityViewsDataTest extends UnitTestCase {
     $this->viewsData->setEntityType($entity_type);
 
      // Setup the table mapping.
-    $table_mapping = $this->getMock('Drupal\Core\Entity\Sql\TableMappingInterface');
+    $table_mapping = $this->getMockBuilder(DefaultTableMapping::class)
+      ->disableOriginalConstructor()
+      ->getMock();
     $table_mapping->expects($this->any())
       ->method('getTableNames')
-      ->willReturn(['entity_test_mulrev', 'entity_test_mulrev_revision', 'entity_test_mulrev_property_data', 'entity_test_mulrev_property_revision']);
+      ->willReturn(['entity_test_mulrev', 'entity_test_mulrev_revision', 'entity_test_mulrev_property_data', 'entity_test_mulrev_property_revision', 'entity_test_mulrev__string', 'entity_test_mulrev_revision__string']);
     $table_mapping->expects($this->any())
       ->method('getColumnNames')
       ->willReturnMap([
@@ -666,6 +736,7 @@ class EntityViewsDataTest extends UnitTestCase {
         ['homepage', ['value' => 'homepage']],
         ['user_id', ['target_id' => 'user_id']],
         ['revision_id', ['value' => 'id']],
+        ['string', ['value' => 'value']],
       ]);
     $table_mapping->expects($this->any())
       ->method('getFieldNames')
@@ -674,7 +745,29 @@ class EntityViewsDataTest extends UnitTestCase {
         ['entity_test_mulrev_revision', ['id', 'revision_id', 'langcode']],
         ['entity_test_mulrev_property_data', ['id', 'revision_id', 'langcode', 'name', 'description', 'homepage', 'user_id']],
         ['entity_test_mulrev_property_revision', ['id', 'revision_id', 'langcode', 'name', 'description', 'homepage', 'user_id']],
+        ['entity_test_mulrev__string', ['string']],
+        ['entity_test_mulrev_revision__string', ['string']],
       ]);
+    $table_mapping->expects($this->any())
+      ->method('requiresDedicatedTableStorage')
+      ->willReturnCallback(function (BaseFieldDefinition $base_field) {
+        return $base_field->getName() === 'string';
+      });
+    $table_mapping->expects($this->any())
+      ->method('getDedicatedDataTableName')
+      ->willReturnCallback(function (BaseFieldDefinition $base_field) {
+        if ($base_field->getName() === 'string') {
+          return 'entity_test_mulrev__string';
+        }
+      });
+
+    $table_mapping->expects($this->any())
+      ->method('getDedicatedRevisionTableName')
+      ->willReturnCallback(function (BaseFieldDefinition $base_field) {
+        if ($base_field->getName() === 'string') {
+          return 'entity_test_mulrev_revision__string';
+        }
+      });
 
     $table_mapping->expects($this->any())
       ->method('getFieldTableName')
@@ -767,6 +860,30 @@ class EntityViewsDataTest extends UnitTestCase {
     $relationship = $data['entity_test_mulrev_property_revision']['user_id']['relationship'];
     $this->assertEquals('users_field_data', $relationship['base']);
     $this->assertEquals('uid', $relationship['base field']);
+
+    $this->assertStringField($data['entity_test_mulrev__string']['string']);
+    $this->assertField($data['entity_test_mulrev__string']['string'], 'string');
+    $this->assertEquals([
+      'left_field' => 'id',
+      'field' => 'entity_id',
+      'extra' => [[
+        'field' => 'deleted',
+        'value' => 0,
+        'numeric' => TRUE,
+      ]],
+    ], $data['entity_test_mulrev__string']['table']['join']['entity_test_mulrev_property_data']);
+
+    $this->assertStringField($data['entity_test_mulrev_revision__string']['string']);
+    $this->assertField($data['entity_test_mulrev_revision__string']['string'], 'string');
+    $this->assertEquals([
+      'left_field' => 'revision_id',
+      'field' => 'entity_id',
+      'extra' => [[
+        'field' => 'deleted',
+        'value' => 0,
+        'numeric' => TRUE,
+      ]],
+    ], $data['entity_test_mulrev_revision__string']['table']['join']['entity_test_mulrev_property_revision']);
   }
 
   /**
diff --git a/core/modules/views/tests/src/Unit/Plugin/query/SqlTest.php b/core/modules/views/tests/src/Unit/Plugin/query/SqlTest.php
index ae06eaf4a..2428a46a3 100644
--- a/core/modules/views/tests/src/Unit/Plugin/query/SqlTest.php
+++ b/core/modules/views/tests/src/Unit/Plugin/query/SqlTest.php
@@ -2,9 +2,18 @@
 
 namespace Drupal\Tests\views\Unit\Plugin\query;
 
+use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Entity\EntityStorageInterface;
+use Drupal\Core\Entity\EntityType;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Tests\UnitTestCase;
 use Drupal\views\Plugin\views\query\Sql;
+use Drupal\views\Plugin\views\relationship\RelationshipPluginBase;
 use Drupal\views\ResultRow;
+use Drupal\views\ViewEntityInterface;
+use Drupal\views\ViewExecutable;
+use Drupal\views\ViewsData;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 
 /**
  * @coversDefaultClass \Drupal\views\Plugin\views\query\Sql
@@ -19,8 +28,9 @@ class SqlTest extends UnitTestCase {
    */
   public function testGetCacheTags() {
     $view = $this->prophesize('Drupal\views\ViewExecutable')->reveal();
+    $entity_type_manager = $this->prophesize(EntityTypeManagerInterface::class);
 
-    $query = new Sql([], 'sql', []);
+    $query = new Sql([], 'sql', [], $entity_type_manager->reveal());
     $query->view = $view;
 
     $result = [];
@@ -64,8 +74,9 @@ class SqlTest extends UnitTestCase {
    */
   public function testGetCacheMaxAge() {
     $view = $this->prophesize('Drupal\views\ViewExecutable')->reveal();
+    $entity_type_manager = $this->prophesize(EntityTypeManagerInterface::class);
 
-    $query = new Sql([], 'sql', []);
+    $query = new Sql([], 'sql', [], $entity_type_manager->reveal());
     $query->view = $view;
 
     $view->result = [];
@@ -98,4 +109,427 @@ class SqlTest extends UnitTestCase {
     $this->assertEquals(10, $query->getCacheMaxAge());
   }
 
+  /**
+   * Sets up the views data in the container.
+   *
+   * @param \Drupal\views\ViewsData $views_data
+   *   The views data.
+   */
+  protected function setupViewsData(ViewsData $views_data) {
+    $container = \Drupal::hasContainer() ? \Drupal::getContainer() : new ContainerBuilder();
+    $container->set('views.views_data', $views_data);
+    \Drupal::setContainer($container);
+  }
+
+  /**
+   * Sets up the entity type manager in the container.
+   *
+   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
+   *   The entity type manager.
+   */
+  protected function setupEntityTypeManager(EntityTypeManagerInterface $entity_type_manager) {
+    $container = \Drupal::hasContainer() ? \Drupal::getContainer() : new ContainerBuilder();
+    $container->set('entity_type.manager', $entity_type_manager);
+    $container->set('entity.manager', $entity_type_manager);
+    \Drupal::setContainer($container);
+  }
+
+  /**
+   * Sets up some test entity types and corresponding views data.
+   *
+   * @param \Drupal\Core\Entity\EntityInterface[][] $entities_by_type
+   *   Test entities keyed by entity type and entity ID.
+   * @param \Drupal\Core\Entity\EntityInterface[][] $entities_by_type
+   *   Test entities keyed by entity type and revision ID.
+   *
+   * @return \Prophecy\Prophecy\ObjectProphecy
+   */
+  protected function setupEntityTypes($entities_by_type = [], $entity_revisions_by_type = []) {
+    $entity_type_manager = $this->prophesize(EntityTypeManagerInterface::class);
+    $entity_type0 = new EntityType([
+      'label' => 'First',
+      'id' => 'first',
+      'base_table' => 'entity_first',
+      'revision_table' => 'entity_first__revision',
+      'entity_keys' => [
+        'id' => 'id',
+        'revision' => 'vid',
+      ],
+    ]);
+    $entity_type1 = new EntityType([
+      'label' => 'second',
+      'id' => 'second',
+      'base_table' => 'entity_second',
+      'revision_table' => 'entity_second__revision',
+      'entity_keys' => [
+        'id' => 'id',
+        'revision' => 'vid',
+      ],
+    ]);
+
+    $entity_type_manager->getDefinitions()->willReturn([
+      'first' => $entity_type0,
+      'second' => $entity_type1,
+      'base_table' => 'entity_second',
+    ]);
+
+    $entity_type_manager->getDefinition('first')->willReturn($entity_type0);
+    $entity_type_manager->getDefinition('second')->willReturn($entity_type1);
+
+    // Setup the views data corresponding to the entity types.
+    $views_data = $this->prophesize(ViewsData::class);
+    $views_data->get('entity_first')->willReturn([
+      'table' => [
+        'entity type' => 'first',
+        'entity revision' => FALSE,
+      ],
+    ]);
+    $views_data->get('entity_first__revision')->willReturn([
+      'table' => [
+        'entity type' => 'first',
+        'entity revision' => TRUE,
+      ],
+    ]);
+    $views_data->get('entity_second')->willReturn([
+      'table' => [
+        'entity type' => 'second',
+        'entity revision' => FALSE,
+      ],
+    ]);
+    $views_data->get('entity_second__revision')->willReturn([
+      'table' => [
+        'entity type' => 'second',
+        'entity revision' => TRUE,
+      ],
+    ]);
+    $this->setupViewsData($views_data->reveal());
+
+    // Setup the loading of entities and entity revisions.
+    $entity_storages = [
+      'first' => $this->prophesize(EntityStorageInterface::class),
+      'second' => $this->prophesize(EntityStorageInterface::class),
+    ];
+
+    foreach ($entities_by_type as $entity_type_id => $entities) {
+      foreach ($entities as $entity_id => $entity) {
+        $entity_storages[$entity_type_id]->load($entity_id)->willReturn($entity);
+      }
+      $entity_storages[$entity_type_id]->loadMultiple(array_keys($entities))->willReturn($entities);
+    }
+
+    foreach ($entity_revisions_by_type as $entity_type_id => $entity_revisions) {
+      foreach ($entity_revisions as $revision_id => $revision) {
+        $entity_storages[$entity_type_id]->loadRevision($revision_id)->willReturn($revision);
+      }
+    }
+
+    $entity_type_manager->getStorage('first')->willReturn($entity_storages['first']);
+    $entity_type_manager->getStorage('second')->willReturn($entity_storages['second']);
+
+    $this->setupEntityTypeManager($entity_type_manager->reveal());
+
+    return $entity_type_manager;
+  }
+
+  /**
+   * @covers ::loadEntities
+   * @covers ::_assignEntitiesToResult
+   */
+  public function testLoadEntitiesWithEmptyResult() {
+    $view = $this->prophesize('Drupal\views\ViewExecutable')->reveal();
+    $view_entity = $this->prophesize(ViewEntityInterface::class);
+    $view_entity->get('base_table')->willReturn('entity_first');
+    $view_entity->get('base_field')->willReturn('id');
+    $view->storage = $view_entity->reveal();
+
+    $entity_type_manager = $this->setupEntityTypes();
+
+    $query = new Sql([], 'sql', [], $entity_type_manager->reveal());
+    $query->view = $view;
+
+    $result = [];
+    $query->addField('entity_first', 'id', 'id');
+    $query->loadEntities($result);
+    $this->assertEmpty($result);
+  }
+
+  /**
+   * @covers ::loadEntities
+   * @covers ::_assignEntitiesToResult
+   */
+  public function testLoadEntitiesWithNoRelationshipAndNoRevision() {
+    $view = $this->prophesize('Drupal\views\ViewExecutable')->reveal();
+    $view_entity = $this->prophesize(ViewEntityInterface::class);
+    $view_entity->get('base_table')->willReturn('entity_first');
+    $view_entity->get('base_field')->willReturn('id');
+    $view->storage = $view_entity->reveal();
+
+    $entities = [
+      'first' => [
+        1 => $this->prophesize(EntityInterface::class)->reveal(),
+        2 => $this->prophesize(EntityInterface::class)->reveal(),
+      ],
+    ];
+    $entity_type_manager = $this->setupEntityTypes($entities);
+
+    $query = new Sql([], 'sql', [], $entity_type_manager->reveal());
+    $query->view = $view;
+
+    $result = [];
+    $result[] = new ResultRow([
+      'id' => 1,
+    ]);
+    // Note: Let the same entity be returned multiple times, for example to
+    // support the translation usecase.
+    $result[] = new ResultRow([
+      'id' => 2,
+    ]);
+    $result[] = new ResultRow([
+      'id' => 2,
+    ]);
+
+    $query->addField('entity_first', 'id', 'id');
+    $query->loadEntities($result);
+
+    $this->assertSame($entities['first'][1], $result[0]->_entity);
+    $this->assertSame($entities['first'][2], $result[1]->_entity);
+    $this->assertSame($entities['first'][2], $result[2]->_entity);
+  }
+
+  /**
+   * Create a view with a relationship.
+   */
+  protected function setupViewWithRelationships(ViewExecutable $view, $base = 'entity_second') {
+    // We don't use prophecy, because prophecy enforces methods.
+    $relationship = $this->getMockBuilder(RelationshipPluginBase::class)->disableOriginalConstructor()->getMock();
+    $relationship->definition['base'] = $base;
+    $relationship->tableAlias = $base;
+    $relationship->alias = $base;
+
+    $view->relationship[$base] = $relationship;
+  }
+
+  /**
+   * @covers ::loadEntities
+   * @covers ::_assignEntitiesToResult
+   */
+  public function testLoadEntitiesWithRelationship() {
+    // We don't use prophecy, because prophecy enforces methods.
+    $view = $this->getMockBuilder(ViewExecutable::class)->disableOriginalConstructor()->getMock();
+    $this->setupViewWithRelationships($view);
+
+    $view_entity = $this->prophesize(ViewEntityInterface::class);
+    $view_entity->get('base_table')->willReturn('entity_first');
+    $view_entity->get('base_field')->willReturn('id');
+    $view->storage = $view_entity->reveal();
+
+    $entities = [
+      'first' => [
+        1 => $this->prophesize(EntityInterface::class)->reveal(),
+        2 => $this->prophesize(EntityInterface::class)->reveal(),
+      ],
+      'second' => [
+        11 => $this->prophesize(EntityInterface::class)->reveal(),
+        12 => $this->prophesize(EntityInterface::class)->reveal(),
+      ],
+    ];
+    $entity_type_manager = $this->setupEntityTypes($entities);
+
+    $query = new Sql([], 'sql', [], $entity_type_manager->reveal());
+    $query->view = $view;
+
+    $result = [];
+    $result[] = new ResultRow([
+      'id' => 1,
+      'entity_second__id' => 11,
+    ]);
+    // Provide an explicit NULL value, to test the case of a non required
+    // relationship.
+    $result[] = new ResultRow([
+      'id' => 2,
+      'entity_second__id' => NULL,
+    ]);
+    $result[] = new ResultRow([
+      'id' => 2,
+      'entity_second__id' => 12,
+    ]);
+
+    $query->addField('entity_first', 'id', 'id');
+    $query->addField('entity_second', 'id', 'entity_second__id');
+    $query->loadEntities($result);
+
+    $this->assertSame($entities['first'][1], $result[0]->_entity);
+    $this->assertSame($entities['first'][2], $result[1]->_entity);
+    $this->assertSame($entities['first'][2], $result[2]->_entity);
+
+    $this->assertSame($entities['second'][11], $result[0]->_relationship_entities['entity_second']);
+    $this->assertEquals([], $result[1]->_relationship_entities);
+    $this->assertSame($entities['second'][12], $result[2]->_relationship_entities['entity_second']);
+  }
+
+  /**
+   * @covers ::loadEntities
+   * @covers ::_assignEntitiesToResult
+   */
+  public function testLoadEntitiesWithRevision() {
+    // We don't use prophecy, because prophecy enforces methods.
+    $view = $this->getMockBuilder(ViewExecutable::class)
+      ->disableOriginalConstructor()
+      ->getMock();
+
+    $view_entity = $this->prophesize(ViewEntityInterface::class);
+    $view_entity->get('base_table')->willReturn('entity_first__revision');
+    $view_entity->get('base_field')->willReturn('vid');
+    $view->storage = $view_entity->reveal();
+
+    $entity_revisions = [
+      'first' => [
+        1 => $this->prophesize(EntityInterface::class)->reveal(),
+        3 => $this->prophesize(EntityInterface::class)->reveal(),
+      ],
+    ];
+    $entity_type_manager = $this->setupEntityTypes([], $entity_revisions);
+
+    $query = new Sql([], 'sql', [], $entity_type_manager->reveal());
+    $query->view = $view;
+
+    $result = [];
+    $result[] = new ResultRow([
+      'vid' => 1,
+    ]);
+    $result[] = new ResultRow([
+      'vid' => 1,
+    ]);
+    $result[] = new ResultRow([
+      'vid' => 3,
+    ]);
+
+    $query->addField('entity_first__revision', 'vid', 'vid');
+    $query->loadEntities($result);
+
+    $this->assertSame($entity_revisions['first'][1], $result[0]->_entity);
+    $this->assertSame($entity_revisions['first'][1], $result[1]->_entity);
+    $this->assertSame($entity_revisions['first'][3], $result[2]->_entity);
+  }
+
+  /**
+   * @covers ::loadEntities
+   * @covers ::_assignEntitiesToResult
+   */
+  public function testLoadEntitiesWithRevisionOfSameEntityType() {
+    // We don't use prophecy, because prophecy enforces methods.
+    $view = $this->getMockBuilder(ViewExecutable::class)
+      ->disableOriginalConstructor()
+      ->getMock();
+    $this->setupViewWithRelationships($view, 'entity_first__revision');
+
+    $view_entity = $this->prophesize(ViewEntityInterface::class);
+    $view_entity->get('base_table')->willReturn('entity_first');
+    $view_entity->get('base_field')->willReturn('id');
+    $view->storage = $view_entity->reveal();
+
+    $entity = [
+      'first' => [
+        1 => $this->prophesize(EntityInterface::class)->reveal(),
+        2 => $this->prophesize(EntityInterface::class)->reveal(),
+      ],
+    ];
+    $entity_revisions = [
+      'first' => [
+        1 => $this->prophesize(EntityInterface::class)->reveal(),
+        2 => $this->prophesize(EntityInterface::class)->reveal(),
+        3 => $this->prophesize(EntityInterface::class)->reveal(),
+      ],
+    ];
+    $entity_type_manager = $this->setupEntityTypes($entity, $entity_revisions);
+
+    $query = new Sql([], 'sql', [], $entity_type_manager->reveal());
+    $query->view = $view;
+
+    $result = [];
+    $result[] = new ResultRow([
+      'id' => 1,
+      'entity_first__revision__vid' => 1,
+    ]);
+    $result[] = new ResultRow([
+      'id' => 2,
+      'entity_first__revision__vid' => 2,
+    ]);
+    $result[] = new ResultRow([
+      'id' => 2,
+      'entity_first__revision__vid' => 3,
+    ]);
+
+    $query->addField('entity_first', 'id', 'id');
+    $query->addField('entity_first__revision', 'vid', 'entity_first__revision__vid');
+    $query->loadEntities($result);
+
+    $this->assertSame($entity['first'][1], $result[0]->_entity);
+    $this->assertSame($entity['first'][2], $result[1]->_entity);
+    $this->assertSame($entity['first'][2], $result[2]->_entity);
+    $this->assertSame($entity_revisions['first'][1], $result[0]->_relationship_entities['entity_first__revision']);
+    $this->assertSame($entity_revisions['first'][2], $result[1]->_relationship_entities['entity_first__revision']);
+    $this->assertSame($entity_revisions['first'][3], $result[2]->_relationship_entities['entity_first__revision']);
+  }
+
+  /**
+   * @covers ::loadEntities
+   * @covers ::_assignEntitiesToResult
+   */
+  public function testLoadEntitiesWithRelationshipAndRevision() {
+    // We don't use prophecy, because prophecy enforces methods.
+    $view = $this->getMockBuilder(ViewExecutable::class)->disableOriginalConstructor()->getMock();
+    $this->setupViewWithRelationships($view);
+
+    $view_entity = $this->prophesize(ViewEntityInterface::class);
+    $view_entity->get('base_table')->willReturn('entity_first__revision');
+    $view_entity->get('base_field')->willReturn('vid');
+    $view->storage = $view_entity->reveal();
+
+    $entities = [
+      'second' => [
+        11 => $this->prophesize(EntityInterface::class)->reveal(),
+        12 => $this->prophesize(EntityInterface::class)->reveal(),
+      ],
+    ];
+    $entity_revisions = [
+      'first' => [
+        1 => $this->prophesize(EntityInterface::class)->reveal(),
+        3 => $this->prophesize(EntityInterface::class)->reveal(),
+      ],
+    ];
+    $entity_type_manager = $this->setupEntityTypes($entities, $entity_revisions);
+
+    $query = new Sql([], 'sql', [], $entity_type_manager->reveal());
+    $query->view = $view;
+
+    $result = [];
+    $result[] = new ResultRow([
+      'vid' => 1,
+      'entity_second__id' => 11,
+    ]);
+    // Provide an explicit NULL value, to test the case of a non required
+    // relationship.
+    $result[] = new ResultRow([
+      'vid' => 1,
+      'entity_second__id' => NULL,
+    ]);
+    $result[] = new ResultRow([
+      'vid' => 3,
+      'entity_second__id' => 12,
+    ]);
+
+    $query->addField('entity_first__revision', 'vid', 'vid');
+    $query->addField('entity_second', 'id', 'entity_second__id');
+    $query->loadEntities($result);
+
+    $this->assertSame($entity_revisions['first'][1], $result[0]->_entity);
+    $this->assertSame($entity_revisions['first'][1], $result[1]->_entity);
+    $this->assertSame($entity_revisions['first'][3], $result[2]->_entity);
+
+    $this->assertSame($entities['second'][11], $result[0]->_relationship_entities['entity_second']);
+    $this->assertEquals([], $result[1]->_relationship_entities);
+    $this->assertSame($entities['second'][12], $result[2]->_relationship_entities['entity_second']);
+  }
+
 }
diff --git a/core/modules/views/views.install b/core/modules/views/views.install
index 37d03b63a..aad3659bf 100644
--- a/core/modules/views/views.install
+++ b/core/modules/views/views.install
@@ -360,6 +360,35 @@ function views_update_8005() {
   // Empty update function to rebuild the views data.
 }
 
+/**
+ * Clear caches due to updated entity views data.
+ */
+function views_update_8100() {
+  // Empty update to cause a cache flush so that views data is rebuilt.
+}
+
+/**
+ * Set default values for enabled/expanded flag on page displays.
+ */
+function views_update_8101() {
+  $config_factory = \Drupal::configFactory();
+  foreach ($config_factory->listAll('views.view.') as $view_config_name) {
+    $view = $config_factory->getEditable($view_config_name);
+    $save = FALSE;
+    foreach ($view->get('display') as $display_id => $display) {
+      if ($display['display_plugin'] == 'page') {
+        $display['display_options']['menu']['enabled'] = TRUE;
+        $display['display_options']['menu']['expanded'] = FALSE;
+        $view->set("display.$display_id", $display);
+        $save = TRUE;
+      }
+    }
+    if ($save) {
+      $view->save();
+    }
+  }
+}
+
 /**
  * @} End of "addtogroup updates-8.1.0".
  */
diff --git a/core/modules/views_ui/src/Form/Ajax/ConfigHandler.php b/core/modules/views_ui/src/Form/Ajax/ConfigHandler.php
index 3be2087f5..819cb755b 100644
--- a/core/modules/views_ui/src/Form/Ajax/ConfigHandler.php
+++ b/core/modules/views_ui/src/Form/Ajax/ConfigHandler.php
@@ -237,7 +237,7 @@ class ConfigHandler extends ViewsFormBase {
 
     // Add the incoming options to existing options because items using
     // the extra form may not have everything in the form here.
-    $options = $form_state->getValue('options') + $handler->options;
+    $options = $handler->submitFormCalculateOptions($handler->options, $form_state->getValue('options', []));
 
     // This unpacks only options that are in the definition, ensuring random
     // extra stuff on the form is not sent through.
diff --git a/core/modules/views_ui/src/Tests/FilterBooleanWebTest.php b/core/modules/views_ui/src/Tests/FilterBooleanWebTest.php
index 3faca0c7b..668cc4c1d 100644
--- a/core/modules/views_ui/src/Tests/FilterBooleanWebTest.php
+++ b/core/modules/views_ui/src/Tests/FilterBooleanWebTest.php
@@ -23,6 +23,10 @@ class FilterBooleanWebTest extends UITestBase {
   public function testFilterBooleanUI() {
     $this->drupalPostForm('admin/structure/views/nojs/add-handler/test_view/default/filter', array('name[views_test_data.status]' => TRUE), t('Add and configure @handler', array('@handler' => t('filter criteria'))));
 
+    // Check the field widget label. 'title' should be used as a fallback.
+    $result = $this->cssSelect('#edit-options-value--wrapper legend span');
+    $this->assertEqual((string) $result[0], 'Status');
+
     $this->drupalPostForm(NULL, array(), t('Expose filter'));
     $this->drupalPostForm(NULL, array(), t('Grouped filters'));
 
diff --git a/core/modules/views_ui/tests/src/FunctionalJavascript/ViewsWizardTest.php b/core/modules/views_ui/tests/src/FunctionalJavascript/ViewsWizardTest.php
new file mode 100644
index 000000000..6320f69ed
--- /dev/null
+++ b/core/modules/views_ui/tests/src/FunctionalJavascript/ViewsWizardTest.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace Drupal\Tests\views_ui\FunctionalJavascript;
+
+use Drupal\FunctionalJavascriptTests\JavascriptTestBase;
+
+/**
+ * Tests views creation wizard.
+ *
+ * @see core/modules/views_ui/js/views-admin.js
+ * @group views_ui
+ */
+class ViewsWizardTest extends JavascriptTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['node', 'views', 'views_ui', 'block'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $admin_user = $this->drupalCreateUser([
+      'administer site configuration',
+      'administer views',
+    ]);
+    $this->drupalLogin($admin_user);
+  }
+
+  /**
+   * Tests creating a View using the wizard.
+   */
+  public function testCreateViewWizard() {
+    $this->drupalGet('admin/structure/views/add');
+    $page = $this->getSession()->getPage();
+
+    // Set a view name, this should be used to prepopulate a number of other
+    // fields when creating displays.
+    $label_value = 'test view';
+    $search_input = $page->findField('label');
+    $search_input->setValue($label_value);
+
+    $page->findField('page[create]')->click();
+
+    // Test if the title and path have been populated.
+    $this->assertEquals($label_value, $page->findField('page[title]')->getValue());
+    $this->assertEquals(str_replace(' ', '-', $label_value), $page->findField('page[path]')->getValue());
+
+    // Create a menu item.
+    $page->findField('page[link]')->click();
+    $this->assertEquals($label_value, $page->findField('page[link_properties][title]')->getValue());
+
+    // Add a block display.
+    $page->findField('block[create]')->click();
+    $this->assertEquals($label_value, $page->findField('block[title]')->getValue());
+  }
+
+}
diff --git a/core/phpcs.xml.dist b/core/phpcs.xml.dist
index 39c0e49b9..3fcb48efe 100644
--- a/core/phpcs.xml.dist
+++ b/core/phpcs.xml.dist
@@ -46,7 +46,6 @@
   <rule ref="Drupal.Commenting.FunctionComment">
     <exclude name="Drupal.Commenting.FunctionComment.IncorrectTypeHint"/>
     <exclude name="Drupal.Commenting.FunctionComment.InvalidNoReturn"/>
-    <exclude name="Drupal.Commenting.FunctionComment.InvalidReturn"/>
     <exclude name="Drupal.Commenting.FunctionComment.InvalidReturnNotVoid"/>
     <exclude name="Drupal.Commenting.FunctionComment.InvalidTypeHint"/>
     <exclude name="Drupal.Commenting.FunctionComment.Missing"/>
@@ -59,9 +58,7 @@
     <exclude name="Drupal.Commenting.FunctionComment.ParamCommentFullStop"/>
     <exclude name="Drupal.Commenting.FunctionComment.ParamCommentNotCapital"/>
     <exclude name="Drupal.Commenting.FunctionComment.ParamNameNoMatch"/>
-    <exclude name="Drupal.Commenting.FunctionComment.ReturnCommentIndentation"/>
     <exclude name="Drupal.Commenting.FunctionComment.TypeHintMissing"/>
-    <exclude name="Drupal.Commenting.FunctionComment.VoidReturn"/>
   </rule>
   <rule ref="Drupal.ControlStructures.ElseIf"/>
   <rule ref="Drupal.ControlStructures.ControlSignature"/>
diff --git a/core/phpunit.xml.dist b/core/phpunit.xml.dist
index 2b45c6429..951bd55d4 100644
--- a/core/phpunit.xml.dist
+++ b/core/phpunit.xml.dist
@@ -28,48 +28,16 @@
   </php>
   <testsuites>
     <testsuite name="unit">
-      <directory>./tests/Drupal/Tests</directory>
-      <directory>./modules/*/tests/src/Unit</directory>
-      <directory>../modules/*/tests/src/Unit</directory>
-      <directory>../profiles/*/tests/src/Unit</directory>
-      <directory>../sites/*/modules/*/tests/src/Unit</directory>
-      <!-- Exclude Composer's vendor directory so we don't run tests there. -->
-      <exclude>./vendor</exclude>
-      <!-- Exclude Drush tests. -->
-      <exclude>./drush/tests</exclude>
+      <file>./tests/TestSuites/UnitTestSuite.php</file>
     </testsuite>
     <testsuite name="kernel">
-      <directory>./tests/Drupal/KernelTests</directory>
-      <directory>./modules/*/tests/src/Kernel</directory>
-      <directory>../modules/*/tests/src/Kernel</directory>
-      <directory>../profiles/*/tests/src/Kernel</directory>
-      <directory>../sites/*/modules/*/tests/src/Kernel</directory>
-      <!-- Exclude Composer's vendor directory so we don't run tests there. -->
-      <exclude>./vendor</exclude>
-      <!-- Exclude Drush tests. -->
-      <exclude>./drush/tests</exclude>
+      <file>./tests/TestSuites/KernelTestSuite.php</file>
     </testsuite>
     <testsuite name="functional">
-      <directory>./tests/Drupal/FunctionalTests</directory>
-      <directory>./modules/*/tests/src/Functional</directory>
-      <directory>../modules/*/tests/src/Functional</directory>
-      <directory>../profiles/*/tests/src/Functional</directory>
-      <directory>../sites/*/modules/*/tests/src/Functional</directory>
-      <!-- Exclude Composer's vendor directory so we don't run tests there. -->
-      <exclude>./vendor</exclude>
-      <!-- Exclude Drush tests. -->
-      <exclude>./drush/tests</exclude>
+      <file>./tests/TestSuites/FunctionalTestSuite.php</file>
     </testsuite>
     <testsuite name="functional-javascript">
-      <directory>./tests/Drupal/FunctionalJavascriptTests</directory>
-      <directory>./modules/*/tests/src/FunctionalJavascript</directory>
-      <directory>../modules/*/tests/src/FunctionalJavascript</directory>
-      <directory>../profiles/*/tests/src/FunctionalJavascript</directory>
-      <directory>../sites/*/modules/*/tests/src/FunctionalJavascript</directory>
-      <!-- Exclude Composer's vendor directory so we don't run tests there. -->
-      <exclude>./vendor</exclude>
-      <!-- Exclude Drush tests. -->
-      <exclude>./drush/tests</exclude>
+      <file>./tests/TestSuites/FunctionalJavascriptTestSuite.php</file>
     </testsuite>
   </testsuites>
   <listeners>
diff --git a/core/profiles/standard/src/Tests/StandardTest.php b/core/profiles/standard/tests/src/Functional/StandardTest.php
similarity index 98%
rename from core/profiles/standard/src/Tests/StandardTest.php
rename to core/profiles/standard/tests/src/Functional/StandardTest.php
index bff61a9f7..4f9e756f2 100644
--- a/core/profiles/standard/src/Tests/StandardTest.php
+++ b/core/profiles/standard/tests/src/Functional/StandardTest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Drupal\standard\Tests;
+namespace Drupal\Tests\standard\Functional;
 
 use Drupal\config\Tests\SchemaCheckTestTrait;
 use Drupal\contact\Entity\ContactForm;
 use Drupal\Core\Url;
 use Drupal\dynamic_page_cache\EventSubscriber\DynamicPageCacheSubscriber;
 use Drupal\filter\Entity\FilterFormat;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\user\Entity\Role;
 
 /**
@@ -15,7 +15,7 @@ use Drupal\user\Entity\Role;
  *
  * @group standard
  */
-class StandardTest extends WebTestBase {
+class StandardTest extends BrowserTestBase {
 
   use SchemaCheckTestTrait;
 
diff --git a/core/scripts/run-tests.sh b/core/scripts/run-tests.sh
index df613284b..15e6e8094 100755
--- a/core/scripts/run-tests.sh
+++ b/core/scripts/run-tests.sh
@@ -690,36 +690,7 @@ function simpletest_script_run_phpunit($test_id, $class) {
 
   // Map phpunit results to a data structure we can pass to
   // _simpletest_format_summary_line.
-  $summaries = array();
-  foreach ($results as $result) {
-    if (!isset($summaries[$result['test_class']])) {
-      $summaries[$result['test_class']] = array(
-        '#pass' => 0,
-        '#fail' => 0,
-        '#exception' => 0,
-        '#debug' => 0,
-      );
-    }
-
-    switch ($result['status']) {
-      case 'pass':
-        $summaries[$result['test_class']]['#pass']++;
-        break;
-
-      case 'fail':
-        $summaries[$result['test_class']]['#fail']++;
-        break;
-
-      case 'exception':
-        $summaries[$result['test_class']]['#exception']++;
-        break;
-
-      case 'debug':
-        $summaries[$result['test_class']]['#debug']++;
-        break;
-    }
-  }
-
+  $summaries = simpletest_summarize_phpunit_result($results);
   foreach ($summaries as $class => $summary) {
     simpletest_script_reporter_display_summary($class, $summary);
   }
diff --git a/core/tests/Drupal/FunctionalJavascriptTests/JSWebAssert.php b/core/tests/Drupal/FunctionalJavascriptTests/JSWebAssert.php
new file mode 100644
index 000000000..8d3ff479f
--- /dev/null
+++ b/core/tests/Drupal/FunctionalJavascriptTests/JSWebAssert.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace Drupal\FunctionalJavascriptTests;
+
+use Drupal\Tests\WebAssert;
+
+/**
+ * Defines a class with methods for asserting presence of elements during tests.
+ */
+class JSWebAssert extends WebAssert {
+
+  /**
+   * Waits for AJAX request to be completed.
+   *
+   * @param int $timeout
+   *   (Optional) Timeout in milliseconds, defaults to 10000.
+   * @param string $message
+   *   (optional) A message for exception.
+   *
+   * @throws \RuntimeException
+   *   When the request is not completed. If left blank, a default message will
+   *   be displayed.
+   */
+  public function assertWaitOnAjaxRequest($timeout = 10000, $message = 'Unable to complete AJAX request.') {
+    $result = $this->session->wait($timeout, '(typeof(jQuery)=="undefined" || (0 === jQuery.active && 0 === jQuery(\':animated\').length))');
+    if (!$result) {
+      throw new \RuntimeException($message);
+    }
+  }
+
+}
diff --git a/core/tests/Drupal/FunctionalJavascriptTests/JavascriptTestBase.php b/core/tests/Drupal/FunctionalJavascriptTests/JavascriptTestBase.php
index 8f1ead5cc..116bd3256 100644
--- a/core/tests/Drupal/FunctionalJavascriptTests/JavascriptTestBase.php
+++ b/core/tests/Drupal/FunctionalJavascriptTests/JavascriptTestBase.php
@@ -33,6 +33,24 @@ abstract class JavascriptTestBase extends BrowserTestBase {
     return parent::initMink();
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  protected function tearDown() {
+    // Wait for all requests to finish. It is possible that an AJAX request is
+    // still on-going.
+    $result = $this->getSession()->wait(5000, '(typeof(jQuery)=="undefined" || (0 === jQuery.active && 0 === jQuery(\':animated\').length))');
+    if (!$result) {
+      // If the wait is unsuccessful, there may still be an AJAX request in
+      // progress. If we tear down now, then this AJAX request may fail with
+      // missing database tables, because tear down will have removed them. Rather
+      // than allow it to fail, throw an explicit exception now explaining what
+      // the problem is.
+      throw new \RuntimeException('Unfinished AJAX requests whilst tearing down a test');
+    }
+    parent::tearDown();
+  }
+
   /**
    * Asserts that the element with the given CSS selector is visible.
    *
@@ -84,4 +102,11 @@ abstract class JavascriptTestBase extends BrowserTestBase {
     $this->assertTrue($result, $message);
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function assertSession($name = NULL) {
+    return new JSWebAssert($this->getSession($name), $this->baseUrl);
+  }
+
 }
diff --git a/core/tests/Drupal/FunctionalTests/AssertLegacyTrait.php b/core/tests/Drupal/FunctionalTests/AssertLegacyTrait.php
new file mode 100644
index 000000000..6ca9f850a
--- /dev/null
+++ b/core/tests/Drupal/FunctionalTests/AssertLegacyTrait.php
@@ -0,0 +1,427 @@
+<?php
+
+namespace Drupal\FunctionalTests;
+
+use Drupal\KernelTests\AssertLegacyTrait as BaseAssertLegacyTrait;
+
+/**
+ * Provides convenience methods for assertions in browser tests.
+ *
+ * @deprecated Scheduled for removal in Drupal 9.0.0. Use the methods on
+ *   \Drupal\Tests\WebAssert instead, for example
+ * @code
+ *    $this->assertSession()->statusCodeEquals(200);
+ * @endcode
+ */
+trait AssertLegacyTrait {
+
+  use BaseAssertLegacyTrait;
+
+  /**
+   * Asserts that the element with the given CSS selector is present.
+   *
+   * @param string $css_selector
+   *   The CSS selector identifying the element to check.
+   *
+   * @deprecated Scheduled for removal in Drupal 9.0.0.
+   *   Use $this->assertSession()->elementExists() instead.
+   */
+  protected function assertElementPresent($css_selector) {
+    $this->assertSession()->elementExists('css', $css_selector);
+  }
+
+  /**
+   * Asserts that the element with the given CSS selector is not present.
+   *
+   * @param string $css_selector
+   *   The CSS selector identifying the element to check.
+   *
+   * @deprecated Scheduled for removal in Drupal 9.0.0.
+   *   Use $this->assertSession()->elementNotExists() instead.
+   */
+  protected function assertElementNotPresent($css_selector) {
+    $this->assertSession()->elementNotExists('css', $css_selector);
+  }
+
+  /**
+   * Passes if the page (with HTML stripped) contains the text.
+   *
+   * Note that stripping HTML tags also removes their attributes, such as
+   * the values of text fields.
+   *
+   * @param string $text
+   *   Plain text to look for.
+   *
+   * @deprecated Scheduled for removal in Drupal 9.0.0.
+   *   Use $this->assertSession()->pageTextContains() or
+   *   $this->assertSession()->responseContains() instead.
+   */
+  protected function assertText($text) {
+    $content_type = $this->getSession()->getResponseHeader('Content-type');
+    // In case of a Non-HTML response (example: XML) check the original
+    // response.
+    if (strpos($content_type, 'html') === FALSE) {
+      $this->assertSession()->responseContains($text);
+    }
+    else {
+      $this->assertSession()->pageTextContains($text);
+    }
+  }
+
+  /**
+   * Passes if the page (with HTML stripped) does not contains the text.
+   *
+   * Note that stripping HTML tags also removes their attributes, such as
+   * the values of text fields.
+   *
+   * @param string $text
+   *   Plain text to look for.
+   *
+   * @deprecated Scheduled for removal in Drupal 9.0.0.
+   *   Use $this->assertSession()->pageTextNotContains() or
+   *   $this->assertSession()->responseNotContains() instead.
+   */
+  protected function assertNoText($text) {
+    $content_type = $this->getSession()->getResponseHeader('Content-type');
+    // In case of a Non-HTML response (example: XML) check the original
+    // response.
+    if (strpos($content_type, 'html') === FALSE) {
+      $this->assertSession()->responseNotContains($text);
+    }
+    else {
+      $this->assertSession()->pageTextNotContains($text);
+    }
+  }
+
+  /**
+   * Asserts the page responds with the specified response code.
+   *
+   * @param int $code
+   *   Response code. For example 200 is a successful page request. For a list
+   *   of all codes see http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html.
+   *
+   * @deprecated Scheduled for removal in Drupal 9.0.0.
+   *   Use $this->assertSession()->statusCodeEquals() instead.
+   */
+  protected function assertResponse($code) {
+    $this->assertSession()->statusCodeEquals($code);
+  }
+
+  /**
+   * Asserts that a field exists with the given name and value.
+   *
+   * @param string $name
+   *   Name of field to assert.
+   * @param string $value
+   *   (optional) Value of the field to assert. You may pass in NULL (default)
+   *   to skip checking the actual value, while still checking that the field
+   *   exists.
+   *
+   * @deprecated Scheduled for removal in Drupal 9.0.0.
+   *   Use $this->assertSession()->fieldExists() or
+   *   $this->assertSession()->fieldValueEquals() instead.
+   */
+  protected function assertFieldByName($name, $value = NULL) {
+    $this->assertSession()->fieldExists($name);
+    if ($value !== NULL) {
+      $this->assertSession()->fieldValueEquals($name, (string) $value);
+    }
+  }
+
+  /**
+   * Asserts that a field exists with the given ID and value.
+   *
+   * @param string $id
+   *   ID of field to assert.
+   * @param string|\Drupal\Component\Render\MarkupInterface $value
+   *   (optional) Value for the field to assert. You may pass in NULL to skip
+   *   checking the value, while still checking that the field exists.
+   *   However, the default value ('') asserts that the field value is an empty
+   *   string.
+   *
+   * @deprecated Scheduled for removal in Drupal 9.0.0.
+   *   Use $this->assertSession()->fieldExists() or
+   *   $this->assertSession()->fieldValueEquals() instead.
+   */
+  protected function assertFieldById($id, $value = NULL) {
+    $this->assertFieldByName($id, $value);
+  }
+
+  /**
+   * Asserts that a field exists with the given name or ID.
+   *
+   * @param string $field
+   *   Name or ID of field to assert.
+   *
+   * @deprecated Scheduled for removal in Drupal 9.0.0.
+   *   Use $this->assertSession()->fieldExists() instead.
+   */
+  protected function assertField($field) {
+    $this->assertSession()->fieldExists($field);
+  }
+
+  /**
+   * Asserts that a field exists with the given name or ID does NOT exist.
+   *
+   * @param string $field
+   *   Name or ID of field to assert.
+   *
+   * @deprecated Scheduled for removal in Drupal 9.0.0.
+   *   Use $this->assertSession()->fieldNotExists() instead.
+   */
+  protected function assertNoField($field) {
+    $this->assertSession()->fieldNotExists($field);
+  }
+
+  /**
+   * Passes if the raw text IS found on the loaded page, fail otherwise.
+   *
+   * Raw text refers to the raw HTML that the page generated.
+   *
+   * @param string $raw
+   *   Raw (HTML) string to look for.
+   *
+   * @deprecated Scheduled for removal in Drupal 9.0.0.
+   *   Use $this->assertSession()->responseContains() instead.
+   */
+  protected function assertRaw($raw) {
+    $this->assertSession()->responseContains($raw);
+  }
+
+  /**
+   * Passes if the raw text IS not found on the loaded page, fail otherwise.
+   *
+   * Raw text refers to the raw HTML that the page generated.
+   *
+   * @param string $raw
+   *   Raw (HTML) string to look for.
+   *
+   * @deprecated Scheduled for removal in Drupal 9.0.0.
+   *   Use $this->assertSession()->responseNotContains() instead.
+   */
+  protected function assertNoRaw($raw) {
+    $this->assertSession()->responseNotContains($raw);
+  }
+
+  /**
+   * Pass if the page title is the given string.
+   *
+   * @param string $expected_title
+   *   The string the page title should be.
+   *
+   * @deprecated Scheduled for removal in Drupal 9.0.0.
+   *   Use $this->assertSession()->titleEquals() instead.
+   */
+  protected function assertTitle($expected_title) {
+    // Cast MarkupInterface to string.
+    $expected_title = (string) $expected_title;
+    return $this->assertSession()->titleEquals($expected_title);
+  }
+
+  /**
+   * Passes if a link with the specified label is found.
+   *
+   * An optional link index may be passed.
+   *
+   * @param string|\Drupal\Component\Render\MarkupInterface $label
+   *   Text between the anchor tags.
+   * @param int $index
+   *   Link position counting from zero.
+   *
+   * @deprecated Scheduled for removal in Drupal 9.0.0.
+   *   Use $this->assertSession()->linkExists() instead.
+   */
+  protected function assertLink($label, $index = 0) {
+    return $this->assertSession()->linkExists($label, $index);
+  }
+
+  /**
+   * Passes if a link with the specified label is not found.
+   *
+   * @param string|\Drupal\Component\Render\MarkupInterface $label
+   *   Text between the anchor tags.
+   *
+   * @deprecated Scheduled for removal in Drupal 9.0.0.
+   *   Use $this->assertSession()->linkNotExists() instead.
+   */
+  protected function assertNoLink($label) {
+    return $this->assertSession()->linkNotExists($label);
+  }
+
+  /**
+   * Passes if a link containing a given href (part) is found.
+   *
+   * @param string $href
+   *   The full or partial value of the 'href' attribute of the anchor tag.
+   * @param int $index
+   *   Link position counting from zero.
+   *
+   * @deprecated Scheduled for removal in Drupal 9.0.0.
+   *   Use $this->assertSession()->linkByHref() instead.
+   */
+  protected function assertLinkByHref($href, $index = 0) {
+    $this->assertSession()->linkByHrefExists($href, $index);
+  }
+
+  /**
+   * Passes if a link containing a given href (part) is not found.
+   *
+   * @param string $href
+   *   The full or partial value of the 'href' attribute of the anchor tag.
+   *
+   * @deprecated Scheduled for removal in Drupal 9.0.0.
+   *   Use $this->assertSession()->linkByHrefNotExists() instead.
+   */
+  protected function assertNoLinkByHref($href) {
+    $this->assertSession()->linkByHrefNotExists($href);
+  }
+
+  /**
+   * Asserts that a field does not exist with the given ID and value.
+   *
+   * @param string $id
+   *   ID of field to assert.
+   * @param string $value
+   *   (optional) Value for the field, to assert that the field's value on the
+   *   page doesn't match it. You may pass in NULL to skip checking the value,
+   *   while still checking that the field doesn't exist. However, the default
+   *   value ('') asserts that the field value is not an empty string.
+   *
+   * @deprecated Scheduled for removal in Drupal 9.0.0.
+   *   Use $this->assertSession()->fieldNotExists() or
+   *   $this->assertSession()->fieldValueNotEquals() instead.
+   */
+  protected function assertNoFieldById($id, $value = '') {
+    if ($this->getSession()->getPage()->findField($id)) {
+      $this->assertSession()->fieldValueNotEquals($id, (string) $value);
+    }
+    else {
+      $this->assertSession()->fieldNotExists($id);
+    }
+  }
+
+  /**
+   * Passes if the internal browser's URL matches the given path.
+   *
+   * @param \Drupal\Core\Url|string $path
+   *   The expected system path or URL.
+   *
+   * @deprecated Scheduled for removal in Drupal 9.0.0.
+   *   Use $this->assertSession()->addressEquals() instead.
+   */
+  protected function assertUrl($path) {
+    $this->assertSession()->addressEquals($path);
+  }
+
+  /**
+   * Asserts that a select option in the current page exists.
+   *
+   * @param string $id
+   *   ID of select field to assert.
+   * @param string $option
+   *   Option to assert.
+   *
+   * @deprecated Scheduled for removal in Drupal 9.0.0.
+   *   Use $this->assertSession()->optionExists() instead.
+   */
+  protected function assertOption($id, $option) {
+    return $this->assertSession()->optionExists($id, $option);
+  }
+
+  /**
+   * Asserts that a select option does NOT exist in the current page.
+   *
+   * @param string $id
+   *   ID of select field to assert.
+   * @param string $option
+   *   Option to assert.
+   *
+   * @deprecated Scheduled for removal in Drupal 9.0.0.
+   *   Use $this->assertSession()->optionNotExists() instead.
+   */
+  protected function assertNoOption($id, $option) {
+    return $this->assertSession()->optionNotExists($id, $option);
+  }
+
+  /**
+   * Passes if the raw text IS found escaped on the loaded page, fail otherwise.
+   *
+   * Raw text refers to the raw HTML that the page generated.
+   *
+   * @param string $raw
+   *   Raw (HTML) string to look for.
+   *
+   * @deprecated Scheduled for removal in Drupal 9.0.0.
+   *   Use $this->assertSession()->assertEscaped() instead.
+   */
+  protected function assertEscaped($raw) {
+    $this->assertSession()->assertEscaped($raw);
+  }
+
+  /**
+   * Passes if the raw text is not found escaped on the loaded page.
+   *
+   * Raw text refers to the raw HTML that the page generated.
+   *
+   * @param string $raw
+   *   Raw (HTML) string to look for.
+   *
+   * @deprecated Scheduled for removal in Drupal 9.0.0.
+   *   Use $this->assertSession()->assertNoEscaped() instead.
+   */
+  protected function assertNoEscaped($raw) {
+    $this->assertSession()->assertNoEscaped($raw);
+  }
+
+  /**
+   * Asserts whether an expected cache tag was present in the last response.
+   *
+   * @param string $expected_cache_tag
+   *   The expected cache tag.
+   *
+   * @deprecated Scheduled for removal in Drupal 9.0.0.
+   *   Use $this->assertSession()->responseHeaderContains() instead.
+   */
+  protected function assertCacheTag($expected_cache_tag) {
+    $this->assertSession()->responseHeaderContains('X-Drupal-Cache-Tags', $expected_cache_tag);
+  }
+
+  /**
+   * Returns WebAssert object.
+   *
+   * @param string $name
+   *   (optional) Name of the session. Defaults to the active session.
+   *
+   * @return \Drupal\Tests\WebAssert
+   *   A new web-assert option for asserting the presence of elements with.
+   */
+  abstract public function assertSession($name = NULL);
+
+  /**
+   * Builds an XPath query.
+   *
+   * Builds an XPath query by replacing placeholders in the query by the value
+   * of the arguments.
+   *
+   * XPath 1.0 (the version supported by libxml2, the underlying XML library
+   * used by PHP) doesn't support any form of quotation. This function
+   * simplifies the building of XPath expression.
+   *
+   * @param string $xpath
+   *   An XPath query, possibly with placeholders in the form ':name'.
+   * @param array $args
+   *   An array of arguments with keys in the form ':name' matching the
+   *   placeholders in the query. The values may be either strings or numeric
+   *   values.
+   *
+   * @return string
+   *   An XPath query with arguments replaced.
+   *
+   * @deprecated Scheduled for removal in Drupal 9.0.0.
+   *   Use $this->assertSession()->buildXPathQuery() instead.
+   */
+  protected function buildXPathQuery($xpath, array $args = array()) {
+    return $this->assertSession()->buildXPathQuery($xpath, $args);
+  }
+
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Config/ConfigDependencyTest.php b/core/tests/Drupal/KernelTests/Core/Config/ConfigDependencyTest.php
index 2fd6301f5..d30b3c53b 100644
--- a/core/tests/Drupal/KernelTests/Core/Config/ConfigDependencyTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Config/ConfigDependencyTest.php
@@ -188,7 +188,8 @@ class ConfigDependencyTest extends EntityKernelTestBase {
     /** @var \Drupal\Core\Config\ConfigManagerInterface $config_manager */
     $config_manager = \Drupal::service('config.manager');
     /** @var \Drupal\Core\Config\Entity\ConfigEntityStorage $storage */
-    $storage = $this->container->get('entity.manager')->getStorage('config_test');
+    $storage = $this->container->get('entity.manager')
+      ->getStorage('config_test');
     // Test dependencies between modules.
     $entity1 = $storage->create(
       array(
@@ -221,14 +222,42 @@ class ConfigDependencyTest extends EntityKernelTestBase {
     $config_manager->uninstall('module', 'node');
     $this->assertFalse($storage->load('entity1'), 'Entity 1 deleted');
     $this->assertFalse($storage->load('entity2'), 'Entity 2 deleted');
+  }
 
-    // Set a more complicated test where dependencies will be fixed.
-    \Drupal::state()->set('config_test.fix_dependencies', array($entity1->getConfigDependencyName()));
-    \Drupal::state()->set('config_test.on_dependency_removal_called', []);
-    // Entity1 will be deleted because it depends on node.
-    $entity1 = $storage->create(
+  /**
+   * Data provider for self::testConfigEntityUninstallComplex().
+   */
+  public function providerConfigEntityUninstallComplex() {
+    // Ensure that alphabetical order has no influence on dependency fixing and
+    // removal.
+    return [
+      [['a', 'b', 'c', 'd']],
+      [['d', 'c', 'b', 'a']],
+      [['c', 'd', 'a', 'b']],
+    ];
+  }
+
+  /**
+   * Tests complex configuration entity dependency handling during uninstall.
+   *
+   * Configuration entities can be deleted or updated during module uninstall
+   * because they have dependencies on the module.
+   *
+   * @param array $entity_id_suffixes
+   *   The suffixes to add to the 4 entities created by the test.
+   *
+   * @dataProvider providerConfigEntityUninstallComplex
+   */
+  public function testConfigEntityUninstallComplex(array $entity_id_suffixes) {
+    /** @var \Drupal\Core\Config\ConfigManagerInterface $config_manager */
+    $config_manager = \Drupal::service('config.manager');
+    /** @var \Drupal\Core\Config\Entity\ConfigEntityStorage $storage */
+    $storage = $this->container->get('entity.manager')
+      ->getStorage('config_test');
+    // Entity 1 will be deleted because it depends on node.
+    $entity_1 = $storage->create(
       array(
-        'id' => 'entity1',
+        'id' => 'entity_' . $entity_id_suffixes[0],
         'dependencies' => array(
           'enforced' => array(
             'module' => array('node', 'config_test')
@@ -236,77 +265,85 @@ class ConfigDependencyTest extends EntityKernelTestBase {
         ),
       )
     );
-    $entity1->save();
+    $entity_1->save();
 
-    // Entity2 has a dependency on Entity1 but it can be fixed because
+    // Entity 2 has a dependency on entity 1 but it can be fixed because
     // \Drupal\config_test\Entity::onDependencyRemoval() will remove the
     // dependency before config entities are deleted.
-    $entity2 = $storage->create(
+    $entity_2 = $storage->create(
       array(
-        'id' => 'entity2',
+        'id' => 'entity_' . $entity_id_suffixes[1],
         'dependencies' => array(
           'enforced' => array(
-            'config' => array($entity1->getConfigDependencyName()),
+            'config' => array($entity_1->getConfigDependencyName()),
           ),
         ),
       )
     );
-    $entity2->save();
+    $entity_2->save();
 
-    // Entity3 will be unchanged because it is dependent on Entity2 which can
+    // Entity 3 will be unchanged because it is dependent on entity 2 which can
     // be fixed. The ConfigEntityInterface::onDependencyRemoval() method will
     // not be called for this entity.
-    $entity3 = $storage->create(
+    $entity_3 = $storage->create(
       array(
-        'id' => 'entity3',
+        'id' => 'entity_' . $entity_id_suffixes[2],
         'dependencies' => array(
           'enforced' => array(
-            'config' => array($entity2->getConfigDependencyName()),
+            'config' => array($entity_2->getConfigDependencyName()),
           ),
         ),
       )
     );
-    $entity3->save();
+    $entity_3->save();
 
-    // Entity4's config dependency will be fixed but it will still be deleted
+    // Entity 4's config dependency will be fixed but it will still be deleted
     // because it also depends on the node module.
-    $entity4 = $storage->create(
+    $entity_4 = $storage->create(
       array(
-        'id' => 'entity4',
+        'id' => 'entity_' . $entity_id_suffixes[3],
         'dependencies' => array(
           'enforced' => array(
-            'config' => array($entity1->getConfigDependencyName()),
+            'config' => array($entity_1->getConfigDependencyName()),
             'module' => array('node', 'config_test')
           ),
         ),
       )
     );
-    $entity4->save();
+    $entity_4->save();
+
+    // Set a more complicated test where dependencies will be fixed.
+    \Drupal::state()->set('config_test.fix_dependencies', array($entity_1->getConfigDependencyName()));
+    \Drupal::state()->set('config_test.on_dependency_removal_called', []);
 
     // Do a dry run using
     // \Drupal\Core\Config\ConfigManager::getConfigEntitiesToChangeOnDependencyRemoval().
     $config_entities = $config_manager->getConfigEntitiesToChangeOnDependencyRemoval('module', ['node']);
-    $this->assertEqual($entity1->uuid(), $config_entities['delete'][0]->uuid(), 'Entity 1 will be deleted.');
-    $this->assertEqual($entity2->uuid(), reset($config_entities['update'])->uuid(), 'Entity 2 will be updated.');
-    $this->assertEqual($entity3->uuid(), reset($config_entities['unchanged'])->uuid(), 'Entity 3 is not changed.');
-    $this->assertEqual($entity4->uuid(), $config_entities['delete'][1]->uuid(), 'Entity 4 will be deleted.');
+    $this->assertEqual($entity_1->uuid(), $config_entities['delete'][1]->uuid(), 'Entity 1 will be deleted.');
+    $this->assertEqual($entity_2->uuid(), reset($config_entities['update'])->uuid(), 'Entity 2 will be updated.');
+    $this->assertEqual($entity_3->uuid(), reset($config_entities['unchanged'])->uuid(), 'Entity 3 is not changed.');
+    $this->assertEqual($entity_4->uuid(), $config_entities['delete'][0]->uuid(), 'Entity 4 will be deleted.');
 
     $called = \Drupal::state()->get('config_test.on_dependency_removal_called', []);
-    $this->assertFalse(in_array($entity3->id(), $called), 'ConfigEntityInterface::onDependencyRemoval() is not called for entity 3.');
-    $this->assertIdentical(['entity1', 'entity2', 'entity4'], $called, 'The most dependent entites have ConfigEntityInterface::onDependencyRemoval() called first.');
+    $this->assertFalse(in_array($entity_3->id(), $called), 'ConfigEntityInterface::onDependencyRemoval() is not called for entity 3.');
+    $this->assertIdentical([$entity_1->id(), $entity_4->id(), $entity_2->id()], $called, 'The most dependent entites have ConfigEntityInterface::onDependencyRemoval() called first.');
 
+    // Perform a module rebuild so we can know where the node module is located
+    // and uninstall it.
+    // @todo Remove as part of https://www.drupal.org/node/2186491
+    system_rebuild_module_data();
     // Perform the uninstall.
     $config_manager->uninstall('module', 'node');
 
     // Test that expected actions have been performed.
-    $this->assertFalse($storage->load('entity1'), 'Entity 1 deleted');
-    $entity2 = $storage->load('entity2');
-    $this->assertTrue($entity2, 'Entity 2 not deleted');
-    $this->assertEqual($entity2->calculateDependencies()->getDependencies()['config'], array(), 'Entity 2 dependencies updated to remove dependency on Entity1.');
-    $entity3 = $storage->load('entity3');
-    $this->assertTrue($entity3, 'Entity 3 not deleted');
-    $this->assertEqual($entity3->calculateDependencies()->getDependencies()['config'], [$entity2->getConfigDependencyName()], 'Entity 3 still depends on Entity 2.');
-    $this->assertFalse($storage->load('entity4'), 'Entity 4 deleted');
+    $this->assertFalse($storage->load($entity_1->id()), 'Entity 1 deleted');
+    $entity_2 = $storage->load($entity_2->id());
+    $this->assertTrue($entity_2, 'Entity 2 not deleted');
+    $this->assertEqual($entity_2->calculateDependencies()->getDependencies()['config'], array(), 'Entity 2 dependencies updated to remove dependency on entity 1.');
+    $entity_3 = $storage->load($entity_3->id());
+    $this->assertTrue($entity_3, 'Entity 3 not deleted');
+    $this->assertEqual($entity_3->calculateDependencies()->getDependencies()['config'], [$entity_2->getConfigDependencyName()], 'Entity 3 still depends on entity 2.');
+    $this->assertFalse($storage->load($entity_4->id()), 'Entity 4 deleted');
   }
 
   /**
@@ -456,8 +493,8 @@ class ConfigDependencyTest extends EntityKernelTestBase {
     $entity3->save();
 
     $config_entities = $config_manager->getConfigEntitiesToChangeOnDependencyRemoval('content', [$content_entity->getConfigDependencyName()]);
-    $this->assertEqual($entity1->uuid(), $config_entities['delete'][0]->uuid(), 'Entity 1 will be deleted.');
-    $this->assertEqual($entity2->uuid(), $config_entities['delete'][1]->uuid(), 'Entity 2 will be deleted.');
+    $this->assertEqual($entity1->uuid(), $config_entities['delete'][1]->uuid(), 'Entity 1 will be deleted.');
+    $this->assertEqual($entity2->uuid(), $config_entities['delete'][0]->uuid(), 'Entity 2 will be deleted.');
     $this->assertTrue(empty($config_entities['update']), 'No dependencies of the content entity will be updated.');
     $this->assertTrue(empty($config_entities['unchanged']), 'No dependencies of the content entity will be unchanged.');
   }
diff --git a/core/tests/Drupal/KernelTests/Core/Database/ConnectionTest.php b/core/tests/Drupal/KernelTests/Core/Database/ConnectionTest.php
index e7b6190b3..0cc3627fb 100644
--- a/core/tests/Drupal/KernelTests/Core/Database/ConnectionTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Database/ConnectionTest.php
@@ -97,6 +97,8 @@ class ConnectionTest extends DatabaseTestBase {
     // Set up identical replica and confirm connection options are identical.
     Database::addConnectionInfo('default', 'replica', $connection_info['default']);
     $db2 = Database::getConnection('replica', 'default');
+    // Getting a driver class ensures the namespace option is set.
+    $this->assertEquals($db->getDriverClass('select'), $db2->getDriverClass('select'));
     $connectionOptions2 = $db2->getConnectionOptions();
 
     // Get a fresh copy of the default connection options.
diff --git a/core/tests/Drupal/KernelTests/Core/Database/SelectComplexTest.php b/core/tests/Drupal/KernelTests/Core/Database/SelectComplexTest.php
index cadf178fb..ccf153b25 100644
--- a/core/tests/Drupal/KernelTests/Core/Database/SelectComplexTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Database/SelectComplexTest.php
@@ -375,4 +375,50 @@ class SelectComplexTest extends DatabaseTestBase {
     $this->assertTrue($exception, 'Exception was thrown');
   }
 
+  /**
+   * Test that join conditions can use Condition objects.
+   */
+  public function testJoinConditionObject() {
+    // Same test as testDefaultJoin, but with a Condition object.
+    $query = db_select('test_task', 't');
+    $join_cond = db_and()->where('t.pid = p.id');
+    $people_alias = $query->join('test', 'p', $join_cond);
+    $name_field = $query->addField($people_alias, 'name', 'name');
+    $query->addField('t', 'task', 'task');
+    $priority_field = $query->addField('t', 'priority', 'priority');
+
+    $query->orderBy($priority_field);
+    $result = $query->execute();
+
+    $num_records = 0;
+    $last_priority = 0;
+    foreach ($result as $record) {
+      $num_records++;
+      $this->assertTrue($record->$priority_field >= $last_priority, 'Results returned in correct order.');
+      $this->assertNotEqual($record->$name_field, 'Ringo', 'Taskless person not selected.');
+      $last_priority = $record->$priority_field;
+    }
+
+    $this->assertEqual($num_records, 7, 'Returned the correct number of rows.');
+
+    // Test a condition object that creates placeholders.
+    $t1_name = 'John';
+    $t2_name = 'George';
+    $join_cond = db_and()
+      ->condition('t1.name', $t1_name)
+      ->condition('t2.name', $t2_name);
+    $query = db_select('test', 't1');
+    $query->innerJoin('test', 't2', $join_cond);
+    $query->addField('t1', 'name', 't1_name');
+    $query->addField('t2', 'name', 't2_name');
+
+    $num_records = $query->countQuery()->execute()->fetchField();
+    $this->assertEqual($num_records, 1, 'Query expected to return 1 row. Actual: ' . $num_records);
+    if ($num_records == 1) {
+      $record = $query->execute()->fetchObject();
+      $this->assertEqual($record->t1_name, $t1_name, 'Query expected to retrieve name ' . $t1_name . ' from table t1. Actual: ' . $record->t1_name);
+      $this->assertEqual($record->t2_name, $t2_name, 'Query expected to retrieve name ' . $t2_name . ' from table t2. Actual: ' . $record->t2_name);
+    }
+  }
+
 }
diff --git a/core/modules/system/src/Tests/DrupalKernel/DrupalKernelTest.php b/core/tests/Drupal/KernelTests/Core/DrupalKernel/DrupalKernelTest.php
similarity index 86%
rename from core/modules/system/src/Tests/DrupalKernel/DrupalKernelTest.php
rename to core/tests/Drupal/KernelTests/Core/DrupalKernel/DrupalKernelTest.php
index c412d991a..b28f2b95a 100644
--- a/core/modules/system/src/Tests/DrupalKernel/DrupalKernelTest.php
+++ b/core/tests/Drupal/KernelTests/Core/DrupalKernel/DrupalKernelTest.php
@@ -1,10 +1,9 @@
 <?php
 
-namespace Drupal\system\Tests\DrupalKernel;
+namespace Drupal\KernelTests\Core\DrupalKernel;
 
 use Drupal\Core\DrupalKernel;
-use Drupal\Core\Site\Settings;
-use Drupal\simpletest\KernelTestBase;
+use Drupal\KernelTests\KernelTestBase;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
@@ -14,29 +13,17 @@ use Symfony\Component\HttpFoundation\Request;
  */
 class DrupalKernelTest extends KernelTestBase {
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp() {
     // DrupalKernel relies on global $config_directories and requires those
     // directories to exist. Therefore, create the directories, but do not
     // invoke KernelTestBase::setUp(), since that would set up further
     // environment aspects, which would distort this test, because it tests
     // the DrupalKernel (re-)building itself.
-    $this->prepareConfigDirectories();
-
-    $this->settingsSet('php_storage', array('service_container' => array(
-      'bin' => 'service_container',
-      'class' => 'Drupal\Component\PhpStorage\MTimeProtectedFileStorage',
-      'directory' => DRUPAL_ROOT . '/' . $this->publicFilesDirectory . '/php',
-      'secret' => Settings::getHashSalt(),
-    )));
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function prepareConfigDirectories() {
-    \Drupal::setContainer($this->originalContainer);
-    parent::prepareConfigDirectories();
-    \Drupal::unsetContainer();
+    $this->root = static::getDrupalRoot();
+    $this->bootEnvironment();
   }
 
   /**
@@ -56,10 +43,10 @@ class DrupalKernelTest extends KernelTestBase {
    */
   protected function getTestKernel(Request $request, array $modules_enabled = NULL) {
     // Manually create kernel to avoid replacing settings.
-    $class_loader = require DRUPAL_ROOT . '/autoload.php';
+    $class_loader = require $this->root . '/autoload.php';
     $kernel = DrupalKernel::createFromRequest($request, $class_loader, 'testing');
-    $this->settingsSet('container_yamls', []);
-    $this->settingsSet('hash_salt', $this->databasePrefix);
+    $this->setSetting('container_yamls', []);
+    $this->setSetting('hash_salt', $this->databasePrefix);
     if (isset($modules_enabled)) {
       $kernel->updateModules($modules_enabled);
     }
@@ -153,7 +140,7 @@ class DrupalKernelTest extends KernelTestBase {
    */
   public function testRepeatedBootWithDifferentEnvironment() {
     $request = Request::createFromGlobals();
-    $class_loader = require DRUPAL_ROOT . '/autoload.php';
+    $class_loader = require $this->root . '/autoload.php';
 
     $environments = [
       'testing1',
@@ -164,8 +151,8 @@ class DrupalKernelTest extends KernelTestBase {
 
     foreach ($environments as $environment) {
       $kernel = DrupalKernel::createFromRequest($request, $class_loader, $environment);
-      $this->settingsSet('container_yamls', []);
-      $this->settingsSet('hash_salt', $this->databasePrefix);
+      $this->setSetting('container_yamls', []);
+      $this->setSetting('hash_salt', $this->databasePrefix);
       $kernel->boot();
     }
 
diff --git a/core/tests/Drupal/KernelTests/Core/Entity/EntityAutocompleteTest.php b/core/tests/Drupal/KernelTests/Core/Entity/EntityAutocompleteTest.php
index f03599de9..ae4925ce0 100644
--- a/core/tests/Drupal/KernelTests/Core/Entity/EntityAutocompleteTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Entity/EntityAutocompleteTest.php
@@ -146,7 +146,7 @@ class EntityAutocompleteTest extends EntityKernelTestBase {
    *   The label of the entity to query by.
    *
    * @return mixed
-   *  The JSON value encoded in its appropriate PHP type.
+   *   The JSON value encoded in its appropriate PHP type.
    */
   protected function getAutocompleteResult($input) {
     $request = Request::create('entity_reference_autocomplete/' . $this->entityType . '/default');
diff --git a/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryTest.php b/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryTest.php
index 09c9f845a..d7a160a09 100644
--- a/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryTest.php
@@ -512,6 +512,89 @@ class EntityQueryTest extends EntityKernelTestBase {
     $this->assertResult(6, 14);
   }
 
+  /**
+   * Test queries with delta conditions.
+   */
+  public function testDelta() {
+    $figures = $this->figures;
+    // Test numeric delta value in field condition.
+    $this->queryResults = $this->factory->get('entity_test_mulrev')
+      ->condition("$figures.0.color", 'red')
+      ->sort('id')
+      ->execute();
+    // As unit 0 at delta 0 was the red triangle bit 0 needs to be set.
+    $this->assertResult(1, 3, 5, 7, 9, 11, 13, 15);
+
+    $this->queryResults = $this->factory->get('entity_test_mulrev')
+      ->condition("$figures.1.color", 'red')
+      ->sort('id')
+      ->execute();
+    // Delta 1 is not red.
+    $this->assertResult();
+
+    // Test on two different deltas.
+    $query = $this->factory->get('entity_test_mulrev');
+    $or = $query->andConditionGroup()
+      ->condition("$figures.0.color", 'red')
+      ->condition("$figures.1.color", 'blue');
+    $this->queryResults = $query
+      ->condition($or)
+      ->sort('id')
+      ->execute();
+    $this->assertResult(3, 7, 11, 15);
+
+    // Test the delta range condition.
+    $this->queryResults = $this->factory->get('entity_test_mulrev')
+      ->condition("$figures.%delta.color", array('blue', 'red'), 'IN')
+      ->condition("$figures.%delta", array(0, 1), 'IN')
+      ->sort('id')
+      ->execute();
+    // Figure delta 0 or 1 can be blue or red, this matches a lot of entities.
+    $this->assertResult(1, 2, 3, 5, 6, 7, 9, 10, 11, 13, 14, 15);
+
+    // Test the delta range condition without conditions on the value.
+    $this->queryResults = $this->factory->get('entity_test_mulrev')
+      ->condition("$figures.%delta", 1)
+      ->sort('id')
+      ->execute();
+    // Entity needs to have atleast two figures.
+    $this->assertResult(3, 7, 11, 15);
+
+    // Numeric delta on single value base field should return results only if
+    // the first item is being targeted.
+    $this->queryResults = $this->factory->get('entity_test_mulrev')
+      ->condition("id.0.value", array(1, 3, 5), 'IN')
+      ->sort('id')
+      ->execute();
+    $this->assertResult(1, 3, 5);
+    $this->queryResults = $this->factory->get('entity_test_mulrev')
+      ->condition("id.1.value", array(1, 3, 5), 'IN')
+      ->sort('id')
+      ->execute();
+    $this->assertResult();
+
+    // Delta range condition on single value base field should return results
+    // only if just the field value is targeted.
+    $this->queryResults = $this->factory->get('entity_test_mulrev')
+      ->condition("id.%delta.value", array(1, 3, 5), 'IN')
+      ->sort('id')
+      ->execute();
+    $this->assertResult(1, 3, 5);
+    $this->queryResults = $this->factory->get('entity_test_mulrev')
+      ->condition("id.%delta.value", array(1, 3, 5), 'IN')
+      ->condition("id.%delta", 0, '=')
+      ->sort('id')
+      ->execute();
+    $this->assertResult(1, 3, 5);
+    $this->queryResults = $this->factory->get('entity_test_mulrev')
+      ->condition("id.%delta.value", array(1, 3, 5), 'IN')
+      ->condition("id.%delta", 1, '=')
+      ->sort('id')
+      ->execute();
+    $this->assertResult();
+
+  }
+
   protected function assertResult() {
     $assert = array();
     $expected = func_get_args();
diff --git a/core/tests/Drupal/KernelTests/KernelTestBase.php b/core/tests/Drupal/KernelTests/KernelTestBase.php
index 8f5d2e19b..b2fe7e040 100644
--- a/core/tests/Drupal/KernelTests/KernelTestBase.php
+++ b/core/tests/Drupal/KernelTests/KernelTestBase.php
@@ -1179,7 +1179,7 @@ abstract class KernelTestBase extends \PHPUnit_Framework_TestCase implements Ser
       'kernel',
       // @see \Drupal\simpletest\TestBase::prepareEnvironment()
       'generatedTestFiles',
-      // @see \Drupal\simpletest\KernelTestBase::containerBuild()
+      // Properties from the old KernelTestBase class that has been removed.
       'keyValueFactory',
     );
     if (in_array($name, $denied) || strpos($name, 'original') === 0) {
@@ -1209,6 +1209,9 @@ abstract class KernelTestBase extends \PHPUnit_Framework_TestCase implements Ser
    * {@inheritdoc}
    */
   public static function assertEquals($expected, $actual, $message = '', $delta = 0.0, $maxDepth = 10, $canonicalize = FALSE, $ignoreCase = FALSE) {
+    // Cast objects implementing MarkupInterface to string instead of
+    // relying on PHP casting them to string depending on what they are being
+    // comparing with.
     $expected = static::castSafeStrings($expected);
     $actual = static::castSafeStrings($actual);
     parent::assertEquals($expected, $actual, $message, $delta, $maxDepth, $canonicalize, $ignoreCase);
diff --git a/core/tests/Drupal/Tests/BrowserTestBase.php b/core/tests/Drupal/Tests/BrowserTestBase.php
index 8f2e67103..d5c864d75 100644
--- a/core/tests/Drupal/Tests/BrowserTestBase.php
+++ b/core/tests/Drupal/Tests/BrowserTestBase.php
@@ -6,6 +6,8 @@ use Behat\Mink\Driver\GoutteDriver;
 use Behat\Mink\Element\Element;
 use Behat\Mink\Mink;
 use Behat\Mink\Session;
+use Drupal\Component\FileCache\FileCacheFactory;
+use Drupal\Component\Serialization\Yaml;
 use Drupal\Component\Utility\Html;
 use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Component\Utility\UrlHelper;
@@ -20,9 +22,13 @@ use Drupal\Core\StreamWrapper\StreamWrapperInterface;
 use Drupal\Core\Test\TestRunnerKernel;
 use Drupal\Core\Url;
 use Drupal\Core\Test\TestDatabase;
+use Drupal\FunctionalTests\AssertLegacyTrait;
+use Drupal\simpletest\AssertHelperTrait;
+use Drupal\simpletest\ContentTypeCreationTrait;
+use Drupal\simpletest\BlockCreationTrait;
+use Drupal\simpletest\NodeCreationTrait;
 use Drupal\user\Entity\Role;
 use Drupal\user\Entity\User;
-use Drupal\user\UserInterface;
 use Symfony\Component\CssSelector\CssSelectorConverter;
 use Symfony\Component\HttpFoundation\Request;
 
@@ -31,13 +37,25 @@ use Symfony\Component\HttpFoundation\Request;
  *
  * Tests extending BrowserTestBase must exist in the
  * Drupal\Tests\yourmodule\Functional namespace and live in the
- * modules/yourmodule/Tests/Functional directory.
+ * modules/yourmodule/tests/src/Functional directory.
  *
  * @ingroup testing
  */
 abstract class BrowserTestBase extends \PHPUnit_Framework_TestCase {
+  use AssertHelperTrait;
+  use BlockCreationTrait {
+    placeBlock as drupalPlaceBlock;
+  }
+  use AssertLegacyTrait;
   use RandomGeneratorTrait;
   use SessionTestTrait;
+  use NodeCreationTrait {
+    getNodeByTitle as drupalGetNodeByTitle;
+    createNode as drupalCreateNode;
+  }
+  use ContentTypeCreationTrait {
+    createContentType as drupalCreateContentType;
+  }
 
   /**
    * Class loader.
@@ -273,6 +291,13 @@ abstract class BrowserTestBase extends \PHPUnit_Framework_TestCase {
    */
   protected $baseUrl;
 
+  /**
+   * The original array of shutdown function callbacks.
+   *
+   * @var array
+   */
+  protected $originalShutdownCallbacks = [];
+
   /**
    * Initializes Mink sessions.
    */
@@ -505,6 +530,12 @@ abstract class BrowserTestBase extends \PHPUnit_Framework_TestCase {
     if ($this->mink) {
       $this->mink->stopSessions();
     }
+
+    // Restore original shutdown callbacks.
+    if (function_exists('drupal_register_shutdown_function')) {
+      $callbacks = &drupal_register_shutdown_function();
+      $callbacks = $this->originalShutdownCallbacks;
+    }
   }
 
   /**
@@ -530,7 +561,7 @@ abstract class BrowserTestBase extends \PHPUnit_Framework_TestCase {
    *   A new web-assert option for asserting the presence of elements with.
    */
   public function assertSession($name = NULL) {
-    return new WebAssert($this->getSession($name));
+    return new WebAssert($this->getSession($name), $this->baseUrl);
   }
 
   /**
@@ -546,6 +577,46 @@ abstract class BrowserTestBase extends \PHPUnit_Framework_TestCase {
     $session->setCookie('SIMPLETEST_USER_AGENT', drupal_generate_test_ua($this->databasePrefix));
   }
 
+  /**
+   * Builds an a absolute URL from a system path or a URL object.
+   *
+   * @param string|\Drupal\Core\Url $path
+   *   A system path or a URL.
+   * @param array $options
+   *   Options to be passed to Url::fromUri().
+   *
+   * @return string
+   *   An absolute URL stsring.
+   */
+  protected function buildUrl($path, array $options = array()) {
+    if ($path instanceof Url) {
+      $url_options = $path->getOptions();
+      $options = $url_options + $options;
+      $path->setOptions($options);
+      return $path->setAbsolute()->toString();
+    }
+    // The URL generator service is not necessarily available yet; e.g., in
+    // interactive installer tests.
+    elseif ($this->container->has('url_generator')) {
+      $force_internal = isset($options['external']) && $options['external'] == FALSE;
+      if (!$force_internal && UrlHelper::isExternal($path)) {
+        return Url::fromUri($path, $options)->toString();
+      }
+      else {
+        $uri = $path === '<front>' ? 'base:/' : 'base:/' . $path;
+        // Path processing is needed for language prefixing.  Skip it when a
+        // path that may look like an external URL is being used as internal.
+        $options['path_processing'] = !$force_internal;
+        return Url::fromUri($uri, $options)
+          ->setAbsolute()
+          ->toString();
+      }
+    }
+    else {
+      return $this->getAbsoluteUrl($path);
+    }
+  }
+
   /**
    * Retrieves a Drupal path or an absolute path.
    *
@@ -559,28 +630,8 @@ abstract class BrowserTestBase extends \PHPUnit_Framework_TestCase {
    */
   protected function drupalGet($path, array $options = array()) {
     $options['absolute'] = TRUE;
+    $url = $this->buildUrl($path, $options);
 
-    if ($path instanceof Url) {
-      $url_options = $path->getOptions();
-      $options = $url_options + $options;
-      $path->setOptions($options);
-      $url = $path->setAbsolute()->toString();
-    }
-    // The URL generator service is not necessarily available yet; e.g., in
-    // interactive installer tests.
-    elseif ($this->container->has('url_generator')) {
-      if (UrlHelper::isExternal($path)) {
-        $url = Url::fromUri($path, $options)->toString();
-      }
-      else {
-        // This is needed for language prefixing.
-        $options['path_processing'] = TRUE;
-        $url = Url::fromUri('base:/' . $path, $options)->toString();
-      }
-    }
-    else {
-      $url = $this->getAbsoluteUrl($path);
-    }
     $session = $this->getSession();
 
     $this->prepareRequest();
@@ -874,6 +925,16 @@ abstract class BrowserTestBase extends \PHPUnit_Framework_TestCase {
     // Edit the form values.
     foreach ($edit as $name => $value) {
       $field = $assert_session->fieldExists($name, $form);
+
+      // Provide support for the values '1' and '0' for checkboxes instead of
+      // TRUE and FALSE.
+      // @todo Get rid of supporting 1/0 by converting all tests cases using
+      // this to boolean values.
+      $field_type = $field->getAttribute('type');
+      if ($field_type === 'checkbox') {
+        $value = (bool) $value;
+      }
+
       $field->setValue($value);
     }
 
@@ -893,6 +954,90 @@ abstract class BrowserTestBase extends \PHPUnit_Framework_TestCase {
     }
   }
 
+  /**
+   * Executes a form submission.
+   *
+   * It will be done as usual POST request with Mink.
+   *
+   * @param \Drupal\Core\Url|string $path
+   *   Location of the post form. Either a Drupal path or an absolute path or
+   *   NULL to post to the current page. For multi-stage forms you can set the
+   *   path to NULL and have it post to the last received page. Example:
+   *
+   *   @code
+   *   // First step in form.
+   *   $edit = array(...);
+   *   $this->drupalPostForm('some_url', $edit, t('Save'));
+   *
+   *   // Second step in form.
+   *   $edit = array(...);
+   *   $this->drupalPostForm(NULL, $edit, t('Save'));
+   *   @endcode
+   * @param array $edit
+   *   Field data in an associative array. Changes the current input fields
+   *   (where possible) to the values indicated.
+   *
+   *   When working with form tests, the keys for an $edit element should match
+   *   the 'name' parameter of the HTML of the form. For example, the 'body'
+   *   field for a node has the following HTML:
+   *   @code
+   *   <textarea id="edit-body-und-0-value" class="text-full form-textarea
+   *    resize-vertical" placeholder="" cols="60" rows="9"
+   *    name="body[0][value]"></textarea>
+   *   @endcode
+   *   When testing this field using an $edit parameter, the code becomes:
+   *   @code
+   *   $edit["body[0][value]"] = 'My test value';
+   *   @endcode
+   *
+   *   A checkbox can be set to TRUE to be checked and should be set to FALSE to
+   *   be unchecked. Multiple select fields can be tested using 'name[]' and
+   *   setting each of the desired values in an array:
+   *   @code
+   *   $edit = array();
+   *   $edit['name[]'] = array('value1', 'value2');
+   *   @endcode
+   * @param string $submit
+   *   Value of the submit button whose click is to be emulated. For example,
+   *   t('Save'). The processing of the request depends on this value. For
+   *   example, a form may have one button with the value t('Save') and another
+   *   button with the value t('Delete'), and execute different code depending
+   *   on which one is clicked.
+   *
+   *   This function can also be called to emulate an Ajax submission. In this
+   *   case, this value needs to be an array with the following keys:
+   *   - path: A path to submit the form values to for Ajax-specific processing.
+   *   - triggering_element: If the value for the 'path' key is a generic Ajax
+   *     processing path, this needs to be set to the name of the element. If
+   *     the name doesn't identify the element uniquely, then this should
+   *     instead be an array with a single key/value pair, corresponding to the
+   *     element name and value. The \Drupal\Core\Form\FormAjaxResponseBuilder
+   *     uses this to find the #ajax information for the element, including
+   *     which specific callback to use for processing the request.
+   *
+   *   This can also be set to NULL in order to emulate an Internet Explorer
+   *   submission of a form with a single text field, and pressing ENTER in that
+   *   textfield: under these conditions, no button information is added to the
+   *   POST data.
+   * @param array $options
+   *   Options to be forwarded to the url generator.
+   */
+  protected function drupalPostForm($path, array $edit, $submit, array $options = array()) {
+    if (is_object($submit)) {
+      // Cast MarkupInterface objects to string.
+      $submit = (string) $submit;
+    }
+    if (is_array($edit)) {
+      $edit = $this->castSafeStrings($edit);
+    }
+
+    if (isset($path)) {
+      $this->drupalGet($path, $options);
+    }
+
+    $this->submitForm($edit, $submit);
+  }
+
   /**
    * Helper function to get the options of select field.
    *
@@ -951,6 +1096,10 @@ abstract class BrowserTestBase extends \PHPUnit_Framework_TestCase {
       'value' => $this->publicFilesDirectory,
       'required' => TRUE,
     );
+    $settings['settings']['file_private_path'] = (object) [
+      'value' => $this->privateFilesDirectory,
+      'required' => TRUE,
+    ];
     $this->writeSettings($settings);
     // Allow for test-specific overrides.
     $settings_testing_file = DRUPAL_ROOT . '/' . $this->originalSiteDirectory . '/settings.testing.php';
@@ -961,11 +1110,14 @@ abstract class BrowserTestBase extends \PHPUnit_Framework_TestCase {
       // testing specific overrides.
       file_put_contents($directory . '/settings.php', "\n\$test_class = '" . get_class($this) . "';\n" . 'include DRUPAL_ROOT . \'/\' . $site_path . \'/settings.testing.php\';' . "\n", FILE_APPEND);
     }
+
     $settings_services_file = DRUPAL_ROOT . '/' . $this->originalSiteDirectory . '/testing.services.yml';
-    if (file_exists($settings_services_file)) {
-      // Copy the testing-specific service overrides in place.
-      copy($settings_services_file, $directory . '/services.yml');
+    if (!file_exists($settings_services_file)) {
+      // Otherwise, use the default services as a starting point for overrides.
+      $settings_services_file = DRUPAL_ROOT . '/sites/default/default.services.yml';
     }
+    // Copy the testing-specific service overrides in place.
+    copy($settings_services_file, $directory . '/services.yml');
 
     // Since Drupal is bootstrapped already, install_begin_request() will not
     // bootstrap into DRUPAL_BOOTSTRAP_CONFIGURATION (again). Hence, we have to
@@ -990,6 +1142,10 @@ abstract class BrowserTestBase extends \PHPUnit_Framework_TestCase {
     // using File API; a potential error must trigger a PHP warning.
     chmod($directory, 0777);
 
+    // During tests, cacheable responses should get the debugging cacheability
+    // headers by default.
+    $this->setContainerParameter('http.response.debug_cacheability_headers', TRUE);
+
     $request = \Drupal::request();
     $this->kernel = DrupalKernel::createFromRequest($request, $this->classLoader, 'prod', TRUE);
     $this->kernel->prepareLegacyRequest($request);
@@ -1000,13 +1156,13 @@ abstract class BrowserTestBase extends \PHPUnit_Framework_TestCase {
     $config = $container->get('config.factory');
 
     // Manually create and configure private and temporary files directories.
-    // While these could be preset/enforced in settings.php like the public
-    // files directory above, some tests expect them to be configurable in the
-    // UI. If declared in settings.php, they would no longer be configurable.
     file_prepare_directory($this->privateFilesDirectory, FILE_CREATE_DIRECTORY);
     file_prepare_directory($this->tempFilesDirectory, FILE_CREATE_DIRECTORY);
+    // While the temporary files path could be preset/enforced in settings.php
+    // like the public files directory above, some tests expect it to be
+    // configurable in the UI. If declared in settings.php, it would no longer
+    // be configurable.
     $config->getEditable('system.file')
-      ->set('path.private', $this->privateFilesDirectory)
       ->set('path.temporary', $this->tempFilesDirectory)
       ->save();
 
@@ -1241,6 +1397,14 @@ abstract class BrowserTestBase extends \PHPUnit_Framework_TestCase {
     ));
 
     drupal_set_time_limit($this->timeLimit);
+
+    // Save and clean the shutdown callbacks array because it is static cached
+    // and will be changed by the test run. Otherwise it will contain callbacks
+    // from both environments and the testing environment will try to call the
+    // handlers defined by the original one.
+    $callbacks = &drupal_register_shutdown_function();
+    $this->originalShutdownCallbacks = $callbacks;
+    $callbacks = [];
   }
 
   /**
@@ -1383,6 +1547,7 @@ abstract class BrowserTestBase extends \PHPUnit_Framework_TestCase {
    */
   protected function refreshVariables() {
     // Clear the tag cache.
+    $this->container->get('cache_tags.invalidator')->resetChecksums();
     // @todo Replace drupal_static() usage within classes and provide a
     //   proper interface for invoking reset() on a cache backend:
     //   https://www.drupal.org/node/2311945.
@@ -1402,13 +1567,13 @@ abstract class BrowserTestBase extends \PHPUnit_Framework_TestCase {
   /**
    * Returns whether a given user account is logged in.
    *
-   * @param \Drupal\user\UserInterface $account
+   * @param \Drupal\Core\Session\AccountInterface $account
    *   The user account object to check.
    *
    * @return bool
    *   Return TRUE if the user is logged in, FALSE otherwise.
    */
-  protected function drupalUserIsLoggedIn(UserInterface $account) {
+  protected function drupalUserIsLoggedIn(AccountInterface $account) {
     $logged_in = FALSE;
 
     if (isset($account->sessionId)) {
@@ -1419,30 +1584,6 @@ abstract class BrowserTestBase extends \PHPUnit_Framework_TestCase {
     return $logged_in;
   }
 
-  /**
-   * Asserts that the element with the given CSS selector is present.
-   *
-   * @param string $css_selector
-   *   The CSS selector identifying the element to check.
-   * @param string $message
-   *   Optional message to show alongside the assertion.
-   */
-  protected function assertElementPresent($css_selector, $message = '') {
-    $this->assertNotEmpty($this->getSession()->getDriver()->find($this->cssSelectToXpath($css_selector)), $message);
-  }
-
-  /**
-   * Asserts that the element with the given CSS selector is not present.
-   *
-   * @param string $css_selector
-   *   The CSS selector identifying the element to check.
-   * @param string $message
-   *   Optional message to show alongside the assertion.
-   */
-  protected function assertElementNotPresent($css_selector, $message = '') {
-    $this->assertEmpty($this->getSession()->getDriver()->find($this->cssSelectToXpath($css_selector)), $message);
-  }
-
   /**
    * Clicks the element with the given CSS selector.
    *
@@ -1529,4 +1670,134 @@ abstract class BrowserTestBase extends \PHPUnit_Framework_TestCase {
     return (new CssSelectorConverter($html))->toXPath($selector, $prefix);
   }
 
+  /**
+   * Searches elements using a CSS selector in the raw content.
+   *
+   * The search is relative to the root element (HTML tag normally) of the page.
+   *
+   * @param string $selector
+   *   CSS selector to use in the search.
+   *
+   * @return \Behat\Mink\Element\NodeElement[]
+   *   The list of elements on the page that match the selector.
+   */
+  protected function cssSelect($selector) {
+    return $this->getSession()->getPage()->findAll('css', $selector);
+  }
+
+  /**
+   * Follows a link by complete name.
+   *
+   * Will click the first link found with this link text.
+   *
+   * If the link is discovered and clicked, the test passes. Fail otherwise.
+   *
+   * @param string|\Drupal\Component\Render\MarkupInterface $label
+   *   Text between the anchor tags.
+   */
+  protected function clickLink($label) {
+    $label = (string) $label;
+    $this->getSession()->getPage()->clickLink($label);
+  }
+
+  /**
+   * Retrieves the plain-text content from the current page.
+   */
+  protected function getTextContent() {
+    return $this->getSession()->getPage()->getContent();
+  }
+
+  /**
+   * Performs an xpath search on the contents of the internal browser.
+   *
+   * The search is relative to the root element (HTML tag normally) of the page.
+   *
+   * @param string $xpath
+   *   The xpath string to use in the search.
+   * @param array $arguments
+   *   An array of arguments with keys in the form ':name' matching the
+   *   placeholders in the query. The values may be either strings or numeric
+   *   values.
+   *
+   * @return \Behat\Mink\Element\NodeElement[]
+   *   The list of elements matching the xpath expression.
+   */
+  protected function xpath($xpath, array $arguments = []) {
+    $xpath = $this->assertSession()->buildXPathQuery($xpath, $arguments);
+    return $this->getSession()->getPage()->findAll('xpath', $xpath);
+  }
+
+  /**
+   * Configuration accessor for tests. Returns non-overridden configuration.
+   *
+   * @param string $name
+   *   Configuration name.
+   *
+   * @return \Drupal\Core\Config\Config
+   *   The configuration object with original configuration data.
+   */
+  protected function config($name) {
+    return $this->container->get('config.factory')->getEditable($name);
+  }
+
+  /**
+   * Gets the value of an HTTP response header.
+   *
+   * If multiple requests were required to retrieve the page, only the headers
+   * from the last request will be checked by default.
+   *
+   * @param string $name
+   *   The name of the header to retrieve. Names are case-insensitive (see RFC
+   *   2616 section 4.2).
+   *
+   * @return string|null
+   *   The HTTP header value or NULL if not found.
+   */
+  protected function drupalGetHeader($name) {
+    return $this->getSession()->getResponseHeader($name);
+  }
+
+  /**
+   * Get the current URL from the browser.
+   *
+   * @return string
+   *   The current URL.
+   */
+  protected function getUrl() {
+    return $this->getSession()->getCurrentUrl();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function assertEquals($expected, $actual, $message = '', $delta = 0.0, $maxDepth = 10, $canonicalize = FALSE, $ignoreCase = FALSE) {
+    // Cast objects implementing MarkupInterface to string instead of
+    // relying on PHP casting them to string depending on what they are being
+    // comparing with.
+    $expected = static::castSafeStrings($expected);
+    $actual = static::castSafeStrings($actual);
+    parent::assertEquals($expected, $actual, $message, $delta, $maxDepth, $canonicalize, $ignoreCase);
+  }
+
+  /**
+   * Changes parameters in the services.yml file.
+   *
+   * @param string $name
+   *   The name of the parameter.
+   * @param mixed $value
+   *   The value of the parameter.
+   */
+  protected function setContainerParameter($name, $value) {
+    $filename = $this->siteDirectory . '/services.yml';
+    chmod($filename, 0666);
+
+    $services = Yaml::decode(file_get_contents($filename));
+    $services['parameters'][$name] = $value;
+    file_put_contents($filename, Yaml::encode($services));
+
+    // Ensure that the cache is deleted for the yaml file loader.
+    $file_cache = FileCacheFactory::get('container_yaml_loader');
+    $file_cache->delete($filename);
+  }
+
 }
diff --git a/core/tests/Drupal/Tests/Component/DependencyInjection/ContainerTest.php b/core/tests/Drupal/Tests/Component/DependencyInjection/ContainerTest.php
index 2abf267c8..3c89804d9 100644
--- a/core/tests/Drupal/Tests/Component/DependencyInjection/ContainerTest.php
+++ b/core/tests/Drupal/Tests/Component/DependencyInjection/ContainerTest.php
@@ -222,6 +222,17 @@ class ContainerTest extends \PHPUnit_Framework_TestCase {
     $this->assertTrue($this->container->has('another.service'));
   }
 
+  /**
+   * Tests that Container::has() for aliased services works properly.
+   *
+   * @covers ::has
+   */
+  public function testHasForAliasedService() {
+    $service = $this->container->has('service.provider');
+    $aliased_service = $this->container->has('service.provider_alias');
+    $this->assertSame($service, $aliased_service);
+  }
+
   /**
    * Tests that Container::get() for circular dependencies works properly.
    * @expectedException \Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException
diff --git a/core/tests/Drupal/Tests/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumperTest.php b/core/tests/Drupal/Tests/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumperTest.php
index c1c6058d7..49b65565d 100644
--- a/core/tests/Drupal/Tests/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumperTest.php
+++ b/core/tests/Drupal/Tests/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumperTest.php
@@ -493,6 +493,60 @@ namespace Drupal\Tests\Component\DependencyInjection\Dumper {
       $this->dumper->getArray();
     }
 
+    /**
+     * Tests that references to aliases work correctly.
+     *
+     * @covers ::getReferenceCall
+     *
+     * @dataProvider publicPrivateDataProvider
+     */
+    public function testGetServiceDefinitionWithReferenceToAlias($public) {
+      $bar_definition = new Definition('\stdClass');
+      $bar_definition_php_array = array(
+        'class' => '\stdClass',
+      );
+      if (!$public) {
+        $bar_definition->setPublic(FALSE);
+        $bar_definition_php_array['public'] = FALSE;
+      }
+      $bar_definition_php_array['arguments_count'] = 0;
+
+      $services['bar'] = $bar_definition;
+
+      $aliases['bar.alias'] = 'bar';
+
+      $foo = new Definition('\stdClass');
+      $foo->addArgument(new Reference('bar.alias'));
+
+      $services['foo'] = $foo;
+
+      $this->containerBuilder->getAliases()->willReturn($aliases);
+      $this->containerBuilder->getDefinitions()->willReturn($services);
+      $this->containerBuilder->getDefinition('bar')->willReturn($bar_definition);
+      $dump = $this->dumper->getArray();
+      if ($public) {
+        $service_definition = $this->getServiceCall('bar');
+      }
+      else {
+        $service_definition = $this->getPrivateServiceCall('bar', $bar_definition_php_array, TRUE);
+      }
+      $data = array(
+         'class' => '\stdClass',
+         'arguments' => $this->getCollection(array(
+           $service_definition,
+         )),
+         'arguments_count' => 1,
+      );
+      $this->assertEquals($this->serializeDefinition($data), $dump['services']['foo'], 'Expected definition matches dump.');
+    }
+
+    public function publicPrivateDataProvider() {
+      return array(
+        array(TRUE),
+        array(FALSE),
+      );
+    }
+
     /**
      * Tests that getDecoratedService() is unsupported.
      *
diff --git a/core/tests/Drupal/Tests/Component/Utility/ImageTest.php b/core/tests/Drupal/Tests/Component/Utility/ImageTest.php
index 41eb064eb..7c3a5ac12 100644
--- a/core/tests/Drupal/Tests/Component/Utility/ImageTest.php
+++ b/core/tests/Drupal/Tests/Component/Utility/ImageTest.php
@@ -35,11 +35,10 @@ class ImageTest extends UnitTestCase {
    *
    * @return array
    *   Keyed array containing:
-   * - 'input' - Array which contains input for
-   *   Image::scaleDimensions().
-   * - 'output' - Array which contains expected output after passing
-   *   through Image::scaleDimensions. Also contains a boolean
-   *   'return_value' which should match the expected return value.
+   *   - 'input' - Array which contains input for Image::scaleDimensions().
+   *   - 'output' - Array which contains expected output after passing
+   *     through Image::scaleDimensions. Also contains a boolean
+   *     'return_value' which should match the expected return value.
    *
    * @see testScaleDimensions()
    */
diff --git a/core/tests/Drupal/Tests/Component/Utility/UnicodeTest.php b/core/tests/Drupal/Tests/Component/Utility/UnicodeTest.php
index b8345b46d..39759b51c 100644
--- a/core/tests/Drupal/Tests/Component/Utility/UnicodeTest.php
+++ b/core/tests/Drupal/Tests/Component/Utility/UnicodeTest.php
@@ -474,11 +474,11 @@ class UnicodeTest extends UnitTestCase {
   /**
    * Provides data for self::testValidateUtf8().
    *
+   * Invalid UTF-8 examples sourced from http://stackoverflow.com/a/11709412/109119.
+   *
    * @return array
    *   An array of arrays, each containing the parameters for
    *   self::testValidateUtf8().
-   *
-   * Invalid UTF-8 examples sourced from http://stackoverflow.com/a/11709412/109119.
    */
   public function providerTestValidateUtf8() {
     return array(
diff --git a/core/tests/Drupal/Tests/Component/Uuid/UuidTest.php b/core/tests/Drupal/Tests/Component/Uuid/UuidTest.php
index 96b004dd4..a393bfb27 100644
--- a/core/tests/Drupal/Tests/Component/Uuid/UuidTest.php
+++ b/core/tests/Drupal/Tests/Component/Uuid/UuidTest.php
@@ -77,7 +77,7 @@ class UuidTest extends UnitTestCase {
    * Dataprovider for UUID instance tests.
    *
    * @return array
-   *  An array of arrays containing
+   *   An array of arrays containing
    *   - The Uuid to check against.
    *   - (bool) Whether or not the Uuid is valid.
    *   - Failure message.
diff --git a/core/tests/Drupal/Tests/ComposerIntegrationTest.php b/core/tests/Drupal/Tests/ComposerIntegrationTest.php
index 5ba74b6d0..5ab72f636 100644
--- a/core/tests/Drupal/Tests/ComposerIntegrationTest.php
+++ b/core/tests/Drupal/Tests/ComposerIntegrationTest.php
@@ -48,6 +48,7 @@ class ComposerIntegrationTest extends UnitTestCase {
       $this->root . '/core/lib/Drupal/Component/Assertion',
       $this->root . '/core/lib/Drupal/Component/Bridge',
       $this->root . '/core/lib/Drupal/Component/Datetime',
+      $this->root . '/core/lib/Drupal/Component/DependencyInjection',
       $this->root . '/core/lib/Drupal/Component/Diff',
       $this->root . '/core/lib/Drupal/Component/Discovery',
       $this->root . '/core/lib/Drupal/Component/EventDispatcher',
diff --git a/core/tests/Drupal/Tests/Core/Cache/ChainedFastBackendTest.php b/core/tests/Drupal/Tests/Core/Cache/ChainedFastBackendTest.php
index 956c18d12..0b576b74d 100644
--- a/core/tests/Drupal/Tests/Core/Cache/ChainedFastBackendTest.php
+++ b/core/tests/Drupal/Tests/Core/Cache/ChainedFastBackendTest.php
@@ -33,6 +33,21 @@ class ChainedFastBackendTest extends UnitTestCase {
    */
   protected $bin;
 
+  /**
+   * Tests that chained fast backend cannot be constructed with two instances of
+   * the same service.
+   */
+  public function testConsistentAndFastBackendCannotBeTheSameService() {
+    // ToDo: It should throw a proper exception. See https://www.drupal.org/node/2751847.
+    $this->setExpectedException(\PHPUnit_Framework_Error::class, 'Consistent cache backend and fast cache backend cannot use the same service.');
+    $cache = $this->getMock('Drupal\Core\Cache\CacheBackendInterface');
+    $chained_fast_backend = new ChainedFastBackend(
+      $cache,
+      $cache,
+      'foo'
+    );
+  }
+
   /**
    * Tests a get() on the fast backend, with no hit on the consistent backend.
    */
diff --git a/core/tests/Drupal/Tests/Core/Cache/Context/QueryArgsCacheContextTest.php b/core/tests/Drupal/Tests/Core/Cache/Context/QueryArgsCacheContextTest.php
index 93a11c583..5c30a92fb 100644
--- a/core/tests/Drupal/Tests/Core/Cache/Context/QueryArgsCacheContextTest.php
+++ b/core/tests/Drupal/Tests/Core/Cache/Context/QueryArgsCacheContextTest.php
@@ -31,15 +31,18 @@ class QueryArgsCacheContextTest extends UnitTestCase {
    */
   public function providerTestGetContext() {
     return [
-      [[], NULL, NULL],
-      [[], 'foo', NULL],
+      [[], NULL, ''],
+      [[], 'foo', ''],
       // Non-empty query arguments.
       [['llama' => 'rocks', 'alpaca' => '', 'panda' => 'drools', 'z' => '0'], NULL, 'alpaca=&llama=rocks&panda=drools&z=0'],
       [['llama' => 'rocks', 'alpaca' => '', 'panda' => 'drools', 'z' => '0'], 'llama', 'rocks'],
       [['llama' => 'rocks', 'alpaca' => '', 'panda' => 'drools', 'z' => '0'], 'alpaca', '?valueless?'],
       [['llama' => 'rocks', 'alpaca' => '', 'panda' => 'drools', 'z' => '0'], 'panda', 'drools'],
       [['llama' => 'rocks', 'alpaca' => '', 'panda' => 'drools', 'z' => '0'], 'z', '0'],
-      [['llama' => 'rocks', 'alpaca' => '', 'panda' => 'drools', 'z' => '0'], 'chicken', NULL],
+      [['llama' => 'rocks', 'alpaca' => '', 'panda' => 'drools', 'z' => '0'], 'chicken', ''],
+      [['llama' => ['rocks', 'kitty']], 'llama', '0=rocks&1=kitty'],
+      [['llama' => ['rocks' => 'fuzzball', 'monkey' => 'patch']], 'llama', 'rocks=fuzzball&monkey=patch'],
+      [['llama' => ['rocks' => ['nested', 'bonobo']]], 'llama', 'rocks%5B0%5D=nested&rocks%5B1%5D=bonobo'],
     ];
   }
 
diff --git a/core/tests/Drupal/Tests/Core/Config/ConfigDependencyManagerTest.php b/core/tests/Drupal/Tests/Core/Config/ConfigDependencyManagerTest.php
new file mode 100644
index 000000000..bd1af594a
--- /dev/null
+++ b/core/tests/Drupal/Tests/Core/Config/ConfigDependencyManagerTest.php
@@ -0,0 +1,120 @@
+<?php
+
+namespace Drupal\Tests\Core\Config;
+
+use Drupal\Core\Config\Entity\ConfigDependencyManager;
+use Drupal\Tests\UnitTestCase;
+
+/**
+ * Tests the ConfigDependencyManager class.
+ *
+ * @group Config
+ *
+ * @coversDefaultClass \Drupal\Core\Config\Entity\ConfigDependencyManager
+ */
+class ConfigDependencyManagerTest extends UnitTestCase {
+
+  /**
+   * @dataProvider providerTestSortAll
+   */
+  public function testSortAll(array $data, array $expected_order) {
+    $dependency_manager = new ConfigDependencyManager();
+    $dependency_manager->setData($data);
+    $this->assertEquals($expected_order, $dependency_manager->sortAll());
+  }
+
+  public function providerTestSortAll() {
+    $datasets[] = [
+      [
+        'provider.entity_b' => [],
+        'provider.entity_a' => [],
+      ],
+      ['provider.entity_a', 'provider.entity_b'],
+    ];
+
+    $datasets[] = [
+      [
+        'provider.entity_a' => [],
+        'provider.entity_b' => [],
+      ],
+      ['provider.entity_a', 'provider.entity_b'],
+    ];
+
+    $datasets[] = [
+      [
+        'provider.entity_b' => ['dependencies' => ['config' => ['provider.entity_a']]],
+        'provider.entity_a' => [],
+      ],
+      ['provider.entity_a', 'provider.entity_b'],
+    ];
+
+    $datasets[] = [
+      [
+        'provider.entity_a' => [],
+        'provider.entity_b' => ['dependencies' => ['config' => ['provider.entity_a']]],
+      ],
+      ['provider.entity_a', 'provider.entity_b'],
+    ];
+
+    $datasets[] = [
+      [
+        'provider.entity_b' => [],
+        'provider.entity_a' => ['dependencies' => ['config' => ['provider.entity_b']]],
+      ],
+      ['provider.entity_b', 'provider.entity_a'],
+    ];
+
+    $datasets[] = [
+      [
+        'provider.entity_a' => ['dependencies' => ['config' => ['provider.entity_b']]],
+        'provider.entity_b' => [],
+      ],
+      ['provider.entity_b', 'provider.entity_a'],
+    ];
+
+    $datasets[] = [
+      [
+        'provider.entity_a' => ['dependencies' => ['config' => ['provider.entity_b']]],
+        'provider.entity_b' => [],
+        'block.block.a' => [],
+        'block.block.b' => [],
+      ],
+      ['block.block.a', 'provider.entity_b', 'block.block.b', 'provider.entity_a'],
+    ];
+
+    $datasets[] = [
+      [
+        'provider.entity_b' => [],
+        'block.block.b' => [],
+        'block.block.a' => [],
+        'provider.entity_a' => ['dependencies' => ['config' => ['provider.entity_b']]],
+      ],
+      ['block.block.a', 'provider.entity_b', 'block.block.b', 'provider.entity_a'],
+    ];
+
+    $datasets[] = [
+      [
+        'provider.entity_b' => [],
+        'block.block.b' => [],
+        'block.block.a' => [],
+        'provider.entity_a' => ['dependencies' => ['config' => ['provider.entity_b']]],
+        'provider.entity_c' => ['dependencies' => ['config' => ['block.block.a']]],
+      ],
+      ['block.block.a', 'block.block.b', 'provider.entity_b', 'provider.entity_a', 'provider.entity_c'],
+    ];
+
+    $datasets[] = [
+      [
+        'provider.entity_b' => ['dependencies' => ['module' => ['system']]],
+        'block.block.b' => [],
+        'block.block.a' => ['dependencies' => ['module' => ['system']]],
+        'provider.entity_a' => ['dependencies' => ['config' => ['provider.entity_c']]],
+        'provider.entity_c' => ['dependencies' => ['config' => ['block.block.a']]],
+      ],
+      ['block.block.b', 'block.block.a', 'provider.entity_c', 'provider.entity_a', 'provider.entity_b'],
+    ];
+
+    return $datasets;
+  }
+
+}
diff --git a/core/tests/Drupal/Tests/Core/Config/StorageComparerTest.php b/core/tests/Drupal/Tests/Core/Config/StorageComparerTest.php
index 982ab816b..e339af7b8 100644
--- a/core/tests/Drupal/Tests/Core/Config/StorageComparerTest.php
+++ b/core/tests/Drupal/Tests/Core/Config/StorageComparerTest.php
@@ -158,8 +158,8 @@ class StorageComparerTest extends UnitTestCase {
     $this->storageComparer->createChangelist();
     $expected = array(
       'field.storage.node.body',
-      'views.view.test_view',
       'field.field.node.article.body',
+      'views.view.test_view',
     );
     $this->assertEquals($expected, $this->storageComparer->getChangelist('create'));
     $this->assertEmpty($this->storageComparer->getChangelist('delete'));
@@ -196,8 +196,8 @@ class StorageComparerTest extends UnitTestCase {
 
     $this->storageComparer->createChangelist();
     $expected = array(
-      'field.field.node.article.body',
       'views.view.test_view',
+      'field.field.node.article.body',
       'field.storage.node.body',
     );
     $this->assertEquals($expected, $this->storageComparer->getChangelist('delete'));
@@ -236,8 +236,8 @@ class StorageComparerTest extends UnitTestCase {
     $this->storageComparer->createChangelist();
     $expected = array(
       'field.storage.node.body',
-      'system.site',
       'field.field.node.article.body',
+      'system.site',
     );
     $this->assertEquals($expected, $this->storageComparer->getChangelist('update'));
     $this->assertEmpty($this->storageComparer->getChangelist('create'));
diff --git a/core/tests/Drupal/Tests/Core/Database/ConnectionTest.php b/core/tests/Drupal/Tests/Core/Database/ConnectionTest.php
index ff515f436..8f4aa7ae2 100644
--- a/core/tests/Drupal/Tests/Core/Database/ConnectionTest.php
+++ b/core/tests/Drupal/Tests/Core/Database/ConnectionTest.php
@@ -150,19 +150,16 @@ class ConnectionTest extends UnitTestCase {
     return array(
       array(
         'nonexistent_class',
-        'stub',
         '\\',
         'nonexistent_class',
       ),
       array(
-        'Drupal\\Core\\Database\\Driver\\mysql\\Select',
-        'mysql',
+        'Drupal\Tests\Core\Database\Stub\Select',
         NULL,
         'Select',
       ),
       array(
         'Drupal\\Tests\\Core\\Database\\Stub\\Driver\\Schema',
-        'stub',
         'Drupal\\Tests\\Core\\Database\\Stub\\Driver',
         'Schema',
       ),
@@ -174,11 +171,10 @@ class ConnectionTest extends UnitTestCase {
    *
    * @dataProvider providerGetDriverClass
    */
-  public function testGetDriverClass($expected, $driver, $namespace, $class) {
+  public function testGetDriverClass($expected, $namespace, $class) {
     $mock_pdo = $this->getMock('Drupal\Tests\Core\Database\Stub\StubPDO');
     $connection = new StubConnection($mock_pdo, array('namespace' => $namespace));
     // Set the driver using our stub class' public property.
-    $connection->driver = $driver;
     $this->assertEquals($expected, $connection->getDriverClass($class));
   }
 
diff --git a/core/tests/Drupal/Tests/Core/Database/Stub/Select.php b/core/tests/Drupal/Tests/Core/Database/Stub/Select.php
new file mode 100644
index 000000000..b29ac1a02
--- /dev/null
+++ b/core/tests/Drupal/Tests/Core/Database/Stub/Select.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Drupal\Tests\Core\Database\Stub;
+
+use Drupal\Core\Database\Driver\mysql\Select as QuerySelect;
+
+class Select extends QuerySelect {
+
+}
diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityUrlTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityUrlTest.php
index 05b0784cf..7db0950f1 100644
--- a/core/tests/Drupal/Tests/Core/Entity/EntityUrlTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/EntityUrlTest.php
@@ -2,377 +2,501 @@
 
 namespace Drupal\Tests\Core\Entity;
 
-use Drupal\Core\Config\Entity\ConfigEntityInterface;
-use Drupal\Core\DependencyInjection\ContainerBuilder;
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Language\Language;
-use Drupal\Core\Language\LanguageInterface;
+use Drupal\Core\Entity\Entity;
+use Drupal\Core\Entity\EntityMalformedException;
+use Drupal\Core\Entity\EntityManagerInterface;
+use Drupal\Core\Entity\EntityTypeInterface;
+use Drupal\Core\Entity\Exception\UndefinedLinkTemplateException;
+use Drupal\Core\Entity\RevisionableInterface;
+use Drupal\Core\Url;
 use Drupal\Tests\UnitTestCase;
 
 /**
+ * Tests URL handling of the \Drupal\Core\Entity\Entity class.
+ *
  * @coversDefaultClass \Drupal\Core\Entity\Entity
+ *
  * @group Entity
  */
 class EntityUrlTest extends UnitTestCase {
 
   /**
-   * The mocked entity manager.
+   * The entity manager mock used in this test.
    *
-   * @var \Drupal\Core\Entity\EntityManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+   * @var \Prophecy\Prophecy\ProphecyInterface|\Drupal\Core\Entity\EntityManagerInterface
    */
   protected $entityManager;
 
   /**
-   * The mocked URL generator.
+   * The ID of the entity type used in this test.
    *
-   * @var \Drupal\Core\Routing\UrlGeneratorInterface|\PHPUnit_Framework_MockObject_MockObject
+   * @var string
    */
-  protected $urlGenerator;
+  protected $entityTypeId = 'test_entity';
 
   /**
-   * {@inheritdoc}
+   * The entity type mock used in this test.
+   *
+   * @var \Prophecy\Prophecy\ProphecyInterface|\Drupal\Core\Entity\EntityTypeInterface
    */
-  protected function setUp() {
-    parent::setUp();
+  protected $entityType;
 
-    $this->entityManager = $this->getMock('Drupal\Core\Entity\EntityManagerInterface');
-    $this->urlGenerator = $this->getMock('Drupal\Core\Routing\UrlGeneratorInterface');
+  /**
+   * The ID of the entity used in this test.
+   *
+   * @var int
+   */
+  protected $entityId = 1;
 
-    $container = new ContainerBuilder();
-    $container->set('entity.manager', $this->entityManager);
-    $container->set('url_generator', $this->urlGenerator);
-    \Drupal::setContainer($container);
+  /**
+   * The revision ID of the entity used in this test.
+   *
+   * @var int
+   */
+  protected $revisionId = 2;
+
+  /**
+   * The language code of the entity used in this test.
+   *
+   * @var string
+   */
+  protected $langcode = 'en';
+
+  /**
+   * Indicator for default revisions.
+   *
+   * @var true
+   */
+  const DEFAULT_REVISION = TRUE;
+
+  /**
+   * Indicator for non-default revisions.
+   *
+   * @var false
+   */
+  const NON_DEFAULT_REVISION = FALSE;
+
+  /**
+   * Tests the toUrl() method without an entity ID.
+   *
+   * @covers ::toUrl
+   */
+  public function testToUrlNoId() {
+    $entity = $this->getEntity(Entity::class, []);
+
+    $this->setExpectedException(EntityMalformedException::class, 'The "' . $this->entityTypeId . '" entity cannot have a URI as it does not have an ID');
+    $entity->toUrl();
+  }
+
+  /**
+   * Tests the toUrl() method with simple link templates.
+   *
+   * @param string $link_template
+   *   The link template to test.
+   * @param string $expected_route_name
+   *   The expected route name of the generated URL.
+   *
+   * @dataProvider providerTestToUrlLinkTemplates
+   *
+   * @covers ::toUrl
+   * @covers ::linkTemplates
+   * @covers ::urlRouteParameters
+   */
+  public function testToUrlLinkTemplates($link_template, $expected_route_name) {
+    $values = ['id' => $this->entityId, 'langcode' => $this->langcode];
+    $entity = $this->getEntity(Entity::class, $values);
+    $this->registerLinkTemplate($link_template);
+
+    /** @var \Drupal\Core\Url $url */
+    $url = $entity->toUrl($link_template);
+    // The entity ID is the sole route parameter for the link templates tested
+    // here.
+    $this->assertUrl($expected_route_name, ['test_entity' => $this->entityId], $entity, TRUE, $url);
+  }
+
+  /**
+   * Provides data for testToUrlLinkTemplates().
+   *
+   * @return array
+   *   An array of test cases for testToUrlLinkTemplates().
+   */
+  public function providerTestToUrlLinkTemplates() {
+    $test_cases = [];
+
+    $test_cases['canonical'] = ['canonical', 'entity.test_entity.canonical'];
+    $test_cases['version-history'] = ['version-history', 'entity.test_entity.version_history'];
+    $test_cases['edit-form'] = ['edit-form', 'entity.test_entity.edit_form'];
+    $test_cases['delete-form'] = ['delete-form', 'entity.test_entity.delete_form'];
+    $test_cases['revision'] = ['revision', 'entity.test_entity.revision'];
+
+    return $test_cases;
+  }
+
+  /**
+   * Tests the toUrl() method with the 'revision' link template.
+   *
+   * @param bool $is_default_revision
+   *   Whether or not the mock entity should be the default revision.
+   * @param string $link_template
+   *   The link template to test.
+   * @param string $expected_route_name
+   *   The expected route name of the generated URL.
+   * @param array $expected_route_parameters
+   *   The expected route parameters of the generated URL.
+   *
+   * @dataProvider providerTestToUrlLinkTemplateRevision
+   *
+   * @covers ::toUrl
+   * @covers ::linkTemplates
+   * @covers ::urlRouteParameters
+   */
+  public function testToUrlLinkTemplateRevision($is_default_revision, $link_template, $expected_route_name, array $expected_route_parameters) {
+    $values = ['id' => $this->entityId, 'langcode' => $this->langcode];
+    $entity = $this->getEntity(RevisionableEntity::class, $values);
+    $entity->method('getRevisionId')->willReturn($this->revisionId);
+    $entity->method('isDefaultRevision')->willReturn($is_default_revision);
+    $this->registerLinkTemplate($link_template);
+    // Even though this is tested with both the 'canonical' and the 'revision'
+    // template registered with the entity, we always ask for the 'revision'
+    // link template, to test that it falls back to the 'canonical' link
+    // template in case of the default revision.
+    /** @var \Drupal\Core\Url $url */
+    $url = $entity->toUrl('revision');
+    $this->assertUrl($expected_route_name, $expected_route_parameters, $entity, TRUE, $url);
+
+  }
+
+  /**
+   * Provides data for testToUrlLinkTemplateRevision().
+   *
+   * @return array
+   *   An array of test cases for testToUrlLinkTemplateRevision().
+   */
+  public function providerTestToUrlLinkTemplateRevision() {
+    $test_cases = [];
+
+    $route_parameters = ['test_entity' => $this->entityId];
+    $test_cases['default_revision'] = [static::DEFAULT_REVISION, 'canonical', 'entity.test_entity.canonical', $route_parameters];
+    // Add the revision ID to the expected route parameters.
+    $route_parameters['test_entity_revision'] = $this->revisionId;
+    $test_cases['non_default_revision'] = [static::NON_DEFAULT_REVISION, 'revision', 'entity.test_entity.revision', $route_parameters];
+
+    return $test_cases;
+  }
+
+  /**
+   * Tests the toUrl() method with the 'collection' link template.
+   *
+   * @covers ::toUrl
+   * @covers ::linkTemplates
+   * @covers ::urlRouteParameters
+   */
+  public function testToUrlLinkTemplateCollection() {
+    $entity = $this->getEntity(Entity::class, ['id' => $this->entityId]);
+    $link_template = 'collection';
+    $this->registerLinkTemplate($link_template);
+
+    /** @var \Drupal\Core\Url $url */
+    $url = $entity->toUrl($link_template);
+    $this->assertUrl('entity.test_entity.collection', [], $entity, FALSE, $url);
+  }
+
+  /**
+   * Tests the toUrl() method with neither link templates nor a URI callback.
+   *
+   * @param array $bundle_info
+   *   An array of bundle info to register.
+   * @param string $uri_callback
+   *   The entity type URI callback to register.
+   *
+   * @dataProvider providerTestToUrlUriCallbackUndefined
+   *
+   * @covers ::toUrl
+   * @covers ::linkTemplates
+   */
+  public function testToUrlUriCallbackUndefined(array $bundle_info, $uri_callback) {
+    $entity = $this->getEntity(Entity::class, ['id' => $this->entityId]);
+
+    $this->registerBundleInfo($bundle_info);
+    $this->entityType->getUriCallback()->willReturn($uri_callback);
+
+    $link_template = 'canonical';
+    $this->setExpectedException(UndefinedLinkTemplateException::class, "No link template '$link_template' found for the '$this->entityTypeId' entity type");
+    $entity->toUrl($link_template);
+  }
+
+  /**
+   * Provides data for testToUrlUriCallbackUndefined().
+   *
+   * @return array
+   *   An array of test cases for testToUrlUriCallbackUndefined().
+   */
+  public function providerTestToUrlUriCallbackUndefined() {
+    $test_cases = [];
+
+    $test_cases['no_callback'] = [[], NULL];
+    $test_cases['uri_callback'] = [[], 'not_a_callable'];
+    $test_cases['bundle_uri_callback'] = [['uri_callback' => 'not_a_callable'], NULL];
+
+    return $test_cases;
+  }
+
+  /**
+   * Tests the toUrl() method with a URI callback.
+   *
+   * @param array $bundle_info
+   *   An array of bundle info to register.
+   * @param string $uri_callback
+   *   The entity type URI callback to register.
+   *
+   * @covers ::toUrl
+   * @covers ::linkTemplates
+   *
+   * @dataProvider providerTestToUrlUriCallback
+   */
+  public function testToUrlUriCallback(array $bundle_info, $uri_callback) {
+    $entity = $this->getEntity(Entity::class, ['id' => $this->entityId, 'langcode' => $this->langcode]);
+
+    $this->registerBundleInfo($bundle_info);
+    $this->entityType->getUriCallback()->willReturn($uri_callback);
+
+    /** @var \Drupal\Core\Url $url */
+    $url = $entity->toUrl('canonical');
+    $this->assertUrl('<none>', [], $entity, TRUE, $url);
+  }
+
+  /**
+   * Provides data for testToUrlUriCallback().
+   *
+   * @return array
+   *   An array of test cases for testToUrlUriCallback().
+   */
+  public function providerTestToUrlUriCallback() {
+    $test_cases = [];
+
+    $uri_callback = function () { return Url::fromRoute('<none>'); };
+    $test_cases['uri_callback'] = [[], $uri_callback];
+    $test_cases['bundle_uri_callback'] = [['uri_callback' => $uri_callback], NULL];
+
+    return $test_cases;
   }
 
   /**
    * Tests the urlInfo() method.
    *
-   * Note that urlInfo() is a deprecated alias for toUrl().
-   * See testToUrl().
+   * @param string $rel
+   *   The link relation to test.
+   * @param array $options
+   *   An array of URL options to test with.
    *
    * @covers ::urlInfo
    *
-   * @dataProvider providerTestToUrl
+   * @dataProvider providerTestUrlInfo
    */
-  public function testUrlInfo($entity_class, $link_template, $expected, $langcode = NULL) {
-    /** @var \Drupal\Core\Entity\EntityInterface $entity */
-    $entity = $this->getMockForAbstractClass($entity_class, array(array('id' => 'test_entity_id'), 'test_entity_type'));
-    $uri = $this->getTestUrlInfo($entity, $link_template, [], $langcode);
+  public function testUrlInfo($rel, $options) {
+    $entity = $this->getEntity(Entity::class, [], ['toUrl']);
+    $entity->expects($this->once())
+      ->method('toUrl')
+      ->with($rel, $options);
 
-    $this->assertSame($expected, $uri->getRouteName());
-    $this->assertSame($entity, $uri->getOption('entity'));
-
-    if ($langcode) {
-      $this->assertEquals($langcode, $uri->getOption('language')->getId());
-    }
-    else {
-      if ($entity instanceof ConfigEntityInterface) {
-        // Config entities do not provide a language with their URIs.
-        $this->assertEquals(NULL, $uri->getOption('language'));
-      }
-      else {
-        $this->assertEquals(LanguageInterface::LANGCODE_NOT_SPECIFIED, $uri->getOption('language')->getId());
-      }
-    }
-  }
-  /**
-   * Tests the toUrl() method.
-   *
-   * @covers ::toUrl
-   *
-   * @dataProvider providerTestToUrl
-   */
-  public function testToUrl($entity_class, $link_template, $expected, $langcode = NULL) {
-    /** @var \Drupal\Core\Entity\EntityInterface $entity */
-    $entity = $this->getMockForAbstractClass($entity_class, array(array('id' => 'test_entity_id'), 'test_entity_type'));
-    $uri = $this->getTestToUrl($entity, $link_template, [], $langcode);
-
-    $this->assertSame($expected, $uri->getRouteName());
-    $this->assertSame($entity, $uri->getOption('entity'));
-
-    if ($langcode) {
-      $this->assertEquals($langcode, $uri->getOption('language')->getId());
-    }
-    else {
-      if ($entity instanceof ConfigEntityInterface) {
-        // Config entities do not provide a language with their URIs.
-        $this->assertEquals(NULL, $uri->getOption('language'));
-      }
-      else {
-        $this->assertEquals(LanguageInterface::LANGCODE_NOT_SPECIFIED, $uri->getOption('language')->getId());
-      }
-    }
+    $entity->urlInfo($rel, $options);
   }
 
   /**
-   * Tests for Entity::toUrl() exercising different language options.
+   * Provides data for testUrlInfo().
    *
-   * @covers ::toUrl
+   * @return array
+   *   An array of test cases for testUrlInfo().
    */
-  public function testToUrlWithSpecificLanguageInOptions() {
-    /** @var \Drupal\Core\Entity\EntityInterface $entity */
-    $entity = $this->getMockForAbstractClass('Drupal\Core\Entity\Entity', array(array('id' => 'test_entity_id'), 'test_entity_type'));
+  public function providerTestUrlInfo() {
+    $test_cases = [];
 
-    // Ensure that a specified language overrides the current translation
-    // language.
-    $uri = $this->getTestToUrl($entity, 'edit-form', [], 'en');
-    $this->assertEquals('en', $uri->getOption('language')->getId());
+    $test_cases['default'] = ['canonical', []];
+    $test_cases['with_option'] = ['canonical', ['absolute' => TRUE]];
+    $test_cases['revision'] = ['revision', []];
 
-    $uri = $this->getTestToUrl($entity, 'edit-form', ['language' => new Language(['id' => 'fr'])], 'en');
-    $this->assertEquals('fr', $uri->getOption('language')->getId());
+    return $test_cases;
   }
 
   /**
-   * Provides test data for testUrlInfo().
+   * Tests the url() method without an entity ID.
+   *
+   * @param string $rel
+   *   The link relation to test.
+   *
+   * @covers ::url
+   * @covers ::hasLinkTemplate
+   * @covers ::linkTemplates
+   *
+   * @dataProvider providerTestUrl
    */
-  public function providerTestToUrl() {
-    return array(
-      array('Drupal\Core\Entity\Entity', 'edit-form', 'entity.test_entity_type.edit_form', NULL),
-      // Specify a langcode.
-      array('Drupal\Core\Entity\Entity', 'edit-form', 'entity.test_entity_type.edit_form', 'es'),
-      array('Drupal\Core\Entity\Entity', 'edit-form', 'entity.test_entity_type.edit_form', 'en'),
-      array('Drupal\Core\Config\Entity\ConfigEntityBase', 'edit-form', 'entity.test_entity_type.edit_form', NULL),
-      // Test that overriding the default $rel parameter works.
-      array('Drupal\Core\Config\Entity\ConfigEntityBase', FALSE, 'entity.test_entity_type.edit_form', NULL),
-    );
+  public function testUrlEmpty($rel) {
+    $entity = $this->getEntity(Entity::class, []);
+    $this->assertEquals('', $entity->url($rel));
   }
 
   /**
-   * Tests the toUrl() method with an invalid link template.
+   * Provides data for testUrlEmpty().
    *
-   * @covers ::toUrl
-   *
-   * @expectedException \Drupal\Core\Entity\Exception\UndefinedLinkTemplateException
-   *
-   * @expectedExceptionMessage No link template 'canonical' found for the 'test_entity_type' entity type
-   *
-   * @dataProvider providerTestToUrlForInvalidLinkTemplate
+   * @return array
+   *   An array of test cases for testUrlEmpty().
    */
-  public function testToUrlForInvalidLinkTemplate($entity_class, $link_template) {
-    /** @var \Drupal\Core\Entity\EntityInterface $entity */
-    $entity = $this->getMockForAbstractClass($entity_class, array(array('id' => 'test_entity_id'), 'test_entity_type'));
-    $uri = $this->getTestToUrl($entity, $link_template);
+  public function providerTestUrlEmpty() {
+    $test_cases = [];
 
-    $this->assertEmpty($uri);
-  }
+    $test_cases['default'] = ['canonical', []];
+    $test_cases['revision'] = ['revision', []];
 
-  /**
-   * Provides test data for testUrlInfoForInvalidLinkTemplate().
-   */
-  public function providerTestToUrlForInvalidLinkTemplate() {
-    return array(
-      array('Drupal\Core\Entity\Entity', 'canonical'),
-      array('Drupal\Core\Entity\Entity', FALSE),
-      array('Drupal\Core\Config\Entity\ConfigEntityBase', 'canonical'),
-    );
-  }
-
-  /**
-   * Creates a \Drupal\Core\Url object based on the entity and link template.
-   *
-   * Method urlInfo() is deprecated and replaced with toUrl().
-   * See also getTestToUrl().
-   *
-   * @param \Drupal\Core\Entity\EntityInterface $entity
-   *   The test entity.
-   * @param string $link_template
-   *   The link template.
-   * @param string $langcode
-   *   The langcode.
-   *
-   * @return \Drupal\Core\Url
-   *   The URL for this entity's link template.
-   */
-  protected function getTestUrlInfo(EntityInterface $entity, $link_template, array $options = [], $langcode = NULL) {
-    $entity_type = $this->getMock('Drupal\Core\Entity\EntityTypeInterface');
-    $entity_type->expects($this->any())
-      ->method('getLinkTemplates')
-      ->will($this->returnValue(array(
-        'edit-form' => 'test_entity_type.edit',
-      )));
-
-    if ($langcode) {
-      $entity->langcode = $langcode;
-    }
-
-    $this->entityManager
-      ->expects($this->any())
-      ->method('getDefinition')
-      ->with('test_entity_type')
-      ->will($this->returnValue($entity_type));
-
-    // If no link template is given, call without a value to test the default.
-    if ($link_template) {
-      $uri = $entity->urlInfo($link_template, $options);
-    }
-    else {
-      if ($entity instanceof ConfigEntityInterface) {
-        $uri = $entity->urlInfo('edit-form', $options);
-      }
-      else {
-        $uri = $entity->urlInfo('canonical', $options);
-      }
-    }
-
-    return $uri;
-  }
-
-  /**
-   * Creates a \Drupal\Core\Url object based on the entity and link template.
-   *
-   * @param \Drupal\Core\Entity\EntityInterface $entity
-   *   The test entity.
-   * @param string $link_template
-   *   The link template.
-   * @param string $langcode
-   *   The langcode.
-   *
-   * @return \Drupal\Core\Url
-   *   The URL for this entity's link template.
-   */
-  protected function getTestToUrl(EntityInterface $entity, $link_template, array $options = [], $langcode = NULL) {
-    $entity_type = $this->getMock('Drupal\Core\Entity\EntityTypeInterface');
-    $entity_type->expects($this->any())
-      ->method('getLinkTemplates')
-      ->will($this->returnValue(array(
-        'edit-form' => 'test_entity_type.edit',
-      )));
-
-    if ($langcode) {
-      $entity->langcode = $langcode;
-    }
-
-    $this->entityManager
-      ->expects($this->any())
-      ->method('getDefinition')
-      ->with('test_entity_type')
-      ->will($this->returnValue($entity_type));
-
-    // If no link template is given, call without a value to test the default.
-    if ($link_template) {
-      $uri = $entity->toUrl($link_template, $options);
-    }
-    else {
-      if ($entity instanceof ConfigEntityInterface) {
-        $uri = $entity->toUrl('edit-form', $options);
-      }
-      else {
-        $uri = $entity->toUrl('canonical', $options);
-      }
-    }
-
-    return $uri;
-  }
-
-  /**
-   * Tests the toUrl() method when an entity is still "new".
-   *
-   * @see \Drupal\Core\Entity\EntityInterface::isNew()
-   *
-   * @covers ::toUrl
-   *
-   * @expectedException \Drupal\Core\Entity\EntityMalformedException
-   */
-  public function testToUrlForNewEntity() {
-    $entity = $this->getMockForAbstractClass('Drupal\Core\Entity\Entity', array(array(), 'test_entity_type'));
-    $entity->toUrl();
+    return $test_cases;
   }
 
   /**
    * Tests the url() method.
    *
-   * @covers ::url
-   */
-  public function testUrl() {
-    $entity_type = $this->getMock('Drupal\Core\Entity\EntityTypeInterface');
-    $entity_type->expects($this->any())
-      ->method('getLinkTemplates')
-      ->will($this->returnValue(array(
-        'canonical' => 'test_entity_type.view',
-      )));
-
-    $this->entityManager
-      ->expects($this->any())
-      ->method('getDefinition')
-      ->with('test_entity_type')
-      ->will($this->returnValue($entity_type));
-
-    $invalid_entity = $this->getMockForAbstractClass('Drupal\Core\Entity\Entity', array(array(), 'test_entity_type'));
-    $this->assertSame('', $invalid_entity->url());
-
-    $no_link_entity = $this->getMockForAbstractClass('Drupal\Core\Entity\Entity', array(array('id' => 'test_entity_id'), 'test_entity_type'));
-    $this->assertSame('', $no_link_entity->url('banana'));
-
-    $valid_entity = $this->getMockForAbstractClass('Drupal\Core\Entity\Entity', array(array('id' => 'test_entity_id'), 'test_entity_type'));
-
-    $language = new Language(array('id' => LanguageInterface::LANGCODE_NOT_SPECIFIED));
-    $this->urlGenerator->expects($this->any())
-      ->method('generateFromRoute')
-      // Sadly returnValueMap() uses ===, see \PHPUnit_Framework_MockObject_Stub_ReturnValueMap::invoke
-      // so the $language object can't be compared directly.
-      ->willReturnCallback(function ($route_name, $route_parameters, $options) use ($language) {
-        if ($route_name === 'entity.test_entity_type.canonical' && $route_parameters === array('test_entity_type' => 'test_entity_id') && array_keys($options) === ['entity_type', 'entity', 'language'] && $options['language'] == $language) {
-          return '/entity/test_entity_type/test_entity_id';
-        }
-        if ($route_name === 'entity.test_entity_type.canonical' && $route_parameters === array('test_entity_type' => 'test_entity_id') && array_keys($options) === ['absolute', 'entity_type', 'entity', 'language'] && $options['language'] == $language) {
-          return 'http://drupal/entity/test_entity_type/test_entity_id';
-        }
-      });
-
-    $this->assertSame('/entity/test_entity_type/test_entity_id', $valid_entity->url());
-    $this->assertSame('http://drupal/entity/test_entity_type/test_entity_id', $valid_entity->url('canonical', array('absolute' => TRUE)));
-  }
-
-  /**
-   * Tests the retrieval of link templates.
+   * @param string $rel
+   *   The link relation to test.
+   * @param array $options
+   *   An array of URL options to call url() with.
+   * @param array $default_options
+   *   An array of URL options that toUrl() should generate.
+   * @param array $expected_options
+   *   An array of combined URL options that should be set on the final URL.
    *
+   * @covers ::url
    * @covers ::hasLinkTemplate
    * @covers ::linkTemplates
    *
-   * @dataProvider providerTestLinkTemplates
+   * @dataProvider providerTestUrl
    */
-  public function testLinkTemplates($override_templates, $expected) {
-    $entity_type = $this->getMock('Drupal\Core\Entity\EntityTypeInterface');
-    $entity_type->expects($this->any())
-      ->method('getLinkTemplates')
-      ->will($this->returnValue(array(
-        'canonical' => 'test_entity_type.view',
-      )));
+  public function testUrl($rel, $options, $default_options, $expected_options) {
+    $entity = $this->getEntity(Entity::class, ['id' => $this->entityId], ['toUrl']);
+    $this->registerLinkTemplate($rel);
 
-    $this->entityManager
-      ->expects($this->any())
-      ->method('getDefinition')
-      ->with('test_entity_type')
-      ->will($this->returnValue($entity_type));
+    $uri = $this->prophesize(Url::class);
+    $uri->getOptions()->willReturn($default_options);
+    $uri->setOptions($expected_options)->shouldBeCalled();
 
-    $entity = $this->getMockForAbstractClass('Drupal\Core\Entity\Entity', array(array('id' => 'test_entity_id'), 'test_entity_type'), '', TRUE, TRUE, TRUE, array('linkTemplates'));
-    $entity->expects($this->any())
-      ->method('linkTemplates')
-      ->will($this->returnCallback(function () use ($entity_type, $override_templates) {
-        $templates = $entity_type->getLinkTemplates();
-        if ($override_templates) {
-          $templates['bananas'] = 'test_entity_type.bananas';
-        }
-        return $templates;
-      }));
-    $this->assertSame($expected['canonical'], $entity->hasLinkTemplate('canonical'));
-    $this->assertSame($expected['bananas'], $entity->hasLinkTemplate('bananas'));
+    $url_string = "/test-entity/{$this->entityId}/$rel";
+    $uri->toString()->willReturn($url_string);
+
+    $entity->expects($this->once())
+      ->method('toUrl')
+      ->with($rel)
+      ->willReturn($uri->reveal());
+
+    $this->assertEquals($url_string, $entity->url($rel, $options));
   }
 
   /**
-   * Provides test data for testLinkTemplates().
+   * Provides data for testUrl().
+   *
+   * @return array
+   *   An array of test cases for testUrl().
    */
-  public function providerTestLinkTemplates() {
-    return array(
-      array(FALSE, array(
-        'canonical' => TRUE,
-        'bananas' => FALSE,
-      )),
-      array(TRUE, array(
-        'canonical' => TRUE,
-        'bananas' => TRUE,
-      )),
-    );
+  public function providerTestUrl() {
+    $test_cases = [];
+
+    $test_cases['default'] = ['canonical', [], [], []];
+    $test_cases['revision'] = ['revision', [], [], []];
+    $test_cases['option'] = ['canonical', ['absolute' => TRUE], [], ['absolute' => TRUE]];
+    $test_cases['default_option'] = ['canonical', [], ['absolute' => TRUE], ['absolute' => TRUE]];
+    $test_cases['option_merge'] = ['canonical', ['absolute' => TRUE], ['entity_type' => $this->entityTypeId], ['absolute' => TRUE, 'entity_type' => $this->entityTypeId]];
+    $test_cases['option_override'] = ['canonical', ['absolute' => TRUE], ['absolute' => FALSE], ['absolute' => TRUE]];
+
+    return $test_cases;
+  }
+
+  /**
+   * Returns a mock entity for testing.
+   *
+   * @param string $class
+   *   The class name to mock. Should be \Drupal\Core\Entity\Entity or a
+   *   subclass.
+   * @param array $values
+   *   An array of entity values to construct the mock entity with.
+   * @param array $methods
+   *   (optional) An array of additional methods to mock on the entity object.
+   *   The getEntityType() and entityManager() methods are always mocked.
+   *
+   * @return \Drupal\Core\Entity\Entity|\PHPUnit_Framework_MockObject_MockObject
+   */
+  protected function getEntity($class, array $values, array $methods = []) {
+    $methods = array_merge($methods, ['getEntityType', 'entityManager']);
+
+    // Prophecy does not allow prophesizing abstract classes while actually
+    // calling their code. We use Prophecy below because that allows us to
+    // add method prophecies later while still revealing the prophecy now.
+    $entity = $this->getMockBuilder($class)
+      ->setConstructorArgs([$values, $this->entityTypeId])
+      ->setMethods($methods)
+      ->getMockForAbstractClass();
+
+    $this->entityType = $this->prophesize(EntityTypeInterface::class);
+    $this->entityType->getLinkTemplates()->willReturn([]);
+    $this->entityType->getKey('langcode')->willReturn(FALSE);
+    $entity->method('getEntityType')->willReturn($this->entityType->reveal());
+
+    $this->entityManager = $this->prophesize(EntityManagerInterface::class);
+    $entity->method('entityManager')->willReturn($this->entityManager->reveal());
+
+    return $entity;
+  }
+
+  /**
+   * Asserts that a given URL object matches the expectations.
+   *
+   * @param string $expected_route_name
+   *   The expected route name of the generated URL.
+   * @param array $expected_route_parameters
+   *   The expected route parameters of the generated URL.
+   * @param \Drupal\Core\Entity\Entity|\PHPUnit_Framework_MockObject_MockObject $entity
+   *   The entity that is expected to be set as a URL option.
+   * @param bool $has_language
+   *   Whether or not the URL is expected to have a language option.
+   * @param \Drupal\Core\Url $url
+   *   The URL option to make the assertions on.
+   */
+  protected function assertUrl($expected_route_name, array $expected_route_parameters, $entity, $has_language, Url $url) {
+    $this->assertEquals($expected_route_name, $url->getRouteName());
+    $this->assertEquals($expected_route_parameters, $url->getRouteParameters());
+    $this->assertEquals($this->entityTypeId, $url->getOption('entity_type'));
+    $this->assertEquals($entity, $url->getOption('entity'));
+    if ($has_language) {
+      $this->assertEquals($this->langcode, $url->getOption('language')->getId());
+    }
+    else {
+      $this->assertNull($url->getOption('language'));
+    }
+  }
+
+  /**
+   * Registers a link template for the mock entity.
+   *
+   * @param string $link_template
+   *   The link template to register.
+   */
+  protected function registerLinkTemplate($link_template) {
+    $link_templates = [
+      // The path is actually never used because we never invoke the URL
+      // generator but perform assertions on the URL object directly.
+      $link_template => "/test-entity/{test_entity}/$link_template",
+    ];
+    $this->entityType->getLinkTemplates()->willReturn($link_templates);
+  }
+
+  /**
+   * Registers bundle information for the mock entity type.
+   *
+   * @param array $bundle_info
+   *   The bundle information to register.
+   */
+  protected function registerBundleInfo($bundle_info) {
+    $this->entityManager
+      ->getBundleInfo($this->entityTypeId)
+      ->willReturn([$this->entityTypeId => $bundle_info])
+    ;
   }
 
 }
+
+abstract class RevisionableEntity extends Entity implements RevisionableInterface {}
diff --git a/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageSchemaTest.php b/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageSchemaTest.php
index e38988e26..1ce87c540 100644
--- a/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageSchemaTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageSchemaTest.php
@@ -820,6 +820,16 @@ class SqlContentEntityStorageSchemaTest extends UnitTestCase {
           'length' => 32,
           'not null' => FALSE,
         ),
+        'area' => array(
+          'type' => 'int',
+          'unsigned' => TRUE,
+          'not null' => TRUE,
+        ),
+        'depth' => array(
+          'type' => 'int',
+          'unsigned' => TRUE,
+          'not null' => TRUE,
+        ),
       ),
       'foreign keys' => array(
         'color' => array(
@@ -829,8 +839,14 @@ class SqlContentEntityStorageSchemaTest extends UnitTestCase {
           ),
         ),
       ),
-      'unique keys' => array(),
-      'indexes' => array(),
+      'unique keys' => array(
+        'area' => array('area'),
+        'shape' => array(array('shape', 10)),
+      ),
+      'indexes' => array(
+        'depth' => array('depth'),
+        'color' => array(array('color', 3)),
+      ),
     ));
 
     $field_storage = $this->storageDefinitions[$field_name];
@@ -905,11 +921,27 @@ class SqlContentEntityStorageSchemaTest extends UnitTestCase {
             'length' => 32,
             'not null' => FALSE,
           ),
+          $field_name . '_area' => array(
+            'type' => 'int',
+            'unsigned' => TRUE,
+            'not null' => TRUE,
+          ),
+          $field_name . '_depth' => array(
+            'type' => 'int',
+            'unsigned' => TRUE,
+            'not null' => TRUE,
+          ),
         ),
         'primary key' => array('entity_id', 'deleted', 'delta', 'langcode'),
         'indexes' => array(
           'bundle' => array('bundle'),
           'revision_id' => array('revision_id'),
+          $field_name . '_depth' => array($field_name . '_depth'),
+          $field_name . '_color' => array(array($field_name . '_color', 3)),
+        ),
+        'unique keys' => array(
+           $field_name . '_area' => array($field_name . '_area'),
+           $field_name . '_shape' => array(array($field_name . '_shape', 10)),
         ),
         'foreign keys' => array(
           $field_name . '_color' => array(
diff --git a/core/tests/Drupal/Tests/Core/Image/ImageTest.php b/core/tests/Drupal/Tests/Core/Image/ImageTest.php
index 844dadbe0..312bbdaf2 100644
--- a/core/tests/Drupal/Tests/Core/Image/ImageTest.php
+++ b/core/tests/Drupal/Tests/Core/Image/ImageTest.php
@@ -9,6 +9,7 @@ use Drupal\Tests\UnitTestCase;
 /**
  * Tests the image class.
  *
+ * @requires extension gd
  * @group Image
  */
 class ImageTest extends UnitTestCase {
diff --git a/core/tests/Drupal/Tests/Core/Render/RendererTestBase.php b/core/tests/Drupal/Tests/Core/Render/RendererTestBase.php
index 834d0a47b..7c5e8557d 100644
--- a/core/tests/Drupal/Tests/Core/Render/RendererTestBase.php
+++ b/core/tests/Drupal/Tests/Core/Render/RendererTestBase.php
@@ -22,7 +22,7 @@ use Symfony\Component\HttpFoundation\RequestStack;
 /**
  * Base class for the actual unit tests testing \Drupal\Core\Render\Renderer.
  */
-class RendererTestBase extends UnitTestCase {
+abstract class RendererTestBase extends UnitTestCase {
 
   /**
    * The tested renderer.
diff --git a/core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTest.php b/core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTest.php
index 603b41df6..06e8c177f 100644
--- a/core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTest.php
+++ b/core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTest.php
@@ -300,7 +300,7 @@ class UrlGeneratorTest extends UnitTestCase {
     // No cacheability to test; UrlGenerator::generate() doesn't support
     // collecting cacheability metadata.
 
-    $this->routeProcessorManager->expects($this->exactly(7))
+    $this->routeProcessorManager->expects($this->any())
       ->method('processOutbound')
       ->with($this->anything());
 
@@ -316,6 +316,10 @@ class UrlGeneratorTest extends UnitTestCase {
 
     $path = $this->generator->getPathFromRoute('test_2', array('narf' => '5'));
     $this->assertEquals('test/two/5', $path);
+
+    // Specify a query parameter with NULL.
+    $options = ['query' => ['page' => NULL], 'fragment' => 'bottom'];
+    $this->assertGenerateFromRoute('test_2', ['narf' => 5], $options, '/goodbye/cruel/world?page#bottom', (new BubbleableMetadata())->setCacheMaxAge(Cache::PERMANENT));
   }
 
   /**
diff --git a/core/tests/Drupal/Tests/Core/UnroutedUrlTest.php b/core/tests/Drupal/Tests/Core/UnroutedUrlTest.php
index 2674b36c5..ef6dd2525 100644
--- a/core/tests/Drupal/Tests/Core/UnroutedUrlTest.php
+++ b/core/tests/Drupal/Tests/Core/UnroutedUrlTest.php
@@ -82,6 +82,8 @@ class UnroutedUrlTest extends UnitTestCase {
       // [$uri, $is_external]
       // An external URI.
       ['https://www.drupal.org', TRUE],
+      // A protocol-relative URL.
+      ['//www.drupal.org', TRUE],
       // An internal, unrouted, base-relative URI.
       ['base:robots.txt', FALSE],
       // Base-relative URIs with special characters.
@@ -114,7 +116,6 @@ class UnroutedUrlTest extends UnitTestCase {
       // Schemeless paths.
       ['test'],
       ['/test'],
-      ['//test'],
       // Schemeless path with a query string.
       ['foo?bar'],
       // Only a query string.
diff --git a/core/tests/Drupal/Tests/Core/UrlTest.php b/core/tests/Drupal/Tests/Core/UrlTest.php
index 66013c476..2808a209a 100644
--- a/core/tests/Drupal/Tests/Core/UrlTest.php
+++ b/core/tests/Drupal/Tests/Core/UrlTest.php
@@ -335,6 +335,18 @@ class UrlTest extends UnitTestCase {
     $this->assertEquals('http://example.com/test', $url->getUri());
   }
 
+  /**
+   * Tests the getUri() and isExternal() methods for protocol-relative URLs.
+   *
+   * @covers ::getUri
+   * @covers ::isExternal
+   */
+  public function testGetUriForProtocolRelativeUrl() {
+    $url = Url::fromUri('//example.com/test');
+    $this->assertEquals('//example.com/test', $url->getUri());
+    $this->assertTrue($url->isExternal());
+  }
+
   /**
    * Tests the getInternalPath method().
    *
diff --git a/core/tests/Drupal/Tests/Core/Utility/LinkGeneratorTest.php b/core/tests/Drupal/Tests/Core/Utility/LinkGeneratorTest.php
index 97fb9d3b3..08c9af0ec 100644
--- a/core/tests/Drupal/Tests/Core/Utility/LinkGeneratorTest.php
+++ b/core/tests/Drupal/Tests/Core/Utility/LinkGeneratorTest.php
@@ -69,7 +69,9 @@ class LinkGeneratorTest extends UnitTestCase {
   protected function setUp() {
     parent::setUp();
 
-    $this->urlGenerator = $this->getMock('\Drupal\Core\Routing\UrlGenerator', array(), array(), '', FALSE);
+    $this->urlGenerator = $this->getMockBuilder('\Drupal\Core\Routing\UrlGenerator')
+      ->disableOriginalConstructor()
+      ->getMock();
     $this->moduleHandler = $this->getMock('Drupal\Core\Extension\ModuleHandlerInterface');
     $this->renderer = $this->getMock('\Drupal\Core\Render\RendererInterface');
     $this->linkGenerator = new LinkGenerator($this->urlGenerator, $this->moduleHandler, $this->renderer);
@@ -487,6 +489,33 @@ class LinkGeneratorTest extends UnitTestCase {
     $this->assertInstanceOf('\Drupal\Core\Render\BubbleableMetadata', $generated_link);
   }
 
+  /**
+   * Tests altering the URL object using hook_link_alter().
+   *
+   * @covers ::generate
+   */
+  public function testGenerateWithAlterHook() {
+    $options = ['query' => [], 'language' => NULL, 'set_active_class' => FALSE, 'absolute' => FALSE];
+    $this->urlGenerator->expects($this->any())
+      ->method('generateFromRoute')
+      ->will($this->returnValueMap([
+        ['test_route_1', [], $options, TRUE, (new GeneratedUrl())->setGeneratedUrl('/test-route-1')],
+        ['test_route_2', [], $options, TRUE, (new GeneratedUrl())->setGeneratedUrl('/test-route-2')],
+      ]));
+
+    $url = new Url('test_route_2');
+    $url->setUrlGenerator($this->urlGenerator);
+
+    $this->moduleHandler->expects($this->atLeastOnce())
+      ->method('alter')
+      ->willReturnCallback(function ($hook, &$options) {
+        $options['url'] = (new Url('test_route_1'))->setUrlGenerator($this->urlGenerator);
+      });
+
+    $expected_link_markup = '<a href="/test-route-1">Test</a>';
+    $this->assertEquals($expected_link_markup, (string) $this->linkGenerator->generate('Test', $url)->getGeneratedLink());
+  }
+
   /**
    * Checks that a link with certain properties exists in a given HTML snippet.
    *
diff --git a/core/tests/Drupal/Tests/TestSuites/TestSuiteBaseTest.php b/core/tests/Drupal/Tests/TestSuites/TestSuiteBaseTest.php
new file mode 100644
index 000000000..bebb4310d
--- /dev/null
+++ b/core/tests/Drupal/Tests/TestSuites/TestSuiteBaseTest.php
@@ -0,0 +1,134 @@
+<?php
+
+namespace Drupal\Tests\TestSuites;
+
+use org\bovigo\vfs\vfsStream;
+
+/**
+ * @coversDefaultClass \Drupal\Tests\TestSuites\TestSuiteBase
+ *
+ * @group TestSuite
+ */
+class TestSuiteBaseTest extends \PHPUnit_Framework_TestCase {
+
+  /**
+   * Helper method to set up the file system.
+   *
+   * @return array[]
+   *   A Drupal filesystem suitable for use with vfsStream.
+   */
+  protected function getFilesystem() {
+    return [
+      'core' => [
+        'modules' => [],
+        'profiles' => [],
+        'tests' => [
+          'Drupal' => [
+            'NotUnitTests' => [
+              'CoreNotUnitTest.php' => '<?php',
+            ],
+            'Tests' => [
+              'CoreUnitTest.php' => '<?php',
+            ],
+          ],
+        ],
+      ],
+    ];
+  }
+
+  /**
+   * @return array[]
+   *   Test data for testAddTestsBySuiteNamespaceCore(). An array of arrays:
+   *   - A filesystem array for vfsStream.
+   *   - The sub-namespace of the test suite.
+   *   - The array of tests expected to be discovered.
+   */
+  public function provideCoreTests() {
+    $filesystem = $this->getFilesystem();
+    return [
+      'unit-tests' => [
+        $filesystem,
+        'Unit',
+        [
+          'Drupal\Tests\CoreUnitTest' => 'vfs://root/core/tests/Drupal/Tests/CoreUnitTest.php',
+        ],
+      ],
+      'not-unit-tests' => [
+        $filesystem,
+        'NotUnit',
+        [
+          'Drupal\NotUnitTests\CoreNotUnitTest' => 'vfs://root/core/tests/Drupal/NotUnitTests/CoreNotUnitTest.php',
+        ],
+      ],
+    ];
+  }
+
+  /**
+   * Tests for special case behavior of unit test suite namespaces in core.
+   *
+   * @covers ::addTestsBySuiteNamespace
+   *
+   * @dataProvider provideCoreTests
+   */
+  public function testAddTestsBySuiteNamespaceCore($filesystem, $suite_namespace, $expected_tests) {
+    // Set up the file system.
+    $vfs = vfsStream::setup('root');
+    vfsStream::create($filesystem, $vfs);
+
+    // Make a stub suite base to test.
+    $stub = new StubTestSuiteBase('test_me');
+
+    // Access addTestsBySuiteNamespace().
+    $ref_add_tests = new \ReflectionMethod($stub, 'addTestsBySuiteNamespace');
+    $ref_add_tests->setAccessible(TRUE);
+
+    // Invoke addTestsBySuiteNamespace().
+    $ref_add_tests->invokeArgs($stub, [vfsStream::url('root'), $suite_namespace]);
+
+    // Determine if we loaded the expected test files.
+    $this->assertNotEmpty($stub->testFiles);
+    $this->assertEmpty(array_diff_assoc($expected_tests, $stub->testFiles));
+  }
+
+}
+
+/**
+ * Stub subclass of TestSuiteBase.
+ *
+ * We use this class to alter the behavior of TestSuiteBase so it can be
+ * testable.
+ */
+class StubTestSuiteBase extends TestSuiteBase {
+
+  /**
+   * Test files discovered by addTestsBySuiteNamespace().
+   *
+   * @var string[]
+   */
+  public $testFiles = [];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function findExtensionDirectories($root) {
+    // We have to stub findExtensionDirectories() because we can't inject a
+    // vfsStream filesystem into drupal_phpunit_find_extension_directories(),
+    // which uses \SplFileInfo->getRealPath(). getRealPath() resolves
+    // stream-based paths to an empty string. See
+    // https://github.com/mikey179/vfsStream/wiki/Known-Issues
+    return [];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function addTestFiles($filenames) {
+    // We stub addTestFiles() because the parent implementation can't deal with
+    // vfsStream-based filesystems due to an error in
+    // stream_resolve_include_path(). See
+    // https://github.com/mikey179/vfsStream/issues/5 Here we just store the
+    // test file being added in $this->testFiles.
+    $this->testFiles = array_merge($this->testFiles, $filenames);
+  }
+
+}
diff --git a/core/tests/Drupal/Tests/WebAssert.php b/core/tests/Drupal/Tests/WebAssert.php
index d863de2ea..6156dda8c 100644
--- a/core/tests/Drupal/Tests/WebAssert.php
+++ b/core/tests/Drupal/Tests/WebAssert.php
@@ -2,15 +2,58 @@
 
 namespace Drupal\Tests;
 
+use Behat\Mink\Exception\ExpectationException;
 use Behat\Mink\WebAssert as MinkWebAssert;
 use Behat\Mink\Element\TraversableElement;
 use Behat\Mink\Exception\ElementNotFoundException;
+use Behat\Mink\Session;
+use Drupal\Component\Utility\Html;
+use Drupal\Core\Url;
 
 /**
  * Defines a class with methods for asserting presence of elements during tests.
  */
 class WebAssert extends MinkWebAssert {
 
+  /**
+   * The absolute URL of the site under test.
+   *
+   * @var string
+   */
+  protected $baseUrl = '';
+
+  /**
+   * Constructor.
+   *
+   * @param \Behat\Mink\Session $session
+   *   The Behat session object;
+   * @param string $base_url
+   *   The base URL of the site under test.
+   */
+  public function __construct(Session $session, $base_url = '') {
+    parent::__construct($session);
+    $this->baseUrl = $base_url;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function cleanUrl($url) {
+    if ($url instanceof Url) {
+      $url = $url->setAbsolute()->toString();
+    }
+    // Strip the base URL from the beginning for absolute URLs.
+    if ($this->baseUrl !== '' && strpos($url, $this->baseUrl) === 0) {
+      $url = substr($url, strlen($this->baseUrl));
+    }
+    // Make sure there is a forward slash at the beginning of relative URLs for
+    // consistency.
+    if (parse_url($url, PHP_URL_HOST) === NULL && strpos($url, '/') !== 0) {
+      $url = "/$url";
+    }
+    return parent::cleanUrl($url);
+  }
+
   /**
    * Checks that specific button exists on the current page.
    *
@@ -36,6 +79,24 @@ class WebAssert extends MinkWebAssert {
     return $node;
   }
 
+  /**
+   * Checks that the specific button does NOT exist on the current page.
+   *
+   * @param string $button
+   *   One of id|name|label|value for the button.
+   * @param \Behat\Mink\Element\TraversableElement $container
+   *   (optional) The document to check against. Defaults to the current page.
+   *
+   * @throws \Behat\Mink\Exception\ExpectationException
+   *   When the button exists.
+   */
+  public function buttonNotExists($button, TraversableElement $container = NULL) {
+    $container = $container ?: $this->session->getPage();
+    $node = $container->findButton($button);
+
+    $this->assert(NULL === $node, sprintf('A button "%s" appears on this page, but it should not.', $button));
+  }
+
   /**
    * Checks that specific select field exists on the current page.
    *
@@ -64,4 +125,301 @@ class WebAssert extends MinkWebAssert {
     return $node;
   }
 
+  /**
+   * Checks that specific option in a select field exists on the current page.
+   *
+   * @param string $select
+   *   One of id|name|label|value for the select field.
+   * @param string $option
+   *   The option value.
+   * @param \Behat\Mink\Element\TraversableElement $container
+   *   (optional) The document to check against. Defaults to the current page.
+   *
+   * @return \Behat\Mink\Element\NodeElement
+   *   The matching option element
+   *
+   * @throws \Behat\Mink\Exception\ElementNotFoundException
+   *   When the element doesn't exist.
+   */
+  public function optionExists($select, $option, TraversableElement $container = NULL) {
+    $container = $container ?: $this->session->getPage();
+    $select_field = $container->find('named', array(
+      'select',
+      $this->session->getSelectorsHandler()->xpathLiteral($select),
+    ));
+
+    if ($select_field === NULL) {
+      throw new ElementNotFoundException($this->session, 'select', 'id|name|label|value', $select);
+    }
+
+    $option_field = $select_field->find('named', array('option', $option));
+
+    if ($option_field === NULL) {
+      throw new ElementNotFoundException($this->session, 'select', 'id|name|label|value', $option);
+    }
+
+    return $option_field;
+  }
+
+  /**
+   * Checks that an option in a select field does NOT exist on the current page.
+   *
+   * @param string $select
+   *   One of id|name|label|value for the select field.
+   * @param string $option
+   *   The option value that shoulkd not exist.
+   * @param \Behat\Mink\Element\TraversableElement $container
+   *   (optional) The document to check against. Defaults to the current page.
+   *
+   * @throws \Behat\Mink\Exception\ElementNotFoundException
+   *   When the select element doesn't exist.
+   */
+  public function optionNotExists($select, $option, TraversableElement $container = NULL) {
+    $container = $container ?: $this->session->getPage();
+    $select_field = $container->find('named', array(
+      'select',
+      $this->session->getSelectorsHandler()->xpathLiteral($select),
+    ));
+
+    if ($select_field === NULL) {
+      throw new ElementNotFoundException($this->session, 'select', 'id|name|label|value', $select);
+    }
+
+    $option_field = $select_field->find('named', array('option', $option));
+
+    $this->assert($option_field === NULL, sprintf('An option "%s" exists in select "%s", but it should not.', $option, $select));
+  }
+
+  /**
+   * Pass if the page title is the given string.
+   *
+   * @param string $expected_title
+   *   The string the page title should be.
+   *
+   * @throws \Behat\Mink\Exception\ExpectationException
+   *   Thrown when element doesn't exist, or the title is a different one.
+   */
+  public function titleEquals($expected_title) {
+    $title_element = $this->session->getPage()->find('css', 'title');
+    if (!$title_element) {
+      throw new ExpectationException('No title element found on the page', $this->session);
+    }
+    $actual_title = $title_element->getText();
+    $this->assert($expected_title === $actual_title, 'Title found');
+  }
+
+  /**
+   * Passes if a link with the specified label is found.
+   *
+   * An optional link index may be passed.
+   *
+   * @param string $label
+   *   Text between the anchor tags.
+   * @param int $index
+   *   Link position counting from zero.
+   * @param string $message
+   *   (optional) A message to display with the assertion. Do not translate
+   *   messages: use strtr() to embed variables in the message text, not
+   *   t(). If left blank, a default message will be displayed.
+   *
+   * @throws \Behat\Mink\Exception\ExpectationException
+   *   Thrown when element doesn't exist, or the link label is a different one.
+   */
+  public function linkExists($label, $index = 0, $message = '') {
+    $message = ($message ? $message : strtr('Link with label %label found.', ['%label' => $label]));
+    $links = $this->session->getPage()->findAll('named', ['link', $label]);
+    $this->assert(!empty($links[$index]), $message);
+  }
+
+  /**
+   * Passes if a link with the specified label is not found.
+   *
+   * An optional link index may be passed.
+   *
+   * @param string $label
+   *   Text between the anchor tags.
+   * @param string $message
+   *   (optional) A message to display with the assertion. Do not translate
+   *   messages: use strtr() to embed variables in the message text, not
+   *   t(). If left blank, a default message will be displayed.
+   *
+   * @throws \Behat\Mink\Exception\ExpectationException
+   *   Thrown when element doesn't exist, or the link label is a different one.
+   */
+  public function linkNotExists($label, $message = '') {
+    $message = ($message ? $message : strtr('Link with label %label found.', ['%label' => $label]));
+    $links = $this->session->getPage()->findAll('named', ['link', $label]);
+    $this->assert(empty($links), $message);
+  }
+
+  /**
+   * Passes if a link containing a given href (part) is found.
+   *
+   * @param string $href
+   *   The full or partial value of the 'href' attribute of the anchor tag.
+   * @param int $index
+   *   Link position counting from zero.
+   * @param string $message
+   *   (optional) A message to display with the assertion. Do not translate
+   *   messages: use \Drupal\Component\Utility\SafeMarkup::format() to embed
+   *   variables in the message text, not t(). If left blank, a default message
+   *   will be displayed.
+   *
+   * @throws \Behat\Mink\Exception\ExpectationException
+   *   Thrown when element doesn't exist, or the link label is a different one.
+   */
+  public function linkByHrefExists($href, $index = 0, $message = '') {
+    $xpath = $this->buildXPathQuery('//a[contains(@href, :href)]', [':href' => $href]);
+    $message = ($message ? $message : strtr('Link containing href %href found.', ['%href' => $href]));
+    $links = $this->session->getPage()->findAll('xpath', $xpath);
+    $this->assert(!empty($links[$index]), $message);
+  }
+
+  /**
+   * Passes if a link containing a given href (part) is not found.
+   *
+   * @param string $href
+   *   The full or partial value of the 'href' attribute of the anchor tag.
+   * @param string $message
+   *   (optional) A message to display with the assertion. Do not translate
+   *   messages: use \Drupal\Component\Utility\SafeMarkup::format() to embed
+   *   variables in the message text, not t(). If left blank, a default message
+   *   will be displayed.
+   *
+   * @throws \Behat\Mink\Exception\ExpectationException
+   *   Thrown when element doesn't exist, or the link label is a different one.
+   */
+  public function linkByHrefNotExists($href, $message = '') {
+    $xpath = $this->buildXPathQuery('//a[contains(@href, :href)]', [':href' => $href]);
+    $message = ($message ? $message : strtr('Link containing href %href found.', ['%href' => $href]));
+    $links = $this->session->getPage()->findAll('xpath', $xpath);
+    $this->assert(empty($links), $message);
+  }
+
+  /**
+   * Builds an XPath query.
+   *
+   * Builds an XPath query by replacing placeholders in the query by the value
+   * of the arguments.
+   *
+   * XPath 1.0 (the version supported by libxml2, the underlying XML library
+   * used by PHP) doesn't support any form of quotation. This function
+   * simplifies the building of XPath expression.
+   *
+   * @param string $xpath
+   *   An XPath query, possibly with placeholders in the form ':name'.
+   * @param array $args
+   *   An array of arguments with keys in the form ':name' matching the
+   *   placeholders in the query. The values may be either strings or numeric
+   *   values.
+   *
+   * @return string
+   *   An XPath query with arguments replaced.
+   */
+  public function buildXPathQuery($xpath, array $args = array()) {
+    // Replace placeholders.
+    foreach ($args as $placeholder => $value) {
+      if (is_object($value)) {
+        throw new \InvalidArgumentException('Just pass in scalar values.');
+      }
+      // XPath 1.0 doesn't support a way to escape single or double quotes in a
+      // string literal. We split double quotes out of the string, and encode
+      // them separately.
+      if (is_string($value)) {
+        // Explode the text at the quote characters.
+        $parts = explode('"', $value);
+
+        // Quote the parts.
+        foreach ($parts as &$part) {
+          $part = '"' . $part . '"';
+        }
+
+        // Return the string.
+        $value = count($parts) > 1 ? 'concat(' . implode(', \'"\', ', $parts) . ')' : $parts[0];
+      }
+
+      // Use preg_replace_callback() instead of preg_replace() to prevent the
+      // regular expression engine from trying to substitute backreferences.
+      $replacement = function ($matches) use ($value) {
+        return $value;
+      };
+      $xpath = preg_replace_callback('/' . preg_quote($placeholder) . '\b/', $replacement, $xpath);
+    }
+    return $xpath;
+  }
+
+  /**
+   * Passes if the raw text IS NOT found escaped on the loaded page.
+   *
+   * Raw text refers to the raw HTML that the page generated.
+   *
+   * @param string $raw
+   *   Raw (HTML) string to look for.
+   */
+  public function assertNoEscaped($raw) {
+    $this->responseNotContains(Html::escape($raw));
+  }
+
+  /**
+   * Passes if the raw text IS found escaped on the loaded page.
+   *
+   * Raw text refers to the raw HTML that the page generated.
+   *
+   * @param string $raw
+   *   Raw (HTML) string to look for.
+   */
+  public function assertEscaped($raw) {
+    $this->responseContains(Html::escape($raw));
+  }
+
+  /**
+   * Asserts a condition.
+   *
+   * The parent method is overridden because it is a private method.
+   *
+   * @param bool $condition
+   *   The condition.
+   * @param string $message
+   *   The success message.
+   *
+   * @throws \Behat\Mink\Exception\ExpectationException
+   *   When the condition is not fulfilled.
+   */
+  public function assert($condition, $message) {
+    if ($condition) {
+      return;
+    }
+
+    throw new ExpectationException($message, $this->session->getDriver());
+  }
+
+  /**
+   * Checks that a given form field element is disabled.
+   *
+   * @param string $field
+   *   One of id|name|label|value for the field.
+   * @param \Behat\Mink\Element\TraversableElement $container
+   *   (optional) The document to check against. Defaults to the current page.
+   *
+   * @return \Behat\Mink\Element\NodeElement
+   *   The matching element.
+   *
+   * @throws \Behat\Mink\Exception\ElementNotFoundException
+   * @throws \Behat\Mink\Exception\ExpectationException
+   */
+  public function fieldDisabled($field, TraversableElement $container = NULL)  {
+    $container = $container ?: $this->session->getPage();
+    $node = $container->findField($field);
+
+    if ($node === NULL) {
+      throw new ElementNotFoundException($this->session->getDriver(), 'field', 'id|name|label|value', $field);
+    }
+
+    if (!$node->hasAttribute('disabled')) {
+      throw new ExpectationException("Field $field is disabled", $this->session->getDriver());
+    }
+
+    return $node;
+  }
+
 }
diff --git a/core/tests/TestSuites/FunctionalJavascriptTestSuite.php b/core/tests/TestSuites/FunctionalJavascriptTestSuite.php
new file mode 100644
index 000000000..626be0218
--- /dev/null
+++ b/core/tests/TestSuites/FunctionalJavascriptTestSuite.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Drupal\Tests\TestSuites;
+
+require_once __DIR__ . '/TestSuiteBase.php';
+
+/**
+ * Discovers tests for the functional-javascript test suite.
+ */
+class FunctionalJavascriptTestSuite extends TestSuiteBase {
+
+  /**
+   * Factory method which loads up a suite with all functional javascript tests.
+   *
+   * @return static
+   *   The test suite.
+   */
+  public static function suite() {
+    $root = dirname(dirname(dirname(__DIR__)));
+
+    $suite = new static('functional-javascript');
+    $suite->addTestsBySuiteNamespace($root, 'FunctionalJavascript');
+
+    return $suite;
+  }
+
+}
diff --git a/core/tests/TestSuites/FunctionalTestSuite.php b/core/tests/TestSuites/FunctionalTestSuite.php
new file mode 100644
index 000000000..221a20daf
--- /dev/null
+++ b/core/tests/TestSuites/FunctionalTestSuite.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Drupal\Tests\TestSuites;
+
+require_once __DIR__ . '/TestSuiteBase.php';
+
+/**
+ * Discovers tests for the functional test suite.
+ */
+class FunctionalTestSuite extends TestSuiteBase {
+
+  /**
+   * Factory method which loads up a suite with all functional tests.
+   *
+   * @return static
+   *   The test suite.
+   */
+  public static function suite() {
+    $root = dirname(dirname(dirname(__DIR__)));
+
+    $suite = new static('functional');
+    $suite->addTestsBySuiteNamespace($root, 'Functional');
+
+    return $suite;
+  }
+
+}
diff --git a/core/tests/TestSuites/KernelTestSuite.php b/core/tests/TestSuites/KernelTestSuite.php
new file mode 100644
index 000000000..2625e2b1e
--- /dev/null
+++ b/core/tests/TestSuites/KernelTestSuite.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Drupal\Tests\TestSuites;
+
+require_once __DIR__ . '/TestSuiteBase.php';
+
+/**
+ * Discovers tests for the kernel test suite.
+ */
+class KernelTestSuite extends TestSuiteBase {
+
+  /**
+   * Factory method which loads up a suite with all kernel tests.
+   *
+   * @return static
+   *   The test suite.
+   */
+  public static function suite() {
+    $root = dirname(dirname(dirname(__DIR__)));
+
+    $suite = new static('kernel');
+    $suite->addTestsBySuiteNamespace($root, 'Kernel');
+
+    return $suite;
+  }
+
+}
diff --git a/core/tests/TestSuites/TestSuiteBase.php b/core/tests/TestSuites/TestSuiteBase.php
new file mode 100644
index 000000000..bd047e83c
--- /dev/null
+++ b/core/tests/TestSuites/TestSuiteBase.php
@@ -0,0 +1,60 @@
+<?php
+
+namespace Drupal\Tests\TestSuites;
+use Drupal\simpletest\TestDiscovery;
+
+/**
+ * Base class for Drupal test suites.
+ */
+abstract class TestSuiteBase extends \PHPUnit_Framework_TestSuite {
+
+  /**
+   * Finds extensions in a Drupal installation.
+   *
+   * An extension is defined as a directory with an *.info.yml file in it.
+   *
+   * @param string $root
+   *   Path to the root of the Drupal installation.
+   *
+   * @return string[]
+   *   Associative array of extension paths, with extension name as keys.
+   */
+  protected function findExtensionDirectories($root) {
+    $extension_roots = \drupal_phpunit_contrib_extension_directory_roots($root);
+
+    $extension_directories = array_map('drupal_phpunit_find_extension_directories', $extension_roots);
+    return array_reduce($extension_directories, 'array_merge', array());
+  }
+
+  /**
+   * Find and add tests to the suite for core and any extensions.
+   *
+   * @param string $root
+   *   Path to the root of the Drupal installation.
+   * @param string $suite_namespace
+   *   SubNamespace used to separate test suite. Examples: Unit, Functional.
+   */
+  protected function addTestsBySuiteNamespace($root, $suite_namespace) {
+    // Core's tests are in the namespace Drupal\${suite_namespace}Tests\ and are
+    // always inside of core/tests/Drupal/${suite_namespace}Tests. The exception
+    // to this is Unit tests for historical reasons.
+    if ($suite_namespace == 'Unit') {
+      $this->addTestFiles(TestDiscovery::scanDirectory("Drupal\\Tests\\", "$root/core/tests/Drupal/Tests"));
+    }
+    else {
+      $this->addTestFiles(TestDiscovery::scanDirectory("Drupal\\${suite_namespace}Tests\\", "$root/core/tests/Drupal/${suite_namespace}Tests"));
+    }
+
+    // Extensions' tests will always be in the namespace
+    // Drupal\Tests\$extension_name\$suite_namespace\ and be in the
+    // $extension_path/tests/src/$suite_namespace directory. Not all extensions
+    // will have all kinds of tests.
+    foreach ($this->findExtensionDirectories($root) as $extension_name => $dir) {
+      $test_path = "$dir/tests/src/$suite_namespace";
+      if (is_dir($test_path)) {
+        $this->addTestFiles(TestDiscovery::scanDirectory("Drupal\\Tests\\$extension_name\\$suite_namespace\\", $test_path));
+      }
+    }
+  }
+
+}
diff --git a/core/tests/TestSuites/UnitTestSuite.php b/core/tests/TestSuites/UnitTestSuite.php
new file mode 100644
index 000000000..b05d455e4
--- /dev/null
+++ b/core/tests/TestSuites/UnitTestSuite.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Drupal\Tests\TestSuites;
+
+require_once __DIR__ . '/TestSuiteBase.php';
+
+/**
+ * Discovers tests for the unit test suite.
+ */
+class UnitTestSuite extends TestSuiteBase {
+
+  /**
+   * Factory method which loads up a suite with all unit tests.
+   *
+   * @return static
+   *   The test suite.
+   */
+  public static function suite() {
+    $root = dirname(dirname(dirname(__DIR__)));
+
+    $suite = new static('unit');
+    $suite->addTestsBySuiteNamespace($root, 'Unit');
+
+    return $suite;
+  }
+
+}
diff --git a/core/tests/bootstrap.php b/core/tests/bootstrap.php
index 49e350aca..804aedf0b 100644
--- a/core/tests/bootstrap.php
+++ b/core/tests/bootstrap.php
@@ -23,7 +23,9 @@ function drupal_phpunit_find_extension_directories($scan_directory) {
   $dirs = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($scan_directory, \RecursiveDirectoryIterator::FOLLOW_SYMLINKS));
   foreach ($dirs as $dir) {
     if (strpos($dir->getPathname(), '.info.yml') !== FALSE) {
-      // Cut off ".info.yml" from the filename for use as the extension name.
+      // Cut off ".info.yml" from the filename for use as the extension name. We
+      // use getRealPath() so that we can scan extensions represented by
+      // directory aliases.
       $extensions[substr($dir->getFilename(), 0, -9)] = $dir->getPathInfo()
         ->getRealPath();
     }
@@ -34,11 +36,16 @@ function drupal_phpunit_find_extension_directories($scan_directory) {
 /**
  * Returns directories under which contributed extensions may exist.
  *
+ * @param string $root
+ *   (optional) Path to the root of the Drupal installation.
+ *
  * @return array
  *   An array of directories under which contributed extensions may exist.
  */
-function drupal_phpunit_contrib_extension_directory_roots() {
-  $root = dirname(dirname(__DIR__));
+function drupal_phpunit_contrib_extension_directory_roots($root = NULL) {
+  if ($root === NULL) {
+    $root = dirname(dirname(__DIR__));
+  }
   $paths = array(
     $root . '/core/modules',
     $root . '/core/profiles',
diff --git a/core/themes/classy/templates/layout/html.html.twig b/core/themes/classy/templates/layout/html.html.twig
index 5bd83ee31..48ece6f53 100644
--- a/core/themes/classy/templates/layout/html.html.twig
+++ b/core/themes/classy/templates/layout/html.html.twig
@@ -40,6 +40,10 @@
     <js-placeholder token="{{ placeholder_token|raw }}">
   </head>
   <body{{ attributes.addClass(body_classes) }}>
+    {#
+      Keyboard navigation/accessibility link to main content section in
+      page.html.twig.
+    #}
     <a href="#main-content" class="visually-hidden focusable skip-link">
       {{ 'Skip to main content'|t }}
     </a>
diff --git a/core/themes/stable/templates/layout/html.html.twig b/core/themes/stable/templates/layout/html.html.twig
index 4577ac573..5e4f25e86 100644
--- a/core/themes/stable/templates/layout/html.html.twig
+++ b/core/themes/stable/templates/layout/html.html.twig
@@ -32,6 +32,10 @@
     <js-placeholder token="{{ placeholder_token|raw }}">
   </head>
   <body{{ attributes }}>
+    {#
+      Keyboard navigation/accessibility link to main content section in
+      page.html.twig.
+    #}
     <a href="#main-content" class="visually-hidden focusable">
       {{ 'Skip to main content'|t }}
     </a>
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 3c2229e7c..6bf13b85e 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -949,17 +949,17 @@
     },
     {
         "name": "masterminds/html5",
-        "version": "2.1.2",
-        "version_normalized": "2.1.2.0",
+        "version": "2.2.1",
+        "version_normalized": "2.2.1.0",
         "source": {
             "type": "git",
             "url": "https://github.com/Masterminds/html5-php.git",
-            "reference": "8f782e0f01a6e33a319bdc8f6de9cfd6569979a4"
+            "reference": "170aa5cb35b29fccafbf5ea63487c013f396fdc9"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/8f782e0f01a6e33a319bdc8f6de9cfd6569979a4",
-            "reference": "8f782e0f01a6e33a319bdc8f6de9cfd6569979a4",
+            "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/170aa5cb35b29fccafbf5ea63487c013f396fdc9",
+            "reference": "170aa5cb35b29fccafbf5ea63487c013f396fdc9",
             "shasum": ""
         },
         "require": {
@@ -969,9 +969,9 @@
         "require-dev": {
             "phpunit/phpunit": "4.*",
             "sami/sami": "~2.0",
-            "satooshi/php-coveralls": "0.6.*"
+            "satooshi/php-coveralls": "1.0.*"
         },
-        "time": "2015-06-07 08:43:18",
+        "time": "2016-05-10 14:11:45",
         "type": "library",
         "extra": {
             "branch-alias": {
diff --git a/vendor/masterminds/html5/.scrutinizer.yml b/vendor/masterminds/html5/.scrutinizer.yml
new file mode 100644
index 000000000..dcdd2047c
--- /dev/null
+++ b/vendor/masterminds/html5/.scrutinizer.yml
@@ -0,0 +1,41 @@
+tools:
+    php_mess_detector: true
+    php_analyzer:
+        config:
+            parameter_reference_check: { enabled: false }
+            checkstyle: { enabled: false, no_trailing_whitespace: true, naming: { enabled: true, local_variable: '^[a-z][a-zA-Z0-9]*$', abstract_class_name: ^Abstract|Factory$, utility_class_name: 'Utils?$', constant_name: '^[A-Z][A-Z0-9]*(?:_[A-Z0-9]+)*$', property_name: '^[a-z][a-zA-Z0-9]*$', method_name: '^(?:[a-z]|__)[a-zA-Z0-9]*$', parameter_name: '^[a-z][a-zA-Z0-9]*$', interface_name: '^[A-Z][a-zA-Z0-9]*Interface$', type_name: '^[A-Z][a-zA-Z0-9]*$', exception_name: '^[A-Z][a-zA-Z0-9]*Exception$', isser_method_name: '^(?:is|has|should|may|supports)' } }
+            unreachable_code: { enabled: false }
+            check_access_control: { enabled: false }
+            typo_checks: { enabled: false }
+            check_variables: { enabled: false }
+            check_calls: { enabled: true, too_many_arguments: true, missing_argument: true, argument_type_checks: lenient }
+            suspicious_code: { enabled: false, overriding_parameter: false, overriding_closure_use: false, parameter_closure_use_conflict: false, parameter_multiple_times: false, non_existent_class_in_instanceof_check: false, non_existent_class_in_catch_clause: false, assignment_of_null_return: false, non_commented_switch_fallthrough: false, non_commented_empty_catch_block: false, overriding_private_members: false, use_statement_alias_conflict: false, precedence_in_condition_assignment: false }
+            dead_assignments: { enabled: false }
+            verify_php_doc_comments: { enabled: false, parameters: false, return: false, suggest_more_specific_types: false, ask_for_return_if_not_inferrable: false, ask_for_param_type_annotation: false }
+            loops_must_use_braces: { enabled: false }
+            check_usage_context: { enabled: true, foreach: { value_as_reference: true, traversable: true } }
+            simplify_boolean_return: { enabled: false }
+            phpunit_checks: { enabled: false }
+            reflection_checks: { enabled: false }
+            precedence_checks: { enabled: true, assignment_in_condition: true, comparison_of_bit_result: true }
+            basic_semantic_checks: { enabled: false }
+            unused_code: { enabled: false }
+            deprecation_checks: { enabled: false }
+            useless_function_calls: { enabled: false }
+            metrics_lack_of_cohesion_methods: { enabled: false }
+            metrics_coupling: { enabled: true, stable_code: { namespace_prefixes: {  }, classes: {  } } }
+            doctrine_parameter_binding: { enabled: false }
+            doctrine_entity_manager_injection: { enabled: false }
+            symfony_request_injection: { enabled: false }
+            doc_comment_fixes: { enabled: false }
+            reflection_fixes: { enabled: false }
+            use_statement_fixes: { enabled: true, remove_unused: true, preserve_multiple: false, preserve_blanklines: false, order_alphabetically: false }
+    php_code_sniffer: true
+    sensiolabs_security_checker: true
+    php_cpd: true
+    php_loc: true
+    php_pdepend: true
+    external_code_coverage: true
+filter:
+    paths:
+        - src/*
diff --git a/vendor/masterminds/html5/.travis.yml b/vendor/masterminds/html5/.travis.yml
index 2ccb5634b..58fb505a5 100644
--- a/vendor/masterminds/html5/.travis.yml
+++ b/vendor/masterminds/html5/.travis.yml
@@ -11,8 +11,12 @@ php:
   - 5.4
   - 5.5
   - 5.6
+  - 7.0
   - hhvm
-  - nightly
+
+cache:
+  directories:
+    - $HOME/.composer/cache
 
 notifications:
   irc: "irc.freenode.net#masterminds"
@@ -23,7 +27,8 @@ before_script:
 
 script:
   - mkdir -p build/logs
-  - ./vendor/bin/phpunit -c phpunit.xml.dist
+  - ./vendor/bin/phpunit --coverage-clover=coverage.xml
 
 after_script:
-  - php vendor/bin/coveralls -v
+  - bash -c 'if [ "$TRAVIS_PHP_VERSION" == "5.6" ] ; then wget https://scrutinizer-ci.com/ocular.phar; fi;'
+  - bash -c 'if [ "$TRAVIS_PHP_VERSION" == "5.6" ] ; then php ocular.phar code-coverage:upload --format=php-clover coverage.xml; fi;'
diff --git a/vendor/masterminds/html5/README.md b/vendor/masterminds/html5/README.md
index bbe003f6e..505a85f8f 100644
--- a/vendor/masterminds/html5/README.md
+++ b/vendor/masterminds/html5/README.md
@@ -9,10 +9,13 @@ But after some initial refactoring work, we began a new parser.
 - Composer support
 - Event-based (SAX-like) parser
 - DOM tree builder
-- Interoperability with QueryPath [[in progress](https://github.com/technosophos/querypath/issues/114)]
+- Interoperability with [QueryPath](https://github.com/technosophos/querypath)
 - Runs on **PHP** 5.3.0 or newer and **HHVM** 3.2 or newer
 
-[![Build Status](https://travis-ci.org/Masterminds/html5-php.png?branch=master)](https://travis-ci.org/Masterminds/html5-php) [![Latest Stable Version](https://poser.pugx.org/masterminds/html5/v/stable.png)](https://packagist.org/packages/masterminds/html5) [![Coverage Status](https://coveralls.io/repos/Masterminds/html5-php/badge.png?branch=master)](https://coveralls.io/r/Masterminds/html5-php?branch=master)
+[![Build Status](https://travis-ci.org/Masterminds/html5-php.png?branch=master)](https://travis-ci.org/Masterminds/html5-php)
+[![Latest Stable Version](https://poser.pugx.org/masterminds/html5/v/stable.png)](https://packagist.org/packages/masterminds/html5)
+[![Code Coverage](https://scrutinizer-ci.com/g/Masterminds/html5-php/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/Masterminds/html5-php/?branch=master)
+[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/Masterminds/html5-php/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/Masterminds/html5-php/?branch=master)
 
 ## Installation
 
@@ -36,7 +39,7 @@ install.
 
 ## Basic Usage
 
-HTML5-PHP has a high-level API and a low-level API. 
+HTML5-PHP has a high-level API and a low-level API.
 
 Here is how you use the high-level `HTML5` library API:
 
@@ -144,14 +147,14 @@ The serializer is broken into three parts:
 
 - The `OutputRules` contain the rules to turn DOM elements into strings. The
 rules are an implementation of the interface `RulesInterface` allowing for
-different rule sets to be used. 
+different rule sets to be used.
 - The `Traverser`, which is a special-purpose tree walker. It visits
 each node node in the tree and uses the `OutputRules` to transform the node
 into a string.
 - `HTML5` manages the `Traverser` and stores the resultant data
 in the correct place.
 
-The serializer (`save()`, `saveHTML()`) follows the 
+The serializer (`save()`, `saveHTML()`) follows the
 [section 8.9 of the HTML 5.0 spec](http://www.w3.org/TR/2012/CR-html5-20121217/syntax.html#serializing-html-fragments).
 So tags are serialized according to these rules:
 
@@ -166,8 +169,8 @@ issues known issues that are not presently on the roadmap:
 
 - Namespaces: HTML5 only [supports a selected list of namespaces](http://www.w3.org/TR/html5/infrastructure.html#namespaces)
   and they do not operate in the same way as XML namespaces. A `:` has no special
-  meaning. 
-  By default the parser does not support XML style namespaces via `:`; 
+  meaning.
+  By default the parser does not support XML style namespaces via `:`;
   to enable the XML namespaces see the  [XML Namespaces section](#xml-namespaces)
 - Scripts: This parser does not contain a JavaScript or a CSS
   interpreter. While one may be supplied, not all features will be
@@ -184,13 +187,13 @@ issues known issues that are not presently on the roadmap:
   * Per the spec, many legacy tags are admitted and correctly handled,
     even though they are technically not part of HTML5.
 - Attribute names and values: Due to the implementation details of the
-  PHP implementation of DOM, attribute names that do not follow the 
+  PHP implementation of DOM, attribute names that do not follow the
   XML 1.0 standard are not inserted into the DOM. (Effectively, they
   are ignored.) If you've got a clever fix for this, jump in!
 - Processor Instructions: The HTML5 spec does not allow processor
   instructions. We do. Since this is a server-side library, we think
   this is useful. And that means, dear reader, that in some cases you
-  can parse the HTML from a mixed PHP/HTML document. This, however, 
+  can parse the HTML from a mixed PHP/HTML document. This, however,
   is an incidental feature, not a core feature.
 - HTML manifests: Unsupported.
 - PLAINTEXT: Unsupported.
diff --git a/vendor/masterminds/html5/RELEASE.md b/vendor/masterminds/html5/RELEASE.md
index e3d70d386..dfec8f8ce 100644
--- a/vendor/masterminds/html5/RELEASE.md
+++ b/vendor/masterminds/html5/RELEASE.md
@@ -1,7 +1,24 @@
 # Release Notes
+
+2.2.1 (2015-05-10)
+
+- #109: Fixed issue where address tag could be written without closing tag
+
+2.2.0 (2015-04-11)
+
+- #105: Enable composer cache (for CI/CD)
+- #100: Use mb_substitute_character inset of ini_set for environments where
+  ini_set is disable (e.g., shared hosting)
+- #98: Allow link, meta, style tags in noscript tags
+- #96: Fixed xml:href on svgs that use the "use" breaking
+- #94: Counting UTF8 characters performance improvement
+- #93: Use newer version of coveralls package
+- #90: Remove duplicate test
+- #87: Allow multiple root nodes
+
 2.1.2 (2015-06-07)
 - #82: Support for PHP7
-- #84: Improved boolean attribute handling 
+- #84: Improved boolean attribute handling
 
 2.1.1 (2015-03-23)
 - #78: Fixes bug where unmatched entity like string drops everything after &.
diff --git a/vendor/masterminds/html5/composer.json b/vendor/masterminds/html5/composer.json
index 91012390f..30241849b 100644
--- a/vendor/masterminds/html5/composer.json
+++ b/vendor/masterminds/html5/composer.json
@@ -24,7 +24,7 @@
         "php" : ">=5.3.0"
     },
     "require-dev": {
-        "satooshi/php-coveralls": "0.6.*",
+        "satooshi/php-coveralls": "1.0.*",
         "phpunit/phpunit" : "4.*",
         "sami/sami": "~2.0"
     },
diff --git a/vendor/masterminds/html5/phpunit.xml.dist b/vendor/masterminds/html5/phpunit.xml.dist
index c34488018..f36cf1108 100644
--- a/vendor/masterminds/html5/phpunit.xml.dist
+++ b/vendor/masterminds/html5/phpunit.xml.dist
@@ -14,17 +14,4 @@
             <file>src/HTML5/Serializer/HTML5Entities.php</file> 
         </blacklist>
     </filter>
-    <logging>
-        <log
-            type="coverage-html"
-            target="build/coverage"
-            charset="UTF-8"
-            yui="true"
-            highlight="true"
-            lowUpperBound="35"
-            highLowerBound="70"
-            showUncoveredFiles="true"
-            />
-          <log type="coverage-clover" target="build/logs/clover.xml"/>
-    </logging>
 </phpunit>
diff --git a/vendor/masterminds/html5/src/HTML5/Elements.php b/vendor/masterminds/html5/src/HTML5/Elements.php
index 6cf72aa1c..0e880e7f6 100644
--- a/vendor/masterminds/html5/src/HTML5/Elements.php
+++ b/vendor/masterminds/html5/src/HTML5/Elements.php
@@ -24,7 +24,7 @@ class Elements
     const KNOWN_ELEMENT = 1;
 
     // From section 8.1.2: "script", "style"
-    // From 8.2.5.4.7 ("in body" insertion mode): "noembed", "noscript"
+    // From 8.2.5.4.7 ("in body" insertion mode): "noembed"
     // From 8.4 "style", "xmp", "iframe", "noembed", "noframes"
     /**
      * Indicates the contained text should be processed as raw text.
@@ -79,7 +79,7 @@ class Elements
     public static $html5 = array(
         "a" => 1,
         "abbr" => 1,
-        "address" => 89, // NORMAL | VOID_TAG | AUTOCLOSE_P | BLOCK_TAG
+        "address" => 65, // NORMAL | BLOCK_TAG
         "area" => 9, // NORMAL | VOID_TAG
         "article" => 81, // NORMAL | AUTOCLOSE_P | BLOCK_TAG
         "aside" => 81, // NORMAL | AUTOCLOSE_P | BLOCK_TAG
@@ -144,7 +144,7 @@ class Elements
         "meta" => 9, // NORMAL | VOID_TAG
         "meter" => 1,
         "nav" => 17, // NORMAL | AUTOCLOSE_P,
-        "noscript" => 67, // NORMAL | TEXT_RAW | BLOCK_TAG
+        "noscript" => 65, // NORMAL | BLOCK_TAG
         "object" => 1,
         "ol" => 81, // NORMAL | AUTOCLOSE_P | BLOCK_TAG
         "optgroup" => 1,
@@ -557,7 +557,7 @@ class Elements
      * @param string $name
      *            The name of the element.
      *
-     * @return int The element mask.
+     * @return int|bool The element mask or false if element does not exist.
      */
     public static function element($name)
     {
diff --git a/vendor/masterminds/html5/src/HTML5/Parser/EventHandler.php b/vendor/masterminds/html5/src/HTML5/Parser/EventHandler.php
index 2d5534738..3da71a3fd 100644
--- a/vendor/masterminds/html5/src/HTML5/Parser/EventHandler.php
+++ b/vendor/masterminds/html5/src/HTML5/Parser/EventHandler.php
@@ -69,7 +69,7 @@ interface EventHandler
      *            An array with all of the tag's attributes.
      * @param boolean $selfClosing
      *            An indicator of whether or not this tag is self-closing (<foo/>)
-     * @return numeric One of the Tokenizer::TEXTMODE_* constants.
+     * @return int One of the Tokenizer::TEXTMODE_* constants.
      */
     public function startTag($name, $attributes = array(), $selfClosing = false);
 
diff --git a/vendor/masterminds/html5/src/HTML5/Parser/Tokenizer.php b/vendor/masterminds/html5/src/HTML5/Parser/Tokenizer.php
index a779191a4..301addf16 100644
--- a/vendor/masterminds/html5/src/HTML5/Parser/Tokenizer.php
+++ b/vendor/masterminds/html5/src/HTML5/Parser/Tokenizer.php
@@ -299,7 +299,7 @@ class Tokenizer
         }
 
         elseif ($tok == 'D' || $tok == 'd') { // Doctype
-            return $this->doctype('');
+            return $this->doctype();
         }
 
         elseif ($tok == '[') { // CDATA section
diff --git a/vendor/masterminds/html5/src/HTML5/Parser/UTF8Utils.php b/vendor/masterminds/html5/src/HTML5/Parser/UTF8Utils.php
index d319252e8..44affb639 100644
--- a/vendor/masterminds/html5/src/HTML5/Parser/UTF8Utils.php
+++ b/vendor/masterminds/html5/src/HTML5/Parser/UTF8Utils.php
@@ -48,10 +48,10 @@ class UTF8Utils
     public static function countChars($string)
     {
         // Get the length for the string we need.
-        if (function_exists('iconv_strlen')) {
-            return iconv_strlen($string, 'utf-8');
-        } elseif (function_exists('mb_strlen')) {
+        if (function_exists('mb_strlen')) {
             return mb_strlen($string, 'utf-8');
+        } elseif (function_exists('iconv_strlen')) {
+            return iconv_strlen($string, 'utf-8');
         } elseif (function_exists('utf8_decode')) {
             // MPB: Will this work? Won't certain decodes lead to two chars
             // extrapolated out of 2-byte chars?
@@ -94,10 +94,10 @@ class UTF8Utils
             // application executing this library so we store the value, change it
             // to our needs, and then change it back when we are done. This feels
             // a little excessive and it would be great if there was a better way.
-            $save = ini_get('mbstring.substitute_character');
-            ini_set('mbstring.substitute_character', "none");
+            $save = mb_substitute_character();
+            mb_substitute_character('none');
             $data = mb_convert_encoding($data, 'UTF-8', $encoding);
-            ini_set('mbstring.substitute_character', $save);
+            mb_substitute_character($save);
         }        // @todo Get iconv running in at least some environments if that is possible.
         elseif (function_exists('iconv') && $encoding != 'auto') {
             // fprintf(STDOUT, "iconv found\n");
diff --git a/vendor/masterminds/html5/src/HTML5/Serializer/OutputRules.php b/vendor/masterminds/html5/src/HTML5/Serializer/OutputRules.php
index 4ad74f6b5..c45045f78 100644
--- a/vendor/masterminds/html5/src/HTML5/Serializer/OutputRules.php
+++ b/vendor/masterminds/html5/src/HTML5/Serializer/OutputRules.php
@@ -185,7 +185,9 @@ class OutputRules implements \Masterminds\HTML5\Serializer\RulesInterface
     {
         $this->doctype();
         if ($dom->documentElement) {
-            $this->traverser->node($dom->documentElement);
+            foreach ($dom->childNodes as $node) {
+                $this->traverser->node($node);
+            }
             $this->nl();
         }
     }
@@ -347,7 +349,7 @@ class OutputRules implements \Masterminds\HTML5\Serializer\RulesInterface
             // the XML, XMLNS, or XLink NS's should use the canonical
             // prefix. It seems that DOM does this for us already, but there
             // may be exceptions.
-            $name = $node->name;
+            $name = $node->nodeName;
 
             // Special handling for attributes in SVG and MathML.
             // Using if/elseif instead of switch because it's faster in PHP.
diff --git a/vendor/masterminds/html5/src/HTML5/Serializer/Traverser.php b/vendor/masterminds/html5/src/HTML5/Serializer/Traverser.php
index 9c700da20..e95dc3664 100644
--- a/vendor/masterminds/html5/src/HTML5/Serializer/Traverser.php
+++ b/vendor/masterminds/html5/src/HTML5/Serializer/Traverser.php
@@ -103,7 +103,6 @@ class Traverser
             case XML_CDATA_SECTION_NODE:
                 $this->rules->cdata($node);
                 break;
-            // FIXME: It appears that the parser doesn't do PI's.
             case XML_PI_NODE:
                 $this->rules->processorInstruction($node);
                 break;