diff --git a/core/includes/form.inc b/core/includes/form.inc
index 95470f9..42b89f6 100644
--- a/core/includes/form.inc
+++ b/core/includes/form.inc
@@ -2842,7 +2842,7 @@ function form_get_options($element, $key) {
  *   An associative array containing:
  *   - element: An associative array containing the properties of the element.
  *     Properties used: #attributes, #children, #collapsed, #description, #id,
- *     #title, #value.
+ *     #title,#title_display, #value.
  *
  * @ingroup themeable
  */
@@ -4592,7 +4592,7 @@ function theme_form($variables) {
  * Returns HTML for a textarea form element.
  *
  * @param $variables
- *   An associative array containing:
+ *   
  *   - element: An associative array containing the properties of the element.
  *     Properties used: #title, #value, #description, #rows, #cols,
  *     #placeholder, #required, #attributes, #resizable
@@ -4764,14 +4764,32 @@ function theme_form_element($variables) {
   if (!empty($element['#attributes']['disabled'])) {
     $attributes['class'][] = 'form-disabled';
   }
+  $prefix = isset($element['#field_prefix']) ? '<span class="field-prefix">' . $element['#field_prefix'] . '</span> ' : '';
+  $suffix = isset($element['#field_suffix']) ? ' <span class="field-suffix">' . $element['#field_suffix'] . '</span>' : '';
+
+  // Composite elements consist of more than one HTML form control. These must
+  // be grouped by a fieldset.
+  if (isset($element['#composite']) && $element['#composite'] === TRUE) {
+    $fieldset_variables = array('element' => array());
+    $fieldset_variables['element']['#children'] = $prefix . $element['#children'] . $suffix;
+    foreach (array('#attributes', '#description', '#id', '#title', '#title_display') as $property) {
+      if (empty($element[$property])) {
+        $fieldset_variables['element'][$property] = NULL;
+      }
+      else {
+        $fieldset_variables['element'][$property] = $element[$property];
+      }
+    }
+    unset($fieldset_variables['element']['#attributes']['disabled']);
+    $fieldset_variables['element']['#title'] .= !empty($element['#required']) ? ' ' . theme('form_required_marker', array('element' => $element)) : '';
+    return theme('fieldset', $fieldset_variables);
+  }
   $output = '<div' . new Attribute($attributes) . '>' . "\n";
 
   // If #title is not set, we don't display any label or required marker.
   if (!isset($element['#title'])) {
     $element['#title_display'] = 'none';
   }
-  $prefix = isset($element['#field_prefix']) ? '<span class="field-prefix">' . $element['#field_prefix'] . '</span> ' : '';
-  $suffix = isset($element['#field_suffix']) ? ' <span class="field-suffix">' . $element['#field_suffix'] . '</span>' : '';
 
   switch ($element['#title_display']) {
     case 'before':
diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/FormTest.php b/core/modules/system/lib/Drupal/system/Tests/Form/FormTest.php
index f7bf6fb..17bca79 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Form/FormTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Form/FormTest.php
@@ -94,7 +94,7 @@ function testRequiredFields() {
     $elements['file']['empty_values'] = $empty_strings;
 
     // Regular expression to find the expected marker on required elements.
-    $required_marker_preg = '@<label.*<abbr class="form-required" title="This field is required\.">\*</abbr></label>@';
+    $required_marker_preg = '@<(label|legend).*<abbr class="form-required" title="This field is required\.">\*</abbr>.*</\1>@';
 
     // Go through all the elements and all the empty values for them.
     foreach ($elements as $type => $data) {
diff --git a/core/modules/system/system.module b/core/modules/system/system.module
index 8ba745c..1d0c978 100644
--- a/core/modules/system/system.module
+++ b/core/modules/system/system.module
@@ -440,6 +440,7 @@ function system_element_info() {
     '#theme_wrappers' => array('form_element'),
   );
   $types['radios'] = array(
+    '#composite' => TRUE,
     '#input' => TRUE,
     '#process' => array('form_process_radios'),
     '#theme_wrappers' => array('radios'),
@@ -455,6 +456,7 @@ function system_element_info() {
     '#title_display' => 'after',
   );
   $types['checkboxes'] = array(
+    '#composite' => TRUE,
     '#input' => TRUE,
     '#process' => array('form_process_checkboxes'),
     '#pre_render' => array('form_pre_render_conditional_form_element'),
@@ -488,6 +490,7 @@ function system_element_info() {
     '#process' => array('form_process_weight', 'ajax_process_form'),
   );
   $types['date'] = array(
+    '#composite' => TRUE,
     '#input' => TRUE,
     '#element_validate' => array('date_validate'),
     '#process' => array('form_process_date'),
@@ -2979,6 +2982,8 @@ function _system_rebuild_theme_data() {
   $defaults = array(
     'engine' => 'phptemplate',
     'regions' => array(
+      'account' => 'Account links',
+      'main_menu' => 'Main navigation',
       'sidebar_first' => 'Left sidebar',
       'sidebar_second' => 'Right sidebar',
       'content' => 'Content',