From 122746c52a4fbb70a34d00eb367ae66a06f2b6d0 Mon Sep 17 00:00:00 2001
From: Shelane French <macwebdev-dev@yahoo.com>
Date: Tue, 27 Aug 2024 13:28:21 -0700
Subject: [PATCH] Backdrop 1.28.2 (#53)

---
 docroot/core/includes/bootstrap.inc           |   2 +-
 docroot/core/includes/common.inc              |   2 +
 docroot/core/includes/icon.inc                |  38 ++-
 docroot/core/includes/image.inc               |  15 +-
 docroot/core/includes/menu.inc                |   9 +-
 docroot/core/includes/update.inc              |  14 +-
 docroot/core/layouts/boxton/boxton.info       |   6 +-
 docroot/core/layouts/geary/geary.info         |   6 +-
 docroot/core/layouts/harris/harris.info       |   6 +-
 .../layouts/legacy/one_column/one_column.info |   6 +-
 .../three_three_four_column.info              |   6 +-
 .../layouts/legacy/two_column/two_column.info |   6 +-
 .../two_column_flipped.info                   |   6 +-
 docroot/core/layouts/moscone/moscone.info     |   6 +-
 .../moscone_flipped/moscone_flipped.info      |   6 +-
 docroot/core/layouts/rolph/rolph.info         |   6 +-
 docroot/core/layouts/simmons/simmons.info     |   6 +-
 docroot/core/layouts/sutro/sutro.info         |   6 +-
 docroot/core/layouts/taylor/taylor.info       |   6 +-
 .../taylor_flipped/taylor_flipped.info        |   6 +-
 docroot/core/misc/ajax.js                     |   2 +-
 docroot/core/misc/backdrop.js                 |   4 +-
 docroot/core/modules/admin_bar/admin_bar.inc  |  65 ++++--
 docroot/core/modules/admin_bar/admin_bar.info |   6 +-
 .../core/modules/admin_bar/admin_bar.module   |   1 +
 .../modules/admin_bar/admin_bar.theme.inc     |   2 +-
 .../admin_bar/config/admin_bar.settings.json  |   1 +
 .../core/modules/admin_bar/css/admin_bar.css  |  23 +-
 .../admin_bar/tests/admin_bar.tests.info      |   6 +-
 docroot/core/modules/block/block.info         |   6 +-
 .../core/modules/block/tests/block.tests.info |   6 +-
 .../block/tests/block_test/block_test.info    |   6 +-
 docroot/core/modules/book/book.info           |   6 +-
 .../core/modules/book/tests/book.tests.info   |   6 +-
 docroot/core/modules/ckeditor/ckeditor.info   |   6 +-
 .../ckeditor/tests/ckeditor.tests.info        |   6 +-
 docroot/core/modules/ckeditor5/ckeditor5.info |   6 +-
 .../core/modules/ckeditor5/js/ckeditor5.js    |  47 +++-
 .../ckeditor5/tests/ckeditor5.tests.info      |   6 +-
 .../ckeditor5_upgrade_test.info               |   6 +-
 docroot/core/modules/color/color.info         |   6 +-
 .../core/modules/color/tests/color.tests.info |   6 +-
 docroot/core/modules/comment/comment.info     |   6 +-
 .../modules/comment/tests/comment.tests.info  |   6 +-
 docroot/core/modules/config/config.info       |   6 +-
 .../modules/config/tests/config.tests.info    |   6 +-
 .../config/tests/config_test/config_test.info |   6 +-
 .../config_test_hooks/config_test_hooks.info  |   6 +-
 docroot/core/modules/contact/contact.info     |   6 +-
 .../modules/contact/tests/contact.tests.info  |   6 +-
 .../core/modules/contextual/contextual.info   |   6 +-
 .../contextual/tests/contextual.tests.info    |   6 +-
 docroot/core/modules/dashboard/dashboard.info |   6 +-
 .../dashboard/tests/dashboard.tests.info      |   6 +-
 docroot/core/modules/date/date.info           |   6 +-
 .../core/modules/date/tests/date.tests.info   |   6 +-
 docroot/core/modules/dblog/dblog.info         |   6 +-
 .../core/modules/dblog/tests/dblog.tests.info |   6 +-
 docroot/core/modules/email/email.info         |   6 +-
 .../core/modules/email/tests/email.tests.info |   6 +-
 docroot/core/modules/entity/entity.info       |   6 +-
 .../modules/entity/tests/entity.tests.info    |   6 +-
 .../entity_cache_test/entity_cache_test.info  |   6 +-
 .../entity_cache_test_dependency.info         |   6 +-
 .../entity_caching_test.info                  |   6 +-
 .../entity_crud_hook_test.info                |   6 +-
 .../entity_query_access_test.info             |   6 +-
 .../entity/tests/entity_test/entity_test.info |   6 +-
 .../entityreference/entityreference.info      |   6 +-
 .../tests/entityreference.tests.info          |   6 +-
 .../entityreference_views_test.info           |   6 +-
 docroot/core/modules/field/field.info         |   6 +-
 .../field_sql_storage/field_sql_storage.info  |   6 +-
 .../tests/field_sql_storage.tests.info        |   6 +-
 .../core/modules/field/modules/list/list.info |   6 +-
 .../field/modules/list/tests/list.tests.info  |   6 +-
 .../field/modules/list/tests/list_test.info   |   6 +-
 .../modules/field/modules/number/number.info  |   6 +-
 .../modules/number/tests/number.tests.info    |   6 +-
 .../field/modules/options/options.info        |   6 +-
 .../modules/options/tests/options.tests.info  |   6 +-
 .../field/modules/text/tests/text.tests.info  |   6 +-
 .../core/modules/field/modules/text/text.info |   6 +-
 .../core/modules/field/tests/field.tests.info |   6 +-
 .../field/tests/field_test/field_test.info    |   6 +-
 .../field_test_schema_alter.info              |   6 +-
 .../core/modules/field/views/field.views.inc  |   6 +-
 docroot/core/modules/field_ui/field_ui.info   |   6 +-
 .../field_ui/tests/field_ui.tests.info        |   6 +-
 .../tests/view_mode_test/view_mode_test.info  |   6 +-
 docroot/core/modules/file/file.admin.inc      |   7 +-
 docroot/core/modules/file/file.info           |   6 +-
 docroot/core/modules/file/file.module         |   3 +-
 .../core/modules/file/tests/file.tests.info   |   6 +-
 .../file_module_test/file_module_test.info    |   6 +-
 .../views_handler_argument_file_type.inc      |  42 ++++
 docroot/core/modules/filter/filter.info       |   6 +-
 .../modules/filter/tests/filter.tests.info    |   6 +-
 .../modules/filter/tests/filter_formtest.info |   6 +-
 docroot/core/modules/image/image.info         |   6 +-
 .../core/modules/image/tests/image.tests.info |   6 +-
 .../image_module_test/image_module_test.info  |   6 +-
 .../modules/installer/installer.authorize.inc |   2 +-
 docroot/core/modules/installer/installer.info |   6 +-
 .../aaa_installer_test.info                   |   6 +-
 .../bbb_installer_test.info                   |   6 +-
 .../ccc_installer_test.info                   |   6 +-
 .../installer/tests/installer.tests.info      |   6 +-
 .../tests/installer_test/installer_test.info  |   6 +-
 docroot/core/modules/language/language.info   |   6 +-
 .../language/tests/language.tests.info        |   6 +-
 docroot/core/modules/layout/layout.info       |   6 +-
 .../modules/layout/tests/layout.tests.info    |   6 +-
 .../layout/tests/layout_test/layout_test.info |   6 +-
 docroot/core/modules/link/link.info           |   6 +-
 .../core/modules/link/tests/link.tests.info   |   6 +-
 docroot/core/modules/locale/locale.info       |   6 +-
 .../modules/locale/tests/locale.tests.info    |   6 +-
 .../locale/tests/locale_test/locale_test.info |   6 +-
 docroot/core/modules/menu/menu.info           |   6 +-
 .../core/modules/menu/tests/menu.tests.info   |   6 +-
 docroot/core/modules/node/node.info           |   6 +-
 .../core/modules/node/tests/node.tests.info   |   6 +-
 .../node_access_test/node_access_test.info    |   6 +-
 .../node_layout_preview_revision_test.info    |   6 +-
 .../node/tests/node_test/node_test.info       |   6 +-
 .../node_test_exception.info                  |   6 +-
 docroot/core/modules/path/path.info           |   6 +-
 .../core/modules/path/tests/path.tests.info   |   6 +-
 docroot/core/modules/redirect/redirect.info   |   6 +-
 .../redirect/tests/redirect.tests.info        |   6 +-
 docroot/core/modules/search/search.info       |   6 +-
 .../modules/search/tests/search.tests.info    |   6 +-
 .../search_embedded_form.info                 |   6 +-
 .../search_extra_type/search_extra_type.info  |   6 +-
 .../simpletest/backdrop_web_test_case.php     |   6 +-
 .../core/modules/simpletest/simpletest.info   |   6 +-
 .../simpletest/tests/actions_loop_test.info   |   6 +-
 .../simpletest/tests/ajax_forms_test.info     |   6 +-
 .../modules/simpletest/tests/ajax_test.info   |   6 +-
 ...ckdrop_system_listing_compatible_test.info |   6 +-
 ...drop_system_listing_incompatible_test.info |   6 +-
 .../modules/simpletest/tests/batch_test.info  |   6 +-
 .../modules/simpletest/tests/boot_test_1.info |   6 +-
 .../modules/simpletest/tests/boot_test_2.info |   6 +-
 .../modules/simpletest/tests/common_test.info |   6 +-
 .../tests/common_test_cron_helper.info        |   6 +-
 .../config_obj_test/config_obj_test.info      |   6 +-
 .../simpletest/tests/database_test.info       |   6 +-
 .../simpletest/tests/dependency_test1.info    |   6 +-
 .../simpletest/tests/dependency_test2.info    |   6 +-
 .../simpletest/tests/dependency_test3.info    |   6 +-
 .../modules/simpletest/tests/error_test.info  |   6 +-
 .../modules/simpletest/tests/file_test.info   |   6 +-
 .../modules/simpletest/tests/filter_test.info |   6 +-
 .../modules/simpletest/tests/form_test.info   |   6 +-
 .../core/modules/simpletest/tests/icon.test   |  61 +++++
 .../simpletest/tests/icon_test/icon_test.info |   6 +-
 .../modules/simpletest/tests/image_test.info  |   6 +-
 .../modules/simpletest/tests/menu_test.info   |   6 +-
 .../modules/simpletest/tests/module_test.info |   6 +-
 .../modules/simpletest/tests/path_test.info   |   6 +-
 .../simpletest/tests/requirements1_test.info  |   6 +-
 .../simpletest/tests/requirements2_test.info  |   6 +-
 .../simpletest/tests/session_test.info        |   6 +-
 .../modules/simpletest/tests/simpletest.test  |  46 ++++
 .../simpletest/tests/simpletest.tests.info    |   6 +-
 .../tests/system_dependencies_test.info       |   6 +-
 ...atible_core_version_dependencies_test.info |   6 +-
 ...system_incompatible_core_version_test.info |   6 +-
 ...ible_module_version_dependencies_test.info |   6 +-
 ...stem_incompatible_module_version_test.info |   6 +-
 .../tests/system_project_namespace_test.info  |   6 +-
 .../modules/simpletest/tests/system_test.info |   6 +-
 .../simpletest/tests/taxonomy_test.info       |   6 +-
 .../modules/simpletest/tests/theme_test.info  |   6 +-
 .../themes/test_basetheme/test_basetheme.info |   6 +-
 .../themes/test_subtheme/test_subtheme.info   |   6 +-
 .../tests/themes/test_theme/test_theme.info   |   6 +-
 .../test_theme_config/test_theme_config.info  |   6 +-
 .../modules/simpletest/tests/token_test.info  |   6 +-
 .../simpletest/tests/update_d7_test_1.info    |   6 +-
 .../simpletest/tests/update_d7_test_2.info    |   6 +-
 .../simpletest/tests/update_script_test.info  |   6 +-
 .../simpletest/tests/update_test_1.info       |   6 +-
 .../simpletest/tests/update_test_2.info       |   6 +-
 .../simpletest/tests/update_test_3.info       |   6 +-
 .../simpletest/tests/url_alter_test.info      |   6 +-
 docroot/core/modules/syslog/syslog.info       |   6 +-
 .../modules/syslog/tests/syslog.tests.info    |   6 +-
 docroot/core/modules/system/system.admin.inc  |  20 +-
 docroot/core/modules/system/system.api.php    |  14 +-
 docroot/core/modules/system/system.info       |   6 +-
 docroot/core/modules/system/system.install    |  97 +++++++-
 docroot/core/modules/system/system.module     |   2 +-
 .../cron_queue_test/cron_queue_test.info      |   6 +-
 .../deprecated_redirect_test.info             |   6 +-
 .../modules/system/tests/system.tests.info    |   6 +-
 .../system_cron_test/system_cron_test.info    |   6 +-
 docroot/core/modules/taxonomy/taxonomy.info   |   6 +-
 .../taxonomy/tests/taxonomy.tests.info        |   6 +-
 .../taxonomy_nodes_test.info                  |   6 +-
 .../taxonomy_vocab_load_test.info             |   6 +-
 docroot/core/modules/telemetry/telemetry.info |   6 +-
 .../core/modules/telemetry/telemetry.install  |   2 +-
 .../core/modules/telemetry/telemetry.module   |   5 +-
 .../translation/tests/translation.tests.info  |   6 +-
 .../translation_test/translation_test.info    |   6 +-
 .../core/modules/translation/translation.info |   6 +-
 .../aaa_update_test/aaa_update_test.info      |   6 +-
 .../bbb_update_test/bbb_update_test.info      |   6 +-
 .../ccc_update_test/ccc_update_test.info      |   6 +-
 .../modules/update/tests/update.tests.info    |   6 +-
 .../update_test_admintheme.info               |   6 +-
 .../update_test_basetheme.info                |   6 +-
 .../update_test_subtheme.info                 |   6 +-
 .../update/tests/update_test/update_test.info |   6 +-
 docroot/core/modules/update/update.info       |   6 +-
 docroot/core/modules/user/js/user.admin.js    |   4 +-
 docroot/core/modules/user/tests/user.test     |  48 ++++
 .../core/modules/user/tests/user.tests.info   |   6 +-
 .../user_flood_test/user_flood_test.info      |   6 +-
 .../tests/user_form_test/user_form_test.info  |   6 +-
 .../user_session_test/user_session_test.info  |   6 +-
 docroot/core/modules/user/user.info           |   6 +-
 docroot/core/modules/user/user.pages.inc      |  14 ++
 .../core/modules/views/tests/views.tests.info |   6 +-
 .../modules/views/tests/views_layout.test     |   4 +-
 .../views/tests/views_test/views_test.info    |   6 +-
 .../views_test_entity/views_test_entity.info  |   6 +-
 docroot/core/modules/views/views.api.php      |   7 +-
 docroot/core/modules/views/views.info         |   6 +-
 .../views_ui/css/views_ui.admin.theme.css     |  18 +-
 .../core/modules/views_ui/js/views-admin.js   | 218 +++++++++---------
 .../core/modules/views_ui/views_ui.admin.inc  | 167 ++++++++------
 docroot/core/modules/views_ui/views_ui.info   |   6 +-
 docroot/core/profiles/minimal/minimal.info    |   6 +-
 docroot/core/profiles/standard/standard.info  |   6 +-
 ...ckdrop_system_listing_compatible_test.info |   6 +-
 ..._system_listing_compatible_test.tests.info |   6 +-
 ...drop_system_listing_incompatible_test.info |   6 +-
 docroot/core/profiles/testing/testing.info    |   6 +-
 docroot/core/themes/bartik/bartik.info        |   6 +-
 docroot/core/themes/bartik/css/colors.css     |   2 +-
 docroot/core/themes/basis/basis.info          |   6 +-
 docroot/core/themes/seven/seven.info          |   6 +-
 docroot/core/themes/stark/stark.info          |   6 +-
 docroot/core/update.php                       |  20 +-
 docroot/robots.txt                            |  33 +++
 249 files changed, 1404 insertions(+), 929 deletions(-)
 create mode 100644 docroot/core/modules/file/views/views_handler_argument_file_type.inc

diff --git a/docroot/core/includes/bootstrap.inc b/docroot/core/includes/bootstrap.inc
index f99f1544..d762c43a 100644
--- a/docroot/core/includes/bootstrap.inc
+++ b/docroot/core/includes/bootstrap.inc
@@ -7,7 +7,7 @@
 /**
  * The current system version.
  */
-define('BACKDROP_VERSION', '1.28.0');
+define('BACKDROP_VERSION', '1.28.2');
 
 /**
  * Core API compatibility.
diff --git a/docroot/core/includes/common.inc b/docroot/core/includes/common.inc
index 4dc532fc..692b47cc 100644
--- a/docroot/core/includes/common.inc
+++ b/docroot/core/includes/common.inc
@@ -953,6 +953,8 @@ function backdrop_access_denied() {
  * @see backdrop_http_build_query()
  *
  * @since 1.18.4 The $options['data'] key may now be passed as an array.
+ * @since 1.27.2 Support added for the 429 response code (previously treaded as
+ *   a 400).
  * @since 1.27.2 Now removes any potentially sensitive headers before following
  *   a redirect. See the 'strip_sensitive_headers_on_host_change' setting in
  *   settings.php for details.
diff --git a/docroot/core/includes/icon.inc b/docroot/core/includes/icon.inc
index 6af950de..b0f3077b 100644
--- a/docroot/core/includes/icon.inc
+++ b/docroot/core/includes/icon.inc
@@ -269,7 +269,7 @@ function icon_get_info($icon_name = NULL) {
  * Returns HTML for an inline-icon.
  *
  * This effectively returns the contents of an SVG file. But it could
- * potentially be override to replace inlined SVGs with other mechanisms, like
+ * potentially be overridden to replace inlined SVGs with other mechanisms, like
  * an icon font.
  *
  * @param array $variables
@@ -282,9 +282,11 @@ function icon_get_info($icon_name = NULL) {
  *   - attributes: Attributes to be added to the icon itself.
  *
  * @return string
- *    The HTML output.
+ *   The HTML output.
  *
  * @since 1.28.0 Function added.
+ * @since 1.28.1 The <ellipse>, <line>, <polygon> and <polyline> SVG elements
+ *   are allowed.
  */
 function theme_icon(array $variables) {
   // Ensure the filename is .svg.
@@ -292,10 +294,34 @@ function theme_icon(array $variables) {
     // Ensure the file contents are an SVG.
     $svg_contents = file_get_contents($variables['path']);
     if (strpos($svg_contents, '<svg') === 0) {
-      // Clean out any embedded XSS within the SVG. This very-restrictive set
-      // of options should be adequate for icons.
-      $svg_contents = filter_xss($svg_contents, array('svg', 'use', 'title',
-        'desc', 'defs', 'linearGradient', 'stop', 'rect', 'circle', 'path'));
+      // Allow basic shapes. See:
+      // https://developer.mozilla.org/en-US/docs/Web/SVG/Element#basic_shapes.
+      $allowed_svg_basic_shapes = array(
+        'circle',
+        'ellipse',
+        'line',
+        'polygon',
+        'polyline',
+        'rect',
+      );
+
+      // Allow some other elements. This very-restrictive set of options should
+      // be adequate for icons.
+      $allowed_svg_other = array(
+        'defs',
+        'desc',
+        'linearGradient',
+        'path',
+        'stop',
+        'svg',
+        'title',
+        'use',
+      );
+
+      $allowed_svg_elements = array_merge($allowed_svg_basic_shapes, $allowed_svg_other);
+
+      // Clean out any embedded XSS within the SVG.
+      $svg_contents = filter_xss($svg_contents, $allowed_svg_elements);
 
       // Move the "alt" text to an attribute.
       if ($variables['alt']) {
diff --git a/docroot/core/includes/image.inc b/docroot/core/includes/image.inc
index 87649f3a..356058ad 100644
--- a/docroot/core/includes/image.inc
+++ b/docroot/core/includes/image.inc
@@ -584,6 +584,7 @@ function image_is_svg($uri) {
 function image_add_svg_attributes($svg_content, array $attributes) {
   $doc = new DOMDocument();
   $doc->loadXML($svg_content);
+  $svg_tag = $doc->getElementsByTagName('svg')->item(0);
 
   // Convert the alt attribute to a <title> element.
   if (isset($attributes['alt'])) {
@@ -591,11 +592,13 @@ function image_add_svg_attributes($svg_content, array $attributes) {
         if (strlen($attributes['alt'])) {
           $title = $doc->createElement('title');
           $title->textContent = $attributes['alt'];
-          $doc->firstChild->prepend($title);
+          // Since DOMDocument::prepend() is not available in PHP versions prior
+          // to v8, we are using DOMNode::insertBefore().
+          $svg_tag->insertBefore($title, $svg_tag->firstChild);
         }
         // Remove any given <title> element if alt is an empty string.
-        elseif ($doc->firstChild->firstChild && $doc->firstChild->firstChild->nodeName === 'title') {
-          $doc->firstChild->removeChild($doc->firstChild->firstChild);
+        elseif ($svg_tag->firstChild && $svg_tag->firstChild->nodeName === 'title') {
+          $svg_tag->removeChild($svg_tag->firstChild);
         }
       } catch (DOMException $e) {}
     unset($attributes['alt']);
@@ -604,13 +607,13 @@ function image_add_svg_attributes($svg_content, array $attributes) {
   foreach ($attributes as $attribute_name => $attribute_value) {
     $attribute_value = implode(' ', (array) $attribute_value);
     if (strlen($attribute_value)) {
-      $doc->firstChild->setAttribute($attribute_name, $attribute_value);
+      $svg_tag->setAttribute($attribute_name, $attribute_value);
     }
     else {
-      $doc->firstChild->removeAttribute($attribute_name);
+      $svg_tag->removeAttribute($attribute_name);
     }
   }
-  return $doc->saveXML($doc->firstChild);
+  return $doc->saveXML($svg_tag);
 }
 
 /**
diff --git a/docroot/core/includes/menu.inc b/docroot/core/includes/menu.inc
index 7c0aa839..384f66c9 100644
--- a/docroot/core/includes/menu.inc
+++ b/docroot/core/includes/menu.inc
@@ -154,8 +154,11 @@ define('MENU_CALLBACK', 0x0000);
  *
  * Modules may "suggest" menu items that the administrator may enable. They act
  * just as callbacks do until enabled, at which time they act like normal items.
- * Note for the value: 0x0010 was a flag which is no longer used, but this way
- * the values of MENU_CALLBACK and MENU_SUGGESTED_ITEM are separate.
+ *
+ * Note: The value 0x0010 cannot be removed from the definition of
+ * MENU_SUGGESTED_ITEM. It is a flag (no longer used) that at one time ensured
+ * that the values of MENU_VISIBLE_IN_BREADCRUMB and MENU_SUGGESTED_ITEM were
+ * separate.
  */
 define('MENU_SUGGESTED_ITEM', MENU_VISIBLE_IN_BREADCRUMB | 0x0010);
 
@@ -730,7 +733,7 @@ function _menu_item_localize(&$item, $map, $link_translate = FALSE) {
   $item['localized_options'] = $item['options'];
   // All 'class' attributes are assumed to be an array during rendering, but
   // links stored in the database may use an old string value.
-  // @todo In order to remove this code we need to implement a database update
+  // @todo In order to remove this code we need to implement a site update,
   //   including unserializing all existing link options and running this code
   //   on them, as well as adding validation to menu_link_save().
   if (isset($item['options']['attributes']['class']) && is_string($item['options']['attributes']['class'])) {
diff --git a/docroot/core/includes/update.inc b/docroot/core/includes/update.inc
index d4675157..a24da0cc 100644
--- a/docroot/core/includes/update.inc
+++ b/docroot/core/includes/update.inc
@@ -1,10 +1,10 @@
 <?php
 /**
  * @file
- * Backdrop database update API.
+ * Backdrop site update API.
  *
- * This file contains functions to perform database updates for a Backdrop
- * installation. It is included and used extensively by update.php.
+ * This file contains functions to perform database and config updates for a
+ * Backdrop installation. It is included and used extensively by update.php.
  */
 
 /**
@@ -611,7 +611,7 @@ function update_do_one($module, $number, $dependency_map, &$context) {
 class BackdropUpdateException extends Exception { }
 
 /**
- * Starts the database update batch process.
+ * Starts the site update batch process.
  *
  * @param $start
  *   An array whose keys contain the names of modules to be updated during the
@@ -714,11 +714,11 @@ function update_finished($success, $results, $operations) {
 }
 
 /**
- * Returns a list of all the pending database updates.
+ * Returns a list of all the pending site updates.
  *
  * @return
- *   An associative array keyed by module name which contains all information
- *   about database updates that need to be run, and any updates that are not
+ *   An associative array keyed by module name, which contains all information
+ *   about site updates that need to be run and any updates that are not
  *   going to proceed due to missing requirements. The system module will
  *   always be listed first.
  *
diff --git a/docroot/core/layouts/boxton/boxton.info b/docroot/core/layouts/boxton/boxton.info
index 5950e705..52e7e283 100644
--- a/docroot/core/layouts/boxton/boxton.info
+++ b/docroot/core/layouts/boxton/boxton.info
@@ -25,7 +25,7 @@ preview = boxton.png
 ; Include the Bootstrap4 Grid System
 libraries[] = bootstrap4-gs
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/layouts/geary/geary.info b/docroot/core/layouts/geary/geary.info
index 34bfc6a6..347c9b7b 100644
--- a/docroot/core/layouts/geary/geary.info
+++ b/docroot/core/layouts/geary/geary.info
@@ -27,7 +27,7 @@ preview = geary.png
 ; Include the Bootstrap4 Grid System
 libraries[] = bootstrap4-gs
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/layouts/harris/harris.info b/docroot/core/layouts/harris/harris.info
index fe68a812..17a29a07 100644
--- a/docroot/core/layouts/harris/harris.info
+++ b/docroot/core/layouts/harris/harris.info
@@ -27,7 +27,7 @@ preview = harris.png
 ; Include the Bootstrap4 Grid System
 libraries[] = bootstrap4-gs
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/layouts/legacy/one_column/one_column.info b/docroot/core/layouts/legacy/one_column/one_column.info
index 536f2f06..47bc75f9 100644
--- a/docroot/core/layouts/legacy/one_column/one_column.info
+++ b/docroot/core/layouts/legacy/one_column/one_column.info
@@ -18,7 +18,7 @@ regions[footer] = Footer
 ; Modify this line if you would like to change the default in this layout.
 default region = content
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/layouts/legacy/three_three_four_column/three_three_four_column.info b/docroot/core/layouts/legacy/three_three_four_column/three_three_four_column.info
index f1962113..9a5c320a 100644
--- a/docroot/core/layouts/legacy/three_three_four_column/three_three_four_column.info
+++ b/docroot/core/layouts/legacy/three_three_four_column/three_three_four_column.info
@@ -26,7 +26,7 @@ regions[footer] = Footer bottom
 ; Modify this line if you would like to change the default in this layout.
 default region = content
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/layouts/legacy/two_column/two_column.info b/docroot/core/layouts/legacy/two_column/two_column.info
index d395ccce..59d20f75 100644
--- a/docroot/core/layouts/legacy/two_column/two_column.info
+++ b/docroot/core/layouts/legacy/two_column/two_column.info
@@ -15,7 +15,7 @@ regions[footer] = Footer
 ; Modify this line if you would like to change the default in this layout.
 default region = content
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/layouts/legacy/two_column_flipped/two_column_flipped.info b/docroot/core/layouts/legacy/two_column_flipped/two_column_flipped.info
index 437370ae..a2a43ebb 100644
--- a/docroot/core/layouts/legacy/two_column_flipped/two_column_flipped.info
+++ b/docroot/core/layouts/legacy/two_column_flipped/two_column_flipped.info
@@ -15,7 +15,7 @@ regions[footer] = Footer
 ; Modify this line if you would like to change the default in this layout.
 default region = content
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/layouts/moscone/moscone.info b/docroot/core/layouts/moscone/moscone.info
index 796faed2..f66ed5af 100644
--- a/docroot/core/layouts/moscone/moscone.info
+++ b/docroot/core/layouts/moscone/moscone.info
@@ -26,7 +26,7 @@ preview = moscone.png
 ; Include the Bootstrap4 Grid System
 libraries[] = bootstrap4-gs
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/layouts/moscone_flipped/moscone_flipped.info b/docroot/core/layouts/moscone_flipped/moscone_flipped.info
index e96b917f..76322355 100644
--- a/docroot/core/layouts/moscone_flipped/moscone_flipped.info
+++ b/docroot/core/layouts/moscone_flipped/moscone_flipped.info
@@ -26,7 +26,7 @@ preview = moscone-flipped.png
 ; Include the Bootstrap4 Grid System
 libraries[] = bootstrap4-gs
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/layouts/rolph/rolph.info b/docroot/core/layouts/rolph/rolph.info
index 372c315a..449ec6d9 100644
--- a/docroot/core/layouts/rolph/rolph.info
+++ b/docroot/core/layouts/rolph/rolph.info
@@ -28,7 +28,7 @@ preview = rolph.png
 ; Include the Bootstrap4 Grid System
 libraries[] = bootstrap4-gs
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/layouts/simmons/simmons.info b/docroot/core/layouts/simmons/simmons.info
index 16d6d2c7..036087db 100644
--- a/docroot/core/layouts/simmons/simmons.info
+++ b/docroot/core/layouts/simmons/simmons.info
@@ -34,7 +34,7 @@ file = simmons.php
 ; Default stylesheets for this layout
 ; stylesheets[all][] = simmons.css
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/layouts/sutro/sutro.info b/docroot/core/layouts/sutro/sutro.info
index 5fed8b3d..b7b0599e 100644
--- a/docroot/core/layouts/sutro/sutro.info
+++ b/docroot/core/layouts/sutro/sutro.info
@@ -27,7 +27,7 @@ preview = sutro.png
 ; Include the Bootstrap4 Grid System
 libraries[] = bootstrap4-gs
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/layouts/taylor/taylor.info b/docroot/core/layouts/taylor/taylor.info
index 9e3bdc12..954a25fd 100644
--- a/docroot/core/layouts/taylor/taylor.info
+++ b/docroot/core/layouts/taylor/taylor.info
@@ -27,7 +27,7 @@ preview = taylor.png
 ; Include the Bootstrap4 Grid System
 libraries[] = bootstrap4-gs
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/layouts/taylor_flipped/taylor_flipped.info b/docroot/core/layouts/taylor_flipped/taylor_flipped.info
index 8a100d8b..cdc482b0 100644
--- a/docroot/core/layouts/taylor_flipped/taylor_flipped.info
+++ b/docroot/core/layouts/taylor_flipped/taylor_flipped.info
@@ -27,7 +27,7 @@ preview = taylor-flipped.png
 ; Include the Bootstrap4 Grid System
 libraries[] = bootstrap4-gs
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/misc/ajax.js b/docroot/core/misc/ajax.js
index e06098af..1457490d 100644
--- a/docroot/core/misc/ajax.js
+++ b/docroot/core/misc/ajax.js
@@ -218,7 +218,7 @@ Backdrop.ajax = function (base, element, element_settings) {
       // Sanity check for browser support (object expected).
       // When using iFrame uploads, responses must be returned as a string.
       if (typeof response == 'string') {
-        response = $.parseJSON(response);
+        response = JSON.parse(response);
 
         // Prior to invoking the response's commands, verify that they can be
         // trusted by checking for a response header. See
diff --git a/docroot/core/misc/backdrop.js b/docroot/core/misc/backdrop.js
index afd992a8..133353d3 100644
--- a/docroot/core/misc/backdrop.js
+++ b/docroot/core/misc/backdrop.js
@@ -586,7 +586,7 @@ Backdrop.ajaxError = function (xmlhttp, uri, customMessage) {
   // Unfortunately, testing for it with typeof, etc, doesn't seem to catch that
   // and the test causes an exception. So we need to catch the exception here.
   try {
-    statusText = "\n" + Backdrop.t("StatusText: !statusText", {'!statusText': $.trim(xmlhttp.statusText)});
+    statusText = "\n" + Backdrop.t("StatusText: !statusText", {'!statusText': xmlhttp.statusText.trim()});
   }
   catch (e) {}
 
@@ -594,7 +594,7 @@ Backdrop.ajaxError = function (xmlhttp, uri, customMessage) {
   // Again, we don't have a way to know for sure whether accessing
   // xmlhttp.responseText is going to throw an exception. So we'll catch it.
   try {
-    responseText = "\n" + Backdrop.t("ResponseText: !responseText", {'!responseText': $.trim(xmlhttp.responseText) } );
+    responseText = "\n" + Backdrop.t("ResponseText: !responseText", {'!responseText': xmlhttp.responseText.trim() } );
   } catch (e) {}
 
   // Make the responseText more readable by stripping HTML tags and newlines.
diff --git a/docroot/core/modules/admin_bar/admin_bar.inc b/docroot/core/modules/admin_bar/admin_bar.inc
index 5cf9b929..8fdacef2 100644
--- a/docroot/core/modules/admin_bar/admin_bar.inc
+++ b/docroot/core/modules/admin_bar/admin_bar.inc
@@ -498,11 +498,16 @@ function admin_bar_links_menu($tree) {
     // Remove description to prevent mouseover tooltip clashes.
     unset($data['link']['localized_options']['attributes']['title']);
 
-    // Make action links (typically "Add ...") appear first in dropdowns.
-    // They might appear first already, but only as long as there is no link
-    // that comes alphabetically first (e.g., a node type with label "Ad").
+    // Move local action links to the appropriate position based on the
+    // respective setting. Defaults to 'top'.
+    $local_actions_bottom = config_get('admin_bar.settings', 'local_actions_bottom');
     if ($data['link']['type'] & MENU_IS_LOCAL_ACTION) {
-      $data['link']['weight'] -= 1000;
+      if (config_get('admin_bar.settings', 'local_action_position') == 'bottom') {
+        $data['link']['weight'] += 9999;
+      }
+      else {
+        $data['link']['weight'] -= 9999;
+      }
     }
 
     $links[$data['link']['href']] = array(
@@ -817,22 +822,44 @@ function admin_bar_links_alert() {
 function admin_bar_theme_settings() {
   $config = config('admin_bar.settings');
   $form['#config'] = 'admin_bar.settings';
-  $form['margin_top'] = array(
+
+  $form['settings'] = array(
+    '#type' => 'fieldset',
+    '#title' => t('Settings'),
+  );
+  $form['settings']['margin_top'] = array(
     '#type' => 'checkbox',
     '#title' => t('Adjust top margin'),
     '#default_value' => $config->get('margin_top'),
     '#description' => t('Shifts the entire site content down to make room for the administration bar. If disabled, absolute- or fixed-positioned page elements may be covered by the administration bar.'),
   );
-  $form['position_fixed'] = array(
+  $form['settings']['position_fixed'] = array(
     '#type' => 'checkbox',
     '#title' => t('Keep bar at top of page'),
     '#default_value' => $config->get('position_fixed'),
     '#description' => t('Displays the administration bar always at the top of the browser viewport, even when scrolling the page.'),
   );
+  $form['settings']['local_action_position'] = array(
+    '#type' => 'radios',
+    '#title' => t('Position of local action links'),
+    '#default_value' => $config->get('local_action_position'),
+    '#options' => array(
+      'top' => t('Top'),
+      'bottom' => t('Bottom'),
+    ),
+    '#description' => t('Where to display local action links (e.g. "<em>Add [something]</em>") within their respective sub-menus.'),
+  );
 
   $form['components'] = array(
+    '#type' => 'fieldset',
+    '#title' => t('Enabled components'),
+    '#description' => t('These features will be enabled/visible in the administration bar. Untick the boxes to disable/hide them.'),
+    '#tree' => TRUE,
+  );
+  $form['components']['options'] = array(
     '#type' => 'checkboxes',
     '#title' => t('Enabled components'),
+    '#title_display' => 'invisible',
     '#options' => array(
       'admin_bar.icon' => t('Icon menu'),
       'admin_bar.back_to_site_link' => t('Back to site link'),
@@ -844,33 +871,35 @@ function admin_bar_theme_settings() {
       'admin_bar.locale' => t('Language switcher'),
     ),
     '#default_value' => $config->get('components'),
-    '#description' => t('These features will be enabled/visible in the administration bar. Untick the boxes to disable/hide them.'),
     'admin_bar.back_to_site_link' => array(
       '#states' => array(
         'visible' => array(
-          ':input[name="components[admin_bar.icon]"]' => array('checked' => TRUE),
+          ':input[name="components[options][admin_bar.icon]"]' => array('checked' => TRUE),
         ),
       ),
+      '#indentation' => 1,
     ),
     'admin_bar.search' => array(
       '#states' => array(
         'visible' => array(
-          ':input[name="components[admin_bar.menu]"]' => array('checked' => TRUE),
+          ':input[name="components[options][admin_bar.menu]"]' => array('checked' => TRUE),
         ),
       ),
+      '#indentation' => 1,
     ),
     'admin_bar.locale' => array(
       '#disabled' => !module_exists('locale'),
     ),
   );
 
-  $form['components']['admin_bar.icon']['#description'] = t('A specialized menu that links to the home page and provides links to perform various other admin tasks (e.g.: clear caches, run cron, etc.).');
-  $form['components']['admin_bar.back_to_site_link']['#description'] = t('Replaces the "Home" link with a "Back to site" link that returns to the last non-admin page visited.');
-  $form['components']['admin_bar.menu']['#description'] = t('Displays the various administrative menu options in the admin bar.');
-  $form['components']['admin_bar.search']['#description'] = t('A search box for quickly finding specific items in the Administration Menu.');
-  $form['components']['admin_bar.page']['#description'] = t('Links to edit items that make up the current page (e.g. layout, theme).');
-  $form['components']['admin_bar.users']['#description'] = t('A count of the people currently logged into the site.');
-  $form['components']['admin_bar.account']['#description'] = t('Links to view and log out of the current user account.');
+  $form['components']['options']['admin_bar.icon']['#description'] = t('A specialized menu that links to the home page and provides links to perform various other admin tasks (e.g.: clear caches, run cron, etc.).');
+  $form['components']['options']['admin_bar.back_to_site_link']['#description'] = t('Replaces the "Home" link with a "Back to site" link that returns to the last non-admin page visited.');
+  $form['components']['options']['admin_bar.menu']['#description'] = t('Displays the various administrative menu options in the admin bar.');
+  $form['components']['options']['admin_bar.search']['#description'] = t('A search box for quickly finding specific items in the Administration Menu.');
+  $form['components']['options']['admin_bar.page']['#description'] = t('Links to edit items that make up the current page (e.g. layout, theme).');
+  $form['components']['options']['admin_bar.users']['#description'] = t('A count of the people currently logged into the site.');
+  $form['components']['options']['admin_bar.account']['#description'] = t('Links to view and log out of the current user account.');
+
   $language_switcher_description = t('Links to switch the language of the user interface.');
   if (!(module_exists('locale'))) {
     if (user_access('administer modules')) {
@@ -881,7 +910,7 @@ function admin_bar_theme_settings() {
     }
 
   }
-  $form['components']['admin_bar.locale']['#description'] = $language_switcher_description;
+  $form['components']['options']['admin_bar.locale']['#description'] = $language_switcher_description;
 
   $form['actions'] = array(
     '#type' => 'actions',
@@ -899,7 +928,7 @@ function admin_bar_theme_settings() {
  * Submit handler for admin_bar_theme_settings().
  */
 function admin_bar_theme_settings_submit($form, &$form_state) {
-  $components = &$form_state['values']['components'];
+  $components = &$form_state['values']['components']['options'];
 
   // Disable back to site if icon bar is also disabled.
   if (!$components['admin_bar.icon']) {
diff --git a/docroot/core/modules/admin_bar/admin_bar.info b/docroot/core/modules/admin_bar/admin_bar.info
index 1be0a7fa..4a817899 100644
--- a/docroot/core/modules/admin_bar/admin_bar.info
+++ b/docroot/core/modules/admin_bar/admin_bar.info
@@ -11,7 +11,7 @@ backdrop = 1.x
 configure = admin/config/administration/admin-bar
 
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/admin_bar/admin_bar.module b/docroot/core/modules/admin_bar/admin_bar.module
index 45cbd9a6..8e38b7dd 100644
--- a/docroot/core/modules/admin_bar/admin_bar.module
+++ b/docroot/core/modules/admin_bar/admin_bar.module
@@ -244,6 +244,7 @@ function admin_bar_preprocess_page(&$variables) {
     $settings['replacements'] = $replacements;
   }
 
+  // Send any setting required for the placement of the admin bar to JS.
   $config = config('admin_bar.settings');
   if ($setting = $config->get('margin_top')) {
     $settings['margin_top'] = $setting;
diff --git a/docroot/core/modules/admin_bar/admin_bar.theme.inc b/docroot/core/modules/admin_bar/admin_bar.theme.inc
index 80decf9d..f4b87e72 100644
--- a/docroot/core/modules/admin_bar/admin_bar.theme.inc
+++ b/docroot/core/modules/admin_bar/admin_bar.theme.inc
@@ -29,7 +29,7 @@ function theme_admin_bar_links($variables) {
 
   // The majority of items in the menu are sorted already, but since modules
   // may add or change arbitrary items anywhere, there is no way around sorting
-  // everything again. element_sort() is not sufficient here, as it
+  // everything again. Sorting by the key #weight is not sufficient here, as it
   // intentionally retains the order of elements having the same #weight,
   // whereas menu links are supposed to be ordered by #weight and #title.
   backdrop_sort($elements, array('#weight' => SORT_NUMERIC, '#title' => SORT_STRING));
diff --git a/docroot/core/modules/admin_bar/config/admin_bar.settings.json b/docroot/core/modules/admin_bar/config/admin_bar.settings.json
index 62839afc..f379e78b 100644
--- a/docroot/core/modules/admin_bar/config/admin_bar.settings.json
+++ b/docroot/core/modules/admin_bar/config/admin_bar.settings.json
@@ -1,5 +1,6 @@
 {
     "_config_name": "admin_bar.settings",
+    "local_action_position": "top",
     "margin_top": 1,
     "position_fixed": 1,
     "components": [
diff --git a/docroot/core/modules/admin_bar/css/admin_bar.css b/docroot/core/modules/admin_bar/css/admin_bar.css
index 391313c9..6917cbae 100644
--- a/docroot/core/modules/admin_bar/css/admin_bar.css
+++ b/docroot/core/modules/admin_bar/css/admin_bar.css
@@ -10,12 +10,13 @@
 /* Set a CSS property declaring the height of the admin bar. */
 /* This can be read by themes to offset the top of the page if needed. */
 :root {
-  --admin-bar-height: 2.35rem;
+  --admin-bar-font-size: 12px;
+  --admin-bar-height: calc(var(--admin-bar-font-size) * 3.05);
 }
 
 #admin-bar {
   /* Adjusting font size will scale the entire admin menu, including icons. */
-  font: normal 12px "Lucida Grande", Verdana, sans-serif;
+  font: normal var(--admin-bar-font-size) "Lucida Grande", Verdana, sans-serif;
   left: 0;
   position: absolute;
   text-align: left; /* LTR */
@@ -71,13 +72,14 @@
 }
 
 /* Specific admin bar menu links. */
-#admin-bar .admin-bar-link-icon svg,
-#admin-bar .admin-bar-link-text {
-  vertical-align: text-bottom;
+#admin-bar .admin-bar-link-icon {
+  vertical-align: middle;
 }
 #admin-bar svg.icon {
   width: 1.9em;
   height: 1.9em;
+  margin-top: -0.3em;
+  margin-bottom: -0.4em;
   padding-right: 0.3em; /* LTR */
   box-sizing: content-box;
 }
@@ -99,11 +101,11 @@
 #admin-bar li {
   margin: 0;
   padding: 0;
+  line-height: 1.5;
 }
 
 /* Dropdown lists. */
 #admin-bar .dropdown {
-  line-height: 1.8em;
   list-style: none;
   margin: 0;
   padding: 0;
@@ -135,13 +137,13 @@
 #admin-bar .dropdown li > a,
 #admin-bar .dropdown li > span {
   display: block;
-  padding: 0.5em 1.5em 0.5em 0.75em;
+  padding: 0.7em 1.5em 0.7em 0.75em;
 }
 #admin-bar-icon > li.expandable > a,
 #admin-bar-menu > li.expandable > ul.dropdown > li > a,
 #admin-bar-extra > li.expandable > ul.dropdown > li > a,
 #admin-bar-extra > li.expandable > ul.dropdown > li > span {
-  padding: 0.5em 0.75em 0.5em 0.7em;
+  padding: 0.7em 0.75em 0.7em 0.7em;
 }
 #admin-bar a.expanded-trail,
 #admin-bar span.expanded-trail {
@@ -195,7 +197,6 @@
 #admin-bar .dropdown li ul {
   display: none;
   left: -999em; /* LTR */
-  line-height: inherit;
   margin: 0;
   position: absolute;
   width: 15em;
@@ -206,7 +207,7 @@
 
 /* Third-and-above-level lists. */
 #admin-bar .dropdown li li.expandable ul {
-  margin: -3.1em 0 0 15em; /* LTR */
+  margin: calc(-1px - var(--admin-bar-height)) 0 0 15em; /* LTR */
 }
 #admin-bar .dropdown li li.expandable.outside-right ul {
   margin-left: -15em; /* LTR */
@@ -242,7 +243,7 @@
   background: #ffffff;
   width: 1em;
   height: 100%;
-  margin: -0.5em 0;
+  margin: -0.7em 0;
   position: absolute;
   right: 0.7em; /* LTR */
 }
diff --git a/docroot/core/modules/admin_bar/tests/admin_bar.tests.info b/docroot/core/modules/admin_bar/tests/admin_bar.tests.info
index 1d4465ba..ed3265c6 100644
--- a/docroot/core/modules/admin_bar/tests/admin_bar.tests.info
+++ b/docroot/core/modules/admin_bar/tests/admin_bar.tests.info
@@ -22,7 +22,7 @@ description = Tests customized menu links.
 group = Administration bar
 file = admin_bar.test
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/block/block.info b/docroot/core/modules/block/block.info
index 379bf398..464901c7 100644
--- a/docroot/core/modules/block/block.info
+++ b/docroot/core/modules/block/block.info
@@ -9,7 +9,7 @@ backdrop = 1.x
 
 configure = admin/structure/block
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/block/tests/block.tests.info b/docroot/core/modules/block/tests/block.tests.info
index 21057ce1..840a89a0 100644
--- a/docroot/core/modules/block/tests/block.tests.info
+++ b/docroot/core/modules/block/tests/block.tests.info
@@ -10,7 +10,7 @@ description = Add, translate and delete custom block.
 group = Block
 file = block.translation.test
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/block/tests/block_test/block_test.info b/docroot/core/modules/block/tests/block_test/block_test.info
index 3b1c756a..6db7f479 100644
--- a/docroot/core/modules/block/tests/block_test/block_test.info
+++ b/docroot/core/modules/block/tests/block_test/block_test.info
@@ -6,7 +6,7 @@ type = module
 backdrop = 1.x
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/book/book.info b/docroot/core/modules/book/book.info
index 9e563dd1..d80b030c 100644
--- a/docroot/core/modules/book/book.info
+++ b/docroot/core/modules/book/book.info
@@ -12,7 +12,7 @@ dependencies[] = node
 
 configure = admin/content/book/settings
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/book/tests/book.tests.info b/docroot/core/modules/book/tests/book.tests.info
index f9991b41..f32fc87b 100644
--- a/docroot/core/modules/book/tests/book.tests.info
+++ b/docroot/core/modules/book/tests/book.tests.info
@@ -4,7 +4,7 @@ description = Create a book, add pages, and test book interface.
 group = Book
 file = book.test
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/ckeditor/ckeditor.info b/docroot/core/modules/ckeditor/ckeditor.info
index df0ba294..901ed679 100644
--- a/docroot/core/modules/ckeditor/ckeditor.info
+++ b/docroot/core/modules/ckeditor/ckeditor.info
@@ -10,7 +10,7 @@ backdrop = 1.x
 
 configure = admin/config/content/formats
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/ckeditor/tests/ckeditor.tests.info b/docroot/core/modules/ckeditor/tests/ckeditor.tests.info
index 2d596c59..c4be6236 100644
--- a/docroot/core/modules/ckeditor/tests/ckeditor.tests.info
+++ b/docroot/core/modules/ckeditor/tests/ckeditor.tests.info
@@ -10,7 +10,7 @@ description = Check the functionality of CKEditor 4 with right-to-left languages
 group = CKEditor 4
 file = ckeditor_rtl.test
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/ckeditor5/ckeditor5.info b/docroot/core/modules/ckeditor5/ckeditor5.info
index 95f1df3c..967003f1 100644
--- a/docroot/core/modules/ckeditor5/ckeditor5.info
+++ b/docroot/core/modules/ckeditor5/ckeditor5.info
@@ -10,7 +10,7 @@ version = BACKDROP_VERSION
 dependencies[] = filter
 configure = admin/config/content/formats
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/ckeditor5/js/ckeditor5.js b/docroot/core/modules/ckeditor5/js/ckeditor5.js
index 5fef4b7d..2bd0eff6 100644
--- a/docroot/core/modules/ckeditor5/js/ckeditor5.js
+++ b/docroot/core/modules/ckeditor5/js/ckeditor5.js
@@ -277,7 +277,7 @@
     },
 
     /**
-     * Compare the data before CKEditor 5 is attached and after attachment.
+     * Compare the data before CKEditor 5 is attached vs. after it is attached.
      *
      * This comparison reformats both the before and after values to the same
      * consistent format before doing a string comparison.
@@ -301,10 +301,47 @@
       beforeElement.innerHTML = beforeAttachValue;
       beforeAttachValue = Backdrop.ckeditor5.elementGetHtml(beforeElement.content);
 
-      // Then run both strings through the same whitespace formatting.
-      const formattedBeforeValue = Backdrop.ckeditor5.formatHtml(beforeAttachValue);
-      const formattedAfterValue = Backdrop.ckeditor5.formatHtml(afterAttachValue);
-      return formattedBeforeValue !== formattedAfterValue;
+      // Then run both strings through the same whitespace formatting, using
+      // formatHtml(). Wrap both strings with a temporary <div> tag, to allow
+      // childNodes (which is used later when comparing the two strings) to work
+      // on them.
+      const formattedBeforeValue = document.createElement('div');
+      formattedBeforeValue.innerHTML = Backdrop.ckeditor5.formatHtml(beforeAttachValue);
+      const formattedAfterValue = document.createElement('div');
+      formattedAfterValue.innerHTML = Backdrop.ckeditor5.formatHtml(afterAttachValue);
+
+      // Get all Nodes for each string.
+      let formattedBeforeValueNodes = formattedBeforeValue.childNodes;
+      let formattedAfterValueNodes = formattedAfterValue.childNodes;
+
+      // If the number of Nodes differs, then the values have been modified.
+      // Bail early in that case.
+      if (formattedBeforeValueNodes.length !== formattedAfterValueNodes.length) {
+        return true;
+      }
+
+      // If the number of Nodes is the same between the two strings, start
+      // comparing each pair of respective Nodes one-by-one.
+      for (let i = 0; i < formattedBeforeValueNodes.length; i++) {
+        // Check if each pair of Nodes is identical between the two strings.
+        if (formattedBeforeValueNodes[i] !== formattedAfterValueNodes[i]) {
+          // The respective Nodes are not the same. This may be because despite
+          // all attributes being the same, they are in a different order. Do a
+          // final check about that, to determine whether they are really
+          // different. isEqualNode() doesn't care about the order of attributes
+          // each Node has - it only expects the same attributes with the same
+          // values.
+          if (!formattedBeforeValueNodes[i].isEqualNode(formattedAfterValueNodes[i])) {
+            // Bail on the first pair of Nodes that is found to have different
+            // attributes/values regardless of their order.
+            return true;
+          }
+        }
+      }
+
+      // If all previous checks for modified values failed, assume that the two
+      // strings have not been modified.
+      return false;
     },
 
     /**
diff --git a/docroot/core/modules/ckeditor5/tests/ckeditor5.tests.info b/docroot/core/modules/ckeditor5/tests/ckeditor5.tests.info
index 2471fe5e..0e901728 100644
--- a/docroot/core/modules/ckeditor5/tests/ckeditor5.tests.info
+++ b/docroot/core/modules/ckeditor5/tests/ckeditor5.tests.info
@@ -16,7 +16,7 @@ description = Check the upgrade process from CKEditor 4 to CKEditor 5.
 group = CKEditor5
 file = ckeditor5_upgrade.test
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/ckeditor5/tests/ckeditor5_upgrade_test/ckeditor5_upgrade_test.info b/docroot/core/modules/ckeditor5/tests/ckeditor5_upgrade_test/ckeditor5_upgrade_test.info
index 92b6e1fd..46883703 100644
--- a/docroot/core/modules/ckeditor5/tests/ckeditor5_upgrade_test/ckeditor5_upgrade_test.info
+++ b/docroot/core/modules/ckeditor5/tests/ckeditor5_upgrade_test/ckeditor5_upgrade_test.info
@@ -7,7 +7,7 @@ version = BACKDROP_VERSION
 dependencies[] = ckeditor5
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/color/color.info b/docroot/core/modules/color/color.info
index f6610b5d..5fce639e 100644
--- a/docroot/core/modules/color/color.info
+++ b/docroot/core/modules/color/color.info
@@ -6,7 +6,7 @@ tags[] = Theme Enhancements
 version = BACKDROP_VERSION
 backdrop = 1.x
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/color/tests/color.tests.info b/docroot/core/modules/color/tests/color.tests.info
index f78a8fe8..af40795f 100644
--- a/docroot/core/modules/color/tests/color.tests.info
+++ b/docroot/core/modules/color/tests/color.tests.info
@@ -4,7 +4,7 @@ description = Modify the Bartik theme colors and make sure the changes are refle
 group = Color
 file = color.test
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/comment/comment.info b/docroot/core/modules/comment/comment.info
index 2e9e7cf8..f84fef04 100644
--- a/docroot/core/modules/comment/comment.info
+++ b/docroot/core/modules/comment/comment.info
@@ -13,7 +13,7 @@ configure = admin/content/comment
 
 stylesheets[all][] = css/comment.css
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/comment/tests/comment.tests.info b/docroot/core/modules/comment/tests/comment.tests.info
index 9e2f31db..608105cf 100644
--- a/docroot/core/modules/comment/tests/comment.tests.info
+++ b/docroot/core/modules/comment/tests/comment.tests.info
@@ -106,7 +106,7 @@ description = 'Test the behavior of comments when the comment author is deleted.
 group = Comment
 file = comment.test
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/config/config.info b/docroot/core/modules/config/config.info
index 751c66ff..ff26e92e 100644
--- a/docroot/core/modules/config/config.info
+++ b/docroot/core/modules/config/config.info
@@ -10,7 +10,7 @@ backdrop = 1.x
 configure = admin/config/development/configuration
 
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/config/tests/config.tests.info b/docroot/core/modules/config/tests/config.tests.info
index 13583ed2..17de62ba 100644
--- a/docroot/core/modules/config/tests/config.tests.info
+++ b/docroot/core/modules/config/tests/config.tests.info
@@ -22,7 +22,7 @@ description = Tests that hook_config_create() is run during configuration sync.
 group = Configuration
 file = config.test
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/config/tests/config_test/config_test.info b/docroot/core/modules/config/tests/config_test/config_test.info
index bf56b894..811a1b69 100644
--- a/docroot/core/modules/config/tests/config_test/config_test.info
+++ b/docroot/core/modules/config/tests/config_test/config_test.info
@@ -6,7 +6,7 @@ backdrop = 1.x
 package = Testing
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/config/tests/config_test_hooks/config_test_hooks.info b/docroot/core/modules/config/tests/config_test_hooks/config_test_hooks.info
index c9307bb9..088e8627 100644
--- a/docroot/core/modules/config/tests/config_test_hooks/config_test_hooks.info
+++ b/docroot/core/modules/config/tests/config_test_hooks/config_test_hooks.info
@@ -6,7 +6,7 @@ backdrop = 1.x
 package = Testing
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/contact/contact.info b/docroot/core/modules/contact/contact.info
index a039de61..0206488e 100644
--- a/docroot/core/modules/contact/contact.info
+++ b/docroot/core/modules/contact/contact.info
@@ -9,7 +9,7 @@ backdrop = 1.x
 
 configure = admin/structure/contact
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/contact/tests/contact.tests.info b/docroot/core/modules/contact/tests/contact.tests.info
index 461bf682..502b55e2 100644
--- a/docroot/core/modules/contact/tests/contact.tests.info
+++ b/docroot/core/modules/contact/tests/contact.tests.info
@@ -10,7 +10,7 @@ description = Tests personal contact form functionality.
 group = Contact
 file = contact.test
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/contextual/contextual.info b/docroot/core/modules/contextual/contextual.info
index 83c30a66..a1eb004b 100644
--- a/docroot/core/modules/contextual/contextual.info
+++ b/docroot/core/modules/contextual/contextual.info
@@ -7,7 +7,7 @@ tags[] = Site Navigation
 version = BACKDROP_VERSION
 backdrop = 1.x
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/contextual/tests/contextual.tests.info b/docroot/core/modules/contextual/tests/contextual.tests.info
index 92dddb39..24a47727 100644
--- a/docroot/core/modules/contextual/tests/contextual.tests.info
+++ b/docroot/core/modules/contextual/tests/contextual.tests.info
@@ -4,7 +4,7 @@ description = Tests if contextual links are showing on the home page depending o
 group = Contextual
 file = contextual.test
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/dashboard/dashboard.info b/docroot/core/modules/dashboard/dashboard.info
index 09ddc8f1..bdab0796 100644
--- a/docroot/core/modules/dashboard/dashboard.info
+++ b/docroot/core/modules/dashboard/dashboard.info
@@ -7,7 +7,7 @@ backdrop = 1.x
 configure = admin/dashboard/settings
 dependencies[] = layout
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/dashboard/tests/dashboard.tests.info b/docroot/core/modules/dashboard/tests/dashboard.tests.info
index a83fb5b7..f2b4908b 100644
--- a/docroot/core/modules/dashboard/tests/dashboard.tests.info
+++ b/docroot/core/modules/dashboard/tests/dashboard.tests.info
@@ -4,7 +4,7 @@ description = Tests the Dashboard functions correctly.
 group = Dashboard
 file = dashboard.test
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/date/date.info b/docroot/core/modules/date/date.info
index 3604facc..7101d820 100644
--- a/docroot/core/modules/date/date.info
+++ b/docroot/core/modules/date/date.info
@@ -9,7 +9,7 @@ backdrop = 1.x
 
 stylesheets[all][] = css/date.css
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/date/tests/date.tests.info b/docroot/core/modules/date/tests/date.tests.info
index 07bff24b..2cdee7e7 100644
--- a/docroot/core/modules/date/tests/date.tests.info
+++ b/docroot/core/modules/date/tests/date.tests.info
@@ -46,7 +46,7 @@ description = Test date theme functions.
 group = Date
 file = date_themes.test
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/dblog/dblog.info b/docroot/core/modules/dblog/dblog.info
index a10031ce..eeb0231b 100644
--- a/docroot/core/modules/dblog/dblog.info
+++ b/docroot/core/modules/dblog/dblog.info
@@ -6,7 +6,7 @@ tags[] = Logging
 version = BACKDROP_VERSION
 backdrop = 1.x
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/dblog/tests/dblog.tests.info b/docroot/core/modules/dblog/tests/dblog.tests.info
index 1b80f5d4..ce8e2a69 100644
--- a/docroot/core/modules/dblog/tests/dblog.tests.info
+++ b/docroot/core/modules/dblog/tests/dblog.tests.info
@@ -4,7 +4,7 @@ description = Generate events and verify dblog entries; verify user access to lo
 group = DBLog
 file = dblog.test
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/email/email.info b/docroot/core/modules/email/email.info
index e3bcc44a..c7cf534c 100644
--- a/docroot/core/modules/email/email.info
+++ b/docroot/core/modules/email/email.info
@@ -8,7 +8,7 @@ version = BACKDROP_VERSION
 backdrop = 1.x
 
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/email/tests/email.tests.info b/docroot/core/modules/email/tests/email.tests.info
index a617b1b5..74e0be80 100644
--- a/docroot/core/modules/email/tests/email.tests.info
+++ b/docroot/core/modules/email/tests/email.tests.info
@@ -4,7 +4,7 @@ description = Tests email field functionality.
 group = Field types
 file = email.test
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/entity/entity.info b/docroot/core/modules/entity/entity.info
index 5dc34338..c79beba5 100644
--- a/docroot/core/modules/entity/entity.info
+++ b/docroot/core/modules/entity/entity.info
@@ -7,7 +7,7 @@ version = BACKDROP_VERSION
 backdrop = 1.x
 required = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/entity/tests/entity.tests.info b/docroot/core/modules/entity/tests/entity.tests.info
index 48a1171f..bdc4987a 100644
--- a/docroot/core/modules/entity/tests/entity.tests.info
+++ b/docroot/core/modules/entity/tests/entity.tests.info
@@ -28,7 +28,7 @@ description = Tests the entity_load() function.
 group = Entity API
 file = entity_crud.test
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/entity/tests/entity_cache_test/entity_cache_test.info b/docroot/core/modules/entity/tests/entity_cache_test/entity_cache_test.info
index 3a661b1d..57076f11 100644
--- a/docroot/core/modules/entity/tests/entity_cache_test/entity_cache_test.info
+++ b/docroot/core/modules/entity/tests/entity_cache_test/entity_cache_test.info
@@ -7,7 +7,7 @@ backdrop = 1.x
 dependencies[] = entity_cache_test_dependency
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/entity/tests/entity_cache_test_dependency/entity_cache_test_dependency.info b/docroot/core/modules/entity/tests/entity_cache_test_dependency/entity_cache_test_dependency.info
index 1f024902..858efe06 100644
--- a/docroot/core/modules/entity/tests/entity_cache_test_dependency/entity_cache_test_dependency.info
+++ b/docroot/core/modules/entity/tests/entity_cache_test_dependency/entity_cache_test_dependency.info
@@ -6,7 +6,7 @@ type = module
 backdrop = 1.x
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/entity/tests/entity_caching_test/entity_caching_test.info b/docroot/core/modules/entity/tests/entity_caching_test/entity_caching_test.info
index 7b7f13e3..ef5b16e7 100644
--- a/docroot/core/modules/entity/tests/entity_caching_test/entity_caching_test.info
+++ b/docroot/core/modules/entity/tests/entity_caching_test/entity_caching_test.info
@@ -7,7 +7,7 @@ backdrop = 1.x
 dependencies[] = entity
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/entity/tests/entity_crud_hook_test/entity_crud_hook_test.info b/docroot/core/modules/entity/tests/entity_crud_hook_test/entity_crud_hook_test.info
index a4347882..d39af83e 100644
--- a/docroot/core/modules/entity/tests/entity_crud_hook_test/entity_crud_hook_test.info
+++ b/docroot/core/modules/entity/tests/entity_crud_hook_test/entity_crud_hook_test.info
@@ -6,7 +6,7 @@ version = BACKDROP_VERSION
 type = module
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/entity/tests/entity_query_access_test/entity_query_access_test.info b/docroot/core/modules/entity/tests/entity_query_access_test/entity_query_access_test.info
index 0a9199d5..ff7608cd 100644
--- a/docroot/core/modules/entity/tests/entity_query_access_test/entity_query_access_test.info
+++ b/docroot/core/modules/entity/tests/entity_query_access_test/entity_query_access_test.info
@@ -6,7 +6,7 @@ type = module
 backdrop = 1.x
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/entity/tests/entity_test/entity_test.info b/docroot/core/modules/entity/tests/entity_test/entity_test.info
index 9e6c572b..e4d7909b 100644
--- a/docroot/core/modules/entity/tests/entity_test/entity_test.info
+++ b/docroot/core/modules/entity/tests/entity_test/entity_test.info
@@ -7,7 +7,7 @@ backdrop = 1.x
 dependencies[] = entity
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/entityreference/entityreference.info b/docroot/core/modules/entityreference/entityreference.info
index cbb8c1f0..ee9e00fc 100644
--- a/docroot/core/modules/entityreference/entityreference.info
+++ b/docroot/core/modules/entityreference/entityreference.info
@@ -8,7 +8,7 @@ version = BACKDROP_VERSION
 dependencies[] = field
 dependencies[] = entity
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/entityreference/tests/entityreference.tests.info b/docroot/core/modules/entityreference/tests/entityreference.tests.info
index 8aad6b17..23de1073 100644
--- a/docroot/core/modules/entityreference/tests/entityreference.tests.info
+++ b/docroot/core/modules/entityreference/tests/entityreference.tests.info
@@ -28,7 +28,7 @@ description = Tests Entity Reference form widgets.
 group = Entity Reference
 file = entityreference.form.test
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/entityreference/tests/entityreference_views_test/entityreference_views_test.info b/docroot/core/modules/entityreference/tests/entityreference_views_test/entityreference_views_test.info
index 2ed14a15..1d1cd747 100644
--- a/docroot/core/modules/entityreference/tests/entityreference_views_test/entityreference_views_test.info
+++ b/docroot/core/modules/entityreference/tests/entityreference_views_test/entityreference_views_test.info
@@ -8,7 +8,7 @@ dependencies[] = views
 dependencies[] = entityreference
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/field/field.info b/docroot/core/modules/field/field.info
index ff2119e7..046e18d4 100644
--- a/docroot/core/modules/field/field.info
+++ b/docroot/core/modules/field/field.info
@@ -11,7 +11,7 @@ required = TRUE
 
 stylesheets[all][] = css/field.css
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/field/modules/field_sql_storage/field_sql_storage.info b/docroot/core/modules/field/modules/field_sql_storage/field_sql_storage.info
index c2c97aad..0ce25bfc 100644
--- a/docroot/core/modules/field/modules/field_sql_storage/field_sql_storage.info
+++ b/docroot/core/modules/field/modules/field_sql_storage/field_sql_storage.info
@@ -9,7 +9,7 @@ backdrop = 1.x
 dependencies[] = field
 required = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/field/modules/field_sql_storage/tests/field_sql_storage.tests.info b/docroot/core/modules/field/modules/field_sql_storage/tests/field_sql_storage.tests.info
index fa2ceedb..75363731 100644
--- a/docroot/core/modules/field/modules/field_sql_storage/tests/field_sql_storage.tests.info
+++ b/docroot/core/modules/field/modules/field_sql_storage/tests/field_sql_storage.tests.info
@@ -4,7 +4,7 @@ description = Test Field SQL Storage module.
 group = Field API
 file = field_sql_storage.test
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/field/modules/list/list.info b/docroot/core/modules/field/modules/list/list.info
index a362392a..850fd501 100644
--- a/docroot/core/modules/field/modules/list/list.info
+++ b/docroot/core/modules/field/modules/list/list.info
@@ -8,7 +8,7 @@ backdrop = 1.x
 dependencies[] = field
 dependencies[] = options
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/field/modules/list/tests/list.tests.info b/docroot/core/modules/field/modules/list/tests/list.tests.info
index 96ba3cc0..fef3f473 100644
--- a/docroot/core/modules/field/modules/list/tests/list.tests.info
+++ b/docroot/core/modules/field/modules/list/tests/list.tests.info
@@ -22,7 +22,7 @@ description = Test the List field Display formatting.
 group = Field types
 file = list.test
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/field/modules/list/tests/list_test.info b/docroot/core/modules/field/modules/list/tests/list_test.info
index 9d206b86..28fe601d 100644
--- a/docroot/core/modules/field/modules/list/tests/list_test.info
+++ b/docroot/core/modules/field/modules/list/tests/list_test.info
@@ -6,7 +6,7 @@ version = BACKDROP_VERSION
 type = module
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/field/modules/number/number.info b/docroot/core/modules/field/modules/number/number.info
index c8ce071f..e126cbf6 100644
--- a/docroot/core/modules/field/modules/number/number.info
+++ b/docroot/core/modules/field/modules/number/number.info
@@ -7,7 +7,7 @@ version = BACKDROP_VERSION
 backdrop = 1.x
 dependencies[] = field
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/field/modules/number/tests/number.tests.info b/docroot/core/modules/field/modules/number/tests/number.tests.info
index bbdc57fa..a539fea6 100644
--- a/docroot/core/modules/field/modules/number/tests/number.tests.info
+++ b/docroot/core/modules/field/modules/number/tests/number.tests.info
@@ -10,7 +10,7 @@ description = Test settings for number fields.
 group = Field types
 file = number_settings.test
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/field/modules/options/options.info b/docroot/core/modules/field/modules/options/options.info
index c22b7b39..bcb2e236 100644
--- a/docroot/core/modules/field/modules/options/options.info
+++ b/docroot/core/modules/field/modules/options/options.info
@@ -7,7 +7,7 @@ version = BACKDROP_VERSION
 backdrop = 1.x
 dependencies[] = field
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/field/modules/options/tests/options.tests.info b/docroot/core/modules/field/modules/options/tests/options.tests.info
index 74f92c49..51b4585c 100644
--- a/docroot/core/modules/field/modules/options/tests/options.tests.info
+++ b/docroot/core/modules/field/modules/options/tests/options.tests.info
@@ -10,7 +10,7 @@ description = Test an options select on a list field with a dynamic allowed valu
 group = Field types
 file = options.test
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/field/modules/text/tests/text.tests.info b/docroot/core/modules/field/modules/text/tests/text.tests.info
index c4276135..3063690e 100644
--- a/docroot/core/modules/field/modules/text/tests/text.tests.info
+++ b/docroot/core/modules/field/modules/text/tests/text.tests.info
@@ -16,7 +16,7 @@ description = Check if the text field is correctly prepared for translation.
 group = Field types
 file = text.test
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/field/modules/text/text.info b/docroot/core/modules/field/modules/text/text.info
index 59666532..b5bb6be7 100644
--- a/docroot/core/modules/field/modules/text/text.info
+++ b/docroot/core/modules/field/modules/text/text.info
@@ -8,7 +8,7 @@ backdrop = 1.x
 dependencies[] = field
 required = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/field/tests/field.tests.info b/docroot/core/modules/field/tests/field.tests.info
index 886f27c2..c6e2caa7 100644
--- a/docroot/core/modules/field/tests/field.tests.info
+++ b/docroot/core/modules/field/tests/field.tests.info
@@ -88,7 +88,7 @@ description = Tests the Views field of the Field API integration.
 group = Field API
 file = field_views.test
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/field/tests/field_test/field_test.info b/docroot/core/modules/field/tests/field_test/field_test.info
index 7b780aae..4a972652 100644
--- a/docroot/core/modules/field/tests/field_test/field_test.info
+++ b/docroot/core/modules/field/tests/field_test/field_test.info
@@ -6,7 +6,7 @@ version = BACKDROP_VERSION
 type = module
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/field/tests/field_test_schema_alter/field_test_schema_alter.info b/docroot/core/modules/field/tests/field_test_schema_alter/field_test_schema_alter.info
index 2c677811..393d7c5e 100644
--- a/docroot/core/modules/field/tests/field_test_schema_alter/field_test_schema_alter.info
+++ b/docroot/core/modules/field/tests/field_test_schema_alter/field_test_schema_alter.info
@@ -6,7 +6,7 @@ version = BACKDROP_VERSION
 type = module
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/field/views/field.views.inc b/docroot/core/modules/field/views/field.views.inc
index 42ef6d38..31efa5e7 100644
--- a/docroot/core/modules/field/views/field.views.inc
+++ b/docroot/core/modules/field/views/field.views.inc
@@ -193,8 +193,8 @@ function field_views_field_default_views_data($field) {
     $data[$table][$old_column]['field']['moved to'] = array($table, $column);
     $data[$table][$column] = array(
       'group' => $group,
-      'title' => $label,
-      'title short' => $label,
+      'title' => check_plain($label),
+      'title short' => check_plain($label),
       'help' =>  t('Appears in: @bundles.', array('@bundles' => implode(', ', $bundles_names))),
     );
 
@@ -212,7 +212,7 @@ function field_views_field_default_views_data($field) {
             $aliases[] = array(
               'base' => $current_tables[$entity_name],
               'group' => $groups[$entity_name],
-              'title' => $label_name,
+              'title' => check_plain($label_name),
               'help' => t('This is an alias of @group: @field.', array('@group' => $group_name, '@field' => $label)),
             );
           }
diff --git a/docroot/core/modules/field_ui/field_ui.info b/docroot/core/modules/field_ui/field_ui.info
index 0be54a7a..23ea46ac 100644
--- a/docroot/core/modules/field_ui/field_ui.info
+++ b/docroot/core/modules/field_ui/field_ui.info
@@ -8,7 +8,7 @@ version = BACKDROP_VERSION
 backdrop = 1.x
 dependencies[] = field
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/field_ui/tests/field_ui.tests.info b/docroot/core/modules/field_ui/tests/field_ui.tests.info
index b500d9f9..b7ee42f3 100644
--- a/docroot/core/modules/field_ui/tests/field_ui.tests.info
+++ b/docroot/core/modules/field_ui/tests/field_ui.tests.info
@@ -22,7 +22,7 @@ description = Tests view mode functionality.
 group = Field UI
 file = field_ui.test
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/field_ui/tests/view_mode_test/view_mode_test.info b/docroot/core/modules/field_ui/tests/view_mode_test/view_mode_test.info
index 28edba74..a5a817ff 100644
--- a/docroot/core/modules/field_ui/tests/view_mode_test/view_mode_test.info
+++ b/docroot/core/modules/field_ui/tests/view_mode_test/view_mode_test.info
@@ -6,7 +6,7 @@ version = BACKDROP_CORE
 hidden = TRUE
 
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/file/file.admin.inc b/docroot/core/modules/file/file.admin.inc
index 0dd45f72..483d27a7 100644
--- a/docroot/core/modules/file/file.admin.inc
+++ b/docroot/core/modules/file/file.admin.inc
@@ -312,6 +312,11 @@ function file_display_form($form, &$form_state, $file_type, $view_mode) {
     if (!empty($formatter['hidden'])) {
       unset($formatters[$name]);
     }
+    if (!isset($formatter['view callback']) || !function_exists($formatter['view callback'])) {
+      // Don't include the formatters for which file_view_file() would show a
+      // link to the file as fallback.
+      unset($formatters[$name]);
+    }
     if (isset($formatter['mime types'])) {
       if (file_match_mimetypes($formatter['mime types'], $file_type->mimetypes)) {
         continue;
@@ -347,7 +352,7 @@ function file_display_form($form, &$form_state, $file_type, $view_mode) {
       if (!empty($settings_form)) {
         $form['display']['settings'][$name] = array(
           '#type' => 'fieldset',
-          '#title' => check_plain($formatter['label']) . ' ' . t('settings'),
+          '#title' => t('@label settings', array('@label' => $formatter['label'])),
           '#parents' => array('display', 'settings', $name),
           '#group' => 'display_settings',
           '#states' => array(
diff --git a/docroot/core/modules/file/file.info b/docroot/core/modules/file/file.info
index 101c6e95..459ab99d 100644
--- a/docroot/core/modules/file/file.info
+++ b/docroot/core/modules/file/file.info
@@ -10,7 +10,7 @@ backdrop = 1.x
 required = TRUE
 dependencies[] = field
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/file/file.module b/docroot/core/modules/file/file.module
index 21320241..cf88e020 100644
--- a/docroot/core/modules/file/file.module
+++ b/docroot/core/modules/file/file.module
@@ -114,6 +114,7 @@ function file_autoload_info() {
 
     // Views handlers.
     'views_handler_argument_file_fid' => 'views/views_handler_argument_file_fid.inc',
+    'views_handler_argument_file_type' => 'views/views_handler_argument_file_type.inc',
     'views_handler_field_file' => 'views/views_handler_field_file.inc',
     'views_handler_field_file_link_edit' => 'views/views_handler_field_file_link_edit.inc',
     'views_handler_field_file_link_delete' => 'views/views_handler_field_file_link_delete.inc',
@@ -3231,7 +3232,7 @@ function file_view_multiple($files, $view_mode = 'full', $weight = 0, $langcode
   }
   // Sort here, to preserve the input order of the entities that were passed to
   // this function.
-  uasort($build['files'], 'element_sort');
+  backdrop_sort($build['files'], array('#weight'));
   $build['files']['#sorted'] = TRUE;
 
   return $build;
diff --git a/docroot/core/modules/file/tests/file.tests.info b/docroot/core/modules/file/tests/file.tests.info
index 305fa05b..38b295ba 100644
--- a/docroot/core/modules/file/tests/file.tests.info
+++ b/docroot/core/modules/file/tests/file.tests.info
@@ -142,7 +142,7 @@ description = Test overriding file entity attributes.
 group = File
 file = file.test
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/file/tests/file_module_test/file_module_test.info b/docroot/core/modules/file/tests/file_module_test/file_module_test.info
index efb36a62..bd0a72d2 100644
--- a/docroot/core/modules/file/tests/file_module_test/file_module_test.info
+++ b/docroot/core/modules/file/tests/file_module_test/file_module_test.info
@@ -6,7 +6,7 @@ type = module
 backdrop = 1.x
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/file/views/views_handler_argument_file_type.inc b/docroot/core/modules/file/views/views_handler_argument_file_type.inc
new file mode 100644
index 00000000..6d294133
--- /dev/null
+++ b/docroot/core/modules/file/views/views_handler_argument_file_type.inc
@@ -0,0 +1,42 @@
+<?php
+/**
+ * @file
+ * Definition of views_handler_argument_file_type.
+ */
+
+/**
+ * Argument handler to accept a file type.
+ */
+class views_handler_argument_file_type extends views_handler_argument_string {
+
+  /**
+   * Override the behavior of summary_name().
+   */
+  public function summary_name($data) {
+    return $this->fileType($data->{$this->name_alias});
+  }
+
+  /**
+   * Override the behavior of title().
+   */
+  public function title() {
+    return $this->fileType($this->argument);
+  }
+
+  /**
+   * Get the File label (human readable).
+   *
+   * @param string $type
+   *   The views string argument, supposed to be a File type (machine name).
+   *
+   * @return string
+   *   The File type label, if the type exists.
+   */
+  protected function fileType($type) {
+    $file_type_name = file_type_get_name($type);
+    if (empty($file_type_name)) {
+      return t('Unknown file type');
+    }
+    return check_plain($file_type_name);
+  }
+}
diff --git a/docroot/core/modules/filter/filter.info b/docroot/core/modules/filter/filter.info
index 8101b999..59120edd 100644
--- a/docroot/core/modules/filter/filter.info
+++ b/docroot/core/modules/filter/filter.info
@@ -11,7 +11,7 @@ required = TRUE
 
 configure = admin/config/content/formats
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/filter/tests/filter.tests.info b/docroot/core/modules/filter/tests/filter.tests.info
index a5b17435..6685fbcf 100644
--- a/docroot/core/modules/filter/tests/filter.tests.info
+++ b/docroot/core/modules/filter/tests/filter.tests.info
@@ -76,7 +76,7 @@ description = Validate correct handling of URLs inserted via editor link dialog.
 group = Filter
 file = filter_dialog.test
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/filter/tests/filter_formtest.info b/docroot/core/modules/filter/tests/filter_formtest.info
index 64d6be83..4fffe41b 100644
--- a/docroot/core/modules/filter/tests/filter_formtest.info
+++ b/docroot/core/modules/filter/tests/filter_formtest.info
@@ -6,7 +6,7 @@ type = module
 backdrop = 1.x
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/image/image.info b/docroot/core/modules/image/image.info
index a30e4cfa..44e64de3 100644
--- a/docroot/core/modules/image/image.info
+++ b/docroot/core/modules/image/image.info
@@ -10,7 +10,7 @@ backdrop = 1.x
 dependencies[] = file
 configure = admin/config/media/image-styles
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/image/tests/image.tests.info b/docroot/core/modules/image/tests/image.tests.info
index 1b59d338..3692cb33 100644
--- a/docroot/core/modules/image/tests/image.tests.info
+++ b/docroot/core/modules/image/tests/image.tests.info
@@ -70,7 +70,7 @@ description = Test image style and attribute tokens.
 group = Image
 file = token.test
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/image/tests/image_module_test/image_module_test.info b/docroot/core/modules/image/tests/image_module_test/image_module_test.info
index f836cef3..4c7a205e 100644
--- a/docroot/core/modules/image/tests/image_module_test/image_module_test.info
+++ b/docroot/core/modules/image/tests/image_module_test/image_module_test.info
@@ -6,7 +6,7 @@ type = module
 backdrop = 1.x
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/installer/installer.authorize.inc b/docroot/core/modules/installer/installer.authorize.inc
index 0d5b09e9..df3061db 100644
--- a/docroot/core/modules/installer/installer.authorize.inc
+++ b/docroot/core/modules/installer/installer.authorize.inc
@@ -230,7 +230,7 @@ function installer_authorize_update_batch_finished($success, $results) {
   // Since we're doing an update of existing code, always add a task for
   // running update.php.
   $results['tasks'][] = t('Your projects have been downloaded and updated.');
-  $results['tasks'][] = t('<a href="@update">Run database updates</a>', array('@update' => base_path() . 'core/update.php'));
+  $results['tasks'][] = t('<a href="@update">Run site updates</a>', array('@update' => base_path() . 'core/update.php'));
 
   // Unset the variable since it is no longer needed.
   unset($_SESSION['maintenance_mode']);
diff --git a/docroot/core/modules/installer/installer.info b/docroot/core/modules/installer/installer.info
index d94c84c1..e622621f 100644
--- a/docroot/core/modules/installer/installer.info
+++ b/docroot/core/modules/installer/installer.info
@@ -8,7 +8,7 @@ tags[] = System
 backdrop = 1.x
 dependencies[] = update
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/installer/tests/aaa_installer_test/aaa_installer_test.info b/docroot/core/modules/installer/tests/aaa_installer_test/aaa_installer_test.info
index cec0bf1e..572fd9d4 100644
--- a/docroot/core/modules/installer/tests/aaa_installer_test/aaa_installer_test.info
+++ b/docroot/core/modules/installer/tests/aaa_installer_test/aaa_installer_test.info
@@ -6,7 +6,7 @@ backdrop = 1.x
 hidden = TRUE
 type = module
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/installer/tests/bbb_installer_test/bbb_installer_test.info b/docroot/core/modules/installer/tests/bbb_installer_test/bbb_installer_test.info
index 6bd3f8e7..c26b5208 100644
--- a/docroot/core/modules/installer/tests/bbb_installer_test/bbb_installer_test.info
+++ b/docroot/core/modules/installer/tests/bbb_installer_test/bbb_installer_test.info
@@ -6,7 +6,7 @@ backdrop = 1.x
 hidden = TRUE
 type = module
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/installer/tests/ccc_installer_test/ccc_installer_test.info b/docroot/core/modules/installer/tests/ccc_installer_test/ccc_installer_test.info
index 8eaa3031..05c56570 100644
--- a/docroot/core/modules/installer/tests/ccc_installer_test/ccc_installer_test.info
+++ b/docroot/core/modules/installer/tests/ccc_installer_test/ccc_installer_test.info
@@ -6,7 +6,7 @@ backdrop = 1.x
 hidden = TRUE
 type = module
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/installer/tests/installer.tests.info b/docroot/core/modules/installer/tests/installer.tests.info
index d47105ed..b6ff03b5 100644
--- a/docroot/core/modules/installer/tests/installer.tests.info
+++ b/docroot/core/modules/installer/tests/installer.tests.info
@@ -10,7 +10,7 @@ description = Tests installer browse functionality.
 group = Installer (module)
 file = installer.test
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/installer/tests/installer_test/installer_test.info b/docroot/core/modules/installer/tests/installer_test/installer_test.info
index 297c8ed4..2a789d2d 100644
--- a/docroot/core/modules/installer/tests/installer_test/installer_test.info
+++ b/docroot/core/modules/installer/tests/installer_test/installer_test.info
@@ -7,7 +7,7 @@ type = module
 hidden = TRUE
 
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/language/language.info b/docroot/core/modules/language/language.info
index 0c527bc3..201e1ca7 100644
--- a/docroot/core/modules/language/language.info
+++ b/docroot/core/modules/language/language.info
@@ -7,7 +7,7 @@ type = module
 backdrop = 1.x
 configure = admin/config/regional/language
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/language/tests/language.tests.info b/docroot/core/modules/language/tests/language.tests.info
index 93d38fbf..fd548563 100644
--- a/docroot/core/modules/language/tests/language.tests.info
+++ b/docroot/core/modules/language/tests/language.tests.info
@@ -4,7 +4,7 @@ description = Adds a new language and tests changing its status and the default
 group = Language
 file = language.test
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/layout/layout.info b/docroot/core/modules/layout/layout.info
index a02c0ede..a643d4a9 100644
--- a/docroot/core/modules/layout/layout.info
+++ b/docroot/core/modules/layout/layout.info
@@ -8,7 +8,7 @@ version = BACKDROP_VERSION
 backdrop = 1.x
 required = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/layout/tests/layout.tests.info b/docroot/core/modules/layout/tests/layout.tests.info
index 2d4edf83..0eed59f2 100644
--- a/docroot/core/modules/layout/tests/layout.tests.info
+++ b/docroot/core/modules/layout/tests/layout.tests.info
@@ -70,7 +70,7 @@ description = Tests checks and messages when layouts are deleted.
 group = Layout
 file = layout.test
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/layout/tests/layout_test/layout_test.info b/docroot/core/modules/layout/tests/layout_test/layout_test.info
index bacccad5..fb97092d 100644
--- a/docroot/core/modules/layout/tests/layout_test/layout_test.info
+++ b/docroot/core/modules/layout/tests/layout_test/layout_test.info
@@ -6,7 +6,7 @@ type = module
 backdrop = 1.x
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/link/link.info b/docroot/core/modules/link/link.info
index c8e2b123..0f944c26 100644
--- a/docroot/core/modules/link/link.info
+++ b/docroot/core/modules/link/link.info
@@ -7,7 +7,7 @@ version = BACKDROP_VERSION
 backdrop = 1.x
 
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/link/tests/link.tests.info b/docroot/core/modules/link/tests/link.tests.info
index 33297e08..a01d062a 100644
--- a/docroot/core/modules/link/tests/link.tests.info
+++ b/docroot/core/modules/link/tests/link.tests.info
@@ -28,7 +28,7 @@ description = Tests the link_validate_url() function by itself, without invoking
 group = Link
 file = link.validate.test
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/locale/locale.info b/docroot/core/modules/locale/locale.info
index 11ffd664..404048e4 100644
--- a/docroot/core/modules/locale/locale.info
+++ b/docroot/core/modules/locale/locale.info
@@ -8,7 +8,7 @@ backdrop = 1.x
 dependencies[] = language
 
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/locale/tests/locale.tests.info b/docroot/core/modules/locale/tests/locale.tests.info
index de0a9c6a..80eae0bb 100644
--- a/docroot/core/modules/locale/tests/locale.tests.info
+++ b/docroot/core/modules/locale/tests/locale.tests.info
@@ -130,7 +130,7 @@ description = Tests locale translation safe string handling.
 group = Locale
 file = locale.test
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/locale/tests/locale_test/locale_test.info b/docroot/core/modules/locale/tests/locale_test/locale_test.info
index fd2467d5..70a728c4 100644
--- a/docroot/core/modules/locale/tests/locale_test/locale_test.info
+++ b/docroot/core/modules/locale/tests/locale_test/locale_test.info
@@ -6,7 +6,7 @@ version = BACKDROP_VERSION
 type = module
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/menu/menu.info b/docroot/core/modules/menu/menu.info
index 23055f2c..f4f8b874 100644
--- a/docroot/core/modules/menu/menu.info
+++ b/docroot/core/modules/menu/menu.info
@@ -10,7 +10,7 @@ backdrop = 1.x
 
 configure = admin/structure/menu
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/menu/tests/menu.tests.info b/docroot/core/modules/menu/tests/menu.tests.info
index 63d664a2..fb2e95fb 100644
--- a/docroot/core/modules/menu/tests/menu.tests.info
+++ b/docroot/core/modules/menu/tests/menu.tests.info
@@ -16,7 +16,7 @@ description = Test menu item creation and parent availability with language supp
 group = Menu
 file = menu_language.test
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/node/node.info b/docroot/core/modules/node/node.info
index 040c7668..297f0580 100644
--- a/docroot/core/modules/node/node.info
+++ b/docroot/core/modules/node/node.info
@@ -9,7 +9,7 @@ required = TRUE
 dependencies[] = entity
 configure = admin/structure/types
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/node/tests/node.tests.info b/docroot/core/modules/node/tests/node.tests.info
index ba5fe824..bc1019bf 100644
--- a/docroot/core/modules/node/tests/node.tests.info
+++ b/docroot/core/modules/node/tests/node.tests.info
@@ -226,7 +226,7 @@ description = Tests the new node states for Draft, Publish Now and Schedule Publ
 group = Node
 file = node.test
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/node/tests/node_access_test/node_access_test.info b/docroot/core/modules/node/tests/node_access_test/node_access_test.info
index a47f2462..2e29d5bf 100644
--- a/docroot/core/modules/node/tests/node_access_test/node_access_test.info
+++ b/docroot/core/modules/node/tests/node_access_test/node_access_test.info
@@ -6,7 +6,7 @@ type = module
 backdrop = 1.x
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/node/tests/node_layout_preview_revision_test/node_layout_preview_revision_test.info b/docroot/core/modules/node/tests/node_layout_preview_revision_test/node_layout_preview_revision_test.info
index 5081fb28..971aac45 100644
--- a/docroot/core/modules/node/tests/node_layout_preview_revision_test/node_layout_preview_revision_test.info
+++ b/docroot/core/modules/node/tests/node_layout_preview_revision_test/node_layout_preview_revision_test.info
@@ -6,7 +6,7 @@ type = module
 backdrop = 1.x
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/node/tests/node_test/node_test.info b/docroot/core/modules/node/tests/node_test/node_test.info
index b36855b6..ab9abdd4 100644
--- a/docroot/core/modules/node/tests/node_test/node_test.info
+++ b/docroot/core/modules/node/tests/node_test/node_test.info
@@ -6,7 +6,7 @@ type = module
 backdrop = 1.x
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/node/tests/node_test_exception/node_test_exception.info b/docroot/core/modules/node/tests/node_test_exception/node_test_exception.info
index 2622ab9f..bda37ead 100644
--- a/docroot/core/modules/node/tests/node_test_exception/node_test_exception.info
+++ b/docroot/core/modules/node/tests/node_test_exception/node_test_exception.info
@@ -6,7 +6,7 @@ type = module
 backdrop = 1.x
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/path/path.info b/docroot/core/modules/path/path.info
index 4bd4e09c..efd3e014 100644
--- a/docroot/core/modules/path/path.info
+++ b/docroot/core/modules/path/path.info
@@ -8,7 +8,7 @@ backdrop = 1.x
 
 configure = admin/config/urls/path
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/path/tests/path.tests.info b/docroot/core/modules/path/tests/path.tests.info
index 6e369d97..c1b79d77 100644
--- a/docroot/core/modules/path/tests/path.tests.info
+++ b/docroot/core/modules/path/tests/path.tests.info
@@ -64,7 +64,7 @@ description = Tests tokens provided by Path.
 group = Path
 file = path_pattern.test
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/redirect/redirect.info b/docroot/core/modules/redirect/redirect.info
index 7c91375a..2a4352fe 100644
--- a/docroot/core/modules/redirect/redirect.info
+++ b/docroot/core/modules/redirect/redirect.info
@@ -8,7 +8,7 @@ version = BACKDROP_VERSION
 
 configure = admin/config/urls/redirect/settings
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/redirect/tests/redirect.tests.info b/docroot/core/modules/redirect/tests/redirect.tests.info
index 8ee7b322..1b8aec8a 100644
--- a/docroot/core/modules/redirect/tests/redirect.tests.info
+++ b/docroot/core/modules/redirect/tests/redirect.tests.info
@@ -10,7 +10,7 @@ description = Test interface functionality.
 group = Redirect
 file = redirect.test
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/search/search.info b/docroot/core/modules/search/search.info
index af12375b..cb7e22f5 100644
--- a/docroot/core/modules/search/search.info
+++ b/docroot/core/modules/search/search.info
@@ -10,7 +10,7 @@ configure = admin/config/search/settings
 
 stylesheets[all][] = search.theme.css
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/search/tests/search.tests.info b/docroot/core/modules/search/tests/search.tests.info
index bb3a5650..ee1eab4d 100644
--- a/docroot/core/modules/search/tests/search.tests.info
+++ b/docroot/core/modules/search/tests/search.tests.info
@@ -124,7 +124,7 @@ description = Check that search works with numeric locale settings.
 group  = Search
 file = search.test
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/search/tests/search_embedded_form/search_embedded_form.info b/docroot/core/modules/search/tests/search_embedded_form/search_embedded_form.info
index ddd98f97..4bcbb771 100644
--- a/docroot/core/modules/search/tests/search_embedded_form/search_embedded_form.info
+++ b/docroot/core/modules/search/tests/search_embedded_form/search_embedded_form.info
@@ -6,7 +6,7 @@ type = module
 backdrop = 1.x
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/search/tests/search_extra_type/search_extra_type.info b/docroot/core/modules/search/tests/search_extra_type/search_extra_type.info
index d8663215..50153dad 100644
--- a/docroot/core/modules/search/tests/search_extra_type/search_extra_type.info
+++ b/docroot/core/modules/search/tests/search_extra_type/search_extra_type.info
@@ -6,7 +6,7 @@ type = module
 backdrop = 1.x
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/simpletest/backdrop_web_test_case.php b/docroot/core/modules/simpletest/backdrop_web_test_case.php
index 055d014d..0555c5ad 100644
--- a/docroot/core/modules/simpletest/backdrop_web_test_case.php
+++ b/docroot/core/modules/simpletest/backdrop_web_test_case.php
@@ -998,7 +998,7 @@ class BackdropWebTestCase extends BackdropTestCase {
   protected $cookieFile = NULL;
 
   /**
-   * An array of cookies set in the most recent cURL request.
+   * The cookies of the page currently loaded in the internal browser.
    *
    * @var array
    */
@@ -1953,8 +1953,10 @@ protected function tearDown() {
     $language = $this->originalLanguage;
     $language_url = $this->originalLanguageUrl;
 
-    // Close the CURL handler.
+    // Close the CURL handler and reset the cookies array, so that test classes
+    // containing multiple tests are not polluted.
     $this->curlClose();
+    $this->cookies = array();
   }
 
   /**
diff --git a/docroot/core/modules/simpletest/simpletest.info b/docroot/core/modules/simpletest/simpletest.info
index e06dd217..d8069f37 100644
--- a/docroot/core/modules/simpletest/simpletest.info
+++ b/docroot/core/modules/simpletest/simpletest.info
@@ -8,7 +8,7 @@ backdrop = 1.x
 
 configure = admin/config/development/testing/settings
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/simpletest/tests/actions_loop_test.info b/docroot/core/modules/simpletest/tests/actions_loop_test.info
index 0fb873e5..20c3e411 100644
--- a/docroot/core/modules/simpletest/tests/actions_loop_test.info
+++ b/docroot/core/modules/simpletest/tests/actions_loop_test.info
@@ -6,7 +6,7 @@ type = module
 backdrop = 1.x
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/simpletest/tests/ajax_forms_test.info b/docroot/core/modules/simpletest/tests/ajax_forms_test.info
index 63dca863..d49dba66 100644
--- a/docroot/core/modules/simpletest/tests/ajax_forms_test.info
+++ b/docroot/core/modules/simpletest/tests/ajax_forms_test.info
@@ -6,7 +6,7 @@ version = BACKDROP_VERSION
 type = module
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/simpletest/tests/ajax_test.info b/docroot/core/modules/simpletest/tests/ajax_test.info
index 78d559ce..09b1818c 100644
--- a/docroot/core/modules/simpletest/tests/ajax_test.info
+++ b/docroot/core/modules/simpletest/tests/ajax_test.info
@@ -6,7 +6,7 @@ type = module
 backdrop = 1.x
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/simpletest/tests/backdrop_system_listing_compatible_test/backdrop_system_listing_compatible_test.info b/docroot/core/modules/simpletest/tests/backdrop_system_listing_compatible_test/backdrop_system_listing_compatible_test.info
index d6bb9c58..45ed89dc 100644
--- a/docroot/core/modules/simpletest/tests/backdrop_system_listing_compatible_test/backdrop_system_listing_compatible_test.info
+++ b/docroot/core/modules/simpletest/tests/backdrop_system_listing_compatible_test/backdrop_system_listing_compatible_test.info
@@ -6,7 +6,7 @@ type = module
 backdrop = 1.x
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/simpletest/tests/backdrop_system_listing_incompatible_test/backdrop_system_listing_incompatible_test.info b/docroot/core/modules/simpletest/tests/backdrop_system_listing_incompatible_test/backdrop_system_listing_incompatible_test.info
index 39d604e3..d5c5bcf5 100644
--- a/docroot/core/modules/simpletest/tests/backdrop_system_listing_incompatible_test/backdrop_system_listing_incompatible_test.info
+++ b/docroot/core/modules/simpletest/tests/backdrop_system_listing_incompatible_test/backdrop_system_listing_incompatible_test.info
@@ -6,7 +6,7 @@ type = module
 backdrop = 1.x
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/simpletest/tests/batch_test.info b/docroot/core/modules/simpletest/tests/batch_test.info
index 5c5a698c..faa92555 100644
--- a/docroot/core/modules/simpletest/tests/batch_test.info
+++ b/docroot/core/modules/simpletest/tests/batch_test.info
@@ -6,7 +6,7 @@ type = module
 backdrop = 1.x
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/simpletest/tests/boot_test_1.info b/docroot/core/modules/simpletest/tests/boot_test_1.info
index 6e88ed16..466509b2 100644
--- a/docroot/core/modules/simpletest/tests/boot_test_1.info
+++ b/docroot/core/modules/simpletest/tests/boot_test_1.info
@@ -6,7 +6,7 @@ package = Testing
 version = VERSION
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/simpletest/tests/boot_test_2.info b/docroot/core/modules/simpletest/tests/boot_test_2.info
index 7e48947e..12db37d2 100644
--- a/docroot/core/modules/simpletest/tests/boot_test_2.info
+++ b/docroot/core/modules/simpletest/tests/boot_test_2.info
@@ -6,7 +6,7 @@ package = Testing
 version = VERSION
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/simpletest/tests/common_test.info b/docroot/core/modules/simpletest/tests/common_test.info
index 23d014ed..72ac5c30 100644
--- a/docroot/core/modules/simpletest/tests/common_test.info
+++ b/docroot/core/modules/simpletest/tests/common_test.info
@@ -8,7 +8,7 @@ stylesheets[all][] = common_test.css
 stylesheets[print][] = common_test.print.css
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/simpletest/tests/common_test_cron_helper.info b/docroot/core/modules/simpletest/tests/common_test_cron_helper.info
index a64a1a94..9e860ed4 100644
--- a/docroot/core/modules/simpletest/tests/common_test_cron_helper.info
+++ b/docroot/core/modules/simpletest/tests/common_test_cron_helper.info
@@ -6,7 +6,7 @@ type = module
 backdrop = 1.x
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/simpletest/tests/config_obj_test/config_obj_test.info b/docroot/core/modules/simpletest/tests/config_obj_test/config_obj_test.info
index 8f4aedf3..d3d30dc5 100644
--- a/docroot/core/modules/simpletest/tests/config_obj_test/config_obj_test.info
+++ b/docroot/core/modules/simpletest/tests/config_obj_test/config_obj_test.info
@@ -6,7 +6,7 @@ type = module
 backdrop = 1.x
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/simpletest/tests/database_test.info b/docroot/core/modules/simpletest/tests/database_test.info
index af7b9692..94c10bdc 100644
--- a/docroot/core/modules/simpletest/tests/database_test.info
+++ b/docroot/core/modules/simpletest/tests/database_test.info
@@ -6,7 +6,7 @@ version = BACKDROP_VERSION
 type = module
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/simpletest/tests/dependency_test1.info b/docroot/core/modules/simpletest/tests/dependency_test1.info
index 9fb3224d..c1a71e9e 100644
--- a/docroot/core/modules/simpletest/tests/dependency_test1.info
+++ b/docroot/core/modules/simpletest/tests/dependency_test1.info
@@ -6,7 +6,7 @@ type = module
 backdrop = 1.x
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/simpletest/tests/dependency_test2.info b/docroot/core/modules/simpletest/tests/dependency_test2.info
index a27a8a55..1a6f9da5 100644
--- a/docroot/core/modules/simpletest/tests/dependency_test2.info
+++ b/docroot/core/modules/simpletest/tests/dependency_test2.info
@@ -6,7 +6,7 @@ type = module
 backdrop = 1.x
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/simpletest/tests/dependency_test3.info b/docroot/core/modules/simpletest/tests/dependency_test3.info
index 7f2c1078..b9ae28ed 100644
--- a/docroot/core/modules/simpletest/tests/dependency_test3.info
+++ b/docroot/core/modules/simpletest/tests/dependency_test3.info
@@ -6,7 +6,7 @@ type = module
 backdrop = 1.x
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/simpletest/tests/error_test.info b/docroot/core/modules/simpletest/tests/error_test.info
index f7f49dd0..d713d1f2 100644
--- a/docroot/core/modules/simpletest/tests/error_test.info
+++ b/docroot/core/modules/simpletest/tests/error_test.info
@@ -6,7 +6,7 @@ type = module
 backdrop = 1.x
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/simpletest/tests/file_test.info b/docroot/core/modules/simpletest/tests/file_test.info
index 37fd114f..7306f84c 100644
--- a/docroot/core/modules/simpletest/tests/file_test.info
+++ b/docroot/core/modules/simpletest/tests/file_test.info
@@ -6,7 +6,7 @@ type = module
 backdrop = 1.x
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/simpletest/tests/filter_test.info b/docroot/core/modules/simpletest/tests/filter_test.info
index a9f1f01e..ca4c76e1 100644
--- a/docroot/core/modules/simpletest/tests/filter_test.info
+++ b/docroot/core/modules/simpletest/tests/filter_test.info
@@ -6,7 +6,7 @@ type = module
 backdrop = 1.x
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/simpletest/tests/form_test.info b/docroot/core/modules/simpletest/tests/form_test.info
index 0f1f3916..56131806 100644
--- a/docroot/core/modules/simpletest/tests/form_test.info
+++ b/docroot/core/modules/simpletest/tests/form_test.info
@@ -7,7 +7,7 @@ backdrop = 1.x
 dependencies[] = file
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/simpletest/tests/icon.test b/docroot/core/modules/simpletest/tests/icon.test
index 8562c6c5..ac3cd6f0 100644
--- a/docroot/core/modules/simpletest/tests/icon.test
+++ b/docroot/core/modules/simpletest/tests/icon.test
@@ -90,6 +90,67 @@ class IconTestCase extends BackdropWebTestCase {
     $this->assertIconsEqual($core_path, 'gear-bold', FALSE, 'Icon provided by a base-theme uses the correct icon.');
   }
 
+  /**
+   * Test that rendered icons have the expected content and attributes.
+   */
+  protected function testIconAttributes() {
+    $options_alt = array(
+      'alt' => 'Hello world',
+    );
+    $expected_alt = '<svg xmlns="http://www.w3.org/2000/svg" viewbox="0 0 256 256" fill="currentColor" class="icon icon--circle-fill"><title>Hello world</title><path d="M232,128A104,104,0,1,1,128,24,104.13,104.13,0,0,1,232,128Z"/></svg>';
+    $icon = icon('circle-fill', $options_alt);
+    $this->assertEqual($icon, $expected_alt, 'Alt option properly converted to title dom element.');
+
+    $options_dimensions = array(
+      'attributes' => array(
+        'width' => 99,
+        'height' => 99,
+      ),
+    );
+    $expected_dimensions = '<svg xmlns="http://www.w3.org/2000/svg" viewbox="0 0 256 256" fill="currentColor" width="99" height="99" aria-hidden="true" class="icon icon--line-vertical"><path d="M136,24V232a8,8,0,0,1-16,0V24a8,8,0,0,1,16,0Z"/></svg>';
+    $icon = icon('line-vertical', $options_dimensions);
+    $this->assertEqual($icon, $expected_dimensions, 'Width and height attributes properly added.');
+
+    $options_fill = array(
+      'attributes' => array(
+        'fill' => 'red',
+      ),
+    );
+    $expected_fill = '<svg xmlns="http://www.w3.org/2000/svg" viewbox="0 0 256 256" fill="red" aria-hidden="true" class="icon icon--dot"><path d="M140,128a12,12,0,1,1-12-12A12,12,0,0,1,140,128Z"/></svg>';
+    $icon = icon('dot', $options_fill);
+    $this->assertEqual($icon, $expected_fill, 'Value of fill attribute properly overridden.');
+
+    // Remove title tag if alt option is an empty string, low level check.
+    $initial_svg = '<svg width="16" height="16" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"><title>Hello world</title><circle cx="8" cy="8" r="4"></circle></svg>';
+    $options = array(
+      'alt' => '',
+      'aria-hidden' => 'true',
+    );
+    $expected_svg = '<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" version="1.1" viewBox="0 0 16 16" aria-hidden="true"><circle cx="8" cy="8" r="4"/></svg>';
+    $updated_svg = image_add_svg_attributes($initial_svg, $options);
+    $this->assertEqual($updated_svg, $expected_svg, 'Title tag stripped and aria attribute added properly.');
+
+    // Make sure, a comment does not break attribute handling.
+    $initial_svg = '<!-- Some vendor comment --><svg width="16" height="16" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"><circle cx="8" cy="8" r="4"></circle></svg>';
+    $options = array(
+      'alt' => 'Some alternative text',
+      'fill' => 'blue',
+    );
+    $expected_svg = '<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" version="1.1" viewBox="0 0 16 16" fill="blue"><title>Some alternative text</title><circle cx="8" cy="8" r="4"/></svg>';
+    $updated_svg = image_add_svg_attributes($initial_svg, $options);
+    $this->assertEqual($updated_svg, $expected_svg, 'Addition of title and attribute works with comment in svg file.');
+
+    // Unlikely but possible: a comment as first item in svg tag.
+    $initial_svg = '<svg width="16" height="16" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"><!-- Comment --><circle cx="8" cy="8" r="4"></circle></svg>';
+    $options = array(
+      'alt' => 'Some alternative text',
+      'fill' => 'green',
+    );
+    $expected_svg = '<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" version="1.1" viewBox="0 0 16 16" fill="green"><title>Some alternative text</title><!-- Comment --><circle cx="8" cy="8" r="4"/></svg>';
+    $updated_svg = image_add_svg_attributes($initial_svg, $options);
+    $this->assertEqual($updated_svg, $expected_svg, 'Addition of title and attribute works with comment as first child of svg tag.');
+  }
+
   /**
    * Compare an expected icon path against the active icon path by icon name.
    *
diff --git a/docroot/core/modules/simpletest/tests/icon_test/icon_test.info b/docroot/core/modules/simpletest/tests/icon_test/icon_test.info
index c4f61dda..523e8cc5 100644
--- a/docroot/core/modules/simpletest/tests/icon_test/icon_test.info
+++ b/docroot/core/modules/simpletest/tests/icon_test/icon_test.info
@@ -6,7 +6,7 @@ type = module
 backdrop = 1.x
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/simpletest/tests/image_test.info b/docroot/core/modules/simpletest/tests/image_test.info
index c08e5db1..f33d2068 100644
--- a/docroot/core/modules/simpletest/tests/image_test.info
+++ b/docroot/core/modules/simpletest/tests/image_test.info
@@ -6,7 +6,7 @@ type = module
 backdrop = 1.x
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/simpletest/tests/menu_test.info b/docroot/core/modules/simpletest/tests/menu_test.info
index e0341eb9..1ef4252a 100644
--- a/docroot/core/modules/simpletest/tests/menu_test.info
+++ b/docroot/core/modules/simpletest/tests/menu_test.info
@@ -6,7 +6,7 @@ type = module
 backdrop = 1.x
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/simpletest/tests/module_test.info b/docroot/core/modules/simpletest/tests/module_test.info
index 57a720b5..1e4ba431 100644
--- a/docroot/core/modules/simpletest/tests/module_test.info
+++ b/docroot/core/modules/simpletest/tests/module_test.info
@@ -6,7 +6,7 @@ type = module
 backdrop = 1.x
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/simpletest/tests/path_test.info b/docroot/core/modules/simpletest/tests/path_test.info
index 5ac23ba6..a2403236 100644
--- a/docroot/core/modules/simpletest/tests/path_test.info
+++ b/docroot/core/modules/simpletest/tests/path_test.info
@@ -6,7 +6,7 @@ type = module
 backdrop = 1.x
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/simpletest/tests/requirements1_test.info b/docroot/core/modules/simpletest/tests/requirements1_test.info
index fc2bed43..85b9ee43 100644
--- a/docroot/core/modules/simpletest/tests/requirements1_test.info
+++ b/docroot/core/modules/simpletest/tests/requirements1_test.info
@@ -6,7 +6,7 @@ type = module
 backdrop = 1.x
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/simpletest/tests/requirements2_test.info b/docroot/core/modules/simpletest/tests/requirements2_test.info
index 4accd8de..bbf6e92f 100644
--- a/docroot/core/modules/simpletest/tests/requirements2_test.info
+++ b/docroot/core/modules/simpletest/tests/requirements2_test.info
@@ -8,7 +8,7 @@ type = module
 backdrop = 1.x
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/simpletest/tests/session_test.info b/docroot/core/modules/simpletest/tests/session_test.info
index c9bc0563..ec3aba29 100644
--- a/docroot/core/modules/simpletest/tests/session_test.info
+++ b/docroot/core/modules/simpletest/tests/session_test.info
@@ -6,7 +6,7 @@ type = module
 backdrop = 1.x
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/simpletest/tests/simpletest.test b/docroot/core/modules/simpletest/tests/simpletest.test
index 92b5d0d5..05b88147 100644
--- a/docroot/core/modules/simpletest/tests/simpletest.test
+++ b/docroot/core/modules/simpletest/tests/simpletest.test
@@ -349,6 +349,13 @@ class SimpleTestFunctionalTest extends BackdropWebTestCase {
  * Test internal testing framework browser.
  */
 class SimpleTestBrowserTestCase extends BackdropWebTestCase {
+  /**
+   * A flag indicating whether a cookie has been set in a test.
+   *
+   * @var bool
+   */
+  protected static $cookieSet = FALSE;
+
   function setUp() {
     parent::setUp();
     config_set('system.core', 'user_register', USER_REGISTER_VISITORS);
@@ -400,6 +407,45 @@ EOF;
     $urls = $this->xpath('//a[text()=:text]', array(':text' => 'A second "even more weird" link, in memory of George O\'Malley'));
     $this->assertEqual($urls[0]['href'], 'link2', 'Match with mixed single and double quotes.');
   }
+
+  /**
+   * Tests that cookies set during a request are available for testing.
+   */
+  public function testCookies() {
+    // Check that the $this->cookies property is populated when a user logs in.
+    $user = $this->backdropCreateUser();
+    $edit = array('name' => $user->name, 'pass' => $user->pass_raw);
+    $this->backdropPost('user/login', $edit, t('Log in'));
+    $this->assertEqual(count($this->cookies), 1, 'A cookie is set when the user logs in.');
+
+    // Check that the name and value of the cookie match the request data.
+    $cookie_header = $this->backdropGetHeader('set-cookie', TRUE);
+
+    // The name and value are located at the start of the string, separated by
+    // an equals sign and ending in a semicolon.
+    preg_match('/^([^=]+)=([^;]+)/', $cookie_header, $matches);
+    $name = $matches[1];
+    $value = $matches[2];
+
+    $this->assertTrue(array_key_exists($name, $this->cookies), 'The cookie name is correct.');
+    $this->assertEqual($value, $this->cookies[$name]['value'], 'The cookie value is correct.');
+
+    // Set a flag indicating that a cookie has been set in this test.
+    // @see SimpleTestBrowserTestCase::testCookieDoesNotBleed().
+    self::$cookieSet = TRUE;
+  }
+
+  /**
+   * Tests that the cookies from a previous test do not bleed into a new test.
+   *
+   * @see SimpleTestBrowserTestCase::testCookies().
+   */
+  public function testCookieDoesNotBleed() {
+    // In order for this test to be effective it should always run after the
+    // testCookies() test.
+    $this->assertTrue(self::$cookieSet, 'Tests have been executed in the expected order.');
+    $this->assertEqual(count($this->cookies), 0, 'No cookies are present at the start of a new test.');
+  }
 }
 
 class SimpleTestMailCaptureTestCase extends BackdropWebTestCase {
diff --git a/docroot/core/modules/simpletest/tests/simpletest.tests.info b/docroot/core/modules/simpletest/tests/simpletest.tests.info
index 2aed39fd..6c7314f2 100644
--- a/docroot/core/modules/simpletest/tests/simpletest.tests.info
+++ b/docroot/core/modules/simpletest/tests/simpletest.tests.info
@@ -1390,7 +1390,7 @@ description = Test the file tokens.
 group = Token
 file = token.test
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/simpletest/tests/system_dependencies_test.info b/docroot/core/modules/simpletest/tests/system_dependencies_test.info
index b1396900..27187ddc 100644
--- a/docroot/core/modules/simpletest/tests/system_dependencies_test.info
+++ b/docroot/core/modules/simpletest/tests/system_dependencies_test.info
@@ -7,7 +7,7 @@ backdrop = 1.x
 hidden = TRUE
 dependencies[] = _missing_dependency
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/simpletest/tests/system_incompatible_core_version_dependencies_test.info b/docroot/core/modules/simpletest/tests/system_incompatible_core_version_dependencies_test.info
index c37f3a0a..5be1046f 100644
--- a/docroot/core/modules/simpletest/tests/system_incompatible_core_version_dependencies_test.info
+++ b/docroot/core/modules/simpletest/tests/system_incompatible_core_version_dependencies_test.info
@@ -7,7 +7,7 @@ backdrop = 1.x
 hidden = TRUE
 dependencies[] = system_incompatible_core_version_test
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/simpletest/tests/system_incompatible_core_version_test.info b/docroot/core/modules/simpletest/tests/system_incompatible_core_version_test.info
index f7227c9a..4f7512a4 100644
--- a/docroot/core/modules/simpletest/tests/system_incompatible_core_version_test.info
+++ b/docroot/core/modules/simpletest/tests/system_incompatible_core_version_test.info
@@ -6,7 +6,7 @@ type = module
 backdrop = 0.x
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/simpletest/tests/system_incompatible_module_version_dependencies_test.info b/docroot/core/modules/simpletest/tests/system_incompatible_module_version_dependencies_test.info
index 1fb17dd2..dffa1af4 100644
--- a/docroot/core/modules/simpletest/tests/system_incompatible_module_version_dependencies_test.info
+++ b/docroot/core/modules/simpletest/tests/system_incompatible_module_version_dependencies_test.info
@@ -8,7 +8,7 @@ hidden = TRUE
 ; system_incompatible_module_version_test declares version 1.0
 dependencies[] = system_incompatible_module_version_test (>2.0)
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/simpletest/tests/system_incompatible_module_version_test.info b/docroot/core/modules/simpletest/tests/system_incompatible_module_version_test.info
index 4c8f3807..6bb054ff 100644
--- a/docroot/core/modules/simpletest/tests/system_incompatible_module_version_test.info
+++ b/docroot/core/modules/simpletest/tests/system_incompatible_module_version_test.info
@@ -6,7 +6,7 @@ backdrop = 1.x
 hidden = TRUE
 type = module
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/simpletest/tests/system_project_namespace_test.info b/docroot/core/modules/simpletest/tests/system_project_namespace_test.info
index 657a64f4..51e0cbf7 100644
--- a/docroot/core/modules/simpletest/tests/system_project_namespace_test.info
+++ b/docroot/core/modules/simpletest/tests/system_project_namespace_test.info
@@ -7,7 +7,7 @@ backdrop = 1.x
 hidden = TRUE
 dependencies[] = backdrop:filter
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/simpletest/tests/system_test.info b/docroot/core/modules/simpletest/tests/system_test.info
index bf1f1d85..f5f413b9 100644
--- a/docroot/core/modules/simpletest/tests/system_test.info
+++ b/docroot/core/modules/simpletest/tests/system_test.info
@@ -6,7 +6,7 @@ type = module
 backdrop = 1.x
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/simpletest/tests/taxonomy_test.info b/docroot/core/modules/simpletest/tests/taxonomy_test.info
index ba31e4d5..2d1a5424 100644
--- a/docroot/core/modules/simpletest/tests/taxonomy_test.info
+++ b/docroot/core/modules/simpletest/tests/taxonomy_test.info
@@ -7,7 +7,7 @@ backdrop = 1.x
 hidden = TRUE
 dependencies[] = taxonomy
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/simpletest/tests/theme_test.info b/docroot/core/modules/simpletest/tests/theme_test.info
index 27b05118..1054db7a 100644
--- a/docroot/core/modules/simpletest/tests/theme_test.info
+++ b/docroot/core/modules/simpletest/tests/theme_test.info
@@ -6,7 +6,7 @@ type = module
 backdrop = 1.x
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/simpletest/tests/themes/test_basetheme/test_basetheme.info b/docroot/core/modules/simpletest/tests/themes/test_basetheme/test_basetheme.info
index fa46b18d..7a8aa0f5 100644
--- a/docroot/core/modules/simpletest/tests/themes/test_basetheme/test_basetheme.info
+++ b/docroot/core/modules/simpletest/tests/themes/test_basetheme/test_basetheme.info
@@ -8,7 +8,7 @@ hidden = TRUE
 settings[basetheme_only] = base theme value
 settings[subtheme_override] = base theme value
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/simpletest/tests/themes/test_subtheme/test_subtheme.info b/docroot/core/modules/simpletest/tests/themes/test_subtheme/test_subtheme.info
index 88352719..6c6245bd 100644
--- a/docroot/core/modules/simpletest/tests/themes/test_subtheme/test_subtheme.info
+++ b/docroot/core/modules/simpletest/tests/themes/test_subtheme/test_subtheme.info
@@ -8,7 +8,7 @@ hidden = TRUE
 
 settings[subtheme_override] = subtheme value
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/simpletest/tests/themes/test_theme/test_theme.info b/docroot/core/modules/simpletest/tests/themes/test_theme/test_theme.info
index 1126aa9e..a45b950c 100644
--- a/docroot/core/modules/simpletest/tests/themes/test_theme/test_theme.info
+++ b/docroot/core/modules/simpletest/tests/themes/test_theme/test_theme.info
@@ -19,7 +19,7 @@ stylesheets[all][] = system.css
 
 settings[theme_test_setting] = default value
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/simpletest/tests/themes/test_theme_config/test_theme_config.info b/docroot/core/modules/simpletest/tests/themes/test_theme_config/test_theme_config.info
index 7eac1715..3d7b773a 100644
--- a/docroot/core/modules/simpletest/tests/themes/test_theme_config/test_theme_config.info
+++ b/docroot/core/modules/simpletest/tests/themes/test_theme_config/test_theme_config.info
@@ -5,7 +5,7 @@ backdrop = 1.x
 type = theme
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/simpletest/tests/token_test.info b/docroot/core/modules/simpletest/tests/token_test.info
index cdb24339..25f1bffa 100644
--- a/docroot/core/modules/simpletest/tests/token_test.info
+++ b/docroot/core/modules/simpletest/tests/token_test.info
@@ -6,7 +6,7 @@ version = BACKDROP_VERSION
 hidden = TRUE
 type = module
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/simpletest/tests/update_d7_test_1.info b/docroot/core/modules/simpletest/tests/update_d7_test_1.info
index cb98ae92..a1649d76 100644
--- a/docroot/core/modules/simpletest/tests/update_d7_test_1.info
+++ b/docroot/core/modules/simpletest/tests/update_d7_test_1.info
@@ -6,7 +6,7 @@ type = module
 backdrop = 1.x
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/simpletest/tests/update_d7_test_2.info b/docroot/core/modules/simpletest/tests/update_d7_test_2.info
index cb98ae92..a1649d76 100644
--- a/docroot/core/modules/simpletest/tests/update_d7_test_2.info
+++ b/docroot/core/modules/simpletest/tests/update_d7_test_2.info
@@ -6,7 +6,7 @@ type = module
 backdrop = 1.x
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/simpletest/tests/update_script_test.info b/docroot/core/modules/simpletest/tests/update_script_test.info
index b0deab97..2412d92c 100644
--- a/docroot/core/modules/simpletest/tests/update_script_test.info
+++ b/docroot/core/modules/simpletest/tests/update_script_test.info
@@ -6,7 +6,7 @@ type = module
 backdrop = 1.x
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/simpletest/tests/update_test_1.info b/docroot/core/modules/simpletest/tests/update_test_1.info
index 149fe121..2a27b400 100644
--- a/docroot/core/modules/simpletest/tests/update_test_1.info
+++ b/docroot/core/modules/simpletest/tests/update_test_1.info
@@ -6,7 +6,7 @@ type = module
 backdrop = 1.x
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/simpletest/tests/update_test_2.info b/docroot/core/modules/simpletest/tests/update_test_2.info
index 149fe121..2a27b400 100644
--- a/docroot/core/modules/simpletest/tests/update_test_2.info
+++ b/docroot/core/modules/simpletest/tests/update_test_2.info
@@ -6,7 +6,7 @@ type = module
 backdrop = 1.x
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/simpletest/tests/update_test_3.info b/docroot/core/modules/simpletest/tests/update_test_3.info
index 149fe121..2a27b400 100644
--- a/docroot/core/modules/simpletest/tests/update_test_3.info
+++ b/docroot/core/modules/simpletest/tests/update_test_3.info
@@ -6,7 +6,7 @@ type = module
 backdrop = 1.x
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/simpletest/tests/url_alter_test.info b/docroot/core/modules/simpletest/tests/url_alter_test.info
index 3f179795..eb48357a 100644
--- a/docroot/core/modules/simpletest/tests/url_alter_test.info
+++ b/docroot/core/modules/simpletest/tests/url_alter_test.info
@@ -6,7 +6,7 @@ version = BACKDROP_VERSION
 type = module
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/syslog/syslog.info b/docroot/core/modules/syslog/syslog.info
index 9c85bc70..7aa87fdd 100644
--- a/docroot/core/modules/syslog/syslog.info
+++ b/docroot/core/modules/syslog/syslog.info
@@ -9,7 +9,7 @@ backdrop = 1.x
 
 configure = admin/config/development/logging
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/syslog/tests/syslog.tests.info b/docroot/core/modules/syslog/tests/syslog.tests.info
index 339b4e9d..0421a728 100644
--- a/docroot/core/modules/syslog/tests/syslog.tests.info
+++ b/docroot/core/modules/syslog/tests/syslog.tests.info
@@ -4,7 +4,7 @@ description = Test syslog settings.
 group = Syslog
 file = syslog.test
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/system/system.admin.inc b/docroot/core/modules/system/system.admin.inc
index 23f5c641..694b8467 100644
--- a/docroot/core/modules/system/system.admin.inc
+++ b/docroot/core/modules/system/system.admin.inc
@@ -1644,15 +1644,8 @@ function system_cron_settings($form, &$form_state) {
  * @ingroup forms
  */
 function system_run_cron_submit($form, &$form_state) {
-  // Run cron manually from Cron form.
-  if (backdrop_cron_run()) {
-    backdrop_set_message(t('Cron run successfully.'));
-  }
-  else {
-    backdrop_set_message(t('Cron run failed.'), 'error');
-  }
-
-  backdrop_goto('admin/config/system/cron');
+  // Run cron manually.
+  system_run_cron();
 }
 
 /**
@@ -2648,7 +2641,7 @@ function _system_format_debug_info(array $lines, array $format_settings) {
  * Menu callback: run cron manually.
  */
 function system_run_cron() {
-  // Run cron manually
+  // Run cron manually.
   if (backdrop_cron_run()) {
     backdrop_set_message(t('Cron ran successfully.'));
   }
@@ -2656,7 +2649,12 @@ function system_run_cron() {
     backdrop_set_message(t('Cron run failed.'), 'error');
   }
 
-  backdrop_goto('admin/reports/status');
+  if ($_SERVER['HTTP_REFERER']) {
+    backdrop_goto($_SERVER['HTTP_REFERER']);
+  }
+  else {
+    backdrop_goto('admin/reports/status');
+  }
 }
 
 /**
diff --git a/docroot/core/modules/system/system.api.php b/docroot/core/modules/system/system.api.php
index dbe90e4e..da3dba90 100644
--- a/docroot/core/modules/system/system.api.php
+++ b/docroot/core/modules/system/system.api.php
@@ -2975,8 +2975,8 @@ function hook_install() {
  * loaded by that one, including, for example, autoload information) will not
  * have been loaded.
  *
- * During database updates the schema of any module could be out of date. For
- * this reason, caution is needed when using any API function within an update
+ * During site updates the schema of any module could be out of date. For this
+ * reason, caution is needed when using any API function within an update
  * function - particularly CRUD functions, functions that depend on the schema
  * (for example by using backdrop_write_record()), and any functions that invoke
  * hooks. See @link update_api Update versions of API functions @endlink for
@@ -3027,7 +3027,7 @@ function hook_update_N(&$sandbox) {
   // its default value exists in `config/my_module.settings.json`.
   config_set('my_module.settings', 'three', '3.33');
 
-  // For most database updates, the following is sufficient.
+  // For most site updates, the following is sufficient.
   db_add_field('mytable1', 'newcol', array('type' => 'int', 'not null' => TRUE, 'description' => 'My new integer column.'));
 
   // However, for more complex operations that may take a long time, you may
@@ -3106,7 +3106,7 @@ function hook_update_dependencies() {
   // the 'yet_another_module' module. (Note that declaring dependencies in this
   // direction should be done only in rare situations, since it can lead to the
   // following problem: If a site has already run the yet_another_module
-  // module's database updates before it updates its codebase to pick up the
+  // module's site update(s) before it updates its codebase to pick up the
   // newest my_module code, then the dependency declared here will be ignored.)
   $dependencies['yet_another_module'][1004] = array(
     'my_module' => 1001,
@@ -3137,7 +3137,7 @@ function hook_update_dependencies() {
  * @see hook_update_N()
  */
 function hook_update_last_removed() {
-  // We've removed the 1.x-1.x version of my_module, including database updates.
+  // We've removed the 1.x-1.x version of my_module, including site updates.
   // For the 1.x-2.x version of the module, the next update function would be
   // my_module_update_1200().
   return 1103;
@@ -4174,8 +4174,8 @@ function hook_filetransfer_info_alter(&$filetransfer_info) {
  * These simplified versions of core API functions are provided for use by
  * update functions (hook_update_N() implementations).
  *
- * During database updates the schema of any module could be out of date. For
- * this reason, caution is needed when using any API function within an update
+ * During site updates the schema of any module could be out of date. For this
+ * reason, caution is needed when using any API function within an update
  * function - particularly CRUD functions, functions that depend on the schema
  * (for example by using backdrop_write_record()), and any functions that invoke
  * hooks.
diff --git a/docroot/core/modules/system/system.info b/docroot/core/modules/system/system.info
index e576da8a..c260eb04 100644
--- a/docroot/core/modules/system/system.info
+++ b/docroot/core/modules/system/system.info
@@ -8,7 +8,7 @@ required = TRUE
 
 configure = admin/config/system
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/system/system.install b/docroot/core/modules/system/system.install
index 806557eb..cd34f707 100644
--- a/docroot/core/modules/system/system.install
+++ b/docroot/core/modules/system/system.install
@@ -14,8 +14,8 @@ function system_requirements($phase) {
   // Ensure translations don't break during installation.
   $t = get_t();
 
-  // Report Backdrop version.
   if ($phase == 'runtime') {
+    // Report Backdrop version.
     $requirements['backdrop'] = array(
       'title' => $t('Backdrop CMS'),
       'value' => BACKDROP_VERSION,
@@ -23,8 +23,8 @@ function system_requirements($phase) {
       'weight' => -10,
     );
 
-    // Display the currently active installation profile, if the site
-    // is not running the default installation profile.
+    // Display the currently active installation profile, if the site is not
+    // running the default installation profile.
     $profile = backdrop_get_profile();
     if ($profile != 'standard') {
       $info = system_get_info('module', $profile);
@@ -40,6 +40,41 @@ function system_requirements($phase) {
         'weight' => -9,
       );
     }
+
+    // Report the configuration storage being used.
+    $config_storage_types = array(
+      'active' => t('Active'),
+      'staging' => t('Staging'),
+    );
+    foreach ($config_storage_types as $type => $type_name) {
+      $storage = config_get_config_storage($type);
+      $class = get_class($storage);
+
+      switch ($class) {
+        case 'ConfigDatabaseStorage':
+          $config_locations[$type] = t('!type: database: <code>@config_location</code>', array (
+            // $type_name has already been passed through t() earlier. Avoid
+            // double-escaping.
+            '!type' => $type_name,
+            '@config_location' => 'db://default/config_' . $type,
+          ));
+          break;
+        case 'ConfigFileStorage':
+        default:
+          $config_locations[$type] = t('!type: JSON files: <code>@config_location</code>', array (
+            // $type_name has already been passed through t() earlier. Avoid
+            // double-escaping.
+            '!type' => $type_name,
+            '@config_location' => config_get_config_directory($type),
+          ));
+      }
+    }
+
+    $requirements['config_storage'] = array(
+      'title' => $t('Configuration storage'),
+      'value' => theme('item_list', array('items' => $config_locations)),
+      'severity' => REQUIREMENT_INFO,
+    );
   }
 
   // Web server information.
@@ -423,7 +458,7 @@ function system_requirements($phase) {
   // See if updates are available in update.php.
   if ($phase == 'runtime') {
     $requirements['update'] = array(
-      'title' => $t('Database updates'),
+      'title' => $t('Site updates'),
       'severity' => REQUIREMENT_OK,
       'value' => $t('Up to date'),
     );
@@ -437,8 +472,8 @@ function system_requirements($phase) {
         if ($current_schema < $latest_schema) {
           $update_link = base_path() . 'core/update.php';
           $requirements['update']['severity'] = REQUIREMENT_ERROR;
-          $requirements['update']['value'] = $t('Out of date (<a href="@update">Run database updates</a>)', array('@update' => $update_link));
-          $requirements['update']['description'] = $t('Some modules have database schema updates to install. You should run the <a href="@update">database update script</a> immediately.', array('@update' => $update_link));
+          $requirements['update']['value'] = $t('Out of date (<a href="@update">Run site updates</a>)', array('@update' => $update_link));
+          $requirements['update']['description'] = $t('Some modules have database schema updates to install. You should run the <a href="@update">site update script</a> immediately.', array('@update' => $update_link));
           break;
         }
       }
@@ -3547,6 +3582,56 @@ function system_update_1095() {
   }
 }
 
+/**
+ * Fix icon display for customized system menu items.
+ */
+function system_update_1096() {
+  $icon_mapping = array(
+    'admin/dashboard' => 'speedometer-fill',
+    'admin/content' => 'pencil-fill',
+    'admin/people' => 'users-fill',
+    'admin/appearance' => 'palette-fill',
+    'admin/modules' => 'puzzle-piece-fill',
+    'admin/structure' => 'stack-fill',
+    'admin/config' => 'gear-fill',
+    'admin/reports' => 'info-fill',
+  );
+
+  $items = db_select('menu_links')
+    ->fields('menu_links')
+    ->condition('menu_name', 'management')
+    ->condition('module', 'system')
+    ->condition('depth', 2)
+    ->condition('customized', 1)
+    ->execute()->fetchAllAssoc('router_path');
+
+  foreach ($items as $router_path => $item) {
+    if (!array_key_exists($router_path, $icon_mapping)) {
+      continue;
+    }
+    $existing_item = (array) $item;
+    $options = unserialize($existing_item['options']);
+    if (isset($options['icon'])) {
+      continue;
+    }
+    $updated_item = $existing_item;
+    $options['icon'] = $icon_mapping[$router_path];
+    $updated_item['options'] = $options;
+    menu_link_save($updated_item, $existing_item);
+  }
+}
+
+/**
+ * Set local_action_position in Admin Bar.
+ */
+function system_update_1097() {
+  $config = config('admin_bar.settings');
+  if ($config->get('local_action_position') === NULL) {
+    $config->set('local_action_position', 'top');
+    $config->save();
+  }
+}
+
 /**
  * @} End of "defgroup updates-7.x-to-1.x"
  * The next series of updates should start at 2000.
diff --git a/docroot/core/modules/system/system.module b/docroot/core/modules/system/system.module
index 995e0198..a9775096 100644
--- a/docroot/core/modules/system/system.module
+++ b/docroot/core/modules/system/system.module
@@ -169,7 +169,7 @@ function system_permission() {
     'administer software updates' => array(
       'title' => t('Administer software updates'),
       'restrict access' => TRUE,
-      'warning' => t('Run database updates for Backdrop projects.'),
+      'warning' => t('Run site updates for Backdrop projects.'),
     ),
     'access administration pages' => array(
       'title' => t('Use the administration pages'),
diff --git a/docroot/core/modules/system/tests/cron_queue_test/cron_queue_test.info b/docroot/core/modules/system/tests/cron_queue_test/cron_queue_test.info
index ca22f70b..e7a872f1 100644
--- a/docroot/core/modules/system/tests/cron_queue_test/cron_queue_test.info
+++ b/docroot/core/modules/system/tests/cron_queue_test/cron_queue_test.info
@@ -6,7 +6,7 @@ backdrop = 1.x
 hidden = TRUE
 type = module
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/system/tests/deprecated_redirect_test/deprecated_redirect_test.info b/docroot/core/modules/system/tests/deprecated_redirect_test/deprecated_redirect_test.info
index b106e848..3eb000dd 100644
--- a/docroot/core/modules/system/tests/deprecated_redirect_test/deprecated_redirect_test.info
+++ b/docroot/core/modules/system/tests/deprecated_redirect_test/deprecated_redirect_test.info
@@ -6,7 +6,7 @@ version = BACKDROP_VERSION
 type = module
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/system/tests/system.tests.info b/docroot/core/modules/system/tests/system.tests.info
index b3e13866..c5b82b6f 100644
--- a/docroot/core/modules/system/tests/system.tests.info
+++ b/docroot/core/modules/system/tests/system.tests.info
@@ -221,7 +221,7 @@ description = Tests limiting menu block level and depth.
 group = System
 file = system.test
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/system/tests/system_cron_test/system_cron_test.info b/docroot/core/modules/system/tests/system_cron_test/system_cron_test.info
index 709395f3..d848d5d3 100644
--- a/docroot/core/modules/system/tests/system_cron_test/system_cron_test.info
+++ b/docroot/core/modules/system/tests/system_cron_test/system_cron_test.info
@@ -6,7 +6,7 @@ version = VERSION
 backdrop = 1.x
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/taxonomy/taxonomy.info b/docroot/core/modules/taxonomy/taxonomy.info
index bc96aa16..e3f5af7e 100644
--- a/docroot/core/modules/taxonomy/taxonomy.info
+++ b/docroot/core/modules/taxonomy/taxonomy.info
@@ -11,7 +11,7 @@ dependencies[] = entity
 
 configure = admin/structure/taxonomy
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/taxonomy/tests/taxonomy.tests.info b/docroot/core/modules/taxonomy/tests/taxonomy.tests.info
index 3ac9627c..4c7345a7 100644
--- a/docroot/core/modules/taxonomy/tests/taxonomy.tests.info
+++ b/docroot/core/modules/taxonomy/tests/taxonomy.tests.info
@@ -101,7 +101,7 @@ group = Taxonomy
 file = taxonomy_views_handler_relationship_node_term_data.test
 
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/taxonomy/tests/taxonomy_nodes_test/taxonomy_nodes_test.info b/docroot/core/modules/taxonomy/tests/taxonomy_nodes_test/taxonomy_nodes_test.info
index 459b6341..21a9b792 100644
--- a/docroot/core/modules/taxonomy/tests/taxonomy_nodes_test/taxonomy_nodes_test.info
+++ b/docroot/core/modules/taxonomy/tests/taxonomy_nodes_test/taxonomy_nodes_test.info
@@ -6,7 +6,7 @@ version = VERSION
 backdrop = 1.x
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/taxonomy/tests/taxonomy_vocab_load_test/taxonomy_vocab_load_test.info b/docroot/core/modules/taxonomy/tests/taxonomy_vocab_load_test/taxonomy_vocab_load_test.info
index f3c75675..ad96366e 100644
--- a/docroot/core/modules/taxonomy/tests/taxonomy_vocab_load_test/taxonomy_vocab_load_test.info
+++ b/docroot/core/modules/taxonomy/tests/taxonomy_vocab_load_test/taxonomy_vocab_load_test.info
@@ -6,7 +6,7 @@ version = VERSION
 backdrop = 1.x
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/telemetry/telemetry.info b/docroot/core/modules/telemetry/telemetry.info
index e6425d33..f8813951 100644
--- a/docroot/core/modules/telemetry/telemetry.info
+++ b/docroot/core/modules/telemetry/telemetry.info
@@ -5,7 +5,7 @@ version = BACKDROP_VERSION
 type = module
 backdrop = 1.x
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/telemetry/telemetry.install b/docroot/core/modules/telemetry/telemetry.install
index bcd4eb66..720d3e3d 100644
--- a/docroot/core/modules/telemetry/telemetry.install
+++ b/docroot/core/modules/telemetry/telemetry.install
@@ -7,7 +7,7 @@
 /**
  * Implements hook_uninstall().
  */
-function project_uninstall() {
+function telemetry_uninstall() {
   $state_settings = array(
     'telemetry_cron_last',
   );
diff --git a/docroot/core/modules/telemetry/telemetry.module b/docroot/core/modules/telemetry/telemetry.module
index 586b57c6..12b229c5 100644
--- a/docroot/core/modules/telemetry/telemetry.module
+++ b/docroot/core/modules/telemetry/telemetry.module
@@ -101,7 +101,7 @@ function telemetry_get_data() {
  */
 function telemetry_cron() {
   if (settings_get('telemetry_enabled', TRUE)) {
-    $last_run = state_get('telemetry_cron');
+    $last_run = state_get('telemetry_cron_last');
     $interval = 86400; // One day in seconds.
     if (REQUEST_TIME - $last_run > $interval) {
       $telemetry_data = telemetry_get_data();
@@ -114,6 +114,9 @@ function telemetry_cron() {
           'X-Site-Key' => _telemetry_site_key(),
         ),
       ));
+      if ($response->code == 200) {
+        state_set('telemetry_cron_last', REQUEST_TIME);
+      }
     }
   }
 }
diff --git a/docroot/core/modules/translation/tests/translation.tests.info b/docroot/core/modules/translation/tests/translation.tests.info
index 26f19667..7520112d 100644
--- a/docroot/core/modules/translation/tests/translation.tests.info
+++ b/docroot/core/modules/translation/tests/translation.tests.info
@@ -4,7 +4,7 @@ description = Create a page with translation, modify the page outdating translat
 group = Translation
 file = translation.test
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/translation/tests/translation_test/translation_test.info b/docroot/core/modules/translation/tests/translation_test/translation_test.info
index 31c8630f..4bef93ab 100644
--- a/docroot/core/modules/translation/tests/translation_test/translation_test.info
+++ b/docroot/core/modules/translation/tests/translation_test/translation_test.info
@@ -6,7 +6,7 @@ version = BACKDROP_VERSION
 type = module
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/translation/translation.info b/docroot/core/modules/translation/translation.info
index fe19e90c..e425d02c 100644
--- a/docroot/core/modules/translation/translation.info
+++ b/docroot/core/modules/translation/translation.info
@@ -7,7 +7,7 @@ tags[] = Language
 version = BACKDROP_VERSION
 backdrop = 1.x
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/update/tests/aaa_update_test/aaa_update_test.info b/docroot/core/modules/update/tests/aaa_update_test/aaa_update_test.info
index 2cd4bb64..00624686 100644
--- a/docroot/core/modules/update/tests/aaa_update_test/aaa_update_test.info
+++ b/docroot/core/modules/update/tests/aaa_update_test/aaa_update_test.info
@@ -6,7 +6,7 @@ backdrop = 1.x
 hidden = TRUE
 type = module
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/update/tests/bbb_update_test/bbb_update_test.info b/docroot/core/modules/update/tests/bbb_update_test/bbb_update_test.info
index c89bc46a..f3408741 100644
--- a/docroot/core/modules/update/tests/bbb_update_test/bbb_update_test.info
+++ b/docroot/core/modules/update/tests/bbb_update_test/bbb_update_test.info
@@ -6,7 +6,7 @@ backdrop = 1.x
 hidden = TRUE
 type = module
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/update/tests/ccc_update_test/ccc_update_test.info b/docroot/core/modules/update/tests/ccc_update_test/ccc_update_test.info
index 487764d0..81e74d78 100644
--- a/docroot/core/modules/update/tests/ccc_update_test/ccc_update_test.info
+++ b/docroot/core/modules/update/tests/ccc_update_test/ccc_update_test.info
@@ -6,7 +6,7 @@ backdrop = 1.x
 hidden = TRUE
 type = module
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/update/tests/update.tests.info b/docroot/core/modules/update/tests/update.tests.info
index 49f896fe..9085860e 100644
--- a/docroot/core/modules/update/tests/update.tests.info
+++ b/docroot/core/modules/update/tests/update.tests.info
@@ -16,7 +16,7 @@ description = Test update functionality unrelated to the database.
 group = Update
 file = update.test
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/update/tests/update_test/themes/update_test_admintheme/update_test_admintheme.info b/docroot/core/modules/update/tests/update_test/themes/update_test_admintheme/update_test_admintheme.info
index 14823aff..8f7f6eef 100644
--- a/docroot/core/modules/update/tests/update_test/themes/update_test_admintheme/update_test_admintheme.info
+++ b/docroot/core/modules/update/tests/update_test/themes/update_test_admintheme/update_test_admintheme.info
@@ -5,7 +5,7 @@ version = BACKDROP_VERSION
 backdrop = 1.x
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/update/tests/update_test/themes/update_test_basetheme/update_test_basetheme.info b/docroot/core/modules/update/tests/update_test/themes/update_test_basetheme/update_test_basetheme.info
index da49d08c..4baf363d 100644
--- a/docroot/core/modules/update/tests/update_test/themes/update_test_basetheme/update_test_basetheme.info
+++ b/docroot/core/modules/update/tests/update_test/themes/update_test_basetheme/update_test_basetheme.info
@@ -5,7 +5,7 @@ version = BACKDROP_VERSION
 backdrop = 1.x
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/update/tests/update_test/themes/update_test_subtheme/update_test_subtheme.info b/docroot/core/modules/update/tests/update_test/themes/update_test_subtheme/update_test_subtheme.info
index c3c6a4f0..30d5ae18 100644
--- a/docroot/core/modules/update/tests/update_test/themes/update_test_subtheme/update_test_subtheme.info
+++ b/docroot/core/modules/update/tests/update_test/themes/update_test_subtheme/update_test_subtheme.info
@@ -6,7 +6,7 @@ backdrop = 1.x
 base theme = update_test_basetheme
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/update/tests/update_test/update_test.info b/docroot/core/modules/update/tests/update_test/update_test.info
index 512e5173..bc377026 100644
--- a/docroot/core/modules/update/tests/update_test/update_test.info
+++ b/docroot/core/modules/update/tests/update_test/update_test.info
@@ -6,7 +6,7 @@ type = module
 backdrop = 1.x
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/update/update.info b/docroot/core/modules/update/update.info
index ff6ebeb6..5a4732fa 100644
--- a/docroot/core/modules/update/update.info
+++ b/docroot/core/modules/update/update.info
@@ -9,7 +9,7 @@ backdrop = 1.x
 
 configure = admin/reports/updates/settings
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/user/js/user.admin.js b/docroot/core/modules/user/js/user.admin.js
index 58a956da..46390367 100644
--- a/docroot/core/modules/user/js/user.admin.js
+++ b/docroot/core/modules/user/js/user.admin.js
@@ -69,14 +69,14 @@ Backdrop.behaviors.userFieldsetSummaries = {
       // Timezone.
       var $timezone = $context.find('select[name="timezone"]');
       if ($timezone.length && $timezone.val().length) {
-        var timezoneText = Backdrop.t('Time zone:') + ' ' + $.trim($timezone.find(':selected').text());
+        var timezoneText = Backdrop.t('Time zone:') + ' ' + $timezone.find(':selected').text().trim();
         vals.push(timezoneText);
       }
 
       // Language.
       var $language = $context.find('input[name="language"]:checked');
       if ($language.length) {
-        var languageText = Backdrop.t('Language:') + ' ' + $.trim($language.parent().find('label').text());
+        var languageText = Backdrop.t('Language:') + ' ' + $language.parent().find('label').text().trim();
         vals.push(languageText);
       }
 
diff --git a/docroot/core/modules/user/tests/user.test b/docroot/core/modules/user/tests/user.test
index 2bc2e21a..11196370 100644
--- a/docroot/core/modules/user/tests/user.test
+++ b/docroot/core/modules/user/tests/user.test
@@ -503,6 +503,14 @@ class UserLoginTestCase extends UserLoginTestBase {
     // A login with the correct password should also result in a flood error
     // message.
     $this->assertFailedLogin($user1, NULL, TRUE, 'ip');
+
+    // A login attempt after resetting the password should still fail, since the
+    // IP-based flood control count is not cleared after a password reset.
+    $new_pass = $this->resetUserPassword($user1);
+    $user1->pass_raw = $new_pass;
+    $this->backdropLogout();
+    $this->assertFailedLogin($user1, NULL, FALSE, 'ip');
+    $this->assertRaw(t('Sorry, too many failed login attempts from your IP address. This IP address is temporarily blocked. Try again later or <a href="@url">request a new password</a>.', array('@url' => url('user/password'))));
   }
 
   /**
@@ -543,6 +551,17 @@ class UserLoginTestCase extends UserLoginTestBase {
     // Try one more attempt for user 1, it should be rejected, even if the
     // correct password has been used.
     $this->assertFailedLogin($user1, NULL, TRUE, 'user');
+
+    // Resetting the password should clear the flood control for the user.
+    $new_pass = $this->resetUserPassword($user1);
+    $this->backdropLogout();
+
+    // Try to log in as user 1, it should be successful.
+    // Need to reload user since the password changed.
+    $user1->pass_raw = $new_pass;
+    $this->backdropLogin($user1);
+    $this->assertRaw('Member for');
+
   }
 
   /**
@@ -625,6 +644,35 @@ class UserLoginTestCase extends UserLoginTestBase {
     $this->backdropPost('user', $edit, t('Log in'), array(), array(), NULL, $extra_post);
     $this->assertText(t('Sorry, incorrect password.'));
   }
+
+  /**
+   * Resets the user password and logs the user in.
+   *
+   * @param User $user
+   *   The account to reset the password for.
+   * @return string
+   *   New password.
+   */
+  protected function resetUserPassword(User $user) {
+    $this->backdropGet('user/password');
+    $edit['name'] = $user->name;
+    $this->backdropPost(NULL, $edit, 'Reset password');
+    $emails = $this->backdropGetMails();
+    $email = end($emails);
+    $urls = array();
+    preg_match('#.+user/reset/.+#', $email['body'], $urls);
+    $resetURL = $urls[0];
+    $this->backdropGet($resetURL);
+    $pass = user_password();
+    $pass_edit = array(
+      'pass[pass1]' => $pass,
+      'pass[pass2]' => $pass,
+    );
+    $this->backdropPost(NULL, $pass_edit, t('Save password & log in'));
+
+    return $pass;
+  }
+
 }
 
 /**
diff --git a/docroot/core/modules/user/tests/user.tests.info b/docroot/core/modules/user/tests/user.tests.info
index f5808893..d9d600fb 100644
--- a/docroot/core/modules/user/tests/user.tests.info
+++ b/docroot/core/modules/user/tests/user.tests.info
@@ -178,7 +178,7 @@ description = Tests the basic integration with Views module.
 group = User
 file = user_views.test
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/user/tests/user_flood_test/user_flood_test.info b/docroot/core/modules/user/tests/user_flood_test/user_flood_test.info
index ac2ea4ad..0b0aee24 100644
--- a/docroot/core/modules/user/tests/user_flood_test/user_flood_test.info
+++ b/docroot/core/modules/user/tests/user_flood_test/user_flood_test.info
@@ -6,7 +6,7 @@ type = module
 backdrop = 1.x
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/user/tests/user_form_test/user_form_test.info b/docroot/core/modules/user/tests/user_form_test/user_form_test.info
index 3280ae8b..6313c17a 100644
--- a/docroot/core/modules/user/tests/user_form_test/user_form_test.info
+++ b/docroot/core/modules/user/tests/user_form_test/user_form_test.info
@@ -6,7 +6,7 @@ type = module
 backdrop = 1.x
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/user/tests/user_session_test/user_session_test.info b/docroot/core/modules/user/tests/user_session_test/user_session_test.info
index 176c1a88..4b579d49 100644
--- a/docroot/core/modules/user/tests/user_session_test/user_session_test.info
+++ b/docroot/core/modules/user/tests/user_session_test/user_session_test.info
@@ -6,7 +6,7 @@ type = module
 backdrop = 1.x
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/user/user.info b/docroot/core/modules/user/user.info
index b75c5a05..aa7501a7 100644
--- a/docroot/core/modules/user/user.info
+++ b/docroot/core/modules/user/user.info
@@ -11,7 +11,7 @@ configure = admin/config/people
 
 stylesheets[all][] = css/user.css
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/user/user.pages.inc b/docroot/core/modules/user/user.pages.inc
index 364af7d5..573c7bb2 100644
--- a/docroot/core/modules/user/user.pages.inc
+++ b/docroot/core/modules/user/user.pages.inc
@@ -189,6 +189,20 @@ function user_pass_reset($uid, $timestamp, $hashed_pass, $immediate_login = FALS
         backdrop_goto('user/password');
       }
       elseif ($account->uid && $timestamp >= $account->login && $timestamp <= $current && $hashed_pass == user_pass_rehash($account->pass, $timestamp, $account->login, $account->uid, $account->mail)) {
+        if (config_get('user.flood', 'flood_uid_only')) {
+          // Clear flood events based on the uid only if configured.
+          $identifier = $account->uid;
+        }
+        else {
+          // The default identifier is a combination of uid and IP address.
+          $identifier = $account->uid . '-' . ip_address();
+        }
+        // Only clear the user specific flood events. We cannot clear the more
+        // broad IP address flood events because that would open a
+        // vulnerability where an attacker with a valid account could use that
+        // to brute force other accounts.
+        flood_clear_event('failed_login_attempt_user', $identifier);
+
         if ($immediate_login) {
           $user = $account;
           user_login_finalize();
diff --git a/docroot/core/modules/views/tests/views.tests.info b/docroot/core/modules/views/tests/views.tests.info
index d72732e0..eae8355b 100644
--- a/docroot/core/modules/views/tests/views.tests.info
+++ b/docroot/core/modules/views/tests/views.tests.info
@@ -346,7 +346,7 @@ description = Tests some functionality of the view class.
 group = Views
 file = views_view.test
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/views/tests/views_layout.test b/docroot/core/modules/views/tests/views_layout.test
index e6fe4d12..c98974cd 100644
--- a/docroot/core/modules/views/tests/views_layout.test
+++ b/docroot/core/modules/views/tests/views_layout.test
@@ -65,7 +65,7 @@ class ViewsLayoutsTest extends BackdropWebTestCase {
     $this->backdropGet('admin/structure/views/nojs/add-item/layout_context_test_ua/block/field');
 
     $fields = array(
-      'name[users.uid]' => 1,
+      'name[fields][users.uid]' => 1,
     );
 
     $this->backdropPost(NULL, $fields, t('Add and configure fields'));
@@ -73,7 +73,7 @@ class ViewsLayoutsTest extends BackdropWebTestCase {
 
     // Add Contextual Filter User ID to our view.
     $this->backdropGet('admin/structure/views/nojs/add-item/layout_context_test_ua/block/argument');
-    $this->backdropPost(NULL, array('name[users.uid]' => 1), t('Add and configure contextual filters'));
+    $this->backdropPost(NULL, array('name[fields][users.uid]' => 1), t('Add and configure contextual filters'));
     $this->backdropPost(NULL, NULL, t('Apply'));
 
     // Navigate to the Edit form of the Contextual filter input of our view.
diff --git a/docroot/core/modules/views/tests/views_test/views_test.info b/docroot/core/modules/views/tests/views_test/views_test.info
index 5babf10e..86401b13 100644
--- a/docroot/core/modules/views/tests/views_test/views_test.info
+++ b/docroot/core/modules/views/tests/views_test/views_test.info
@@ -7,7 +7,7 @@ backdrop = 1.x
 dependencies[] = views
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/views/tests/views_test_entity/views_test_entity.info b/docroot/core/modules/views/tests/views_test_entity/views_test_entity.info
index e60d9067..09d697ec 100644
--- a/docroot/core/modules/views/tests/views_test_entity/views_test_entity.info
+++ b/docroot/core/modules/views/tests/views_test_entity/views_test_entity.info
@@ -7,7 +7,7 @@ backdrop = 1.x
 dependencies[] = views
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/views/views.api.php b/docroot/core/modules/views/views.api.php
index 69f8fca6..a12b4646 100644
--- a/docroot/core/modules/views/views.api.php
+++ b/docroot/core/modules/views/views.api.php
@@ -338,9 +338,10 @@ function hook_views_data() {
   );
 
   // Next, describe each of the individual fields in this table to Views. This
-  // is done by describing $data['example_table']['FIELD_NAME']. This part of
-  // the array may then have further entries:
-  //   - title: The label for the table field, as presented in Views.
+  // is done by describing $data['example_table']['FIELD_NAME']. All text should
+  // both be sanitized and translated or run through t() before being passed to
+  // the views UI. Keys are as follows:
+  //   - title: A sanitized label for the table field, as presented in Views.
   //   - help: The description text for the table field.
   //   - relationship: A description of any relationship handler for the table
   //     field.
diff --git a/docroot/core/modules/views/views.info b/docroot/core/modules/views/views.info
index a327eaed..3a727d0f 100644
--- a/docroot/core/modules/views/views.info
+++ b/docroot/core/modules/views/views.info
@@ -8,7 +8,7 @@ backdrop = 1.x
 stylesheets[all][] = css/views.css
 required = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/modules/views_ui/css/views_ui.admin.theme.css b/docroot/core/modules/views_ui/css/views_ui.admin.theme.css
index 23d9461a..3fa4bec7 100644
--- a/docroot/core/modules/views_ui/css/views_ui.admin.theme.css
+++ b/docroot/core/modules/views_ui/css/views_ui.admin.theme.css
@@ -808,24 +808,24 @@ td.group-title {
 }
 
 .views-filterable-options .form-type-checkbox {
-  border: 1px solid #CCC;
-  padding: 5px 8px;
-  border-top: none;
+  border: none;
+  padding: 0;
 }
 
 .views-filterable-options {
-  border-top:  1px solid #CCC;
-}
-
-.views-filterable-options .even .form-type-checkbox {
-  background-color: #f7f7f7;
+  box-shadow: inset 0 1px 0 0 #eee;
+  border-radius: 4px;
 }
 
-.filterable-option .form-item {
+tr.views-filterable-option .form-item {
   margin-bottom: 0;
   margin-top: 0;
 }
 
+tr.views-filterable-option td.title {
+  font-weight: bold;
+}
+
 .views-filterable-options .form-type-checkbox .description {
   margin-top: 0;
   margin-bottom: 0;
diff --git a/docroot/core/modules/views_ui/js/views-admin.js b/docroot/core/modules/views_ui/js/views-admin.js
index 0339ff06..19924f99 100644
--- a/docroot/core/modules/views_ui/js/views-admin.js
+++ b/docroot/core/modules/views_ui/js/views-admin.js
@@ -197,14 +197,14 @@ Backdrop.viewsUi.AddItemForm = function ($form) {
 
 Backdrop.viewsUi.AddItemForm.prototype.handleCheck = function (event) {
   var $target = $(event.target);
-  var label = $.trim($target.next().text());
+  var label = $target.closest('td').next().text().trim();
   // Add/remove the checked item to the list.
   if ($target.is(':checked')) {
     this.$selected_div.css('display', 'block');
-    this.checkedItems.push(label);
+    this.checkedItems.push(Backdrop.checkPlain(label));
   }
   else {
-    var position = $.inArray(label, this.checkedItems);
+    var position = $.inArray(Backdrop.checkPlain(label), this.checkedItems);
     // Delete the item from the list and take sure that the list doesn't have undefined items left.
     for (var i = 0; i < this.checkedItems.length; i++) {
       if (i == position) {
@@ -298,120 +298,122 @@ Backdrop.behaviors.viewsUiSearchOptions = {
   }
 };
 
-/**
- * Constructor for the viewsUi.OptionsSearch object.
- *
- * The OptionsSearch object filters the available options on a form according
- * to the user's search term. Typing in "taxonomy" will show only those options
- * containing "taxonomy" in their label.
- */
-Backdrop.viewsUi.OptionsSearch = function ($form) {
-  this.$form = $form;
-  // Add a keyup handler to the search box.
-  this.$searchBox = this.$form.find('#edit-options-search');
-  this.$searchBox.on('keyup', $.proxy(this.handleKeyup, this));
-  // Get a list of option labels and their corresponding divs and maintain it
-  // in memory, so we have as little overhead as possible at keyup time.
-  this.options = this.getOptions(this.$form.find('.filterable-option'));
-  // Restripe on initial loading.
-  this.handleKeyup();
-
-  // Add a change handler to the filter group select.
-  this.$filterGroup = this.$form.find('select[name="group"]');
-  this.$filterGroup.on('change', $.proxy(this.filterGroup, this));
-  // Trap the ENTER key in the search box so that it doesn't submit the form.
-  this.$searchBox.on('keypress', function (event) {
-    if (event.which == 13) {
-      event.preventDefault();
-    }
-  });
-};
-
-$.extend(Backdrop.viewsUi.OptionsSearch.prototype, {
   /**
-   * Assemble a list of all the filterable options on the form.
+   * Constructor for the viewsUi.OptionsSearch object.
    *
-   * @param $allOptions
-   *   A $ object representing the rows of filterable options to be
-   *   shown and hidden depending on the user's search terms.
+   * The OptionsSearch object filters the available options on a form according
+   * to the user's search term. Typing in "taxonomy" will show only those options
+   * containing "taxonomy" in their label.
    */
-  getOptions: function ($allOptions) {
-    var i, $label, $description, $option;
-    var options = [];
-    var length = $allOptions.length;
-    for (i = 0; i < length; i++) {
-      $option = $($allOptions[i]);
-      $label = $option.find('label');
-      $description = $option.find('div.description');
-      options[i] = {
-        // Search on the lowercase version of the label text + description.
-        'searchText': $label.text().toLowerCase() + " " + $description.text().toLowerCase(),
-        // Maintain a reference to the jQuery object for each row, so we don't
-        // have to create a new object inside the performance-sensitive keyup
-        // handler.
-        '$div': $option
-      };
-    }
-    return options;
-  },
+  Backdrop.viewsUi.OptionsSearch = function ($form) {
+    /**
+     *
+     * @type {jQuery}
+     */
+    this.$form = $form;
 
-  /**
-   * Keyup handler for the search box that hides or shows the relevant options.
-   */
-  handleKeyup: function (event) {
-    var found, i, j, option, search, words, wordsLength, zebraClass, zebraCounter;
+    const searchBoxSelector = '#edit-options-search';
+    const controlGroupSelector = 'select[name="group"]';
+    this.$form.on(
+      'formUpdated',
+      `${searchBoxSelector},${controlGroupSelector}`,
+      $.proxy(this.handleFilter, this),
+    );
 
-    // Determine the user's search query. The search text has been converted to
-    // lowercase.
-    search = this.$searchBox.val().toLowerCase();
-    words = search.split(' ');
-    wordsLength = words.length;
+    this.$searchBox = this.$form.find(searchBoxSelector);
+    this.$controlGroup = this.$form.find(controlGroupSelector);
 
-    // Start the counter for restriping rows.
-    zebraCounter = 0;
+    /**
+     * Get a list of option labels and their corresponding divs and maintain it
+     * in memory, so we have as little overhead as possible at keyup time.
+     */
+    this.options = this.getOptions(this.$form.find('.views-filterable-option'));
 
-    // Search through the search texts in the form for matching text.
-    var length = this.options.length;
-    for (i = 0; i < length; i++) {
-      // Use a local variable for the option being searched, for performance.
-      option = this.options[i];
-      found = true;
-      // Each word in the search string has to match the item in order for the
-      // item to be shown.
-      for (j = 0; j < wordsLength; j++) {
-        if (option.searchText.indexOf(words[j]) === -1) {
-          found = false;
-        }
-      }
-      if (found) {
-        // Show the checkbox row, and restripe it.
-        zebraClass = (zebraCounter % 2) ? 'odd' : 'even';
-        option.$div.show();
-        option.$div.removeClass('even odd');
-        option.$div.addClass(zebraClass);
-        zebraCounter++;
+    // Trap the ENTER key in the search box so that it doesn't submit the form.
+    this.$searchBox.on('keypress', (event) => {
+      if (event.which === 13) {
+        event.preventDefault();
       }
-      else {
-        // The search string wasn't found; hide this item.
-        option.$div.hide();
-      }
-    }
-  },
+    });
+  };
 
-  /**
-   * Filter down the list of all options based on group.
-   */
-  filterGroup: function() {
-    var groupName = this.$filterGroup.val();
-    if (groupName === 'all') {
-      this.$form.find('.views-filterable-group').show();
-    }
-    else {
-      this.$form.find('.views-filterable-group').hide();
-      this.$form.find('.views-filterable-group-' + groupName).show();
-    }
-  }
-});
+  $.extend(
+    Backdrop.viewsUi.OptionsSearch.prototype,
+  /** @lends Backdrop.viewsUi.OptionsSearch# */ {
+      /**
+       * Assemble a list of all the filterable options on the form.
+       *
+       * @param {jQuery} $allOptions
+       *   A jQuery object representing the rows of filterable options to be
+       *   shown and hidden depending on the user's search terms.
+       *
+       * @return {Array}
+       *   An array of all the filterable options.
+       */
+      getOptions($allOptions) {
+        let $title;
+        let $description;
+        let $option;
+        let $group;
+        const options = [];
+        const length = $allOptions.length;
+        for (let i = 0; i < length; i++) {
+          $option = $($allOptions[i]);
+          $title = $option.find('.title');
+          $description = $option.find('.description');
+          $group = $option.find('.group');
+          options[i] = {
+            // Search on the lowercase version of the title text + description.
+            searchText: `${$title[0].textContent.toLowerCase()} ${$description[0].textContent.toLowerCase()} ${$group[0].textContent.toLowerCase()}
+            .toLowerCase()}`,
+            // Maintain a reference to the jQuery object for each row, so we don't
+            // have to create a new object inside the performance-sensitive keyup
+            // handler.
+            $div: $option,
+          };
+        }
+        return options;
+      },
+
+      /**
+       * Filter handler for the search box and type select that hides or shows the
+       * relevant options.
+       *
+       * @param {jQuery.Event} event
+       *   The formUpdated event.
+       */
+      handleFilter(event) {
+        // Determine the user's search query. The search text has been converted
+        // to lowercase.
+        const search = this.$searchBox[0].value.toLowerCase();
+        const words = search.split(' ');
+        // Get selected Group
+        const group = this.$controlGroup[0].value;
+
+        // Search through the search texts in the form for matching text.
+        this.options.forEach((option) => {
+          function hasWord(word) {
+            return option.searchText.indexOf(word) !== -1;
+          }
+
+          let found = true;
+          // Each word in the search string has to match the item in order for
+          // the item to be shown.
+          if (search) {
+            found = words.every(hasWord);
+          }
+          if (found && group !== 'all') {
+            found = option.$div.hasClass(group);
+          }
+
+          option.$div.toggle(found);
+        });
+
+        // Adapt dialog to content size.
+        $(event.target).trigger('dialogContentResize');
+      },
+    },
+  );
 
 Backdrop.behaviors.viewsUiPreview = {
  attach: function (context) {
diff --git a/docroot/core/modules/views_ui/views_ui.admin.inc b/docroot/core/modules/views_ui/views_ui.admin.inc
index 55bf5a9e..9a5aed1c 100644
--- a/docroot/core/modules/views_ui/views_ui.admin.inc
+++ b/docroot/core/modules/views_ui/views_ui.admin.inc
@@ -3769,86 +3769,111 @@ function views_ui_add_item_form($form, &$form_state) {
   // Add the display override dropdown.
   views_ui_standard_display_dropdown($form, $form_state, $section);
 
-  // Figure out all the base tables allowed based upon what the relationships provide.
+  // Figure out base tables allowed based upon what the relationships provide.
   $base_tables = $view->get_base_tables();
-  $options = views_fetch_fields(array_keys($base_tables), $type, $display->handler->use_group_by());
+  $fields = views_fetch_fields(array_keys($base_tables), $type, $display->handler->use_group_by());
 
-  if (!empty($options)) {
-    $form['options']['controls'] = array(
-      '#theme_wrappers' => array('container'),
-      '#id' => 'views-filterable-options-controls',
-      '#attributes' => array('class' => array('container-inline')),
+  $form['options']['controls'] = array(
+    '#theme_wrappers' => array('container'),
+    '#id' => 'views-filterable-options-controls',
+    '#attributes' => array('class' => array('container-inline')),
+  );
+  $form['options']['controls']['options_search'] = array(
+    '#type' => 'textfield',
+    '#title' => t('Search'),
+  );
+
+  $form['options']['controls']['group'] = array(
+    '#type' => 'select',
+    '#title' => t('Filter'),
+    '#options' => array(),
+    '#empty_value' => 'all',
+    '#empty_option' => t('- All -'),
+  );
+
+  $form['options']['name'] = array(
+    '#prefix' => '<div class="views-radio-box form-checkboxes views-filterable-options">',
+    '#suffix' => '</div>',
+    '#tree' => TRUE,
+  );
+
+  // Build the table header.
+  $header = array(
+    'title' => array('data' => t('Title'), 'sort' => 'asc'),
+    'group' => array('data' => t('Category'), 'sort' => 'asc'),
+    'help' => array('data' => t('Description')),
+  );
+  $groups = array();
+  foreach ($fields as $key => $field) {
+    $group = preg_replace('/[^a-z0-9]/', '-', strtolower($field['group']));
+    $groups[$group] = $field['group'];
+    $fields[$key]['#attributes'] = array(
+      'class' => array(
+        'views-filterable-option',
+        $group,
+      ),
     );
-    $form['options']['controls']['options_search'] = array(
-      '#type' => 'textfield',
-      '#title' => t('Search'),
+    $fields[$key]['help'] = array(
+      'data' => $field['help'],
+      'class' => array('description'),
     );
-
-    $groups = array('all' => t('- All -'));
-    $form['options']['controls']['group'] = array(
-      '#type' => 'select',
-      '#title' => t('Filter'),
-      '#options' => array(),
+    // Here we generate what will be the ID of the checkbox for this $key.
+    // This allows us to tie the label to the checkbox for better accessibility.
+    // We can't use backdrop_html_id() because it would generate a unique ID
+    // and we need this to match the ID that is generated separately for the
+    // checkbox.
+    $checkbox_id = backdrop_html_class('edit-name-fields-' . $key);
+    $fields[$key]['title'] = array(
+      'data' => '<label for="' . $checkbox_id . '">' . $field['title'] . '</label>',
+      'class' => array('title'),
     );
-
-    $form['options']['name'] = array(
-      '#prefix' => '<div class="views-radio-box form-checkboxes views-filterable-options">',
-      '#suffix' => '</div>',
-      '#tree' => TRUE,
-      '#default_value' => 'all',
+    $fields[$key]['group'] = array(
+      'data' => $field['group'],
+      'class' => array('group'),
     );
-
-    // Group options first to simplify the DOM objects that Views
-    // dependent JS will act upon.
-    $grouped_options = array();
-    foreach ($options as $key => $option) {
-      $group = preg_replace('/[^a-z0-9]/', '-', strtolower($option['group']));
-      $groups[$group] = $option['group'];
-      $grouped_options[$group][$key] = $option;
-      if (!empty($option['aliases']) && is_array($option['aliases'])) {
-        foreach ($option['aliases'] as $id => $alias) {
-          if (empty($alias['base']) || !empty($base_tables[$alias['base']])) {
-            $copy = $option;
-            $copy['group'] = $alias['group'];
-            $copy['title'] = $alias['title'];
-            if (isset($alias['help'])) {
-              $copy['help'] = $alias['help'];
-            }
-
-            $group = preg_replace('/[^a-z0-9]/', '-', strtolower($copy['group']));
-            $groups[$group] = $copy['group'];
-            $grouped_options[$group][$key . '$' . $id] = $copy;
+    if (!empty($field['aliases']) && is_array($field['aliases'])) {
+      foreach ($field['aliases'] as $id => $alias) {
+        if (empty($alias['base']) || !empty($base_tables[$alias['base']])) {
+          $copy = $field;
+          $groups[$group] = $alias['group'];
+          $copy['group'] = array(
+            'data' => $alias['group'],
+            'class' => array('group'),
+          );
+          $copy['title'] = array(
+            'data' => $alias['title'],
+            'class' => array('title'),
+          );
+          if (isset($alias['help'])) {
+            $copy['help'] = array(
+              'data' => $alias['help'],
+              'class' => array('description'),
+            );
           }
+          $group = preg_replace('/[^a-z0-9]/', '-', strtolower($copy['group']['data']));
+          $fields[$key . '$' . $id] = $copy;
+          $fields[$key . '$' . $id]['#attributes'] = array(
+            'class' => array(
+              'views-filterable-option',
+              $group,
+            ),
+          );
         }
       }
     }
-
-    foreach ($grouped_options as $group => $group_options) {
-      $form['options']['name'][$group . '_start']['#markup'] = '<div class="views-filterable-group views-filterable-group-' . $group . '">';
-      $zebra = 0;
-      foreach ($group_options as $key => $option) {
-        $zebra_class = ($zebra % 2) ? 'odd' : 'even';
-        $form['options']['name'][$key] = array(
-          '#type' => 'checkbox',
-          '#title' => t('!group: !field', array('!group' => check_plain($option['group']), '!field' => check_plain($option['title']))),
-          '#description' => filter_xss_admin($option['help']),
-          '#return_value' => $key,
-          '#prefix' => "<div class='$zebra_class filterable-option'>",
-          '#suffix' => '</div>',
-        );
-        $zebra++;
-      }
-      $form['options']['name'][$group . '_end']['#markup'] = '</div>';
-    }
-
-    $form['options']['controls']['group']['#options'] = $groups;
-  }
-  else {
-    $form['options']['markup'] = array(
-      '#markup' => '<div class="form-item">' . t('There are no @types available to add.', array('@types' =>  $ltitle)) . '</div>',
-    );
   }
-  // Add a div to show the selected items
+  $form['options']['name']['fields'] = array(
+    '#type' => 'tableselect',
+    '#header' => $header,
+    '#options' => $fields,
+    '#empty' => t('There are no @types available to add.', array(
+      '@types' => $ltitle,
+    )),
+    '#js_select' => FALSE,
+  );
+  $form['options']['controls']['group']['#options'] = $groups;
+
+  // Add a div to show the selected items.
   $form['selected'] = array(
     '#type' => 'item',
     '#markup' => '<div class="views-selected-options"></div>',
@@ -3895,9 +3920,9 @@ function views_ui_add_item_form_submit($form, &$form_state) {
     $display->handler->set_override($section);
   }
 
-  if (!empty($form_state['values']['name']) && is_array($form_state['values']['name'])) {
+  if (!empty($form_state['values']['name']['fields']) && is_array($form_state['values']['name']['fields'])) {
     // Loop through each of the items that were checked and add them to the view.
-    foreach (array_keys(array_filter($form_state['values']['name'])) as $field) {
+    foreach (array_keys(array_filter($form_state['values']['name']['fields'])) as $field) {
       list($table, $field) = explode('.', $field, 2);
 
       if ($cut = strpos($field, '$')) {
diff --git a/docroot/core/modules/views_ui/views_ui.info b/docroot/core/modules/views_ui/views_ui.info
index fe4874c9..7e98f9c9 100644
--- a/docroot/core/modules/views_ui/views_ui.info
+++ b/docroot/core/modules/views_ui/views_ui.info
@@ -10,7 +10,7 @@ dependencies[] = views
 
 configure = admin/structure/views
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/profiles/minimal/minimal.info b/docroot/core/profiles/minimal/minimal.info
index 1b697338..f7b406da 100644
--- a/docroot/core/profiles/minimal/minimal.info
+++ b/docroot/core/profiles/minimal/minimal.info
@@ -9,7 +9,7 @@ dependencies[] = node
 dependencies[] = dblog
 dependencies[] = layout
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/profiles/standard/standard.info b/docroot/core/profiles/standard/standard.info
index ec136415..17dbd8b4 100644
--- a/docroot/core/profiles/standard/standard.info
+++ b/docroot/core/profiles/standard/standard.info
@@ -35,7 +35,7 @@ dependencies[] = update
 dependencies[] = views
 dependencies[] = views_ui
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/profiles/testing/modules/backdrop_system_listing_compatible_test/backdrop_system_listing_compatible_test.info b/docroot/core/profiles/testing/modules/backdrop_system_listing_compatible_test/backdrop_system_listing_compatible_test.info
index 1974b5da..1fbca73c 100644
--- a/docroot/core/profiles/testing/modules/backdrop_system_listing_compatible_test/backdrop_system_listing_compatible_test.info
+++ b/docroot/core/profiles/testing/modules/backdrop_system_listing_compatible_test/backdrop_system_listing_compatible_test.info
@@ -6,7 +6,7 @@ version = BACKDROP_VERSION
 backdrop = 1.x
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/profiles/testing/modules/backdrop_system_listing_compatible_test/backdrop_system_listing_compatible_test.tests.info b/docroot/core/profiles/testing/modules/backdrop_system_listing_compatible_test/backdrop_system_listing_compatible_test.tests.info
index 05457620..648d6089 100644
--- a/docroot/core/profiles/testing/modules/backdrop_system_listing_compatible_test/backdrop_system_listing_compatible_test.tests.info
+++ b/docroot/core/profiles/testing/modules/backdrop_system_listing_compatible_test/backdrop_system_listing_compatible_test.tests.info
@@ -4,7 +4,7 @@ description = Verifies that tests in installation profile modules are found and
 group = Installation profiles
 file = backdrop_system_listing_compatible_test.test
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/profiles/testing/modules/backdrop_system_listing_incompatible_test/backdrop_system_listing_incompatible_test.info b/docroot/core/profiles/testing/modules/backdrop_system_listing_incompatible_test/backdrop_system_listing_incompatible_test.info
index 3acdd17e..7ea9cc3d 100644
--- a/docroot/core/profiles/testing/modules/backdrop_system_listing_incompatible_test/backdrop_system_listing_incompatible_test.info
+++ b/docroot/core/profiles/testing/modules/backdrop_system_listing_incompatible_test/backdrop_system_listing_incompatible_test.info
@@ -9,7 +9,7 @@ type = module
 backdrop = 0.x
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/profiles/testing/testing.info b/docroot/core/profiles/testing/testing.info
index fed80efa..cb7e89b0 100644
--- a/docroot/core/profiles/testing/testing.info
+++ b/docroot/core/profiles/testing/testing.info
@@ -7,7 +7,7 @@ hidden = TRUE
 
 dependencies[] = layout
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/themes/bartik/bartik.info b/docroot/core/themes/bartik/bartik.info
index b0068b71..3279311e 100644
--- a/docroot/core/themes/bartik/bartik.info
+++ b/docroot/core/themes/bartik/bartik.info
@@ -16,7 +16,7 @@ ckeditor_stylesheets[] = css/editor.css
 settings[color] = true
 settings[main_menu_tabs] = no-tabs
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/themes/bartik/css/colors.css b/docroot/core/themes/bartik/css/colors.css
index 7e05f4ae..46f0f83b 100644
--- a/docroot/core/themes/bartik/css/colors.css
+++ b/docroot/core/themes/bartik/css/colors.css
@@ -11,7 +11,7 @@ body {
 .l-header {
   color: #fffeff;
   background-color: #000000;
-  background-image: linear-gradient(top, #000000 0%, #000001 100%);
+  background: linear-gradient(to bottom, #000000 0%, #000001 100%);
 }
 .l-header ul.menu > li > a {
   color: #e3e3e3;
diff --git a/docroot/core/themes/basis/basis.info b/docroot/core/themes/basis/basis.info
index 20921d79..17b9bd7b 100644
--- a/docroot/core/themes/basis/basis.info
+++ b/docroot/core/themes/basis/basis.info
@@ -46,7 +46,7 @@ scripts[] = js/script.js
 ; menu. Color module provides our defaults, so we just register a dummy setting.
 settings[color] = true
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/themes/seven/seven.info b/docroot/core/themes/seven/seven.info
index 89cb3bd2..334b17ba 100644
--- a/docroot/core/themes/seven/seven.info
+++ b/docroot/core/themes/seven/seven.info
@@ -12,7 +12,7 @@ ckeditor_stylesheets[] = css/seven.base.css
 
 scripts[] = js/script.js
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/themes/stark/stark.info b/docroot/core/themes/stark/stark.info
index 5d11b0bf..f4e1c7ec 100644
--- a/docroot/core/themes/stark/stark.info
+++ b/docroot/core/themes/stark/stark.info
@@ -8,7 +8,7 @@ stylesheets[all][] = layout.css
 ; Hides this theme from the Appearance page
 hidden = TRUE
 
-; Added by Backdrop CMS packaging script on 2024-05-15
+; Added by Backdrop CMS packaging script on 2024-07-03
 project = backdrop
-version = 1.28.0
-timestamp = 1715827451
+version = 1.28.2
+timestamp = 1720046843
diff --git a/docroot/core/update.php b/docroot/core/update.php
index b9a5543d..c2906584 100644
--- a/docroot/core/update.php
+++ b/docroot/core/update.php
@@ -47,10 +47,10 @@
 define('MAINTENANCE_MODE', 'update');
 
 /**
- * Renders form with a list of available database updates.
+ * Renders form with a list of available site updates.
  */
 function update_selection_page() {
-  backdrop_set_title('Backdrop database update');
+  backdrop_set_title('Backdrop site update');
   $elements = backdrop_get_form('update_script_selection_form');
   $output = backdrop_render($elements);
 
@@ -202,7 +202,7 @@ function update_helpful_links() {
  * Displays results of the update script with any accompanying errors.
  */
 function update_results_page() {
-  backdrop_set_title('Backdrop database update');
+  backdrop_set_title('Backdrop site update');
 
   update_task_list();
   // Report end result.
@@ -283,7 +283,7 @@ function update_results_page() {
 }
 
 /**
- * Provides an overview of the Backdrop database update.
+ * Provides an overview of the Backdrop site update.
  *
  * This page provides cautionary suggestions that should happen before
  * proceeding with the update to ensure data integrity.
@@ -312,9 +312,9 @@ function update_info_page() {
   $config_dir = config_get_config_directory('active');
 
   update_task_list('info');
-  backdrop_set_title('Backdrop database update');
+  backdrop_set_title('Backdrop site update');
   $token = backdrop_get_token('update');
-  $output = '<p>Use this utility to update your database whenever you install a new version of Backdrop CMS or one of the site\'s modules.</p>';
+  $output = '<p>Use this utility to update your site whenever you install a new version of Backdrop CMS or one of the site\'s modules.</p>';
   $output .= '<p>For more detailed information, see the <a href="https://backdropcms.org/upgrade">Upgrading Backdrop CMS</a> page. If you are unsure of what these terms mean, contact your hosting provider.</p>';
   $output .= '<p>Before running updates, the following steps are recommended.</p>';
   $output .= "<ol>\n";
@@ -361,7 +361,7 @@ function update_access_denied_page() {
 
   $steps[] = t('Find the <code>settings.php</code> file on your system, and open it with a text editor.');
   $steps[] = t('There is a line inside your <code>settings.php</code> file that says <code>$settings[\'update_free_access\'] = FALSE</code>. Change it to <code>$settings[\'update_free_access\'] = TRUE</code>.');
-  $steps[] = t('Reload this page. The database update script should be able to run now.');
+  $steps[] = t('Reload this page. The site update script should be able to run now.');
   $steps[] = t('As soon as the update script is done, you must change the <code>update_free_access</code> setting in the <code>settings.php</code> file back to <code>FALSE</code>: <code>$settings[\'update_free_access\'] = FALSE;</code>.');
 
   $output .= theme('item_list', array('items' => $steps, 'type' => 'ol'));
@@ -561,6 +561,10 @@ function update_check_requirements($skip_warnings = FALSE) {
         // update.php correctly by default.
         $batch_url = $base_root . backdrop_current_script_url();
         $redirect_url = $base_root . backdrop_current_script_url(array('op' => 'results'));
+        // Set a state indicating we are upgrading a Drupal 7 site.
+        if (backdrop_get_installed_schema_version('system') > 7000) {
+          state_set('update_d7_upgrade', TRUE);
+        }
         update_batch($_POST['start'], $redirect_url, $batch_url);
         break;
       }
@@ -570,6 +574,8 @@ function update_check_requirements($skip_warnings = FALSE) {
       break;
 
     case 'results':
+      // Remove the state indicating a Drupal 7 upgrade.
+      state_del('update_d7_upgrade');
       $output = update_results_page();
       break;
 
diff --git a/docroot/robots.txt b/docroot/robots.txt
index 271227da..ab957ce7 100644
--- a/docroot/robots.txt
+++ b/docroot/robots.txt
@@ -18,6 +18,39 @@
 
 User-agent: *
 Crawl-delay: 10
+# CSS, JS, Images
+Allow: /core/misc/*.css$
+Allow: /core/misc/*.css?
+Allow: /core/misc/*.js$
+Allow: /core/misc/*.js?
+Allow: /core/misc/*.gif
+Allow: /core/misc/*.jpg
+Allow: /core/misc/*.jpeg
+Allow: /core/misc/*.png
+Allow: /core/modules/*.css$
+Allow: /core/modules/*.css?
+Allow: /core/modules/*.js$
+Allow: /core/modules/*.js?
+Allow: /core/modules/*.gif
+Allow: /core/modules/*.jpg
+Allow: /core/modules/*.jpeg
+Allow: /core/modules/*.png
+Allow: /core/profiles/*.css$
+Allow: /core/profiles/*.css?
+Allow: /core/profiles/*.js$
+Allow: /core/profiles/*.js?
+Allow: /core/profiles/*.gif
+Allow: /core/profiles/*.jpg
+Allow: /core/profiles/*.jpeg
+Allow: /core/profiles/*.png
+Allow: /core/themes/*.css$
+Allow: /core/themes/*.css?
+Allow: /core/themes/*.js$
+Allow: /core/themes/*.js?
+Allow: /core/themes/*.gif
+Allow: /core/themes/*.jpg
+Allow: /core/themes/*.jpeg
+Allow: /core/themes/*.png
 # Directories
 Disallow: /core/
 Disallow: /profiles/