diff --git a/core/includes/theme.inc b/core/includes/theme.inc
index ba367fd..0d1e6e6 100644
--- a/core/includes/theme.inc
+++ b/core/includes/theme.inc
@@ -1642,7 +1642,8 @@ function template_preprocess_field_multiple_value_form(&$variables) {
         $removable = TRUE;
         $remove_element = $item['_remove'];
         unset($item['_remove']);
-      } else {
+      }
+      else {
         $remove_element = NULL;
       }
 
diff --git a/core/misc/form.es6.js b/core/misc/form.es6.js
index 5085991..7e014cb 100644
--- a/core/misc/form.es6.js
+++ b/core/misc/form.es6.js
@@ -263,7 +263,7 @@
    * Callback used in {@link Drupal.behaviors.multipleRemove}.
    */
   Drupal.multipleRemove = function () {
-    if ($(this).find('td.delta-remove input[type="checkbox"]').length === 0) {
+    if ($(this).find('> tbody > tr > td.delta-remove input[type="checkbox"]').length === 0) {
       return;
     }
 
@@ -273,7 +273,7 @@
     var $table = $(table);
 
     // For each of the remove buttons within the table.
-    $table.find('td.delta-remove input[type="submit"]').removeClass('hidden').on('click', function (e) {
+    $table.find('> tbody > tr > td.delta-remove input[type="submit"]').removeClass('hidden').on('click', function (e) {
       // Either add or remove the removed class based on the state of the
       // hidden remove checkbox.
 
diff --git a/core/misc/form.js b/core/misc/form.js
index 902b1cb..8b7afc7 100644
--- a/core/misc/form.js
+++ b/core/misc/form.js
@@ -132,14 +132,14 @@
   };
 
   Drupal.multipleRemove = function () {
-    if ($(this).find('td.delta-remove input[type="checkbox"]').length === 0) {
+    if ($(this).find('> tbody > tr > td.delta-remove input[type="checkbox"]').length === 0) {
       return;
     }
 
     var table = this;
     var $table = $(table);
 
-    $table.find('td.delta-remove input[type="submit"]').removeClass('hidden').on('click', function (e) {
+    $table.find('> tbody > tr > td.delta-remove input[type="submit"]').removeClass('hidden').on('click', function (e) {
       var $checkbox = $(this).closest('td').find('input[type="checkbox"]');
       var state = $checkbox.prop('checked');
 
diff --git a/core/modules/views/src/Plugin/views/filter/Bundle.php b/core/modules/views/src/Plugin/views/filter/Bundle.php
index 46142fe..e14c35a 100644
--- a/core/modules/views/src/Plugin/views/filter/Bundle.php
+++ b/core/modules/views/src/Plugin/views/filter/Bundle.php
@@ -56,6 +56,8 @@ class Bundle extends InOperator {
    *   The plugin implementation definition.
    * @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
    *   The entity manager.
+   * @param \Drupal\Core\Entity\EntityTypeBundleInfoInterface $bundle_info_service
+   *   The bundle info service.
    */
   public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityManagerInterface $entity_manager, EntityTypeBundleInfoInterface $bundle_info_service) {
     parent::__construct($configuration, $plugin_id, $plugin_definition);