diff --git a/core/modules/rdf/rdf.module b/core/modules/rdf/rdf.module
index 9c49918..6e33be1 100644
--- a/core/modules/rdf/rdf.module
+++ b/core/modules/rdf/rdf.module
@@ -483,6 +483,9 @@ function rdf_preprocess_comment(&$variables) {
   $author_mapping = $mapping->getPreparedFieldMapping('uid');
   if (!empty($author_mapping)) {
     $author_attributes = array('rel' => $author_mapping['properties']);
+    // Wraps the author variable and the submitted variable which are both
+    // available in comment.html.twig.
+    $variables['author'] = '<span ' . new Attribute($author_attributes) . '>' . $variables['author'] . '</span>';
     $variables['submitted'] = '<span ' . new Attribute($author_attributes) . '>' . $variables['submitted'] . '</span>';
   }
   // Adds RDFa markup for the date of the comment.
@@ -496,7 +499,11 @@ function rdf_preprocess_comment(&$variables) {
       '#theme' => 'rdf_metadata',
       '#metadata' => array($date_attributes),
     );
-    $variables['submitted'] .= drupal_render($rdf_metadata);
+    $created_metadata_markup = drupal_render($rdf_metadata);
+    // Appends the markup to the created variable and the submitted variable
+    // which are both available in comment.html.twig.
+    $variables['created'] .= $created_metadata_markup;
+    $variables['submitted'] .= $created_metadata_markup;
   }
   $title_mapping = $mapping->getPreparedFieldMapping('title');
   if (!empty($title_mapping)) {