diff --git a/core/misc/icons/018fe2/chevron-left.svg b/core/misc/icons/018fe2/chevron-left.svg
new file mode 100644
index 0000000..c024e67
--- /dev/null
+++ b/core/misc/icons/018fe2/chevron-left.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#018fe2" d="M7.951 7.645c-.193.196-.193.516 0 .71l3.258 3.29c.193.193.191.519-.002.709l-1.371 1.371c-.193.192-.512.191-.707 0l-5.335-5.371c-.194-.194-.194-.514 0-.708l5.335-5.369c.195-.195.514-.195.707-.001l1.371 1.371c.193.194.195.513.002.709l-3.258 3.289z"/></svg>
diff --git a/core/misc/icons/018fe2/chevron-right.svg b/core/misc/icons/018fe2/chevron-right.svg
new file mode 100644
index 0000000..6d28722
--- /dev/null
+++ b/core/misc/icons/018fe2/chevron-right.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#018fe2" d="M8.053 8.355c.193-.195.193-.517 0-.711l-3.26-3.289c-.193-.195-.192-.514.002-.709l1.371-1.371c.194-.194.512-.193.706.001l5.335 5.369c.195.195.195.515 0 .708l-5.335 5.37c-.194.192-.512.193-.706.002l-1.371-1.371c-.194-.195-.195-.514-.002-.709l3.26-3.29z"/></svg>
diff --git a/core/modules/action/src/Plugin/Action/GotoAction.php b/core/modules/action/src/Plugin/Action/GotoAction.php
index 770f424..8296c16 100644
--- a/core/modules/action/src/Plugin/Action/GotoAction.php
+++ b/core/modules/action/src/Plugin/Action/GotoAction.php
@@ -76,7 +76,7 @@ public static function create(ContainerInterface $container, array $configuratio
    */
   public function execute($object = NULL) {
     $url = $this->urlGenerator
-      ->generateFromPath($this->configuration['url'], array('absolute' => TRUE));
+      ->generateFromRoute($this->configuration['url'], array('absolute' => TRUE));
     $response = new RedirectResponse($url);
     $listener = function($event) use ($response) {
       $event->setResponse($response);
diff --git a/core/modules/simpletest/src/BrowserTestBase.php b/core/modules/simpletest/src/BrowserTestBase.php
index e0ece50..c17bc82 100644
--- a/core/modules/simpletest/src/BrowserTestBase.php
+++ b/core/modules/simpletest/src/BrowserTestBase.php
@@ -404,7 +404,7 @@ protected function drupalGet($path, array $options = array()) {
     // The URL generator service is not necessarily available yet; e.g., in
     // interactive installer tests.
     if ($this->container->has('url_generator')) {
-      $url = $this->container->get('url_generator')->generateFromPath($path, $options);
+      $url = $this->container->get('url_generator')->generateFromRoute($path, $options);
     }
     else {
       $url = $this->getAbsoluteUrl($path);
diff --git a/core/modules/simpletest/src/WebTestBase.php b/core/modules/simpletest/src/WebTestBase.php
index fcdb00a..6c1380a 100644
--- a/core/modules/simpletest/src/WebTestBase.php
+++ b/core/modules/simpletest/src/WebTestBase.php
@@ -2692,7 +2692,7 @@ protected function assertUrl($path, array $options = array(), $message = '', $gr
     }
     else {
       $options['absolute'] = TRUE;
-      $url = $this->container->get('url_generator')->generateFromPath($path, $options);
+      $url = $this->container->get('url_generator')->generateFromRoute($path, $options);
     }
     if (!$message) {
       $message = SafeMarkup::format('Expected @url matches current URL (@current_url).', array(
@@ -2955,7 +2955,7 @@ protected function buildUrl($path, array $options = array()) {
     // interactive installer tests.
     else if ($this->container->has('url_generator')) {
       $options['absolute'] = TRUE;
-      return $this->container->get('url_generator')->generateFromPath($path, $options);
+      return $this->container->get('url_generator')->generateFromRoute($path, $options);
     }
     else {
       return $this->getAbsoluteUrl($path);
diff --git a/core/modules/system/src/Tests/Common/RenderWebTest.php b/core/modules/system/src/Tests/Common/RenderWebTest.php
index f6252e9..22d50af 100644
--- a/core/modules/system/src/Tests/Common/RenderWebTest.php
+++ b/core/modules/system/src/Tests/Common/RenderWebTest.php
@@ -132,7 +132,7 @@ function testDrupalRenderFormElements() {
       ),
     );
     $this->assertRenderedElement($element, '//a[@href=:href and contains(., :title)]', array(
-      ':href' => \Drupal::urlGenerator()->generateFromPath('common-test/destination', ['absolute' => TRUE]),
+      ':href' => $this->container->get('url_generator')->generateFromRoute('common_test.destination', [], ['absolute' => TRUE]),
       ':title' => $element['#title'],
     ));
 
diff --git a/core/modules/system/src/Tests/Path/UrlAlterFunctionalTest.php b/core/modules/system/src/Tests/Path/UrlAlterFunctionalTest.php
index d59d6b6..036966b 100644
--- a/core/modules/system/src/Tests/Path/UrlAlterFunctionalTest.php
+++ b/core/modules/system/src/Tests/Path/UrlAlterFunctionalTest.php
@@ -82,13 +82,10 @@ function testUrlAlter() {
    *   A string with the original path that is run through generateFrommPath().
    * @param $final
    *   A string with the expected result after generateFrommPath().
-   * @return
-   *   TRUE if $original was correctly altered to $final, FALSE otherwise.
    */
   protected function assertUrlOutboundAlter($original, $final) {
     // Test outbound altering.
-    $result = $this->container->get('url_generator')->generateFromPath(ltrim($original, '/'));
-    $final = Url::fromUri('internal:' . $final)->toString();
+    $result = $this->container->get('path_processor_manager')->processOutbound($original);
     $this->assertIdentical($result, $final, format_string('Altered outbound URL %original, expected %final, and got %result.', array('%original' => $original, '%final' => $final, '%result' => $result)));
   }
 
@@ -99,8 +96,6 @@ protected function assertUrlOutboundAlter($original, $final) {
    *   The original path before it has been altered by inbound URL processing.
    * @param $final
    *   A string with the expected result.
-   * @return
-   *   TRUE if $original was correctly altered to $final, FALSE otherwise.
    */
   protected function assertUrlInboundAlter($original, $final) {
     // Test inbound altering.
diff --git a/core/modules/system/src/Tests/Routing/RouterTest.php b/core/modules/system/src/Tests/Routing/RouterTest.php
index 4d532d1..0e381db 100644
--- a/core/modules/system/src/Tests/Routing/RouterTest.php
+++ b/core/modules/system/src/Tests/Routing/RouterTest.php
@@ -181,10 +181,10 @@ public function testControllerResolutionPage() {
    * Checks the generate method on the url generator using the front router.
    */
   public function testUrlGeneratorFront() {
-    global $base_path;
+    $base_path = base_path();
 
     $this->assertEqual($this->container->get('url_generator')->generate('<front>'), $base_path);
-    $this->assertEqual($this->container->get('url_generator')->generateFromPath('<front>'), $base_path);
+    $this->assertEqual($this->container->get('url_generator')->generateFromRoute('<front>'), $base_path);
   }
 
   /**
diff --git a/core/modules/system/tests/modules/url_alter_test/src/PathProcessor.php b/core/modules/system/tests/modules/url_alter_test/src/PathProcessor.php
index bbe5f14..809434c 100644
--- a/core/modules/system/tests/modules/url_alter_test/src/PathProcessor.php
+++ b/core/modules/system/tests/modules/url_alter_test/src/PathProcessor.php
@@ -27,9 +27,7 @@ public function processInbound($path, Request $request) {
     }
 
     // Rewrite community/ to forum/.
-    if ($path == '/community' || strpos($path, '/community/') === 0) {
-      $path = '/forum' . substr($path, 9);
-    }
+    $path = preg_replace('@^/community(.*)@', '/forum$1', $path);
 
     if ($path == '/url-alter-test/bar') {
       $path = '/url-alter-test/foo';
diff --git a/core/modules/system/tests/modules/url_alter_test/src/PathProcessorTest.php b/core/modules/system/tests/modules/url_alter_test/src/PathProcessorTest.php
index c17dcd5..80af197 100644
--- a/core/modules/system/tests/modules/url_alter_test/src/PathProcessorTest.php
+++ b/core/modules/system/tests/modules/url_alter_test/src/PathProcessorTest.php
@@ -31,9 +31,7 @@ public function processInbound($path, Request $request) {
     }
 
     // Rewrite community/ to forum/.
-    if ($path == '/community' || strpos($path, '/community/') === 0) {
-      $path = '/forum' . substr($path, 10);
-    }
+    $path = preg_replace('@^/community(.*)@', '/forum$1', $path);
 
     if ($path == '/url-alter-test/bar') {
       $path = '/url-alter-test/foo';
@@ -57,10 +55,7 @@ public function processOutbound($path, &$options = array(), Request $request = N
     }
 
     // Rewrite forum/ to community/.
-    if ($path == '/forum' || strpos($path, '/forum/') === 0) {
-      $path = '/community' . substr($path, 5);
-    }
-    return $path;
+    return preg_replace('@^/forum(.*)@', '/community$1', $path);
   }
 
 }
diff --git a/core/modules/views/src/Tests/Handler/FieldWebTest.php b/core/modules/views/src/Tests/Handler/FieldWebTest.php
index 0435809..346a068 100644
--- a/core/modules/views/src/Tests/Handler/FieldWebTest.php
+++ b/core/modules/views/src/Tests/Handler/FieldWebTest.php
@@ -262,7 +262,7 @@ public function testAlterUrl() {
 
       // @todo The route-based URL generator strips out NULL attributes.
       // $expected_result = \Drupal::url('entity.node.canonical', ['node' => '123'], ['query' => ['foo' => NULL], 'fragment' => 'bar', 'absolute' => $absolute]);
-      $expected_result = \Drupal::urlGenerator()->generateFromPath('node/123', array('query' => array('foo' => NULL), 'fragment' => 'bar', 'absolute' => $absolute));
+      $expected_result = \Drupal::urlGenerator()->generateFromRoute('node/123', array('query' => array('foo' => NULL), 'fragment' => 'bar', 'absolute' => $absolute));
       $alter['path'] = 'node/123?foo#bar';
       $result = $renderer->executeInRenderContext(new RenderContext(), function () use ($id_field, $row) {
         return $id_field->theme($row);
diff --git a/core/themes/seven/css/components/node-preview.css b/core/themes/seven/css/components/node-preview.css
new file mode 100644
index 0000000..51d8bea
--- /dev/null
+++ b/core/themes/seven/css/components/node-preview.css
@@ -0,0 +1,39 @@
+/**
+ * @file
+ * Styles for the node preview bar component.
+ * This is loaded on the frontend, so we can't rely on any other Seven styles.
+ */
+
+.node-preview-container {
+  background: #fffce5;
+  font-family: "Lucida Grande", "Lucida Sans Unicode", "DejaVu Sans", "Lucida Sans", sans-serif;
+  box-shadow: 0 1px 3px 1px rgba(0, 0, 0, 0.3333);
+  position: fixed;
+  z-index: 499;
+  width: 100%;
+  padding: 10px;
+}
+.node-preview-backlink {
+  background: url(../../../../misc/icons/0074bd/chevron-left.svg) left no-repeat; /* LTR */
+  padding-left: 1.2em; /* LTR */
+  border-bottom: 0 none;
+  font-weight: bold;
+  color: #0074bd;
+  text-decoration: none;
+}
+[dir="rtl"] .node-preview-backlink {
+  background-image: url(../../../../misc/icons/0074bd/chevron-right.svg);
+  background-position: right;
+  padding-left: 0;
+  padding-right: 1.2em;
+  float: right;
+}
+.node-preview-backlink:hover,
+.node-preview-backlink:focus {
+  background-image: url(../../../../misc/icons/018fe2/chevron-left.svg); /* LTR */
+  text-decoration: underline;
+}
+[dir="rtl"] .node-preview-backlink:hover,
+[dir="rtl"] .node-preview-backlink:focus {
+  background-image: url(../../../../misc/icons/018fe2/chevron-right.svg);
+}
