diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index efb59b68659c7..4df560490fdea 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -32,11 +32,15 @@ before it will be accepted, we ask that you follow these simple guidelines:
 Please be patient as not all items will be viewed or tested immediately (remember, all bug testing for the Joomla! CMS is done by volunteers) and be receptive to feedback about your code.
 
 #### Branches
-Bug fixing PRs should be made to the `5.4-dev` branch. Merged bugfixes will be upmerged into the current branches. New features that do not break backwards compatibility should be made to the `6.3-dev`.
+
+Joomla 5.4 is in security maintenance mode until 12th October 2027, which means it will only receive security fixes.
+Bug fixing PRs should be made to the `6.2-dev` branch. Merged bugfixes will be upmerged into the current branches.
+New features that do not break backwards compatibility should be made to the `6.3-dev` branch, otherwise they should
+be made to the `7.0-dev` branch.
 
 | Branch  | Purpose                                                                                                      |
 |---------|--------------------------------------------------------------------------------------------------------------|
-| 5.4-dev | Branch for the current 5.x Joomla version.                                                                   |
-| 6.2-dev | Branch for the current 6.x Joomla version. Bugfixes only for 6.2 go into this branch.                        |
+| 5.4-dev | Branch for the current 5.x Joomla version. Currently in security maintenance mode.                           |
+| 6.2-dev | Branch for the current 6.x Joomla version. Bugfixes go into this branch.                                     |
 | 6.3-dev | Branch for the next minor 6.x Joomla version. New features have to go into this branch.                      |
 | 7.0-dev | Branch for the next major Joomla version. New features that include a b/c break have to go into this branch. |
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 50194981e0087..b1c93d8851028 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -84,13 +84,17 @@ jobs:
       - name: Check PHP code style
         run: |
           set -e
+          if [ "$GITHUB_REPOSITORY" = "joomla/joomla-cms" ]; then
+            ./libraries/vendor/bin/php-cs-fixer check -vvv --diff
+            exit 0
+          fi
           ./libraries/vendor/bin/php-cs-fixer fix -vvv --diff
           git config --global --add safe.directory "$GITHUB_WORKSPACE"
-          if [ "$GITHUB_EVENT_NAME" = "push" ] && [ "$GITHUB_REPOSITORY" != "joomla/joomla-cms" ] && ! git diff --quiet; then
+          if [ "$GITHUB_EVENT_NAME" = "push" ] && ! git diff --quiet; then
             git config user.name  "github-actions[bot]"
             git config user.email "github-actions[bot]@users.noreply.github.com"
             git add --all
-            git commit -m "Fix code style issues [skip ci]"
+            git commit -m "Fix code style issues"
             git push origin "HEAD:${{ github.head_ref || github.ref_name }}"
           fi
 
@@ -145,7 +149,7 @@ jobs:
             git config user.name  "github-actions[bot]"
             git config user.email "github-actions[bot]@users.noreply.github.com"
             git add phpstan-baseline.neon
-            git commit -m "Updated PHPStan baseline [skip ci]"
+            git commit -m "Updated PHPStan baseline"
             git push origin "HEAD:${{ github.head_ref || github.ref_name }}"
           fi
 
diff --git a/README.md b/README.md
index bb92cf646f909..165da1ebf2f0f 100644
--- a/README.md
+++ b/README.md
@@ -81,12 +81,12 @@ and it will be regenerated on the next call to Joomla.
 
 Using a simple classification keeps the project **stable**, **transparent**, and **easy** for everyone to contribute.
 
-| Type of change | What it means | Target branch                                                                     |
-|---|---|-----------------------------------------------------------------------------------|
-| **Bug / Patch release** | The change fixes an actual error. The software crashes, produces the wrong result, or behaves contrary to its specification. It can be resolved without large‑scale refactoring or new functionality. | **[5.4-dev](https://github.com/joomla/joomla-cms/tree/5.4-dev)** (6.2-dev) **\*** |
-| **Feature / Minor release** | Anything that isn’t a strict bug – new behavior, refactoring, performance improvements, enhancements, UI tweaks, etc. These changes are bundled together for the next minor version. | **[6.3-dev](https://github.com/joomla/joomla-cms/tree/6.3-dev)**                  |
+| Type of change | What it means | Target branch                                                                                                                       |
+|---|---|-------------------------------------------------------------------------------------------------------------------------------------|
+| **Bug / Patch release** | The change fixes an actual error. The software crashes, produces the wrong result, or behaves contrary to its specification. It can be resolved without large‑scale refactoring or new functionality. | **[6.2-dev](https://github.com/joomla/joomla-cms/tree/6.2-dev)** **\*** |
+| **Feature / Minor release** | Anything that isn’t a strict bug – new behavior, refactoring, performance improvements, enhancements, UI tweaks, etc. These changes are bundled together for the next minor version. | **[6.3-dev](https://github.com/joomla/joomla-cms/tree/6.3-dev)**                                                                    |
 
-**\*** All bugs that already exist in version 5.4.x or 6.2.x should be fixed in `5.4-dev` or `6.2-dev`. Only bugs that are introduced for the first time in version 6.3.x should target the [`6.3-dev`](https://github.com/joomla/joomla-cms/tree/6.3-dev) branch.
+**\*** All bugs that already exist in version 5.4.x or 6.1.x or 6.2.x should be fixed in `6.2-dev`.
 
 A member of the maintainer or bug squad team confirms the classification and sets the appropriate labels when a PR is opened. If a PR is opened in the wrong branch, a maintainer will simply ask you to retarget it to the proper branch.
 
diff --git a/administrator/components/com_config/src/Model/ApplicationModel.php b/administrator/components/com_config/src/Model/ApplicationModel.php
index 2a66c4c80212a..2dd938f3eed28 100644
--- a/administrator/components/com_config/src/Model/ApplicationModel.php
+++ b/administrator/components/com_config/src/Model/ApplicationModel.php
@@ -343,8 +343,8 @@ public function save($data)
             return false;
         }
 
-        // Check if we can set the Force SSL option
-        if ((int) $data['force_ssl'] !== 0 && (int) $data['force_ssl'] !== (int) $app->get('force_ssl', '0')) {
+        // Check if we can set the Force SSL option unless we are in CLI mode, in which case we skip this check
+        if (!$app->isClient('cli') && (int) $data['force_ssl'] !== 0 && (int) $data['force_ssl'] !== (int) $app->get('force_ssl', '0')) {
             try {
                 // Make an HTTPS request to check if the site is available in HTTPS.
                 $host    = Uri::getInstance()->getHost();
diff --git a/administrator/components/com_fields/forms/filter_fields.xml b/administrator/components/com_fields/forms/filter_fields.xml
index 3a349dbe84514..3d601cd01453c 100644
--- a/administrator/components/com_fields/forms/filter_fields.xml
+++ b/administrator/components/com_fields/forms/filter_fields.xml
@@ -4,6 +4,7 @@
 		<field
 			name="context"
 			type="fieldcontexts"
+			label="COM_FIELDS_CHOOSE_CONTEXT_LABEL"
 			filtermode="selector"
 			class="js-select-submit-on-change"
 		/>
diff --git a/administrator/components/com_fields/forms/filter_groups.xml b/administrator/components/com_fields/forms/filter_groups.xml
index 4491214aa1e5b..3bf726fa414ce 100644
--- a/administrator/components/com_fields/forms/filter_groups.xml
+++ b/administrator/components/com_fields/forms/filter_groups.xml
@@ -4,6 +4,7 @@
 		<field
 			name="context"
 			type="fieldcontexts"
+			label="COM_FIELDS_CHOOSE_CONTEXT_LABEL"
 			filtermode="selector"
 			class="js-select-submit-on-change"
 		/>
diff --git a/administrator/components/com_fields/src/Model/FieldModel.php b/administrator/components/com_fields/src/Model/FieldModel.php
index 18e2d8b5aefb3..376abe272296c 100644
--- a/administrator/components/com_fields/src/Model/FieldModel.php
+++ b/administrator/components/com_fields/src/Model/FieldModel.php
@@ -997,9 +997,11 @@ protected function loadFormData()
     public function validate($form, $data, $group = null)
     {
         // Check if the values are unique. This should only apply for list, checkboxes and radio custom field types
-        if (\in_array($data['type'], ['list', 'checkboxes', 'radio'])
+        if (
+            \in_array($data['type'], ['list', 'checkboxes', 'radio'])
             && !empty($data['fieldparams']['options'])
-            && \is_array($data['fieldparams']['options'])) {
+            && \is_array($data['fieldparams']['options'])
+        ) {
             $tmpValues = [];
             foreach ($data['fieldparams']['options'] as $option) {
                 $tmpValues[] = $option['value'];
diff --git a/administrator/components/com_guidedtours/src/Controller/AjaxController.php b/administrator/components/com_guidedtours/src/Controller/AjaxController.php
index cdf73f68fdfdf..7e3706abb9f49 100644
--- a/administrator/components/com_guidedtours/src/Controller/AjaxController.php
+++ b/administrator/components/com_guidedtours/src/Controller/AjaxController.php
@@ -15,6 +15,7 @@
 use Joomla\CMS\MVC\Controller\BaseController;
 use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\Response\JsonResponse;
+use Joomla\CMS\Session\Session;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -35,6 +36,12 @@ class AjaxController extends BaseController
      */
     public function fetchUserState()
     {
+        // The request changes persisted user state, so it must carry a valid token.
+        if (!Session::checkToken('get')) {
+            echo new JsonResponse(null, Text::_('JINVALID_TOKEN'), true);
+            $this->app->close();
+        }
+
         $user = $this->app->getIdentity();
 
         $tourId     = $this->app->getInput()->getInt('tid', 0);
diff --git a/administrator/components/com_installer/tmpl/update/default.php b/administrator/components/com_installer/tmpl/update/default.php
index e493e91f3b0da..7b17f3cdf8c81 100644
--- a/administrator/components/com_installer/tmpl/update/default.php
+++ b/administrator/components/com_installer/tmpl/update/default.php
@@ -105,11 +105,11 @@
                                             <?php $url = 'index.php?option=com_installer&task=updatesite.edit&update_site_id=' . (int) $item->update_site_id; ?>
                                             <a class="btn btn-danger btn-sm text-decoration-none" href="<?php echo Route::_($url); ?>"><?php echo Text::_('COM_INSTALLER_DOWNLOADKEY_MISSING_LABEL'); ?></a>
                                         <?php endif; ?>
-										<?php if (!empty($item->security)) : ?>
+                                        <?php if (!empty($item->security)) : ?>
                                         <div class="btn btn-<?php echo $item->security > 2 ? 'danger' : 'warning'; ?> btn-sm text-decoration-none">
                                             <?php echo Text::_('COM_INSTALLER_SECURITY_SEVERITY_' . (int) $item->security); ?>
-										</div>
-										<?php endif; ?>
+                                        </div>
+                                        <?php endif; ?>
                                     </th>
                                     <td class="d-none d-md-table-cell">
                                         <?php echo $item->client_translated; ?>
diff --git a/administrator/components/com_joomlaupdate/src/Model/UpdateModel.php b/administrator/components/com_joomlaupdate/src/Model/UpdateModel.php
index 742ebfcbb0f4a..cd532fae82da9 100644
--- a/administrator/components/com_joomlaupdate/src/Model/UpdateModel.php
+++ b/administrator/components/com_joomlaupdate/src/Model/UpdateModel.php
@@ -511,12 +511,20 @@ public function getAutoUpdateVersion(): ?string
      */
     public function getAutoUpdateRequirementsState(): bool
     {
+        // Check basic requirements of the *current* system
         foreach ($this->getPhpOptions() as $option) {
             if ($option->state !== true) {
                 return false;
             }
         }
 
+        // Fetch update and check constraints - if the "otherinfo" is set, we have a constraint issue
+        $updateInfo = $this->getUpdateInformation();
+
+        if (!empty($updateInfo['object']) && !empty((array) $updateInfo['object']->get('otherUpdateInfo'))) {
+            return false;
+        }
+
         return true;
     }
 
diff --git a/administrator/components/com_menus/src/Model/ItemModel.php b/administrator/components/com_menus/src/Model/ItemModel.php
index 418ed43c5125b..0e698469872c9 100644
--- a/administrator/components/com_menus/src/Model/ItemModel.php
+++ b/administrator/components/com_menus/src/Model/ItemModel.php
@@ -235,6 +235,15 @@ protected function batchCopy($value, $pks, $contexts)
                 continue;
             }
 
+            // Check that the user is allowed to access the item
+            $itemMenuTypeId = (int) $this->getMenuTypeId($table->menutype);
+
+            if ($table->menutype === 'main' || !$user->authorise('core.edit', 'com_menus.menu.' . $itemMenuTypeId)) {
+                $this->setError(Text::_('JLIB_APPLICATION_ERROR_BATCH_CANNOT_EDIT'));
+
+                return false;
+            }
+
             // Copy is a bit tricky, because we also need to copy the children
             $query = $db->createQuery()
                 ->select($db->quoteName('id'))
diff --git a/administrator/components/com_scheduler/tmpl/logs/default.php b/administrator/components/com_scheduler/tmpl/logs/default.php
index 8872b6ce28196..4b8ab2e5383a4 100644
--- a/administrator/components/com_scheduler/tmpl/logs/default.php
+++ b/administrator/components/com_scheduler/tmpl/logs/default.php
@@ -34,7 +34,7 @@
                 <?php echo LayoutHelper::render('joomla.searchtools.default', ['view' => $this]); ?>
                 <?php if (empty($this->items)) : ?>
                     <div class="alert alert-info">
-                        <span class="icon-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
+                        <span class="icon-info-circle" aria-hidden="true"></span><span class="visually-hidden"><?php echo Text::_('INFO'); ?></span>
                         <?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
                     </div>
                 <?php else : ?>
diff --git a/administrator/components/com_templates/tmpl/template/default.php b/administrator/components/com_templates/tmpl/template/default.php
index 881f5cc9c2d93..adb5ee1acf6cb 100644
--- a/administrator/components/com_templates/tmpl/template/default.php
+++ b/administrator/components/com_templates/tmpl/template/default.php
@@ -184,10 +184,10 @@
                                 <?php foreach ($this->archive as $file) : ?>
                                     <li>
                                         <?php if (substr($file, -1) === DIRECTORY_SEPARATOR) : ?>
-                                            <span class="icon-folder icon-fw" aria-hidden="true"></span>&nbsp;<?php echo $file; ?>
+                                            <span class="icon-folder icon-fw" aria-hidden="true"></span>&nbsp;<?php echo $this->escape($file); ?>
                                         <?php endif; ?>
                                         <?php if (substr($file, -1) != DIRECTORY_SEPARATOR) : ?>
-                                            <span class="icon-file icon-fw" aria-hidden="true"></span>&nbsp;<?php echo $file; ?>
+                                            <span class="icon-file icon-fw" aria-hidden="true"></span>&nbsp;<?php echo $this->escape($file); ?>
                                         <?php endif; ?>
                                     </li>
                                 <?php endforeach; ?>
diff --git a/administrator/components/com_users/forms/user.xml b/administrator/components/com_users/forms/user.xml
index 199662a2c8207..248beb05ffbe9 100644
--- a/administrator/components/com_users/forms/user.xml
+++ b/administrator/components/com_users/forms/user.xml
@@ -259,6 +259,18 @@
 				<option value="0">JNO</option>
 				<option value="fontsize">JYES</option>
 			</field>
+			<field
+				name="a11y_shortcut_timeout"
+				type="list"
+				label="COM_USERS_A11Y_SETTINGS_FIELD_SHORTCUT_TIMEOUT"
+				description="COM_USERS_A11Y_SETTINGS_FIELD_SHORTCUT_TIMEOUT_DESC"
+				>
+				<option value="">JOPTION_USE_DEFAULT</option>
+				<option value="2000">COM_USERS_A11Y_SETTINGS_SHORTCUT_TIMEOUT_2000</option>
+				<option value="3000">COM_USERS_A11Y_SETTINGS_SHORTCUT_TIMEOUT_3000</option>
+				<option value="5000">COM_USERS_A11Y_SETTINGS_SHORTCUT_TIMEOUT_5000</option>
+				<option value="10000">COM_USERS_A11Y_SETTINGS_SHORTCUT_TIMEOUT_10000</option>
+			</field>
 		</fieldset>
 
 	</fields>
diff --git a/administrator/components/com_users/src/View/Group/HtmlView.php b/administrator/components/com_users/src/View/Group/HtmlView.php
index 8f4554368b8d6..5745978bac76d 100644
--- a/administrator/components/com_users/src/View/Group/HtmlView.php
+++ b/administrator/components/com_users/src/View/Group/HtmlView.php
@@ -85,7 +85,7 @@ public function display($tpl = null)
 
         // Add form control fields
         $this->form
-            ->addControlField('task');
+            ->addControlField('task', 'group.save');
 
         $this->addToolbar();
         parent::display($tpl);
diff --git a/administrator/components/com_users/src/View/Level/HtmlView.php b/administrator/components/com_users/src/View/Level/HtmlView.php
index b0821a7334bad..fa4650fdacf8c 100644
--- a/administrator/components/com_users/src/View/Level/HtmlView.php
+++ b/administrator/components/com_users/src/View/Level/HtmlView.php
@@ -76,7 +76,7 @@ public function display($tpl = null)
 
         // Add form control fields
         $this->form
-            ->addControlField('task');
+            ->addControlField('task', 'level.save');
 
         $this->addToolbar();
         parent::display($tpl);
diff --git a/administrator/components/com_users/tmpl/captive/select.php b/administrator/components/com_users/tmpl/captive/select.php
index a062464d23ccb..432ac059d3a8a 100644
--- a/administrator/components/com_users/tmpl/captive/select.php
+++ b/administrator/components/com_users/tmpl/captive/select.php
@@ -51,7 +51,7 @@
                href="<?php echo Route::_('index.php?option=com_users&view=captive&record_id=' . $record->id)?>">
                 <div class="com-users-methods-list-method-image">
                 <img src="<?php echo Uri::root() . $this->getModel()->getMethodImage($record->method) ?>"
-                     alt="<?php echo $this->escape(strip_tags($record->title)) ?>"
+                     alt=""
                      class="img-fluid" />
                 </div>
                 <?php if (!$this->allowEntryBatching || !$allowEntryBatching) : ?>
@@ -62,16 +62,10 @@ class="img-fluid" />
                         <?php echo $this->escape($record->title) ?>
                     <?php endif; ?>
                 </span>
-                    <small class="com-users-method-name text-muted">
-                        <?php echo $methodName ?>
-                    </small>
                 <?php else : ?>
                     <span class="com-users-method-title flex-grow-1 fs-5 fw-bold">
                     <?php echo $methodName ?>
                 </span>
-                    <small class="com-users-method-name text-muted">
-                        <?php echo $methodName ?>
-                    </small>
                 <?php endif; ?>
             </a>
         <?php endforeach; ?>
diff --git a/administrator/language/en-GB/com_users.ini b/administrator/language/en-GB/com_users.ini
index 1cd983eb0de7f..e8f1df9203641 100644
--- a/administrator/language/en-GB/com_users.ini
+++ b/administrator/language/en-GB/com_users.ini
@@ -10,6 +10,12 @@ COM_USERS_A11Y_SETTINGS_FIELD_CONTRAST="High Contrast"
 COM_USERS_A11Y_SETTINGS_FIELD_FONTSIZE="Increase Font Size"
 COM_USERS_A11Y_SETTINGS_FIELD_HIGHLIGHT="Highlight Links"
 COM_USERS_A11Y_SETTINGS_FIELD_MONOCHROME="Monochrome"
+COM_USERS_A11Y_SETTINGS_FIELD_SHORTCUT_TIMEOUT="Keyboard Shortcut Timeout"
+COM_USERS_A11Y_SETTINGS_FIELD_SHORTCUT_TIMEOUT_DESC="Customise the maximum time between key presses to activate Joomla-specific keyboard shortcuts."
+COM_USERS_A11Y_SETTINGS_SHORTCUT_TIMEOUT_2000="2 seconds"
+COM_USERS_A11Y_SETTINGS_SHORTCUT_TIMEOUT_3000="3 seconds"
+COM_USERS_A11Y_SETTINGS_SHORTCUT_TIMEOUT_5000="5 seconds"
+COM_USERS_A11Y_SETTINGS_SHORTCUT_TIMEOUT_10000="10 seconds"
 COM_USERS_ACTIVATED="Activated"
 COM_USERS_ADD_NOTE="Add Note"
 COM_USERS_ASSIGNED_GROUPS="Assigned User Groups"
diff --git a/administrator/language/en-GB/guidedtours.joomla_whatsnew_6_2_steps.ini b/administrator/language/en-GB/guidedtours.joomla_whatsnew_6_2_steps.ini
index 12daf14d27a49..0e211ea95441d 100644
--- a/administrator/language/en-GB/guidedtours.joomla_whatsnew_6_2_steps.ini
+++ b/administrator/language/en-GB/guidedtours.joomla_whatsnew_6_2_steps.ini
@@ -1,2 +1,2 @@
-COM_GUIDEDTOURS_TOUR_WHATSNEW_6_2_STEP_0_DESCRIPTION="<h3>Joomla 6.2 Full Release Notes</h3><p><a title=\"Full release notes\" href=\"https://www.joomla.org/announcements.html\" target=\"_blank\" rel=\"noopener noreferrer\">View the full release notes on joomla.org</a></p><hr><h3>Help and Information</h3><p class=\"mb-3\">Many resources to help you can be found here together with additional links to more resources, documentation, support and how to become involved in Joomla.</p><p><img class=\"img-fluid d-block mx-auto\" src=\"media/com_guidedtours/images/6_2/help_index.jpg\" alt=\"New help index\" width=\"450\" height=\"275\"></p>"
+COM_GUIDEDTOURS_TOUR_WHATSNEW_6_2_STEP_0_DESCRIPTION="<h3>Joomla 6.2 Full Release Notes</h3><p><a title=\"Full release notes\" href=\"https://www.joomla.org/announcements/release-news/joomla-6-2-is-here.html\" target=\"_blank\" rel=\"noopener noreferrer\">View the full release notes on joomla.org</a></p><hr><h3>Help and Information</h3><p class=\"mb-3\">Many resources to help you can be found here together with additional links to more resources, documentation, support and how to become involved in Joomla.</p><p><img class=\"img-fluid d-block mx-auto\" src=\"media/com_guidedtours/images/6_2/help_index.jpg\" alt=\"New help index\" width=\"450\" height=\"275\"></p>"
 COM_GUIDEDTOURS_TOUR_WHATSNEW_6_2_STEP_0_TITLE="More Information and Help"
diff --git a/administrator/language/en-GB/plg_installer_packageinstaller.ini b/administrator/language/en-GB/plg_installer_packageinstaller.ini
index b8c5d50b47f3d..6f713fd1099d5 100644
--- a/administrator/language/en-GB/plg_installer_packageinstaller.ini
+++ b/administrator/language/en-GB/plg_installer_packageinstaller.ini
@@ -8,7 +8,7 @@ PLG_INSTALLER_PACKAGEINSTALLER_EXTENSION_PACKAGE_FILE="Extension package file"
 PLG_INSTALLER_PACKAGEINSTALLER_INSTALLING="Installing &hellip;"
 PLG_INSTALLER_PACKAGEINSTALLER_NO_PACKAGE="Please select a package to upload."
 PLG_INSTALLER_PACKAGEINSTALLER_PLUGIN_XML_DESCRIPTION="This plugin allows you to install extensions from your local computer."
-PLG_INSTALLER_PACKAGEINSTALLER_SELECT_FILE="Or browse for file"
+PLG_INSTALLER_PACKAGEINSTALLER_SELECT_FILE="Browse for file"
 PLG_INSTALLER_PACKAGEINSTALLER_UPLOAD_AND_INSTALL="Upload & Install"
 PLG_INSTALLER_PACKAGEINSTALLER_UPLOAD_ERROR_EMPTY="Error: Server returns empty response."
 PLG_INSTALLER_PACKAGEINSTALLER_UPLOAD_ERROR_UNKNOWN="Error: Unknown error or invalid JSON output."
diff --git a/administrator/language/en-GB/plg_multifactorauth_totp.ini b/administrator/language/en-GB/plg_multifactorauth_totp.ini
index 7de7c1c7aaf26..9bf8d7bd04b50 100644
--- a/administrator/language/en-GB/plg_multifactorauth_totp.ini
+++ b/administrator/language/en-GB/plg_multifactorauth_totp.ini
@@ -9,6 +9,7 @@ PLG_MULTIFACTORAUTH_TOTP_ERR_VALIDATIONFAILED="You did not enter a valid verific
 PLG_MULTIFACTORAUTH_TOTP_LBL_LABEL="Enter the six digit verification code"
 PLG_MULTIFACTORAUTH_TOTP_LBL_SETUP_INSTRUCTIONS="Set up your verification code (also known as an \"authenticator code\") using the information below. You can use an authenticator app (such Google Authenticator, Authy, LastPass Authenticator, etc), your favourite password manager (1Password, BitWarden, Keeper, KeePassXC, Strongbox, etc) or, in some cases, your browser."
 PLG_MULTIFACTORAUTH_TOTP_LBL_SETUP_PLACEHOLDER="Six Digit Code"
+PLG_MULTIFACTORAUTH_TOTP_LBL_SETUP_QR_ALT="QR code for setting up your authenticator app."
 PLG_MULTIFACTORAUTH_TOTP_LBL_SETUP_TABLE_HEADING="Authenticator app setup"
 PLG_MULTIFACTORAUTH_TOTP_LBL_SETUP_TABLE_KEY="Enter this key"
 PLG_MULTIFACTORAUTH_TOTP_LBL_SETUP_TABLE_LINK="Click this link"
diff --git a/administrator/modules/mod_menu/src/Menu/CssMenu.php b/administrator/modules/mod_menu/src/Menu/CssMenu.php
index 0b6fa25f280a6..6f14d631eefb4 100644
--- a/administrator/modules/mod_menu/src/Menu/CssMenu.php
+++ b/administrator/modules/mod_menu/src/Menu/CssMenu.php
@@ -281,7 +281,7 @@ protected function preprocess($parent)
         $language   = $this->application->getLanguage();
         $dispatcher = $this->application->getDispatcher();
 
-        $noSeparator = true;
+        $noSeparator = false;
         $children    = $parent->getChildren();
 
         /**
diff --git a/administrator/templates/atum/index.php b/administrator/templates/atum/index.php
index e7db74e97d40b..d3f96f135ae72 100644
--- a/administrator/templates/atum/index.php
+++ b/administrator/templates/atum/index.php
@@ -123,20 +123,27 @@ function adjustColorLightness($r, $g, $b, $percent)
     }
 }
 
+$a11yClasses = array_filter([
+    $a11y_font                  ? 'a11y_font'      : null,
+    ($a11y_mono || $monochrome) ? 'monochrome'     : null,
+    $a11y_contrast              ? 'a11y_contrast'  : null,
+    $a11y_highlight             ? 'a11y_highlight' : null,
+]);
+
 Text::script('TPL_ATUM_MORE_ELEMENTS');
 
 // @see administrator/templates/atum/html/layouts/status.php
 $statusModules = LayoutHelper::render('status', ['modules' => 'status']);
 ?>
 <!DOCTYPE html>
-<html lang="<?php echo $this->language; ?>" dir="<?php echo $this->direction; ?>"<?php echo $a11y_font ? ' class="a11y_font"' : ''; ?><?php echo $themeModeAttr; ?>>
+<html lang="<?php echo $this->language; ?>" dir="<?php echo $this->direction; ?>"<?php echo $a11yClasses ? ' class="' . implode(' ', $a11yClasses) . '"' : ''; ?><?php echo $themeModeAttr; ?>>
 <head>
     <jdoc:include type="metas" />
     <jdoc:include type="styles" />
     <jdoc:include type="scripts" />
 </head>
 
-<body class="admin <?php echo $option . ' view-' . $view . ' layout-' . $layout . ($task ? ' task-' . $task : '') . ($monochrome || $a11y_mono ? ' monochrome' : '') . ($a11y_contrast ? ' a11y_contrast' : '') . ($a11y_highlight ? ' a11y_highlight' : ''); ?>">
+<body class="admin <?php echo $option . ' view-' . $view . ' layout-' . $layout . ($task ? ' task-' . $task : ''); ?>">
 <noscript>
     <div class="alert alert-danger" role="alert">
         <?php echo Text::_('JGLOBAL_WARNJAVASCRIPT'); ?>
diff --git a/build/build-modules-js/utils/compressFile.mjs b/build/build-modules-js/utils/compressFile.mjs
index fe033f861f54f..629fa228b9f30 100644
--- a/build/build-modules-js/utils/compressFile.mjs
+++ b/build/build-modules-js/utils/compressFile.mjs
@@ -32,7 +32,7 @@ export const compressFileAndSave = async (file, enableBrotli = false) => {
     });
     const brotliRun = !enableBrotli
       ? Promise.resolve()
-      : brotliEncode(content).then(() => {
+      : brotliEncode(content).then((data) => {
           return writeFile(`${file}.br`, data);
         });
 
diff --git a/build/github_update_title.php b/build/github_update_title.php
index de220ab77837a..02bbfb630007e 100644
--- a/build/github_update_title.php
+++ b/build/github_update_title.php
@@ -160,16 +160,24 @@
         $title = substr($title, strpos($title, ']') + 1);
     }
 
-    $newTitle = '[' . $branch . '] ' . trim($title);
+    $title = trim($title);
+
+    if (!str_starts_with($title, '[')) {
+        $title = ' ' . $title;
+    }
+
+    $newTitle = '[' . $branch . ']' . $title;
 
     if ($newTitle === $pr['title']) {
         continue;
     }
 
+    $newTitleEscaped = escapeShellArg($newTitle);
+
     echo 'OLD: ' . trim($pr['title']) ."\n";
     echo 'NEW: ' . $newTitle ."\n";
 
-    $cmd    = $gh . ' pr edit ' . $pr['url'] . ' --title "' . str_replace('"', '\"', $newTitle) . '"';
+    $cmd    = $gh . ' pr edit ' . $pr['url'] . ' --title ' . $newTitleEscaped;
     $output = [];
     if (!$tryRun) {
         exec($cmd, $output, $result);
diff --git a/components/com_contact/tmpl/contact/default_profile.php b/components/com_contact/tmpl/contact/default_profile.php
index a592bee3d0a6e..2cb1d5fcf6d45 100644
--- a/components/com_contact/tmpl/contact/default_profile.php
+++ b/components/com_contact/tmpl/contact/default_profile.php
@@ -24,25 +24,25 @@
             <?php foreach ($fields as $profile) :
                 if ($profile->value) :
                     echo '<dt>' . $profile->label . '</dt>';
-                    $profile->text = htmlspecialchars($profile->value, ENT_COMPAT, 'UTF-8');
+                    $profileText = htmlspecialchars($profile->value, ENT_COMPAT, 'UTF-8');
 
                     switch ($profile->id) :
                         case 'profile_website':
                             $v_http = substr($profile->value, 0, 4);
 
                             if ($v_http === 'http') :
-                                echo '<dd><a href="' . $profile->text . '">' . $this->escape(PunycodeHelper::urlToUTF8($profile->text)) . '</a></dd>';
+                                echo '<dd><a href="' . $profileText . '">' . $this->escape(PunycodeHelper::urlToUTF8($profileText)) . '</a></dd>';
                             else :
-                                echo '<dd><a href="http://' . $profile->text . '">' . $this->escape(PunycodeHelper::urlToUTF8($profile->text)) . '</a></dd>';
+                                echo '<dd><a href="http://' . $profileText . '">' . $this->escape(PunycodeHelper::urlToUTF8($profileText)) . '</a></dd>';
                             endif;
                             break;
 
                         case 'profile_dob':
-                            echo '<dd>' . HTMLHelper::_('date', $profile->text, Text::_('DATE_FORMAT_LC4'), false) . '</dd>';
+                            echo '<dd>' . HTMLHelper::_('date', $profileText, Text::_('DATE_FORMAT_LC4'), false) . '</dd>';
                             break;
 
                         default:
-                            echo '<dd>' . $profile->text . '</dd>';
+                            echo '<dd>' . $profileText . '</dd>';
                             break;
                     endswitch;
                 endif;
diff --git a/components/com_users/tmpl/captive/select.php b/components/com_users/tmpl/captive/select.php
index a0d247e87acd0..15a0d08efc442 100644
--- a/components/com_users/tmpl/captive/select.php
+++ b/components/com_users/tmpl/captive/select.php
@@ -50,7 +50,7 @@
         <a class="com-users-method p-2 border-top border-dark bg-light d-flex flex-row flex-wrap justify-content-start align-items-center text-decoration-none gap-2 text-body"
            href="<?php echo Route::_('index.php?option=com_users&view=captive&record_id=' . $record->id)?>">
             <img src="<?php echo Uri::root() . $this->getModel()->getMethodImage($record->method) ?>"
-                 alt="<?php echo $this->escape(strip_tags($record->title)) ?>"
+                 alt=""
                  class="com-users-method-image img-fluid" />
             <?php if (!$this->allowEntryBatching || !$allowEntryBatching) : ?>
                 <span class="com-users-method-title flex-grow-1 fs-5 fw-bold">
@@ -60,16 +60,10 @@ class="com-users-method-image img-fluid" />
                         <?php echo $this->escape($record->title) ?>
                     <?php endif; ?>
                 </span>
-                <small class="com-users-method-name text-muted">
-                    <?php echo $methodName ?>
-                </small>
             <?php else : ?>
                 <span class="com-users-method-title flex-grow-1 fs-5 fw-bold">
                     <?php echo $methodName ?>
                 </span>
-                <small class="com-users-method-name text-muted">
-                    <?php echo $methodName ?>
-                </small>
             <?php endif; ?>
         </a>
         <?php endforeach; ?>
diff --git a/composer.json b/composer.json
index ab1e19b006e45..be67aa494507e 100644
--- a/composer.json
+++ b/composer.json
@@ -89,7 +89,7 @@
     "symfony/options-resolver": "^7",
     "symfony/polyfill-mbstring": "^1.33.0",
     "symfony/web-link": "^6.4.32",
-    "symfony/yaml": "^6.4.34",
+    "symfony/yaml": "^6.4.48",
     "wamania/php-stemmer": "^4.0.0",
     "tobscure/json-api": "dev-joomla-backports",
     "willdurand/negotiation": "^3.1.0",
@@ -99,9 +99,9 @@
     "ext-gd": "*",
     "web-auth/webauthn-lib": "4.5.2",
     "ext-dom": "*",
-    "composer/ca-bundle": "^1.5.10",
+    "composer/ca-bundle": "^1.6.0",
     "dragonmantank/cron-expression": "^3.6.0",
-    "enshrined/svg-sanitize": "^0.22.0",
+    "enshrined/svg-sanitize": "^1.1.1",
     "lcobucci/jwt": "^4.3.0",
     "web-token/jwt-library": "^3.4.10",
     "phpseclib/bcmath_compat": "^2.0.3",
diff --git a/composer.lock b/composer.lock
index 0e513833bc795..dd84fe97fc990 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "a6b35f787925a089f2646438929954ce",
+    "content-hash": "e31b602fc66bf014073619c06d6a22d2",
     "packages": [
         {
             "name": "algo26-matthias/idna-convert",
@@ -170,16 +170,16 @@
         },
         {
             "name": "composer/ca-bundle",
-            "version": "1.5.12",
+            "version": "1.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/ca-bundle.git",
-                "reference": "00a2f4201641d5c53f7fc0195e6c8d9fcc321a78"
+                "reference": "2c99cf2e92516985dea4914812b93d9daf01cdd6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/ca-bundle/zipball/00a2f4201641d5c53f7fc0195e6c8d9fcc321a78",
-                "reference": "00a2f4201641d5c53f7fc0195e6c8d9fcc321a78",
+                "url": "https://api.github.com/repos/composer/ca-bundle/zipball/2c99cf2e92516985dea4914812b93d9daf01cdd6",
+                "reference": "2c99cf2e92516985dea4914812b93d9daf01cdd6",
                 "shasum": ""
             },
             "require": {
@@ -226,7 +226,7 @@
             "support": {
                 "irc": "irc://irc.freenode.org/composer",
                 "issues": "https://github.com/composer/ca-bundle/issues",
-                "source": "https://github.com/composer/ca-bundle/tree/1.5.12"
+                "source": "https://github.com/composer/ca-bundle/tree/1.6.0"
             },
             "funding": [
                 {
@@ -238,7 +238,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2026-05-19T11:26:22+00:00"
+            "time": "2026-10-20T20:14:05+00:00"
         },
         {
             "name": "defuse/php-encryption",
@@ -463,16 +463,16 @@
         },
         {
             "name": "enshrined/svg-sanitize",
-            "version": "0.22.0",
+            "version": "1.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/darylldoyle/svg-sanitizer.git",
-                "reference": "0afa95ea74be155a7bcd6c6fb60c276c39984500"
+                "reference": "1976ff93c8d8a234cdd3ff99626bd43ecf11bf49"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/darylldoyle/svg-sanitizer/zipball/0afa95ea74be155a7bcd6c6fb60c276c39984500",
-                "reference": "0afa95ea74be155a7bcd6c6fb60c276c39984500",
+                "url": "https://api.github.com/repos/darylldoyle/svg-sanitizer/zipball/1976ff93c8d8a234cdd3ff99626bd43ecf11bf49",
+                "reference": "1976ff93c8d8a234cdd3ff99626bd43ecf11bf49",
                 "shasum": ""
             },
             "require": {
@@ -502,9 +502,9 @@
             "description": "An SVG sanitizer for PHP",
             "support": {
                 "issues": "https://github.com/darylldoyle/svg-sanitizer/issues",
-                "source": "https://github.com/darylldoyle/svg-sanitizer/tree/0.22.0"
+                "source": "https://github.com/darylldoyle/svg-sanitizer/tree/1.1.1"
             },
-            "time": "2025-08-12T10:13:48+00:00"
+            "time": "2026-10-20T09:45:10+00:00"
         },
         {
             "name": "fig/link-util",
@@ -5473,16 +5473,16 @@
         },
         {
             "name": "symfony/yaml",
-            "version": "v6.4.41",
+            "version": "v6.4.48",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
-                "reference": "e8fdf3408c85806198d5826e604ffc6830d33152"
+                "reference": "91288fddb497a598b564343ea663ea272370a7dc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/e8fdf3408c85806198d5826e604ffc6830d33152",
-                "reference": "e8fdf3408c85806198d5826e604ffc6830d33152",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/91288fddb497a598b564343ea663ea272370a7dc",
+                "reference": "91288fddb497a598b564343ea663ea272370a7dc",
                 "shasum": ""
             },
             "require": {
@@ -5525,7 +5525,7 @@
             "description": "Loads and dumps YAML files",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/yaml/tree/v6.4.41"
+                "source": "https://github.com/symfony/yaml/tree/v6.4.48"
             },
             "funding": [
                 {
@@ -5545,7 +5545,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-05-25T06:03:23+00:00"
+            "time": "2026-10-12T09:18:28+00:00"
         },
         {
             "name": "tobscure/json-api",
diff --git a/installation/sql/mysql/base.sql b/installation/sql/mysql/base.sql
index 1bc7b30c04b94..2b8a29a7e8e60 100644
--- a/installation/sql/mysql/base.sql
+++ b/installation/sql/mysql/base.sql
@@ -286,7 +286,7 @@ INSERT INTO `#__extensions` (`package_id`, `name`, `type`, `element`, `folder`,
 (0, 'plg_editors-xtd_readmore', 'plugin', 'readmore', 'editors-xtd', 0, 1, 1, 0, 1, '', '', '', 8, 0),
 (0, 'plg_editors_codemirror', 'plugin', 'codemirror', 'editors', 0, 1, 1, 0, 1, '', '{"lineNumbers":"1","lineWrapping":"1","matchTags":"1","matchBrackets":"1","marker-gutter":"1","autoCloseTags":"1","autoCloseBrackets":"1","autoFocus":"1","theme":"default","tabmode":"indent"}', '', 1, 0),
 (0, 'plg_editors_none', 'plugin', 'none', 'editors', 0, 1, 1, 1, 1, '', '', '', 2, 0),
-(0, 'plg_editors_tinymce', 'plugin', 'tinymce', 'editors', 0, 1, 1, 0, 1, '', '{"configuration":{"toolbars":{"2":{"toolbar1":["bold","underline","strikethrough","|","readmore","|","undo","redo","|","bullist","numlist","|","pastetext"]},"1":{"menu":["edit","insert","view","format","table","tools"],"toolbar1":["bold","italic","underline","strikethrough","|","alignleft","aligncenter","alignright","alignjustify","|","readmore","|","blocks","|","bullist","numlist","|","outdent","indent","|","undo","redo","|","link","unlink","anchor","code","|","hr","table","|","subscript","superscript","|","charmap","pastetext","preview"]},"0":{"menu":["edit","insert","view","format","table","tools"],"toolbar1":["bold","italic","underline","strikethrough","|","alignleft","aligncenter","alignright","alignjustify","|","readmore","|","lineheight","|","styles","|","blocks","fontfamily","fontsize","|","searchreplace","|","bullist","numlist","|","outdent","indent","|","undo","redo","|","link","unlink","anchor","image","|","code","|","forecolor","backcolor","|","fullscreen","|","table","|","subscript","superscript","|","charmap","emoticons","media","hr","ltr","rtl","|","cut","copy","paste","pastetext","|","visualchars","visualblocks","nonbreaking","blockquote","jtemplate","|","print","preview","codesample","insertdatetime","removeformat","language","abbr","abbr_remove"]}},"setoptions":{"2":{"access":["1"],"skin":"0","skin_admin":"0","mobile":"0","drag_drop":"1","path":"","entity_encoding":"raw","lang_mode":"1","text_direction":"ltr","content_css":"1","content_css_custom":"","relative_urls":"1","newlines":"0","use_config_textfilters":"1","invalid_elements":"script,applet,iframe","valid_elements":"","extended_elements":"","resizing":"1","resize_horizontal":"1","element_path":"1","wordcount":"1","image_advtab":"0","advlist":"1","autosave":"1","contextmenu":"1","custom_plugin":"","custom_button":""},"1":{"access":["6","2"],"skin":"0","skin_admin":"0","mobile":"0","drag_drop":"1","path":"","entity_encoding":"raw","lang_mode":"1","text_direction":"ltr","content_css":"1","content_css_custom":"","relative_urls":"1","newlines":"0","use_config_textfilters":"1","invalid_elements":"script,applet,iframe","valid_elements":"","extended_elements":"","resizing":"1","resize_horizontal":"1","element_path":"1","wordcount":"1","image_advtab":"0","advlist":"1","autosave":"1","contextmenu":"1","custom_plugin":"","custom_button":""},"0":{"access":["7","4","8"],"skin":"0","skin_admin":"0","mobile":"0","drag_drop":"1","path":"","entity_encoding":"raw","lang_mode":"1","text_direction":"ltr","content_css":"1","content_css_custom":"","relative_urls":"1","newlines":"0","use_config_textfilters":"1","invalid_elements":"script,applet,iframe","valid_elements":"","extended_elements":"","resizing":"1","resize_horizontal":"1","element_path":"1","wordcount":"1","image_advtab":"1","advlist":"1","autosave":"1","contextmenu":"1","custom_plugin":"","custom_button":""}}},"sets_amount":3,"html_height":"550px","html_width":"100%"}', '', 3, 0),
+(0, 'plg_editors_tinymce', 'plugin', 'tinymce', 'editors', 0, 1, 1, 0, 1, '', '{"configuration":{"toolbars":{"2":{"toolbar1":["bold","underline","strikethrough","|","readmore","|","undo","redo","|","bullist","numlist","|","pastetext","jxtdbuttons"]},"1":{"menu":["edit","insert","view","format","table","tools","help"],"toolbar1":["bold","italic","underline","strikethrough","|","alignleft","aligncenter","alignright","alignjustify","|","readmore","|","blocks","|","bullist","numlist","|","outdent","indent","|","undo","redo","|","link","unlink","anchor","code","|","hr","table","|","subscript","superscript","|","charmap","pastetext","preview","jxtdbuttons"]},"0":{"menu":["edit","insert","view","format","table","tools","help"],"toolbar1":["bold","italic","underline","strikethrough","|","alignleft","aligncenter","alignright","alignjustify","|","readmore","|","lineheight","|","styles","|","blocks","fontfamily","fontsize","|","searchreplace","|","bullist","numlist","accordion","|","outdent","indent","|","undo","redo","|","link","unlink","anchor","image","|","code","|","forecolor","backcolor","|","fullscreen","|","table","|","subscript","superscript","|","charmap","emoticons","media","hr","ltr","rtl","|","cut","copy","paste","pastetext","|","visualchars","visualblocks","nonbreaking","blockquote","jtemplate","|","print","preview","codesample","insertdatetime","removeformat","jxtdbuttons","language","abbr","abbr_remove"]}},"setoptions":{"2":{"access":["1"],"skin":"0","skin_admin":"0","mobile":"0","drag_drop":"1","path":"","entity_encoding":"raw","lang_mode":"1","text_direction":"ltr","content_css":"1","content_css_custom":"","relative_urls":"1","newlines":"0","use_config_textfilters":"1","invalid_elements":"script,applet,iframe","valid_elements":"","extended_elements":"","resizing":"1","resize_horizontal":"1","element_path":"1","wordcount":"1","image_advtab":"0","advlist":"1","autosave":"1","contextmenu":"1","custom_plugin":"","custom_button":""},"1":{"access":["6","2"],"skin":"0","skin_admin":"0","mobile":"0","drag_drop":"1","path":"","entity_encoding":"raw","lang_mode":"1","text_direction":"ltr","content_css":"1","content_css_custom":"","relative_urls":"1","newlines":"0","use_config_textfilters":"1","invalid_elements":"script,applet,iframe","valid_elements":"","extended_elements":"","resizing":"1","resize_horizontal":"1","element_path":"1","wordcount":"1","image_advtab":"0","advlist":"1","autosave":"1","contextmenu":"1","custom_plugin":"","custom_button":""},"0":{"access":["7","4","8"],"skin":"0","skin_admin":"0","mobile":"0","drag_drop":"1","path":"","entity_encoding":"raw","lang_mode":"1","text_direction":"ltr","content_css":"1","content_css_custom":"","relative_urls":"1","newlines":"0","use_config_textfilters":"1","invalid_elements":"script,applet,iframe","valid_elements":"","extended_elements":"","resizing":"1","resize_horizontal":"1","element_path":"1","wordcount":"1","image_advtab":"1","advlist":"1","autosave":"1","contextmenu":"1","custom_plugin":"","custom_button":""}}},"sets_amount":3,"html_height":"550px","html_width":"100%"}', '', 3, 0),
 (0, 'plg_extension_finder', 'plugin', 'finder', 'extension', 0, 1, 1, 0, 1, '', '', '', 1, 0),
 (0, 'plg_extension_joomla', 'plugin', 'joomla', 'extension', 0, 1, 1, 0, 1, '', '', '', 2, 0),
 (0, 'plg_extension_joomlaupdate', 'plugin', 'joomlaupdate', 'extension', 0, 1, 1, 0, 1, '', '', '', 3, 0),
diff --git a/installation/sql/postgresql/base.sql b/installation/sql/postgresql/base.sql
index 7fe510546ed83..963236e1a8803 100644
--- a/installation/sql/postgresql/base.sql
+++ b/installation/sql/postgresql/base.sql
@@ -292,7 +292,7 @@ INSERT INTO "#__extensions" ("package_id", "name", "type", "element", "folder",
 (0, 'plg_editors-xtd_readmore', 'plugin', 'readmore', 'editors-xtd', 0, 1, 1, 0, 1, '', '', '', 8, 0),
 (0, 'plg_editors_codemirror', 'plugin', 'codemirror', 'editors', 0, 1, 1, 0, 1, '', '{"lineNumbers":"1","lineWrapping":"1","matchTags":"1","matchBrackets":"1","marker-gutter":"1","autoCloseTags":"1","autoCloseBrackets":"1","autoFocus":"1","theme":"default","tabmode":"indent"}', '', 1, 0),
 (0, 'plg_editors_none', 'plugin', 'none', 'editors', 0, 1, 1, 1, 1, '', '', '', 2, 0),
-(0, 'plg_editors_tinymce', 'plugin', 'tinymce', 'editors', 0, 1, 1, 0, 1, '', '{"configuration":{"toolbars":{"2":{"toolbar1":["bold","underline","strikethrough","|","readmore","|","undo","redo","|","bullist","numlist","|","pastetext"]},"1":{"menu":["edit","insert","view","format","table","tools"],"toolbar1":["bold","italic","underline","strikethrough","|","alignleft","aligncenter","alignright","alignjustify","|","readmore","|","blocks","|","bullist","numlist","|","outdent","indent","|","undo","redo","|","link","unlink","anchor","code","|","hr","table","|","subscript","superscript","|","charmap","pastetext","preview"]},"0":{"menu":["edit","insert","view","format","table","tools"],"toolbar1":["bold","italic","underline","strikethrough","|","alignleft","aligncenter","alignright","alignjustify","|","readmore","|","lineheight","|","styles","|","blocks","fontfamily","fontsize","|","searchreplace","|","bullist","numlist","|","outdent","indent","|","undo","redo","|","link","unlink","anchor","image","|","code","|","forecolor","backcolor","|","fullscreen","|","table","|","subscript","superscript","|","charmap","emoticons","media","hr","ltr","rtl","|","cut","copy","paste","pastetext","|","visualchars","visualblocks","nonbreaking","blockquote","jtemplate","|","print","preview","codesample","insertdatetime","removeformat","language","abbr","abbr_remove"]}},"setoptions":{"2":{"access":["1"],"skin":"0","skin_admin":"0","mobile":"0","drag_drop":"1","path":"","entity_encoding":"raw","lang_mode":"1","text_direction":"ltr","content_css":"1","content_css_custom":"","relative_urls":"1","newlines":"0","use_config_textfilters":"1","invalid_elements":"script,applet,iframe","valid_elements":"","extended_elements":"","resizing":"1","resize_horizontal":"1","element_path":"1","wordcount":"1","image_advtab":"0","advlist":"1","autosave":"1","contextmenu":"1","custom_plugin":"","custom_button":""},"1":{"access":["6","2"],"skin":"0","skin_admin":"0","mobile":"0","drag_drop":"1","path":"","entity_encoding":"raw","lang_mode":"1","text_direction":"ltr","content_css":"1","content_css_custom":"","relative_urls":"1","newlines":"0","use_config_textfilters":"1","invalid_elements":"script,applet,iframe","valid_elements":"","extended_elements":"","resizing":"1","resize_horizontal":"1","element_path":"1","wordcount":"1","image_advtab":"0","advlist":"1","autosave":"1","contextmenu":"1","custom_plugin":"","custom_button":""},"0":{"access":["7","4","8"],"skin":"0","skin_admin":"0","mobile":"0","drag_drop":"1","path":"","entity_encoding":"raw","lang_mode":"1","text_direction":"ltr","content_css":"1","content_css_custom":"","relative_urls":"1","newlines":"0","use_config_textfilters":"1","invalid_elements":"script,applet,iframe","valid_elements":"","extended_elements":"","resizing":"1","resize_horizontal":"1","element_path":"1","wordcount":"1","image_advtab":"1","advlist":"1","autosave":"1","contextmenu":"1","custom_plugin":"","custom_button":""}}},"sets_amount":3,"html_height":"550px","html_width":"100%"}', '', 3, 0),
+(0, 'plg_editors_tinymce', 'plugin', 'tinymce', 'editors', 0, 1, 1, 0, 1, '', '{"configuration":{"toolbars":{"2":{"toolbar1":["bold","underline","strikethrough","|","readmore","|","undo","redo","|","bullist","numlist","|","pastetext","jxtdbuttons"]},"1":{"menu":["edit","insert","view","format","table","tools","help"],"toolbar1":["bold","italic","underline","strikethrough","|","alignleft","aligncenter","alignright","alignjustify","|","readmore","|","blocks","|","bullist","numlist","|","outdent","indent","|","undo","redo","|","link","unlink","anchor","code","|","hr","table","|","subscript","superscript","|","charmap","pastetext","preview","jxtdbuttons"]},"0":{"menu":["edit","insert","view","format","table","tools","help"],"toolbar1":["bold","italic","underline","strikethrough","|","alignleft","aligncenter","alignright","alignjustify","|","readmore","|","lineheight","|","styles","|","blocks","fontfamily","fontsize","|","searchreplace","|","bullist","numlist","accordion","|","outdent","indent","|","undo","redo","|","link","unlink","anchor","image","|","code","|","forecolor","backcolor","|","fullscreen","|","table","|","subscript","superscript","|","charmap","emoticons","media","hr","ltr","rtl","|","cut","copy","paste","pastetext","|","visualchars","visualblocks","nonbreaking","blockquote","jtemplate","|","print","preview","codesample","insertdatetime","removeformat","jxtdbuttons","language","abbr","abbr_remove"]}},"setoptions":{"2":{"access":["1"],"skin":"0","skin_admin":"0","mobile":"0","drag_drop":"1","path":"","entity_encoding":"raw","lang_mode":"1","text_direction":"ltr","content_css":"1","content_css_custom":"","relative_urls":"1","newlines":"0","use_config_textfilters":"1","invalid_elements":"script,applet,iframe","valid_elements":"","extended_elements":"","resizing":"1","resize_horizontal":"1","element_path":"1","wordcount":"1","image_advtab":"0","advlist":"1","autosave":"1","contextmenu":"1","custom_plugin":"","custom_button":""},"1":{"access":["6","2"],"skin":"0","skin_admin":"0","mobile":"0","drag_drop":"1","path":"","entity_encoding":"raw","lang_mode":"1","text_direction":"ltr","content_css":"1","content_css_custom":"","relative_urls":"1","newlines":"0","use_config_textfilters":"1","invalid_elements":"script,applet,iframe","valid_elements":"","extended_elements":"","resizing":"1","resize_horizontal":"1","element_path":"1","wordcount":"1","image_advtab":"0","advlist":"1","autosave":"1","contextmenu":"1","custom_plugin":"","custom_button":""},"0":{"access":["7","4","8"],"skin":"0","skin_admin":"0","mobile":"0","drag_drop":"1","path":"","entity_encoding":"raw","lang_mode":"1","text_direction":"ltr","content_css":"1","content_css_custom":"","relative_urls":"1","newlines":"0","use_config_textfilters":"1","invalid_elements":"script,applet,iframe","valid_elements":"","extended_elements":"","resizing":"1","resize_horizontal":"1","element_path":"1","wordcount":"1","image_advtab":"1","advlist":"1","autosave":"1","contextmenu":"1","custom_plugin":"","custom_button":""}}},"sets_amount":3,"html_height":"550px","html_width":"100%"}', '', 3, 0),
 (0, 'plg_extension_finder', 'plugin', 'finder', 'extension', 0, 1, 1, 0, 1, '', '', '', 1, 0),
 (0, 'plg_extension_joomla', 'plugin', 'joomla', 'extension', 0, 1, 1, 0, 1, '', '', '', 2, 0),
 (0, 'plg_extension_joomlaupdate', 'plugin', 'joomlaupdate', 'extension', 0, 1, 1, 0, 1, '', '', '', 3, 0),
diff --git a/language/en-GB/mod_finder.ini b/language/en-GB/mod_finder.ini
index 3c682c5280645..73b1875a863fd 100644
--- a/language/en-GB/mod_finder.ini
+++ b/language/en-GB/mod_finder.ini
@@ -11,6 +11,7 @@ COM_FINDER_SELECT_SEARCH_FILTER="- No Filter -"
 
 ; Module strings
 MOD_FINDER="Smart Search"
+MOD_FINDER_ARIA_LABEL="Search"
 MOD_FINDER_CONFIG_OPTION_BOTTOM="Bottom"
 MOD_FINDER_CONFIG_OPTION_TOP="Top"
 MOD_FINDER_FIELD_OPENSEARCH_LABEL="Enable OpenSearch"
diff --git a/language/en-GB/tpl_cassiopeia.ini b/language/en-GB/tpl_cassiopeia.ini
index f8b0cd3cd8106..6ba37b8327fb0 100644
--- a/language/en-GB/tpl_cassiopeia.ini
+++ b/language/en-GB/tpl_cassiopeia.ini
@@ -4,6 +4,7 @@
 ; Note : All ini files need to be saved as UTF-8
 
 CASSIOPEIA="Cassiopeia Site template"
+CASSIOPEIA_EXTENDED="Cassiopeia Extended"
 TPL_CASSIOPEIA_BACKTOTOP="Back to Top"
 TPL_CASSIOPEIA_BACKTOTOP_LABEL="Back-to-top Link"
 TPL_CASSIOPEIA_BODY_BACKGROUND_COLOR_LABEL="Body Background Colour"
diff --git a/language/en-GB/tpl_cassiopeia.sys.ini b/language/en-GB/tpl_cassiopeia.sys.ini
index 88d27dac3095b..ef2f5601b5184 100644
--- a/language/en-GB/tpl_cassiopeia.sys.ini
+++ b/language/en-GB/tpl_cassiopeia.sys.ini
@@ -4,6 +4,7 @@
 ; Note : All ini files need to be saved as UTF-8
 
 CASSIOPEIA="Cassiopeia Site template"
+CASSIOPEIA_EXTENDED="Cassiopeia Extended"
 TPL_CASSIOPEIA_COLORS_FIELDSET_LABEL="Colour Settings"
 TPL_CASSIOPEIA_EXTENDED_XML_DESCRIPTION="Continuing the space theme (Solarflare from 1.0, Milkyway from 1.5 and Protostar from 3.0), Cassiopeia is the Joomla site template based on Bootstrap 5. This is an extended child version with a new colour set for the base Cassiopeia template."
 TPL_CASSIOPEIA_FONTS_FIELDSET_LABEL="Font Settings"
diff --git a/layouts/joomla/content/tags.php b/layouts/joomla/content/tags.php
index 0a3260959b38a..2c20eebfc2ff7 100644
--- a/layouts/joomla/content/tags.php
+++ b/layouts/joomla/content/tags.php
@@ -11,6 +11,7 @@
 defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
 use Joomla\Component\Tags\Site\Helper\RouteHelper;
 use Joomla\Registry\Registry;
@@ -19,17 +20,19 @@
 
 ?>
 <?php if (!empty($displayData)) : ?>
-    <ul class="tags list-inline">
-        <?php foreach ($displayData as $i => $tag) : ?>
-            <?php if (in_array($tag->access, $authorised)) : ?>
-                <?php $tagParams = new Registry($tag->params); ?>
-                <?php $link_class = $tagParams->get('tag_link_class', 'btn-info'); ?>
-                <li class="list-inline-item tag-<?php echo $tag->tag_id; ?> tag-list<?php echo $i; ?>">
-                    <a href="<?php echo Route::_(RouteHelper::getComponentTagRoute($tag->tag_id . ':' . $tag->alias, $tag->language)); ?>" class="btn btn-sm <?php echo $link_class; ?>">
-                        <?php echo $this->escape($tag->title); ?>
-                    </a>
-                </li>
-            <?php endif; ?>
-        <?php endforeach; ?>
-    </ul>
+    <nav aria-label="<?php echo $this->escape(Text::_('JTAG')); ?>">
+        <ul class="tags list-inline">
+            <?php foreach ($displayData as $i => $tag) : ?>
+                <?php if (in_array($tag->access, $authorised)) : ?>
+                    <?php $tagParams = new Registry($tag->params); ?>
+                    <?php $link_class = $tagParams->get('tag_link_class', 'btn-info'); ?>
+                    <li class="list-inline-item tag-<?php echo $tag->tag_id; ?> tag-list<?php echo $i; ?>">
+                        <a href="<?php echo Route::_(RouteHelper::getComponentTagRoute($tag->tag_id . ':' . $tag->alias, $tag->language)); ?>" class="btn btn-sm <?php echo $link_class; ?>">
+                            <?php echo $this->escape($tag->title); ?>
+                        </a>
+                    </li>
+                <?php endif; ?>
+            <?php endforeach; ?>
+        </ul>
+    </nav>
 <?php endif; ?>
diff --git a/layouts/joomla/form/renderlabel.php b/layouts/joomla/form/renderlabel.php
index 011c18e3547bf..04833b2973464 100644
--- a/layouts/joomla/form/renderlabel.php
+++ b/layouts/joomla/form/renderlabel.php
@@ -24,15 +24,22 @@
 $classes = array_filter((array) $classes);
 $id      = $for . '-lbl';
 
+$isGroupedField = isset($field) && (
+    $field instanceof \Joomla\CMS\Form\Field\RadioField
+    || $field instanceof \Joomla\CMS\Form\Field\CheckboxesField
+);
+
+$tag = $isGroupedField ? 'span' : 'label';
+
 if ($required) {
     $classes[] = 'required';
 }
 
 ?>
-<label id="<?php echo $id; ?>" for="<?php echo $for; ?>"<?php if (!empty($classes)) {
+<<?php echo $tag; ?> id="<?php echo $id; ?>"<?php if (!$isGroupedField) : ?> for="<?php echo $for; ?>"<?php endif; ?><?php if (!empty($classes)) {
     echo ' class="' . implode(' ', $classes) . '"';
            } ?>>
     <?php echo $text; ?><?php if ($required) :
         ?><span class="star" aria-hidden="true">&#160;*</span><?php
     endif; ?>
-</label>
+</<?php echo $tag; ?>>
diff --git a/layouts/joomla/searchtools/default/bar.php b/layouts/joomla/searchtools/default/bar.php
index e10e576862816..335b288b3f7ef 100644
--- a/layouts/joomla/searchtools/default/bar.php
+++ b/layouts/joomla/searchtools/default/bar.php
@@ -35,15 +35,15 @@
 
 <div class="filter-search-bar btn-group">
     <div class="input-group">
+        <span class="filter-search-bar__label visually-hidden">
+            <?php echo $filters['filter_search']->label; ?>
+        </span>
         <?php echo $filters['filter_search']->input; ?>
         <?php if ($filters['filter_search']->description) : ?>
         <div role="tooltip" id="<?php echo ($filters['filter_search']->id ?: $filters['filter_search']->name) . '-desc'; ?>" class="filter-search-bar__description">
             <?php echo htmlspecialchars(Text::_($filters['filter_search']->description), ENT_COMPAT, 'UTF-8'); ?>
         </div>
         <?php endif; ?>
-        <span class="filter-search-bar__label visually-hidden">
-            <?php echo $filters['filter_search']->label; ?>
-        </span>
         <button type="submit" class="filter-search-bar__button btn btn-primary" aria-label="<?php echo Text::_('JSEARCH_FILTER_SUBMIT'); ?>">
             <span class="filter-search-bar__button-icon icon-search" aria-hidden="true"></span>
         </button>
diff --git a/libraries/loader.php b/libraries/loader.php
index 70089172a830a..a72b5a9b15783 100644
--- a/libraries/loader.php
+++ b/libraries/loader.php
@@ -702,7 +702,7 @@ private static function stripFirstBackslash($class)
      * @return  never
      *
      * @codeCoverageIgnore
-     * @since   1.7.0
+     * @since   1.5.2
      */
     function jexit($message = 0): never
     {
diff --git a/libraries/src/HTML/HTMLHelper.php b/libraries/src/HTML/HTMLHelper.php
index bb993b21cab5a..ee29a6683b029 100644
--- a/libraries/src/HTML/HTMLHelper.php
+++ b/libraries/src/HTML/HTMLHelper.php
@@ -733,11 +733,19 @@ public static function image($file, $alt, $attribs = null, $relative = false, $r
 
         // Get the relative file name when requested
         if ($returnPath !== -1) {
+            // Decode spaces for filesystem lookup
+            $lookupPath = str_replace('%20', ' ', $path);
+
             // Search for relative file names
-            $includes = static::includeRelativeFiles('images', $path, $relative, false, false);
+            $includes = static::includeRelativeFiles('images', $lookupPath, $relative, false, false);
 
             // Grab the first found path and if none exists default to null
             $path = \count($includes) ? $includes[0] : null;
+
+            // Encode spaces for the URL
+            if ($path !== null) {
+                $path = str_replace(' ', '%20', $path);
+            }
         }
 
         // Compile the file name
diff --git a/libraries/src/HTML/Helpers/Grid.php b/libraries/src/HTML/Helpers/Grid.php
index 15319d107b7fe..bced932dba066 100644
--- a/libraries/src/HTML/Helpers/Grid.php
+++ b/libraries/src/HTML/Helpers/Grid.php
@@ -113,10 +113,10 @@ public static function id($rowNum, $recId, $checkedOut = false, $name = 'cid', $
     {
         Factory::getApplication()->getDocument()->getWebAssetManager()->useScript('list-view');
 
-        return $checkedOut ? '' : '<label for="' . $stub . $rowNum . '"><span class="visually-hidden">' . Text::_('JSELECT')
-        . ' ' . htmlspecialchars($title, ENT_COMPAT, 'UTF-8') . '</span></label>'
-        . '<input class="form-check-input js-grid-item-is-checked" autocomplete="off" type="checkbox" id="' . $stub . $rowNum
-            . '" name="' . $name . '[]" value="' . $recId . '"' . ($formId !== null ? ' data-item-form-id="' . $formId . '"' : '') . '>';
+        return $checkedOut ? '' : '<input class="form-check-input js-grid-item-is-checked" autocomplete="off" type="checkbox" id="' . $stub . $rowNum
+            . '" name="' . $name . '[]" value="' . $recId . '"' . ($formId !== null ? ' data-item-form-id="' . $formId . '"' : '') . '>'
+            . '<label for="' . $stub . $rowNum . '"><span class="visually-hidden">' . Text::_('JSELECT')
+            . ' ' . htmlspecialchars($title, ENT_COMPAT, 'UTF-8') . '</span></label>';
     }
 
     /**
diff --git a/libraries/src/HTML/Helpers/JGrid.php b/libraries/src/HTML/Helpers/JGrid.php
index 07d4b956911db..95f734421628a 100644
--- a/libraries/src/HTML/Helpers/JGrid.php
+++ b/libraries/src/HTML/Helpers/JGrid.php
@@ -98,7 +98,7 @@ public static function action(
             $html[] = $tip ? '<div role="tooltip" id="' . $ariaid . '">' . $title . '</div>' : '';
         } else {
             $html[] = '<span class="tbody-icon jgrid"';
-            $html[] = $tip ? ' aria-labelledby="' . $ariaid . '"' : '';
+            $html[] = $tip ? ' tabindex="0" aria-labelledby="' . $ariaid . '"' : '';
             $html[] = '>';
             $html[] = LayoutHelper::render('joomla.icon.iconclass', ['icon' => $inactiveClass]);
             $html[] = '</span>';
diff --git a/libraries/src/Toolbar/Button/DropdownButton.php b/libraries/src/Toolbar/Button/DropdownButton.php
index 915f45e7540f0..b6e907443f96d 100644
--- a/libraries/src/Toolbar/Button/DropdownButton.php
+++ b/libraries/src/Toolbar/Button/DropdownButton.php
@@ -47,6 +47,9 @@ class DropdownButton extends AbstractGroupButton
      */
     protected function prepareOptions(array &$options)
     {
+        // Preserve the original language string before the parent translates it.
+        $text = $this->getText();
+
         parent::prepareOptions($options);
 
         $childToolbar          = $this->getChildToolbar();
@@ -66,10 +69,11 @@ protected function prepareOptions(array &$options)
             } else {
                 $options['dropdownItems'] = $childToolbar->render(['is_child' => true]);
 
-                $button = new BasicButton($this->getName(), $this->getText(), $options);
+                $button = new BasicButton($this->getName(), $text, $options);
 
                 $options['button'] = $button
                     ->setParent($this->parent)
+                    ->text($text)
                     ->buttonClass($button->getButtonClass() . ' dropdown-toggle')
                     ->attributes(
                         [
diff --git a/media_source/com_contenthistory/js/admin-compare-compare.es6.js b/media_source/com_contenthistory/js/admin-compare-compare.es6.js
index a2023eb27a610..3ab727292cb53 100644
--- a/media_source/com_contenthistory/js/admin-compare-compare.es6.js
+++ b/media_source/com_contenthistory/js/admin-compare-compare.es6.js
@@ -18,22 +18,17 @@
     const fragment = document.createDocumentFragment();
 
     diff.forEach((part) => {
-      let color = '';
+      let tag = 'span';
 
       if (part.added) {
-        color = '#a6f3a6';
+        tag = 'ins';
+      } else if (part.removed) {
+        tag = 'del';
       }
 
-      if (part.removed) {
-        color = '#f8cbcb';
-      }
-
-      // @todo use the tag MARK here not SPAN
-      const span = document.createElement('span');
-      span.style.backgroundColor = color;
-      span.style.borderRadius = '.2rem';
-      span.appendChild(document.createTextNode(decodeHtml(part.value)));
-      fragment.appendChild(span);
+      const element = document.createElement(tag);
+      element.appendChild(document.createTextNode(decodeHtml(part.value)));
+      fragment.appendChild(element);
     });
 
     display.appendChild(fragment);
diff --git a/media_source/plg_installer_webinstaller/scss/client.scss b/media_source/plg_installer_webinstaller/scss/client.scss
index 45fca4515ae6c..0a8cf6db577d4 100644
--- a/media_source/plg_installer_webinstaller/scss/client.scss
+++ b/media_source/plg_installer_webinstaller/scss/client.scss
@@ -31,6 +31,7 @@ $extension-types: (
       background-color: var(--danger);
     }
     &.badge-warning {
+      color: var(--warning-text);
       background-color: var(--warning);
     }
   }
diff --git a/media_source/plg_multifactorauth_totp/js/setup.es6.js b/media_source/plg_multifactorauth_totp/js/setup.es6.js
index 62cf5d5218843..7b872e4062bde 100644
--- a/media_source/plg_multifactorauth_totp/js/setup.es6.js
+++ b/media_source/plg_multifactorauth_totp/js/setup.es6.js
@@ -20,6 +20,10 @@
     const qr = qrcode(0, 'H');
     qr.addData(qrData);
     qr.make();
-    elTarget.innerHTML = qr.createImgTag(4);
+    elTarget.innerHTML = qr.createImgTag(
+      4,
+      undefined,
+      Joomla.Text._('PLG_MULTIFACTORAUTH_TOTP_LBL_SETUP_QR_ALT'),
+    );
   });
 })(Joomla, document, qrcode);
diff --git a/media_source/plg_system_guidedtours/js/guidedtours.es6.js b/media_source/plg_system_guidedtours/js/guidedtours.es6.js
index b3a18eda01b5a..0235495f8682b 100644
--- a/media_source/plg_system_guidedtours/js/guidedtours.es6.js
+++ b/media_source/plg_system_guidedtours/js/guidedtours.es6.js
@@ -27,8 +27,10 @@ function emptyStorage() {
 */
 function fetchTourState(tid, sid, context) {
   const fetchUrl = 'index.php?option=com_guidedtours&task=ajax.fetchUserState&format=json';
+  // The endpoint persists user state, so the request must carry the CSRF token.
+  const token = Joomla.getOptions('com_guidedtours.token', '');
   Joomla.request({
-    url: `${fetchUrl}&tid=${tid}&sid=${sid}&context=${context}`,
+    url: `${fetchUrl}&${token}=1&tid=${tid}&sid=${sid}&context=${context}`,
     method: 'GET',
     perform: true,
     onSuccess: (response) => {
diff --git a/media_source/system/js/fields/color-field-adv-init.es5.js b/media_source/system/js/fields/color-field-adv-init.es5.js
index fd4fcdc4b19c2..48730c4183d42 100644
--- a/media_source/system/js/fields/color-field-adv-init.es5.js
+++ b/media_source/system/js/fields/color-field-adv-init.es5.js
@@ -4,35 +4,40 @@
  */
 
 !(function(document, $) {
-	"use strict";
+  "use strict";
 
-	function initMinicolorsField (event) {
-		$(event.target).find('.minicolors').each(function() {
-			$(this).minicolors({
-				control: $(this).attr('data-control') || 'hue',
-				format: $(this).attr('data-validate') === 'color'
-					? 'hex'
-					: ($(this).attr('data-format') === 'rgba'
-					? 'rgb'
-					: $(this).attr('data-format'))
-					|| 'hex',
-				keywords: $(this).attr('data-keywords') || '',
-				opacity:  $(this).attr('data-format') === 'rgba',
-				position: $(this).attr('data-position') || 'default',
-				swatches: $(this).attr('data-colors') ? $(this).attr('data-colors').split(",") : [],
-				theme: 'bootstrap'
-			});
-		});
-	}
+  function initMinicolorsField (event) {
+    $(event.target).find('.minicolors').each(function () {
+      const position = $(this).attr('data-position') || 'default';
+      const isRtl = document.documentElement.dir === 'rtl';
 
-	/**
-	 * Initialize at an initial page load
-	 */
-	document.addEventListener("DOMContentLoaded", initMinicolorsField);
+      $(this).minicolors({
+        control: $(this).attr('data-control') || 'hue',
+        format: $(this).attr('data-validate') === 'color'
+          ? 'hex'
+          : ($(this).attr('data-format') === 'rgba'
+            ? 'rgb'
+            : $(this).attr('data-format'))
+          || 'hex',
+        keywords: $(this).attr('data-keywords') || '',
+        opacity: $(this).attr('data-format') === 'rgba',
+        position: isRtl
+          ? (position === 'left' ? 'right' : position === 'right' ? 'left' : position)
+          : position,
+        swatches: $(this).attr('data-colors') ? $(this).attr('data-colors').split(',') : [],
+        theme: 'bootstrap'
+      });
+    });
+  }
 
-	/**
-	 * Initialize when a part of the page was updated
-	 */
-	document.addEventListener("joomla:updated", initMinicolorsField);
+  /**
+   * Initialize at an initial page load
+   */
+  document.addEventListener("DOMContentLoaded", initMinicolorsField);
+
+  /**
+   * Initialize when a part of the page was updated
+   */
+  document.addEventListener("joomla:updated", initMinicolorsField);
 
 })(document, jQuery);
diff --git a/media_source/system/js/fields/joomla-field-fancy-select.w-c.es6.js b/media_source/system/js/fields/joomla-field-fancy-select.w-c.es6.js
index 6a041d913e935..dacb2324b7abf 100644
--- a/media_source/system/js/fields/joomla-field-fancy-select.w-c.es6.js
+++ b/media_source/system/js/fields/joomla-field-fancy-select.w-c.es6.js
@@ -149,6 +149,7 @@ window.customElements.define('joomla-field-fancy-select', class extends HTMLElem
       classNames: {
         button: 'choices__button_joomla', // It is need because an original styling use unavailable Icon.svg file
       },
+      labelId: this.select.labels?.[0]?.id ?? '',
     });
 
     // Handle typing of custom Term
diff --git a/media_source/system/js/fields/joomla-field-subform.w-c.es6.js b/media_source/system/js/fields/joomla-field-subform.w-c.es6.js
index 80878570122c7..e437f665f333a 100644
--- a/media_source/system/js/fields/joomla-field-subform.w-c.es6.js
+++ b/media_source/system/js/fields/joomla-field-subform.w-c.es6.js
@@ -296,10 +296,12 @@ class JoomlaFieldSubform extends HTMLElement {
             const oldSetId = fieldset.id;
             fieldset.id = idNew;
 
-            const groupLbl = row.querySelector(`label[for="${oldSetId}"]`);
+            const groupLbl = row.querySelector(`label[for="${oldSetId}"], [id="${oldSetId}-lbl"]`);
 
             if (groupLbl) {
-              groupLbl.setAttribute('for', idNew);
+              if (groupLbl.matches('label')) {
+                groupLbl.setAttribute('for', idNew);
+              }
 
               if (groupLbl.id) {
                 groupLbl.setAttribute('id', `${idNew}-lbl`);
@@ -329,10 +331,12 @@ class JoomlaFieldSubform extends HTMLElement {
             const oldSetId = fieldset.id;
             fieldset.id = idNew;
 
-            const groupLbl = row.querySelector(`label[for="${oldSetId}"]`);
+            const groupLbl = row.querySelector(`label[for="${oldSetId}"], [id="${oldSetId}-lbl"]`);
 
             if (groupLbl) {
-              groupLbl.setAttribute('for', idNew);
+              if (groupLbl.matches('label')) {
+                groupLbl.setAttribute('for', idNew);
+              }
 
               if (groupLbl.id) {
                 groupLbl.setAttribute('id', `${idNew}-lbl`);
diff --git a/media_source/system/js/fields/validate.es6.js b/media_source/system/js/fields/validate.es6.js
index ea330495a6fa8..161f9e8eb8303 100644
--- a/media_source/system/js/fields/validate.es6.js
+++ b/media_source/system/js/fields/validate.es6.js
@@ -205,7 +205,8 @@ class JFormValidator {
 
   markValid(element) {
     // Get a label
-    const label = element.form.querySelector(`label[for="${element.id}"]`);
+    const label = element.form.querySelector(`label[for="${element.id}"]`)
+      || document.getElementById(`${element.id}-lbl`);
     let message;
 
     if (element.classList.contains('required') || element.getAttribute('required')) {
@@ -233,7 +234,8 @@ class JFormValidator {
 
   markInvalid(element, empty) {
     // Get a label
-    const label = element.form.querySelector(`label[for="${element.id}"]`);
+    const label = element.form.querySelector(`label[for="${element.id}"]`)
+      || document.getElementById(`${element.id}-lbl`);
 
     element.classList.remove('form-control-success', 'valid');
     element.classList.add('form-control-danger', 'invalid');
@@ -274,7 +276,8 @@ class JFormValidator {
   removeMarking(element) {
     // Get the associated label
     let message;
-    const label = element.form.querySelector(`label[for="${element.id}"]`);
+    const label = element.form.querySelector(`label[for="${element.id}"]`)
+      || document.getElementById(`${element.id}-lbl`);
 
     if (label) {
       message = label.querySelector('span.form-control-feedback');
diff --git a/media_source/templates/administrator/atum/scss/blocks/_form.scss b/media_source/templates/administrator/atum/scss/blocks/_form.scss
index aa65e32b7c493..e59d90d783a03 100644
--- a/media_source/templates/administrator/atum/scss/blocks/_form.scss
+++ b/media_source/templates/administrator/atum/scss/blocks/_form.scss
@@ -63,6 +63,10 @@
   .control-label {
     inline-size: 240px;
     padding: .3rem 1rem .3rem 0;
+
+    > span:not(.invalid):not(.valid) {
+      color: var(--login-label-color);
+    }
   }
 
   .controls {
@@ -120,6 +124,7 @@ td .form-control {
   border-color: var(--danger);
 }
 
+.control-group .control-label .invalid,
 label.invalid {
   color: var(--danger-text);
 }
@@ -128,6 +133,7 @@ label.invalid {
   border-color: var(--success);
 }
 
+.control-group .control-label .valid,
 label.valid {
   color: var(--success-text);
 }
@@ -140,10 +146,6 @@ label.valid {
   box-shadow: $input-box-shadow;
 }
 
-.sortable-handler.inactive {
-  opacity: .3;
-}
-
 // set up hidden tooltip
 [role="tooltip"]:not(.show) {
   z-index: $zindex-tooltip;
diff --git a/media_source/templates/administrator/atum/scss/blocks/_global.scss b/media_source/templates/administrator/atum/scss/blocks/_global.scss
index acbbb2d629eec..8acf23f752b59 100644
--- a/media_source/templates/administrator/atum/scss/blocks/_global.scss
+++ b/media_source/templates/administrator/atum/scss/blocks/_global.scss
@@ -11,22 +11,10 @@ html {
   &.a11y_font {
     font-size: 18px;
   }
-}
-
-body {
-  display: flex;
-  flex-direction: column;
-  min-block-size: 100%;
-  padding: 0;
-  margin: 0;
-  text-align: start;
-
-  &.admin, &#subhead-container {
-    background-color: $admin-background;
-  }
 
   &.monochrome {
     filter: grayscale(1);
+
     &::after {
       position: fixed;
       inset-block-start: 0;
@@ -48,6 +36,7 @@ body {
   }
 
   &.a11y_highlight {
+
     a,
     .header-item-content {
       padding: 3px;
@@ -64,7 +53,19 @@ body {
     a.page-link {
       padding: $pagination-padding-y $pagination-padding-x;
     }
+  }
+}
+
+body {
+  display: flex;
+  flex-direction: column;
+  min-block-size: 100%;
+  padding: 0;
+  margin: 0;
+  text-align: start;
 
+  &.admin, &#subhead-container {
+    background-color: $admin-background;
   }
 }
 
@@ -198,11 +199,6 @@ a[target="_blank"]::before {
   }
 }
 
-.text-muted {
-  color: $text-muted-color;
-  opacity: .7;
-}
-
 .card-columns {
   display: grid;
   grid-gap: 0 15px;
diff --git a/media_source/templates/administrator/atum/scss/pages/_com_contenthistory.scss b/media_source/templates/administrator/atum/scss/pages/_com_contenthistory.scss
new file mode 100644
index 0000000000000..747441d7f89c6
--- /dev/null
+++ b/media_source/templates/administrator/atum/scss/pages/_com_contenthistory.scss
@@ -0,0 +1,29 @@
+#diff .diff {
+  ins,
+  del {
+    padding: 2px 4px;
+    border-radius: .2rem;
+  }
+
+  ins {
+    color: #000;
+    background-color: #d4fcbc;
+  }
+
+  del {
+    color: #555;
+    background-color: #fbb;
+  }
+}
+
+[data-bs-theme="dark"] #diff .diff {
+  ins {
+    color: #fff;
+    background-color: #266303;
+  }
+
+  del {
+    color: #b3b3b3;
+    background-color: #8f0000;
+  }
+}
diff --git a/media_source/templates/administrator/atum/scss/system/searchtools/searchtools.scss b/media_source/templates/administrator/atum/scss/system/searchtools/searchtools.scss
index c03f773122599..7099e5267181a 100644
--- a/media_source/templates/administrator/atum/scss/system/searchtools/searchtools.scss
+++ b/media_source/templates/administrator/atum/scss/system/searchtools/searchtools.scss
@@ -42,10 +42,25 @@
         }
       }
     }
+
+    @media (max-width: 575.98px) {
+      >.ordering-select {
+        margin-inline: 0;
+        inline-size: 100%;
+      }
+    }
   }
 
   .ordering-select {
     display: flex;
+
+    @media (max-width: 575.98px) {
+      flex-direction: column;
+      align-items: stretch;
+      gap: 8px;
+      inline-size: 100%;
+      margin-inline-start: 0;
+    }
   }
 }
 
@@ -66,6 +81,19 @@
   + .js-stools-field-list {
     margin-inline-start: 8px;
   }
+
+  @media (max-width: 575.98px) {
+    inline-size: 100%;
+    max-inline-size: 100%;
+
+    + .js-stools-field-list {
+      margin-inline-start: 0;
+    }
+
+    select {
+      inline-size: 100%;
+    }
+  }
 }
 
 .js-stools-container-selector {
diff --git a/media_source/templates/administrator/atum/scss/template.scss b/media_source/templates/administrator/atum/scss/template.scss
index 19c53e4c9ed24..a7aa6780536e6 100644
--- a/media_source/templates/administrator/atum/scss/template.scss
+++ b/media_source/templates/administrator/atum/scss/template.scss
@@ -73,6 +73,7 @@
 // Page specifics
 @import "pages/com_config";
 @import "pages/com_content";
+@import "pages/com_contenthistory";
 @import "pages/com_cpanel";
 @import "pages/com_joomlaupdate";
 @import "pages/com_media";
diff --git a/media_source/templates/administrator/atum/scss/vendor/choicesjs/choices.scss b/media_source/templates/administrator/atum/scss/vendor/choicesjs/choices.scss
index cbd3abed8dae0..1c63d20cebda9 100644
--- a/media_source/templates/administrator/atum/scss/vendor/choicesjs/choices.scss
+++ b/media_source/templates/administrator/atum/scss/vendor/choicesjs/choices.scss
@@ -53,6 +53,7 @@
 }
 
 .choices__list--single {
+  width: 90%;
   padding: 7px 16px 0 4px;
 }
 
@@ -111,6 +112,7 @@
 
 .choices__button_joomla {
   position: relative;
+  flex: 0 0 24px;
   padding: 0 10px;
   color: inherit;
   text-indent: -9999px;
@@ -119,11 +121,15 @@
   border: 0;
   opacity: .5;
   appearance: none;
+  inline-size: 24px;
+  block-size: 24px;
 
   &::before {
     position: absolute;
     inset: 0;
-    display: block;
+    display: flex;
+    align-items: center;
+    justify-content: center;
     text-align: center;
     text-indent: 0;
     content: "\00d7";
@@ -197,8 +203,8 @@
     position: absolute;
     inset-block-start: 50%;
     inset-inline-end: 0;
-    inline-size: 20px;
-    block-size: 20px;
+    inline-size: 24px;
+    block-size: 24px;
     padding: 0;
     margin-block-start: -10px;
     margin-inline-end: 50px;
diff --git a/media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-tab.scss b/media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-tab.scss
index f6d2507e350c5..d17b99c799da6 100644
--- a/media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-tab.scss
+++ b/media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-tab.scss
@@ -293,6 +293,18 @@ joomla-tab[view=accordion] {
         content: attr(data-label) ":";
       }
 
+      .respTable td:nth-child(2) {
+        text-align: start;
+
+        &::before {
+          display: block;
+          float: none;
+          padding-inline-end: 0;
+          margin-block-end: .5rem;
+        }
+
+      }
+
       .respTable td:nth-child(1) {
         font-weight: $bold-weight;
       }
@@ -309,6 +321,18 @@ joomla-tab[view=accordion] {
 
 }
 
+@include media-breakpoint-down(lg) {
+  joomla-tab[view=accordion] #permissions-sliders .respTable td:nth-child(2) .d-flex {
+    flex-direction: column;
+    align-items: stretch !important;
+  }
+
+  joomla-tab[view=accordion] #permissions-sliders .respTable td:nth-child(2) select {
+    inline-size: 100%;
+    max-inline-size: 100%;
+  }
+}
+
 @if $enable-dark-mode {
   @include color-mode(dark) {
     joomla-tab {
diff --git a/media_source/templates/site/cassiopeia/scss/system/searchtools/searchtools.scss b/media_source/templates/site/cassiopeia/scss/system/searchtools/searchtools.scss
index e42ebdf50ffc0..411dba4622f08 100644
--- a/media_source/templates/site/cassiopeia/scss/system/searchtools/searchtools.scss
+++ b/media_source/templates/site/cassiopeia/scss/system/searchtools/searchtools.scss
@@ -21,6 +21,21 @@
 
   .ordering-select {
     display: flex;
+
+    @media (max-width: 575.98px) {
+      flex-direction: column;
+      align-items: stretch;
+      gap: 8px;
+      inline-size: 100%;
+      margin-inline-start: 0;
+    }
+  }
+
+  @media (max-width: 575.98px) {
+    > .ordering-select {
+      margin-inline: 0;
+      inline-size: 100%;
+    }
   }
 }
 
@@ -47,6 +62,19 @@
   + .js-stools-field-list {
     margin-inline-start: 8px;
   }
+
+  @media (max-width: 575.98px) {
+    inline-size: 100%;
+    max-inline-size: 100%;
+
+    + .js-stools-field-list {
+      margin-inline-start: 0;
+    }
+
+    select {
+      inline-size: 100%;
+    }
+  }
 }
 
 .js-stools-field-selector {
diff --git a/modules/mod_finder/tmpl/default.php b/modules/mod_finder/tmpl/default.php
index bd81891d524f0..0cb487f0461ca 100644
--- a/modules/mod_finder/tmpl/default.php
+++ b/modules/mod_finder/tmpl/default.php
@@ -63,7 +63,7 @@
 ?>
 
 <search>
-    <form class="mod-finder js-finder-searchform form-search" action="<?php echo Route::_($route); ?>" method="get" aria-label="search">
+    <form class="mod-finder js-finder-searchform form-search" action="<?php echo Route::_($route); ?>" method="get" aria-label="<?php echo Text::_('MOD_FINDER_ARIA_LABEL'); ?>">
         <?php echo $output; ?>
 
         <?php $show_advanced = $params->get('show_advanced', 0); ?>
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 418dc86a677e4..7d4d3669973f6 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -3427,7 +3427,7 @@ parameters:
 				             Throw an Exception instead of using setError$#
 			'''
 			identifier: method.deprecated
-			count: 35
+			count: 36
 			path: administrator/components/com_menus/src/Model/ItemModel.php
 
 		-
diff --git a/plugins/editors/tinymce/src/PluginTraits/DisplayTrait.php b/plugins/editors/tinymce/src/PluginTraits/DisplayTrait.php
index e0d0458674d43..9a737af1ed52a 100644
--- a/plugins/editors/tinymce/src/PluginTraits/DisplayTrait.php
+++ b/plugins/editors/tinymce/src/PluginTraits/DisplayTrait.php
@@ -311,6 +311,11 @@ public function display(string $name, string $content = '', array $attributes =
         $toolbar1 = (array) $levelParams->get('toolbar1', []);
         $toolbar2 = (array) $levelParams->get('toolbar2', []);
 
+        // Make sure that we load the help plugin if the help menu is enabled
+        if (\in_array('help', $menubar, true)) {
+            $plugins[] = 'help';
+        }
+
         // Make an easy way to check which button is enabled
         $allButtons = array_merge($toolbar1, $toolbar2);
         $allButtons = array_combine($allButtons, $allButtons);
diff --git a/plugins/installer/packageinstaller/tmpl/default.php b/plugins/installer/packageinstaller/tmpl/default.php
index 5d68a7187b8da..a6f351af64180 100644
--- a/plugins/installer/packageinstaller/tmpl/default.php
+++ b/plugins/installer/packageinstaller/tmpl/default.php
@@ -76,12 +76,12 @@
                     <?php echo Text::_('PLG_INSTALLER_PACKAGEINSTALLER_DRAG_FILE_HERE'); ?>
                 </p>
                 <p>
-                    <button id="select-file-button" type="button" class="btn btn-success">
+                    <button id="select-file-button" type="button" aria-describedby="install-package-upload-limit-global" class="btn btn-success">
                         <span class="icon-copy" aria-hidden="true"></span>
                         <?php echo Text::_('PLG_INSTALLER_PACKAGEINSTALLER_SELECT_FILE'); ?>
                     </button>
                 </p>
-                <p>
+                <p id="install-package-upload-limit-global">
                     <?php echo Text::sprintf('JGLOBAL_MAXIMUM_UPLOAD_SIZE_LIMIT', '&#x200E;' . $maxSize); ?>
                 </p>
             </div>
diff --git a/plugins/multifactorauth/totp/src/Extension/Totp.php b/plugins/multifactorauth/totp/src/Extension/Totp.php
index d666917d7dfb7..6983089f95e41 100644
--- a/plugins/multifactorauth/totp/src/Extension/Totp.php
+++ b/plugins/multifactorauth/totp/src/Extension/Totp.php
@@ -195,6 +195,7 @@ public function onUserMultifactorGetSetup(GetSetup $event): void
         $wam      = $document->getWebAssetManager();
 
         $document->addScriptOptions('plg_multifactorauth_totp.totp.qr', $otpURL);
+        Text::script('PLG_MULTIFACTORAUTH_TOTP_LBL_SETUP_QR_ALT');
 
         $wam->getRegistry()->addExtensionRegistryFile('plg_multifactorauth_totp');
         $wam->useScript('plg_multifactorauth_totp.setup');
diff --git a/plugins/system/shortcut/src/Extension/Shortcut.php b/plugins/system/shortcut/src/Extension/Shortcut.php
index 2293a996384fa..283e2037ae30e 100644
--- a/plugins/system/shortcut/src/Extension/Shortcut.php
+++ b/plugins/system/shortcut/src/Extension/Shortcut.php
@@ -110,7 +110,11 @@ public function initialize(BeforeCompileHeadEvent $event): void
             ['hotkeysjs', 'joomla.dialog']
         );
 
-        $timeout = $this->params->get('timeout', 2000);
+        $timeout = $app->getIdentity()->getParam('a11y_shortcut_timeout');
+
+        if (!is_numeric($timeout)) {
+            $timeout = $this->params->get('timeout', 2000);
+        }
 
         $document->addScriptOptions('plg_system_shortcut.shortcuts', $shortcuts);
         $document->addScriptOptions('plg_system_shortcut.timeout', $timeout);
diff --git a/tests/Unit/Libraries/Cms/Mail/MailTest.php b/tests/Unit/Libraries/Cms/Mail/MailTest.php
index de782fe4002c0..a56ac4c3e396e 100644
--- a/tests/Unit/Libraries/Cms/Mail/MailTest.php
+++ b/tests/Unit/Libraries/Cms/Mail/MailTest.php
@@ -236,7 +236,7 @@ public function testAddAttachment()
     }
 
     /**
-     * Tests the IsHTML method.
+     * Tests the isHtml method.
      *
      * @return void
      *
@@ -250,7 +250,7 @@ public function testIsHtmlTrue()
     }
 
     /**
-     * Tests the IsHTML method.
+     * Tests the isHtml method.
      *
      * @return void
      *