diff --git a/core/lib/Drupal/Core/Entity/EntityRenderController.php b/core/lib/Drupal/Core/Entity/EntityRenderController.php
index 2cd0578..0bd821a 100644
--- a/core/lib/Drupal/Core/Entity/EntityRenderController.php
+++ b/core/lib/Drupal/Core/Entity/EntityRenderController.php
@@ -66,6 +66,23 @@ public function buildContent(array $entities = array(), $view_mode = 'full', $la
   }
 
   /**
+   * Implements Drupal\Core\Entity\EntityRenderControllerInterface::buildUserPictures().
+   */
+  function buildUserPictures(array $entities = array(), $view_mode = 'compact', $langcode = NULL) {
+    $accounts = array();
+    foreach ($entities as $entity) {
+      $accounts[$entity->account->id()] = $entity->account;
+    }
+    if (!empty($accounts)) {
+      $rendered_accounts = user_view_multiple($accounts, 'compact');
+      foreach ($entities as $entity_id => $entity) {
+        // @todo Should we need to declare user_picture property in Entity?
+        $entities[$entity_id]->content['user_picture'] = $rendered_accounts[$entity->account->id()];
+      }
+    }
+  }
+
+  /**
    * Provides entity-specific defaults to the build process.
    *
    * @param Drupal\Core\Entity\EntityInterface $entity
diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module
index ab757a9..28030fc 100644
--- a/core/modules/comment/comment.module
+++ b/core/modules/comment/comment.module
@@ -1654,14 +1654,6 @@ function template_preprocess_comment(&$variables) {
   $variables['changed'] = format_date($comment->changed);
 
   $variables['new'] = !empty($comment->new) ? t('new') : '';
-  if (theme_get_setting('toggle_comment_user_picture')) {
-    // To change user picture settings (e.g., image style), edit the 'compact'
-    // view mode on the User entity.
-    $variables['user_picture'] = user_view($comment->account, 'compact');
-  }
-  else {
-    $variables['user_picture'] = array();
-  }
   $variables['signature'] = $comment->signature;
 
   $uri = $comment->uri();
diff --git a/core/modules/comment/lib/Drupal/comment/CommentRenderController.php b/core/modules/comment/lib/Drupal/comment/CommentRenderController.php
index bc21cd2..d105f1a 100644
--- a/core/modules/comment/lib/Drupal/comment/CommentRenderController.php
+++ b/core/modules/comment/lib/Drupal/comment/CommentRenderController.php
@@ -32,6 +32,10 @@ public function buildContent(array $entities = array(), $view_mode = 'full', $la
 
     parent::buildContent($entities, $view_mode, $langcode);
 
+    if (theme_get_setting('toggle_comment_user_picture') && user_picture_enabled()) {
+      parent::buildUserPictures($entities, 'compact', $langcode);
+    }
+
     foreach ($entities as $entity) {
       $node = node_load($entity->nid);
       if (!$node) {
diff --git a/core/modules/comment/templates/comment.tpl.php b/core/modules/comment/templates/comment.tpl.php
index 5a8a37e..4765169 100644
--- a/core/modules/comment/templates/comment.tpl.php
+++ b/core/modules/comment/templates/comment.tpl.php
@@ -20,8 +20,6 @@
  * - $permalink: Comment permalink.
  * - $submitted: Submission information created from $author and $created during
  *   template_preprocess_comment().
- * - $user_picture: The comment author's picture. Use render($user_picture) to
- *   print it.
  * - $signature: Authors signature.
  * - $status: Comment status. Possible values are:
  *   unpublished, published, or preview.
@@ -80,7 +78,7 @@
   <?php print render($title_suffix); ?>
 
   <footer>
-    <?php print render($user_picture); ?>
+    <?php print render($content['user_picture']); ?>
     <p class="submitted"><?php print $submitted; ?></p>
     <?php
       // Indicate the semantic relationship between parent and child comments
diff --git a/core/modules/node/lib/Drupal/node/NodeRenderController.php b/core/modules/node/lib/Drupal/node/NodeRenderController.php
index 606722a..9513fde 100644
--- a/core/modules/node/lib/Drupal/node/NodeRenderController.php
+++ b/core/modules/node/lib/Drupal/node/NodeRenderController.php
@@ -29,6 +29,10 @@ public function buildContent(array $entities = array(), $view_mode = 'full', $la
 
     parent::buildContent($entities, $view_mode, $langcode);
 
+    if (theme_get_setting('toggle_node_user_picture') && user_picture_enabled()) {
+      parent::buildUserPictures($entities, 'compact', $langcode);
+    }
+
     foreach ($entities as $key => $entity) {
       $entity_view_mode = $entity->content['#view_mode'];
 
diff --git a/core/modules/node/node.module b/core/modules/node/node.module
index ea2b4ce..a8e9a35 100644
--- a/core/modules/node/node.module
+++ b/core/modules/node/node.module
@@ -1148,19 +1148,10 @@ function template_preprocess_node(&$variables) {
   if (variable_get('node_submitted_' . $node->type, TRUE)) {
     $variables['display_submitted'] = TRUE;
     $variables['submitted'] = t('Submitted by !username on !datetime', array('!username' => $variables['name'], '!datetime' => $variables['date']));
-    if (theme_get_setting('toggle_node_user_picture')) {
-      // To change user picture settings (e.g. image style), edit the 'compact'
-      // view mode on User entity.
-      $variables['user_picture'] = user_view($node->account, 'compact');
-    }
-    else {
-      $variables['user_picture'] = array();
-    }
   }
   else {
     $variables['display_submitted'] = FALSE;
     $variables['submitted'] = '';
-    $variables['user_picture'] = '';
   }
 
   // Add article ARIA role.
diff --git a/core/modules/node/templates/node.tpl.php b/core/modules/node/templates/node.tpl.php
index 196d26f..aee99fd 100644
--- a/core/modules/node/templates/node.tpl.php
+++ b/core/modules/node/templates/node.tpl.php
@@ -10,7 +10,6 @@
  *   or print a subset such as render($content['field_example']). Use
  *   hide($content['field_example']) to temporarily suppress the printing of a
  *   given element.
- * - $user_picture: The node author's picture. Use render() to print it.
  * - $date: Formatted creation date. Preprocess functions can reformat it by
  *   calling format_date() with the desired parameters on the $created variable.
  * - $name: Themed username of node author output from theme_username().
@@ -86,7 +85,7 @@
 
   <?php if ($display_submitted): ?>
     <footer>
-      <?php print render($user_picture); ?>
+      <?php print render($content['user_picture']); ?>
       <p class="submitted"><?php print $submitted; ?></p>
     </footer>
   <?php endif; ?>
diff --git a/core/modules/node/templates/node.twig b/core/modules/node/templates/node.twig
index 2d4a674..90d4140 100644
--- a/core/modules/node/templates/node.twig
+++ b/core/modules/node/templates/node.twig
@@ -9,7 +9,6 @@
  *   or print a subset such as {{ content.field_example }}. Use
  *   {% hide(content.field_example) %} to temporarily suppress the printing
  *   of a given element.
- * - user_picture: The node author's picture from user-picture.twig.
  * - date: Formatted creation date. Preprocess functions can reformat it by
  *   calling format_date() with the desired parameters on
  *   $variables['created'].
@@ -88,7 +87,7 @@
 
   {% if display_submitted %}
     <footer>
-      {{ user_picture }}
+      {{ content.user_picture }}
       <p class="submitted">{{ submitted }}</p>
     </footer>
   {% endif %}
diff --git a/core/modules/user/user.module b/core/modules/user/user.module
index 7dabb6d..f39555a 100644
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -171,8 +171,7 @@ function user_attach_accounts(array $entities) {
  *
  * This approach preserves compatibility with node/comment templates. Alternate
  * user picture implementations (e.g., Gravatar) should provide their own
- * add/edit/delete forms and populate the 'picture' variable during the
- * preprocess stage.
+ * formatter on the user_picture field instance.
  */
 function user_picture_enabled() {
   return (bool) field_info_instance('user', 'user_picture', 'user');
@@ -1980,7 +1979,7 @@ function user_view($account, $view_mode = 'full', $langcode = NULL) {
  *   An array in the format expected by drupal_render().
  */
 function user_view_multiple($accounts, $view_mode = 'full', $langcode = NULL) {
-  return entity_view($accounts, $view_mode, $langcode);
+  return entity_view_multiple($accounts, $view_mode, $langcode);
 }
 
 /**
diff --git a/core/themes/bartik/templates/comment.tpl.php b/core/themes/bartik/templates/comment.tpl.php
index 2b285d2..159d3b9 100644
--- a/core/themes/bartik/templates/comment.tpl.php
+++ b/core/themes/bartik/templates/comment.tpl.php
@@ -72,7 +72,7 @@
 
   <div class="attribution">
 
-    <?php print render($user_picture); ?>
+    <?php print render($content['user_picture']); ?>
 
     <div class="submitted">
       <p class="commenter-name">
diff --git a/core/themes/bartik/templates/node.tpl.php b/core/themes/bartik/templates/node.tpl.php
index 0038e92..0278872 100644
--- a/core/themes/bartik/templates/node.tpl.php
+++ b/core/themes/bartik/templates/node.tpl.php
@@ -10,7 +10,6 @@
  *   or print a subset such as render($content['field_example']). Use
  *   hide($content['field_example']) to temporarily suppress the printing of a
  *   given element.
- * - $user_picture: The node author's picture. Use render() when printing.
  * - $date: Formatted creation date. Preprocess functions can reformat it by
  *   calling format_date() with the desired parameters on the $created variable.
  * - $name: Themed username of node author output from theme_username().
@@ -88,7 +87,7 @@
 
   <?php if ($display_submitted): ?>
     <div class="meta submitted">
-      <?php print render($user_picture); ?>
+      <?php print render($content['user_picture']); ?>
       <?php print $submitted; ?>
     </div>
   <?php endif; ?>