diff --git a/core/modules/datetime/datetime.module b/core/modules/datetime/datetime.module
index 31150bb..b5d8f7b 100644
--- a/core/modules/datetime/datetime.module
+++ b/core/modules/datetime/datetime.module
@@ -249,6 +249,7 @@ function template_preprocess_datetime_wrapper(&$variables) {
 
   if (!empty($element['#description'])) {
     $variables['description'] = $element['#description'];
+    $variables['attributes']['class'][] = 'description';
   }
 
   $title_attributes = array('class' => array('label'));
diff --git a/core/modules/datetime/src/Plugin/Field/FieldWidget/DateTimeDefaultWidget.php b/core/modules/datetime/src/Plugin/Field/FieldWidget/DateTimeDefaultWidget.php
index 9b2f3bd..312be04 100644
--- a/core/modules/datetime/src/Plugin/Field/FieldWidget/DateTimeDefaultWidget.php
+++ b/core/modules/datetime/src/Plugin/Field/FieldWidget/DateTimeDefaultWidget.php
@@ -51,7 +51,6 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen
     // title because the actual title display is handled at a higher level by
     // the Field module.
 
-    $element['#theme_wrappers'][] = 'datetime_wrapper';
     $element['#attributes']['class'][] = 'container-inline';
     $element['#element_validate'][] = 'datetime_datetime_widget_validate';
 
@@ -60,6 +59,7 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen
       case DateTimeItem::DATETIME_TYPE_DATE:
         $date_type = 'date';
         $time_type = 'none';
+        $element['#theme_wrappers'][] = 'datetime_wrapper';
         $date_format = $this->dateStorage->load('html_date')->getPattern();
         $time_format = '';
         $element_format = $date_format;
@@ -69,6 +69,7 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen
       default:
         $date_type = 'date';
         $time_type = 'time';
+        $element['#pre_render'][] = 'form_pre_render_conditional_form_element';
         $date_format = $this->dateStorage->load('html_date')->getPattern();
         $time_format = $this->dateStorage->load('html_time')->getPattern();
         $element_format = $date_format . ' ' . $time_format;
diff --git a/core/modules/datetime/src/Tests/DateTimeFieldTest.php b/core/modules/datetime/src/Tests/DateTimeFieldTest.php
index 62b69cb..dafcbe5 100644
--- a/core/modules/datetime/src/Tests/DateTimeFieldTest.php
+++ b/core/modules/datetime/src/Tests/DateTimeFieldTest.php
@@ -168,6 +168,7 @@ function testDatetimeField() {
     $this->drupalGet('entity_test/add');
     $this->assertFieldByName("{$field_name}[0][value][date]", '', 'Date element found.');
     $this->assertFieldByName("{$field_name}[0][value][time]", '', 'Time element found.');
+    $this->assertFieldByXPath('//*[@id="edit-' . $field_name . '-wrapper"]/fieldset/legend/span[contains(@class, "form-required")]', TRUE, 'Required markup found');
 
     // Submit a valid date and ensure it is accepted.
     $value = '2012-12-31 00:00:00';
diff --git a/core/modules/datetime/templates/datetime-wrapper.html.twig b/core/modules/datetime/templates/datetime-wrapper.html.twig
index 5660cf5..2bc9be0 100644
--- a/core/modules/datetime/templates/datetime-wrapper.html.twig
+++ b/core/modules/datetime/templates/datetime-wrapper.html.twig
@@ -8,6 +8,7 @@
  * - title: The title of the form element.
  * - title_attributes: HTML attributes for the title wrapper.
  * - description: Description text for the form element.
+ * - attributes: Attributes for the description field.
  *
  * @see template_preprocess_datetime_wrapper()
  *
@@ -19,5 +20,5 @@
 {% endif %}
 {{ content }}
 {% if description %}
-  <div class="description">{{ description }}</div>
+  <div{{ attributes }}>{{ description }}</div>
 {% endif %}
diff --git a/core/modules/system/css/system.module.css b/core/modules/system/css/system.module.css
index dc4a0d0..46f9615 100644
--- a/core/modules/system/css/system.module.css
+++ b/core/modules/system/css/system.module.css
@@ -271,6 +271,9 @@ tr .ajax-progress-throbber .throbber {
 .container-inline .details-wrapper {
   display: block;
 }
+.container-inline .description {
+  display: block;
+}
 
 /**
  * Prevent text wrapping.
diff --git a/core/modules/system/templates/fieldset.html.twig b/core/modules/system/templates/fieldset.html.twig
index 52d410f..23cebfc 100644
--- a/core/modules/system/templates/fieldset.html.twig
+++ b/core/modules/system/templates/fieldset.html.twig
@@ -16,6 +16,7 @@
  * - children: The rendered child elements of the fieldset.
  * - prefix: The content to add before the fieldset children.
  * - suffix: The content to add after the fieldset children.
+ * - content: The form element to be output.
  *
  * @see template_preprocess_fieldset()
  *
@@ -32,6 +33,7 @@
       <span class="field-prefix">{{ prefix }}</span>
     {% endif %}
     {{ children }}
+    {{ content }}
     {% if suffix %}
       <span class="field-suffix">{{ suffix }}</span>
     {% endif %}