diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module
index abc63b4..d87922f 100644
--- a/core/modules/comment/comment.module
+++ b/core/modules/comment/comment.module
@@ -465,6 +465,7 @@ function comment_node_links_alter(array &$node_links, NodeInterface $node, array
           if (user_access('post comments')) {
             $links['comment-add'] = array(
               'title' => t('Add new comment'),
+              'language' => $node->language(),
               'attributes' => array('title' => t('Add a new comment to this page.')),
               'fragment' => 'comment-form',
             );
diff --git a/core/modules/locale/lib/Drupal/locale/Tests/LocalePathTest.php b/core/modules/locale/lib/Drupal/locale/Tests/LocalePathTest.php
index 62aba31..4466a91 100644
--- a/core/modules/locale/lib/Drupal/locale/Tests/LocalePathTest.php
+++ b/core/modules/locale/lib/Drupal/locale/Tests/LocalePathTest.php
@@ -117,14 +117,14 @@ function testPathLanguageConfiguration() {
     $this->container->get('path.crud')->delete($edit);
 
     // Create language nodes to check priority of aliases.
-    $first_node = $this->drupalCreateNode(array('type' => 'page', 'promote' => 1));
-    $second_node = $this->drupalCreateNode(array('type' => 'page', 'promote' => 1));
+    $first_node = $this->drupalCreateNode(array('type' => 'page', 'promote' => 1, 'langcode' => 'en'));
+    $second_node = $this->drupalCreateNode(array('type' => 'page', 'promote' => 1, 'langcode' => Language::LANGCODE_NOT_SPECIFIED));
 
     // Assign a custom path alias to the first node with the English language.
     $edit = array(
       'source'   => 'node/' . $first_node->id(),
       'alias'    => $custom_path,
-      'langcode' => 'en',
+      'langcode' => $first_node->language()->id,
     );
     $this->container->get('path.crud')->save($edit['source'], $edit['alias'], $edit['langcode']);
 
@@ -132,7 +132,7 @@ function testPathLanguageConfiguration() {
     $edit = array(
       'source'   => 'node/' . $second_node->id(),
       'alias'    => $custom_path,
-      'langcode' => Language::LANGCODE_NOT_SPECIFIED,
+      'langcode' => $second_node->language()->id,
     );
     $this->container->get('path.crud')->save($edit['source'], $edit['alias'], $edit['langcode']);
 
diff --git a/core/modules/node/lib/Drupal/node/NodeViewBuilder.php b/core/modules/node/lib/Drupal/node/NodeViewBuilder.php
index 48fb0ff..34ca5de 100644
--- a/core/modules/node/lib/Drupal/node/NodeViewBuilder.php
+++ b/core/modules/node/lib/Drupal/node/NodeViewBuilder.php
@@ -95,7 +95,7 @@ public static function renderLinks(array $context) {
     );
 
     if (!$context['in_preview']) {
-      $entity = entity_load('node', $context['node_entity_id']);
+      $entity = entity_load('node', $context['node_entity_id'])->getTranslation($context['langcode']);
       $links['node'] = self::buildLinks($entity, $context['view_mode']);
 
       // Allow other modules to alter the node links.
@@ -132,6 +132,7 @@ protected static function buildLinks(NodeInterface $entity, $view_mode) {
           '@title' => $node_title_stripped,
         )),
         'href' => 'node/' . $entity->id(),
+        'language' => $entity->language(),
         'html' => TRUE,
         'attributes' => array(
           'rel' => 'tag',
diff --git a/core/modules/node/node.module b/core/modules/node/node.module
index 74dc548..a456696 100644
--- a/core/modules/node/node.module
+++ b/core/modules/node/node.module
@@ -658,7 +658,9 @@ function template_preprocess_node(&$variables) {
   );
   $variables['name'] = drupal_render($username);
 
-  $variables['node_url'] = $node->url();
+  $variables['node_url'] = $node->url('canonical', array(
+    'language' => $node->language(),
+  ));
   $variables['label'] = $variables['elements']['title'];
   unset($variables['elements']['title']);
   $variables['page'] = $variables['view_mode'] == 'full' && node_is_page($node);