diff --git a/core/modules/entity/lib/Drupal/entity/DatabaseStorageController.php b/core/modules/entity/lib/Drupal/entity/DatabaseStorageController.php
index 8c4f3c8..34810f9 100644
--- a/core/modules/entity/lib/Drupal/entity/DatabaseStorageController.php
+++ b/core/modules/entity/lib/Drupal/entity/DatabaseStorageController.php
@@ -318,11 +318,6 @@ class DatabaseStorageController implements EntityStorageControllerInterface {
       }
     }
 
-    // Call hook_entity_load().
-    foreach (module_implements('entity_load') as $module) {
-      $function = $module . '_entity_load';
-      $function($queried_entities, $this->entityType);
-    }
     // Call hook_TYPE_load(). The first argument for hook_TYPE_load() are
     // always the queried entities, followed by additional arguments set in
     // $this->hookLoadArguments.
@@ -330,6 +325,11 @@ class DatabaseStorageController implements EntityStorageControllerInterface {
     foreach (module_implements($this->entityType . '_load') as $module) {
       call_user_func_array($module . '_' . $this->entityType . '_load', $args);
     }
+    // Call hook_entity_load().
+    foreach (module_implements('entity_load') as $module) {
+      $function = $module . '_entity_load';
+      $function($queried_entities, $this->entityType);
+    }
   }
 
   /**
diff --git a/core/modules/entity/lib/Drupal/entity/Tests/EntityCrudHookTest.php b/core/modules/entity/lib/Drupal/entity/Tests/EntityCrudHookTest.php
index 5f7f577..6b8ae4a 100644
--- a/core/modules/entity/lib/Drupal/entity/Tests/EntityCrudHookTest.php
+++ b/core/modules/entity/lib/Drupal/entity/Tests/EntityCrudHookTest.php
@@ -110,8 +110,8 @@ class EntityCrudHookTest extends WebTestBase {
     $comment = comment_load($comment->cid);
 
     $this->assertHookMessageOrder(array(
-      'entity_crud_hook_test_entity_load called for type comment',
       'entity_crud_hook_test_comment_load called',
+      'entity_crud_hook_test_entity_load called for type comment',
     ));
 
     $_SESSION['entity_crud_hook_test'] = array();
@@ -166,8 +166,8 @@ class EntityCrudHookTest extends WebTestBase {
     $file = file_load($file->fid);
 
     $this->assertHookMessageOrder(array(
-      'entity_crud_hook_test_entity_load called for type file',
       'entity_crud_hook_test_file_load called',
+      'entity_crud_hook_test_entity_load called for type file',
     ));
 
     $_SESSION['entity_crud_hook_test'] = array();
@@ -222,8 +222,8 @@ class EntityCrudHookTest extends WebTestBase {
     $node = node_load($node->nid);
 
     $this->assertHookMessageOrder(array(
-      'entity_crud_hook_test_entity_load called for type node',
       'entity_crud_hook_test_node_load called',
+      'entity_crud_hook_test_entity_load called for type node',
     ));
 
     $_SESSION['entity_crud_hook_test'] = array();
@@ -282,8 +282,8 @@ class EntityCrudHookTest extends WebTestBase {
     $term = taxonomy_term_load($term->tid);
 
     $this->assertHookMessageOrder(array(
-      'entity_crud_hook_test_entity_load called for type taxonomy_term',
       'entity_crud_hook_test_taxonomy_term_load called',
+      'entity_crud_hook_test_entity_load called for type taxonomy_term',
     ));
 
     $_SESSION['entity_crud_hook_test'] = array();
@@ -333,8 +333,8 @@ class EntityCrudHookTest extends WebTestBase {
     $vocabulary = taxonomy_vocabulary_load($vocabulary->vid);
 
     $this->assertHookMessageOrder(array(
-      'entity_crud_hook_test_entity_load called for type taxonomy_vocabulary',
       'entity_crud_hook_test_taxonomy_vocabulary_load called',
+      'entity_crud_hook_test_entity_load called for type taxonomy_vocabulary',
     ));
 
     $_SESSION['entity_crud_hook_test'] = array();
@@ -384,8 +384,8 @@ class EntityCrudHookTest extends WebTestBase {
     user_load($account->uid);
 
     $this->assertHookMessageOrder(array(
-      'entity_crud_hook_test_entity_load called for type user',
       'entity_crud_hook_test_user_load called',
+      'entity_crud_hook_test_entity_load called for type user',
     ));
 
     $_SESSION['entity_crud_hook_test'] = array();
diff --git a/core/modules/rdf/rdf.module b/core/modules/rdf/rdf.module
index fe2bd00..47d81a4 100644
--- a/core/modules/rdf/rdf.module
+++ b/core/modules/rdf/rdf.module
@@ -407,7 +407,8 @@ function rdf_comment_load($comments) {
     // Pages with many comments can show poor performance. This information
     // isn't needed until rdf_preprocess_comment() is called, but set it here
     // to optimize performance for websites that implement an entity cache.
-    $comment->rdf_data['date'] = rdf_rdfa_attributes($comment->rdf_mapping['created'], $comment->created);
+    $rdf_mapping = rdf_mapping_load($comment->entityType(), $comment->bundle());
+    $comment->rdf_data['date'] = rdf_rdfa_attributes($rdf_mapping['created'], $comment->created);
     $comment->rdf_data['nid_uri'] = url('node/' . $comment->nid);
     if ($comment->pid) {
       $comment->rdf_data['pid_uri'] = url('comment/' . $comment->pid, array('fragment' => 'comment-' . $comment->pid));