diff --git a/core/includes/form.inc b/core/includes/form.inc
index 5cd3bdbae..ec1ed5c 100644
--- a/core/includes/form.inc
+++ b/core/includes/form.inc
@@ -8,6 +8,7 @@
 use Drupal\Component\Utility\NestedArray;
 use Drupal\Component\Utility\Number;
 use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\Xss;
 use Drupal\Component\Utility\Url;
 use Drupal\Core\Database\Database;
 use Drupal\Core\Language\Language;
@@ -2907,7 +2908,7 @@ function theme_form_required_marker($variables) {
 }
 
 /**
- * Returns HTML for a form element label and required marker.
+ * Prepares variables for form label templates.
  *
  * Form element labels include the #title and a #required marker. The label is
  * associated with the element itself by the element #id. Labels may appear
@@ -2922,47 +2923,38 @@ function theme_form_required_marker($variables) {
  * required. That is especially important for screenreader users to know
  * which field is required.
  *
- * @param $variables
+ * @param array $variables
  *   An associative array containing:
  *   - element: An associative array containing the properties of the element.
  *     Properties used: #required, #title, #id, #value, #description.
  *
- * @ingroup themeable
  */
-function theme_form_element_label($variables) {
+function template_preprocess_form_element_label(&$variables) {
   $element = $variables['element'];
-  // If title and required marker are both empty, output no label.
-  if ((!isset($element['#title']) || $element['#title'] === '') && empty($element['#required'])) {
-    return '';
-  }
+  $variables['title'] = (isset($element['#title']) && $element['#title'] !== '') ? Xss::filterAdmin($element['#title']) : '';
 
   // If the element is required, a required marker is appended to the label.
-  $required = '';
+  $variables['required'] = array();
   if (!empty($element['#required'])) {
-    $marker = array(
+    $variables['required'] = array(
       '#theme' => 'form_required_marker',
       '#element' => $element,
     );
-    $required = drupal_render($marker);
   }
 
-  $title = filter_xss_admin($element['#title']);
-
-  $attributes = array();
+  $variables['attributes'] = array();
   // Style the label as class option to display inline with the element.
   if ($element['#title_display'] == 'after') {
-    $attributes['class'] = 'option';
+    $variables['attributes']['class'][] = 'option';
   }
   // Show label only to screen readers to avoid disruption in visual flows.
   elseif ($element['#title_display'] == 'invisible') {
-    $attributes['class'] = 'visually-hidden';
+    $variables['attributes']['class'][] = 'visually-hidden';
   }
 
   if (!empty($element['#id'])) {
-    $attributes['for'] = $element['#id'];
+    $variables['attributes']['for'] = $element['#id'];
   }
-
-  return '<label' . new Attribute($attributes) . '>' . t('!title!required', array('!title' => $title, '!required' => $required)) . '</label>';
 }
 
 /**
diff --git a/core/includes/theme.inc b/core/includes/theme.inc
index 3d57521..aa427a9 100644
--- a/core/includes/theme.inc
+++ b/core/includes/theme.inc
@@ -2719,6 +2719,7 @@ function drupal_common_theme() {
     ),
     'form_element_label' => array(
       'render element' => 'element',
+      'template' => 'form-element-label',
     ),
     'vertical_tabs' => array(
       'render element' => 'element',
diff --git a/core/modules/system/templates/form-element-label.html.twig b/core/modules/system/templates/form-element-label.html.twig
new file mode 100644
index 0000000..08899b7
--- /dev/null
+++ b/core/modules/system/templates/form-element-label.html.twig
@@ -0,0 +1,19 @@
+{#
+/**
+ * @file
+ * Default theme implementation for a form element label.
+ *
+ * Available variables:
+ * - title: The label's text.
+ * - required: The required marker or empty if the associated form element is
+ *   not required.
+ * - attributes: A list of HTML attributes for the label.
+ *
+ * @see template_preprocess_form_element_label()
+ *
+ * @ingroup themeable
+ */
+#}
+{% if title is not empty or required -%}
+  <label{{ attributes }}>{{ title }}{{ required }}</label>
+{%- endif %}