diff --git a/core/modules/editor/editor.admin.inc b/core/modules/editor/editor.admin.inc
index 42b4592412ea01868c8f55a8c8ae3c7a1e9e3e90..3388f4692fb4153d30a8058b5c63e6651811aeaf 100644
--- a/core/modules/editor/editor.admin.inc
+++ b/core/modules/editor/editor.admin.inc
@@ -93,8 +93,6 @@ function editor_image_upload_settings_form(Editor $editor) {
   $form['max_dimensions'] = [
     '#type' => 'item',
     '#title' => t('Maximum dimensions'),
-    '#field_prefix' => '<div class="container-inline clearfix">',
-    '#field_suffix' => '</div>',
     '#description' => t('Images larger than these dimensions will be scaled down.'),
     '#states' => $show_if_image_uploads_enabled,
   ];
@@ -110,6 +108,7 @@ function editor_image_upload_settings_form(Editor $editor) {
     '#placeholder' => t('width'),
     '#field_suffix' => ' x ',
     '#states' => $show_if_image_uploads_enabled,
+    '#prefix' => '<div class="form--inline clearfix">',
   ];
   $form['max_dimensions']['height'] = [
     '#title' => t('Height'),
@@ -123,6 +122,7 @@ function editor_image_upload_settings_form(Editor $editor) {
     '#placeholder' => t('height'),
     '#field_suffix' => t('pixels'),
     '#states' => $show_if_image_uploads_enabled,
+    '#suffix' => '</div>',
   ];
 
   return $form;
diff --git a/core/modules/image/src/Plugin/Field/FieldType/ImageItem.php b/core/modules/image/src/Plugin/Field/FieldType/ImageItem.php
index 26aeee5ab7f35247c4b2069be6cc7098403485c4..6d8d929a90023d22e34388a6f46c35a9b45a0297 100644
--- a/core/modules/image/src/Plugin/Field/FieldType/ImageItem.php
+++ b/core/modules/image/src/Plugin/Field/FieldType/ImageItem.php
@@ -209,8 +209,6 @@ public function fieldSettingsForm(array $form, FormStateInterface $form_state) {
       '#title' => t('Maximum image resolution'),
       '#element_validate' => [[get_class($this), 'validateResolution']],
       '#weight' => 4.1,
-      '#field_prefix' => '<div class="container-inline">',
-      '#field_suffix' => '</div>',
       '#description' => t('The maximum allowed image size expressed as WIDTH×HEIGHT (e.g. 640×480). Leave blank for no restriction. If a larger image is uploaded, it will be resized to reflect the given width and height. Resizing images on upload will cause the loss of <a href="http://wikipedia.org/wiki/Exchangeable_image_file_format">EXIF data</a> in the image.'),
     ];
     $element['max_resolution']['x'] = [
@@ -220,6 +218,7 @@ public function fieldSettingsForm(array $form, FormStateInterface $form_state) {
       '#default_value' => $max_resolution[0],
       '#min' => 1,
       '#field_suffix' => ' × ',
+      '#prefix' => '<div class="form--inline clearfix">',
     ];
     $element['max_resolution']['y'] = [
       '#type' => 'number',
@@ -228,6 +227,7 @@ public function fieldSettingsForm(array $form, FormStateInterface $form_state) {
       '#default_value' => $max_resolution[1],
       '#min' => 1,
       '#field_suffix' => ' ' . t('pixels'),
+      '#suffix' => '</div>',
     ];
 
     $min_resolution = explode('x', $settings['min_resolution']) + ['', ''];
@@ -236,8 +236,6 @@ public function fieldSettingsForm(array $form, FormStateInterface $form_state) {
       '#title' => t('Minimum image resolution'),
       '#element_validate' => [[get_class($this), 'validateResolution']],
       '#weight' => 4.2,
-      '#field_prefix' => '<div class="container-inline">',
-      '#field_suffix' => '</div>',
       '#description' => t('The minimum allowed image size expressed as WIDTH×HEIGHT (e.g. 640×480). Leave blank for no restriction. If a smaller image is uploaded, it will be rejected.'),
     ];
     $element['min_resolution']['x'] = [
@@ -247,6 +245,7 @@ public function fieldSettingsForm(array $form, FormStateInterface $form_state) {
       '#default_value' => $min_resolution[0],
       '#min' => 1,
       '#field_suffix' => ' × ',
+      '#prefix' => '<div class="form--inline clearfix">',
     ];
     $element['min_resolution']['y'] = [
       '#type' => 'number',
@@ -255,6 +254,7 @@ public function fieldSettingsForm(array $form, FormStateInterface $form_state) {
       '#default_value' => $min_resolution[1],
       '#min' => 1,
       '#field_suffix' => ' ' . t('pixels'),
+      '#suffix' => '</div>',
     ];
 
     // Remove the description option.
diff --git a/core/modules/views/tests/src/Functional/Plugin/StyleTableTest.php b/core/modules/views/tests/src/Functional/Plugin/StyleTableTest.php
index 00d839da83fdd0d1707fcb46d88d3c09ff1d54f4..cbfd0288d4f53a975b6c0ea5d3a0064ec075f38e 100644
--- a/core/modules/views/tests/src/Functional/Plugin/StyleTableTest.php
+++ b/core/modules/views/tests/src/Functional/Plugin/StyleTableTest.php
@@ -44,7 +44,7 @@ public function testAccessibilitySettings() {
     $this->assertTrue(count($result), 'The summary appears on the table.');
     $this->assertEqual(trim($result[0]->getText()), 'summary-text');
 
-    $result = $this->xpath('//caption/details/child::text()');
+    $result = $this->xpath('//caption/details/child::text()[normalize-space()]');
     $this->assertTrue(count($result), 'The table description appears on the table.');
     $this->assertEqual(trim($result[0]->getText()), 'description-text');
 
@@ -73,7 +73,7 @@ public function testAccessibilitySettings() {
     $view->save();
 
     $this->drupalGet('test-table');
-    $result = $this->xpath('//caption/details/child::text()');
+    $result = $this->xpath('//caption/details/child::text()[normalize-space()]');
     $this->assertFalse(count($result), 'Ensure that the description disappears.');
   }