diff --git a/.drone.yml b/.drone.yml
index 9f197ff68a3..aa38aa92890 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -269,6 +269,6 @@ steps:
 
 ---
 kind: signature
-hmac: 71729a12ae3556e03f924ac95c8a5cd14bb6a3c2d20ef6768fdd1e853397fd22
+hmac: d3d7b9b57f2aa7d6056ec0c37333fbaf81f42452fd7c5ffecdc9c6a9b130c120
 
 ...
diff --git a/administrator/components/com_actionlogs/src/Helper/ActionlogsHelper.php b/administrator/components/com_actionlogs/src/Helper/ActionlogsHelper.php
index 23943baad70..411d9c267d4 100644
--- a/administrator/components/com_actionlogs/src/Helper/ActionlogsHelper.php
+++ b/administrator/components/com_actionlogs/src/Helper/ActionlogsHelper.php
@@ -237,12 +237,13 @@ public static function getHumanReadableLogMessage($log, $generateLinks = true)
 	 * @param   string   $contentType
 	 * @param   integer  $id
 	 * @param   string   $urlVar
+	 * @param   JObject  $object
 	 *
 	 * @return  string  Link to the content item
 	 *
 	 * @since   3.9.0
 	 */
-	public static function getContentTypeLink($component, $contentType, $id, $urlVar = 'id')
+	public static function getContentTypeLink($component, $contentType, $id, $urlVar = 'id', $object = null)
 	{
 		// Try to find the component helper.
 		$eName = str_replace('com_', '', $component);
@@ -257,7 +258,7 @@ public static function getContentTypeLink($component, $contentType, $id, $urlVar
 
 			if (class_exists($cName) && is_callable(array($cName, 'getContentTypeLink')))
 			{
-				return $cName::getContentTypeLink($contentType, $id);
+				return $cName::getContentTypeLink($contentType, $id, $object);
 			}
 		}
 
diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php
index 2fd5ac07e8c..8d54c44f5a5 100644
--- a/administrator/components/com_admin/script.php
+++ b/administrator/components/com_admin/script.php
@@ -560,7 +560,7 @@ protected function updateManifestCaches()
 	 * Delete files that should not exist
 	 *
 	 * @param bool  $dryRun          If set to true, will not actually delete files, but just report their status for use in CLI
-	 * @param bool  $suppressOutput   Set to true to supress echoing any errors, and just return the $status array
+	 * @param bool  $suppressOutput   Set to true to suppress echoing any errors, and just return the $status array
 	 *
 	 * @return  array
 	 */
@@ -1460,7 +1460,6 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
 			'/administrator/components/com_media/controllers/file.json.php',
 			'/administrator/components/com_media/controllers/file.php',
 			'/administrator/components/com_media/controllers/folder.php',
-			'/administrator/components/com_media/helpers/media.php',
 			'/administrator/components/com_media/layouts/toolbar/deletemedia.php',
 			'/administrator/components/com_media/layouts/toolbar/newfolder.php',
 			'/administrator/components/com_media/layouts/toolbar/uploadmedia.php',
@@ -3874,9 +3873,11 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
 			'/libraries/vendor/leafo/lessphp/lessify',
 			'/libraries/vendor/leafo/lessphp/lessify.inc.php',
 			'/libraries/vendor/leafo/lessphp/plessc',
+			'/libraries/vendor/paragonie/random_compat/LICENSE',
 			'/libraries/vendor/paragonie/random_compat/lib/byte_safe_strings.php',
 			'/libraries/vendor/paragonie/random_compat/lib/cast_to_int.php',
 			'/libraries/vendor/paragonie/random_compat/lib/error_polyfill.php',
+			'/libraries/vendor/paragonie/random_compat/lib/random.php',
 			'/libraries/vendor/paragonie/random_compat/lib/random_bytes_com_dotnet.php',
 			'/libraries/vendor/paragonie/random_compat/lib/random_bytes_dev_urandom.php',
 			'/libraries/vendor/paragonie/random_compat/lib/random_bytes_libsodium.php',
@@ -5423,6 +5424,8 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
 			'/libraries/vendor/ozdemirburak/iris/src/Traits/HsTrait.php',
 			'/libraries/vendor/ozdemirburak/iris/src/Traits/HslTrait.php',
 			'/libraries/vendor/ozdemirburak/iris/src/Traits/RgbTrait.php',
+			'/libraries/vendor/paragonie/random_compat/dist/random_compat.phar.pubkey',
+			'/libraries/vendor/paragonie/random_compat/dist/random_compat.phar.pubkey.asc',
 			'/libraries/vendor/psr/http-factory/.pullapprove.yml',
 			'/libraries/vendor/spomky-labs/cbor-php/.php_cs.dist',
 			'/libraries/vendor/spomky-labs/cbor-php/CODE_OF_CONDUCT.md',
@@ -5843,6 +5846,19 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
 			'/templates/cassiopeia/scss/tools/mixins/_margin.scss',
 			'/templates/cassiopeia/scss/tools/mixins/_visually-hidden.scss',
 			'/templates/system/js/error-locales.js',
+			// 4.0 from RC 1 to RC 2
+			'/administrator/components/com_fields/tmpl/field/modal.php',
+			'/administrator/templates/atum/scss/pages/_com_admin.scss',
+			'/administrator/templates/atum/scss/pages/_com_finder.scss',
+			'/administrator/templates/atum/scss/pages/_com_joomlaupdate.scss',
+			'/libraries/src/Error/JsonApi/InstallLanguageExceptionHandler.php',
+			'/libraries/src/MVC/Controller/Exception/InstallLanguage.php',
+			'/media/com_fields/js/admin-field-edit-modal-es5.js',
+			'/media/com_fields/js/admin-field-edit-modal-es5.min.js',
+			'/media/com_fields/js/admin-field-edit-modal-es5.min.js.gz',
+			'/media/com_fields/js/admin-field-edit-modal.js',
+			'/media/com_fields/js/admin-field-edit-modal.min.js',
+			'/media/com_fields/js/admin-field-edit-modal.min.js.gz',
 		);
 
 		$folders = array(
@@ -6167,6 +6183,7 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
 			'/libraries/vendor/simplepie/simplepie',
 			'/libraries/vendor/simplepie',
 			'/libraries/vendor/phpmailer/phpmailer/extras',
+			'/libraries/vendor/paragonie/random_compat/lib',
 			'/libraries/vendor/leafo/lessphp',
 			'/libraries/vendor/leafo',
 			'/libraries/vendor/joomla/session/Joomla/Session/Storage',
@@ -6797,7 +6814,6 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
 			'/administrator/components/com_media/views/images',
 			'/administrator/components/com_media/views',
 			'/administrator/components/com_media/models',
-			'/administrator/components/com_media/helpers',
 			'/administrator/components/com_media/controllers',
 			'/administrator/components/com_login/views/login/tmpl',
 			'/administrator/components/com_login/views/login',
@@ -7051,6 +7067,8 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
 			'/media/vendor/punycode/js',
 			'/media/templates/atum/js',
 			'/media/templates/atum',
+			'/libraries/vendor/paragonie/random_compat/dist',
+			'/libraries/vendor/paragonie/random_compat',
 			'/libraries/vendor/ozdemirburak/iris/src/Traits',
 			'/libraries/vendor/ozdemirburak/iris/src/Helpers',
 			'/libraries/vendor/ozdemirburak/iris/src/Exceptions',
diff --git a/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion.sql b/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion.sql
index b8e951bc1ab..91b4b94b289 100644
--- a/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion.sql
+++ b/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion.sql
@@ -1,5 +1,5 @@
 --
--- Step 1: Convert all tables to utf8mb4 chracter set with utf8mb4_unicode_ci collation
+-- Step 1: Convert all tables to utf8mb4 character set with utf8mb4_unicode_ci collation
 -- except of #__finder_xxx tables, those are handled with 4.0.0-2018-07-29.sql at update.
 --
 
diff --git a/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion_optional.sql b/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion_optional.sql
index 794d604bae1..a3b8fd00881 100644
--- a/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion_optional.sql
+++ b/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion_optional.sql
@@ -7,7 +7,7 @@
 --
 
 --
--- Step 1: Convert all tables to utf8mb4 chracter set with utf8mb4_unicode_ci collation.
+-- Step 1: Convert all tables to utf8mb4 character set with utf8mb4_unicode_ci collation.
 --
 
 ALTER TABLE `#__core_log_searches` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
diff --git a/administrator/components/com_admin/sql/updates/mysql/4.0.0-2021-06-04.sql b/administrator/components/com_admin/sql/updates/mysql/4.0.0-2021-06-04.sql
new file mode 100644
index 00000000000..8988cad5e66
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/mysql/4.0.0-2021-06-04.sql
@@ -0,0 +1,8 @@
+-- after 4.0.0 RC1
+UPDATE `#__template_styles`
+   SET `title` = 'Atum - Default'
+ WHERE `title` = 'atum - Default';
+
+UPDATE `#__template_styles`
+   SET `title` = 'Cassiopeia - Default'
+ WHERE `title` = 'cassiopeia - Default';
diff --git a/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2021-06-04.sql b/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2021-06-04.sql
new file mode 100644
index 00000000000..305b3255742
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2021-06-04.sql
@@ -0,0 +1,8 @@
+-- after 4.0.0 RC1
+UPDATE "#__template_styles"
+   SET "title" = 'Atum - Default'
+ WHERE "title" = 'atum - Default';
+
+UPDATE "#__template_styles"
+   SET "title" = 'Cassiopeia - Default'
+ WHERE "title" = 'cassiopeia - Default';
diff --git a/administrator/components/com_admin/src/Controller/DisplayController.php b/administrator/components/com_admin/src/Controller/DisplayController.php
index 242b8d86ce1..3857024e52e 100644
--- a/administrator/components/com_admin/src/Controller/DisplayController.php
+++ b/administrator/components/com_admin/src/Controller/DisplayController.php
@@ -20,5 +20,28 @@
  */
 class DisplayController extends BaseController
 {
+	/**
+	 * View method
+	 *
+	 * @param   boolean  $cachable   If true, the view output will be cached
+	 * @param   array    $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link \JFilterInput::clean()}.
+	 *
+	 * @return  static  Supports chaining.
+	 *
+	 * @since   3.9
+	 */
+	public function display($cachable = false, $urlparams = array())
+	{
+		$viewName = $this->input->get('view', $this->default_view);
+		$format   = $this->input->get('format', 'html');
 
+		// Check CSRF token for sysinfo export views
+		if ($viewName === 'sysinfo' && ($format === 'text' || $format === 'json'))
+		{
+			// Check for request forgeries.
+			$this->checkToken('GET');
+		}
+
+		return parent::display($cachable, $urlparams);
+	}
 }
diff --git a/administrator/components/com_admin/src/View/Sysinfo/HtmlView.php b/administrator/components/com_admin/src/View/Sysinfo/HtmlView.php
index 380e0352335..a3b8c6325fe 100644
--- a/administrator/components/com_admin/src/View/Sysinfo/HtmlView.php
+++ b/administrator/components/com_admin/src/View/Sysinfo/HtmlView.php
@@ -17,6 +17,7 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
 use Joomla\CMS\Router\Route;
+use Joomla\CMS\Session\Session;
 use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\Component\Admin\Administrator\Model\SysinfoModel;
 
@@ -110,12 +111,12 @@ protected function addToolbar(): void
 	{
 		ToolbarHelper::title(Text::_('COM_ADMIN_SYSTEM_INFORMATION'), 'info-circle systeminfo');
 		ToolbarHelper::link(
-			Route::_('index.php?option=com_admin&view=sysinfo&format=text'),
+			Route::_('index.php?option=com_admin&view=sysinfo&format=text&' . Session::getFormToken() . '=1'),
 			'COM_ADMIN_DOWNLOAD_SYSTEM_INFORMATION_TEXT',
 			'download'
 		);
 		ToolbarHelper::link(
-			Route::_('index.php?option=com_admin&view=sysinfo&format=json'),
+			Route::_('index.php?option=com_admin&view=sysinfo&format=json&' . Session::getFormToken() . '=1'),
 			'COM_ADMIN_DOWNLOAD_SYSTEM_INFORMATION_JSON',
 			'download'
 		);
diff --git a/administrator/components/com_admin/tmpl/help/default.php b/administrator/components/com_admin/tmpl/help/default.php
index acdfc81117c..20b033590a0 100644
--- a/administrator/components/com_admin/tmpl/help/default.php
+++ b/administrator/components/com_admin/tmpl/help/default.php
@@ -30,13 +30,13 @@
 			</button>
 			<div class="sidebar-nav" id="help-index">
 				<ul class="nav flex-column">
-					<li><?php echo HTMLHelper::_('link', Help::createUrl('JHELP_START_HERE'), Text::_('COM_ADMIN_START_HERE'), ['target' => 'helpFrame']); ?></li>
-					<li><?php echo HTMLHelper::_('link', 'https://www.gnu.org/licenses/gpl-2.0.html', Text::_('COM_ADMIN_LICENSE'), ['target' => 'helpFrame']); ?></li>
-					<li><?php echo HTMLHelper::_('link', Help::createUrl('JHELP_GLOSSARY'), Text::_('COM_ADMIN_GLOSSARY'), ['target' => 'helpFrame']); ?></li>
+					<li class="item"><?php echo HTMLHelper::_('link', Help::createUrl('JHELP_START_HERE'), Text::_('COM_ADMIN_START_HERE'), ['target' => 'helpFrame']); ?></li>
+					<li class="item"><?php echo HTMLHelper::_('link', 'https://www.gnu.org/licenses/gpl-2.0.html', Text::_('COM_ADMIN_LICENSE'), ['target' => 'helpFrame']); ?></li>
+					<li class="item"><?php echo HTMLHelper::_('link', Help::createUrl('JHELP_GLOSSARY'), Text::_('COM_ADMIN_GLOSSARY'), ['target' => 'helpFrame']); ?></li>
 					<li class="divider"></li>
 					<li class="nav-header"><?php echo Text::_('COM_ADMIN_ALPHABETICAL_INDEX'); ?></li>
 					<?php foreach ($this->toc as $k => $v) : ?>
-						<li>
+						<li class="item">
 							<?php $url = Help::createUrl('JHELP_' . strtoupper($k)); ?>
 							<?php echo HTMLHelper::_('link', $url, $v, ['target' => 'helpFrame']); ?>
 						</li>
diff --git a/administrator/components/com_associations/src/Field/Modal/AssociationField.php b/administrator/components/com_associations/src/Field/Modal/AssociationField.php
index c63f4601e32..b008ad334be 100644
--- a/administrator/components/com_associations/src/Field/Modal/AssociationField.php
+++ b/administrator/components/com_associations/src/Field/Modal/AssociationField.php
@@ -98,7 +98,7 @@ protected function getInput()
 				'bodyHeight'  => 70,
 				'modalWidth'  => 80,
 				'footer'      => '<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">'
-						. Text::_("JLIB_HTML_BEHAVIOR_CLOSE") . '</button>',
+						. Text::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</button>',
 			)
 		);
 
diff --git a/administrator/components/com_banners/forms/banner.xml b/administrator/components/com_banners/forms/banner.xml
index 5573fa7b135..87320231396 100644
--- a/administrator/components/com_banners/forms/banner.xml
+++ b/administrator/components/com_banners/forms/banner.xml
@@ -4,7 +4,7 @@
 
 		<field
 			name="id"
-			type="number"
+			type="text"
 			label="JGLOBAL_FIELD_ID_LABEL"
 			default="0"
 			readonly="true"
diff --git a/administrator/components/com_banners/src/Controller/TracksController.php b/administrator/components/com_banners/src/Controller/TracksController.php
index ff40a6621a9..fbca3db5c12 100644
--- a/administrator/components/com_banners/src/Controller/TracksController.php
+++ b/administrator/components/com_banners/src/Controller/TracksController.php
@@ -109,6 +109,9 @@ public function display($cachable = false, $urlparams = array())
 		// Get and render the view.
 		if ($view = $this->getView($vName, 'raw'))
 		{
+			// Check for request forgeries.
+			$this->checkToken('GET');
+
 			// Get the model for the view.
 			/** @var \Joomla\Component\Banners\Administrator\Model\TracksModel $model */
 			$model = $this->getModel($vName);
diff --git a/administrator/components/com_banners/src/Model/BannerModel.php b/administrator/components/com_banners/src/Model/BannerModel.php
index 38a37928e57..15485197ce9 100644
--- a/administrator/components/com_banners/src/Model/BannerModel.php
+++ b/administrator/components/com_banners/src/Model/BannerModel.php
@@ -210,6 +210,12 @@ public function getForm($data = array(), $loadData = true)
 			$form->setFieldAttribute('sticky', 'filter', 'unset');
 		}
 
+		// Don't allow to change the created_by user if not allowed to access com_users.
+		if (!Factory::getUser()->authorise('core.manage', 'com_users'))
+		{
+			$form->setFieldAttribute('created_by', 'filter', 'unset');
+		}
+
 		return $form;
 	}
 
@@ -460,31 +466,4 @@ private function canCreateCategory()
 	{
 		return Factory::getUser()->authorise('core.create', 'com_banners');
 	}
-
-	/**
-	 * Method to validate the form data.
-	 *
-	 * @param   Form    $form   The form to validate against.
-	 * @param   array   $data   The data to validate.
-	 * @param   string  $group  The name of the field group to validate.
-	 *
-	 * @return  array|boolean  Array of filtered data if valid, false otherwise.
-	 *
-	 * @see     JFormRule
-	 * @see     JFilterInput
-	 * @since   3.9.25
-	 */
-	public function validate($form, $data, $group = null)
-	{
-		// Don't allow to change the users if not allowed to access com_users.
-		if (!Factory::getUser()->authorise('core.manage', 'com_users'))
-		{
-			if (isset($data['created_by']))
-			{
-				unset($data['created_by']);
-			}
-		}
-
-		return parent::validate($form, $data, $group);
-	}
 }
diff --git a/administrator/components/com_banners/tmpl/download/default.php b/administrator/components/com_banners/tmpl/download/default.php
index a71d2d84029..2fd1ab213dc 100644
--- a/administrator/components/com_banners/tmpl/download/default.php
+++ b/administrator/components/com_banners/tmpl/download/default.php
@@ -11,6 +11,7 @@
 
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Router\Route;
+use \Joomla\CMS\Session\Session;
 
 /** @var \Joomla\Component\Banners\Administrator\View\Download\HtmlView $this */
 
@@ -22,7 +23,7 @@
 		class="form-horizontal form-validate"
 		id="download-form"
 		name="adminForm"
-		action="<?php echo Route::_('index.php?option=com_banners&task=tracks.display&format=raw'); ?>"
+		action="<?php echo Route::_('index.php?option=com_banners&task=tracks.display&format=raw&' . Session::getFormToken() . '=1'); ?>"
 		method="post">
 
 		<?php foreach ($this->form->getFieldset() as $field) : ?>
diff --git a/administrator/components/com_categories/forms/category.xml b/administrator/components/com_categories/forms/category.xml
index b9f88d355dd..5c5a19b12b8 100644
--- a/administrator/components/com_categories/forms/category.xml
+++ b/administrator/components/com_categories/forms/category.xml
@@ -3,7 +3,7 @@
 
 	<field
 		name="id"
-		type="number"
+		type="text"
 		label="JGLOBAL_FIELD_ID_LABEL"
 		default="0"
 		class="readonly"
@@ -12,7 +12,7 @@
 
 	<field
 		name="hits"
-		type="number"
+		type="text"
 		label="JGLOBAL_HITS"
 		default="0"
 		class="readonly"
diff --git a/administrator/components/com_categories/src/Model/CategoryModel.php b/administrator/components/com_categories/src/Model/CategoryModel.php
index afa1b1c8e34..763c58d697b 100644
--- a/administrator/components/com_categories/src/Model/CategoryModel.php
+++ b/administrator/components/com_categories/src/Model/CategoryModel.php
@@ -289,6 +289,12 @@ public function getForm($data = array(), $loadData = true)
 			$form->setFieldAttribute('published', 'filter', 'unset');
 		}
 
+		// Don't allow to change the created_user_id user if not allowed to access com_users.
+		if (!Factory::getUser()->authorise('core.manage', 'com_users'))
+		{
+			$form->setFieldAttribute('created_user_id', 'filter', 'unset');
+		}
+
 		return $form;
 	}
 
@@ -368,15 +374,6 @@ protected function loadFormData()
 	 */
 	public function validate($form, $data, $group = null)
 	{
-		// Don't allow to change the users if not allowed to access com_users.
-		if (!Factory::getUser()->authorise('core.manage', 'com_users'))
-		{
-			if (isset($data['created_user_id']))
-			{
-				unset($data['created_user_id']);
-			}
-		}
-
 		if (!Factory::getUser()->authorise('core.admin', $data['extension']))
 		{
 			if (isset($data['rules']))
diff --git a/administrator/components/com_config/forms/application.xml b/administrator/components/com_config/forms/application.xml
index f6e74808e40..c7971a1440d 100644
--- a/administrator/components/com_config/forms/application.xml
+++ b/administrator/components/com_config/forms/application.xml
@@ -1110,6 +1110,19 @@
 
 		</field>
 
+		<field
+			name="block_floc"
+			type="radio"
+			label="COM_CONFIG_FIELD_FLOC_BLOCKER_LABEL"
+			description="COM_CONFIG_FIELD_FLOC_BLOCKER_DESC"
+			layout="joomla.form.field.radio.switcher"
+			default="1"
+			filter="integer"
+			>
+			<option value="0">JNO</option>
+			<option value="1">JYES</option>
+		</field>
+
 	</fieldset>
 
 	<fieldset
diff --git a/administrator/components/com_config/src/Field/FiltersField.php b/administrator/components/com_config/src/Field/FiltersField.php
index f72539fca54..328300440cd 100644
--- a/administrator/components/com_config/src/Field/FiltersField.php
+++ b/administrator/components/com_config/src/Field/FiltersField.php
@@ -13,7 +13,6 @@
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\FormField;
-use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Layout\LayoutHelper;
 
@@ -43,47 +42,11 @@ class FiltersField extends FormField
 	 */
 	protected function getInput()
 	{
-		// Load Framework
-		HTMLHelper::_('jquery.framework');
-
 		// Add translation string for notification
 		Text::script('COM_CONFIG_TEXT_FILTERS_NOTE');
 
 		// Add Javascript
-		$doc = Factory::getDocument();
-		$doc->addScriptDeclaration('
-			jQuery( document ).ready(function( $ ) {
-				$("#filter-config select").change(function() {
-					var currentFilter = $(this).children("option:selected").val();
-
-					if($(this).children("option:selected").val() === "NONE") {
-						var child = $("#filter-config select[data-parent=" + $(this).attr("data-id") + "]");
-
-						while(child.length !== 0) {
-							if(child.children("option:selected").val() !== "NONE") {
-								alert(Joomla.JText._("COM_CONFIG_TEXT_FILTERS_NOTE"));
-								break;
-							}
-
-							child = $("#filter-config select[data-parent=" + child.attr("data-id") + "]");
-						}
-
-						return;
-					}
-
-					var parent = $("#filter-config select[data-id=" + $(this).attr("data-parent") + "]");
-
-					while(parent.length !== 0) {
-						if(parent.children("option:selected").val() === "NONE") {
-							alert(Joomla.JText._("COM_CONFIG_TEXT_FILTERS_NOTE"));
-							break;
-						}
-
-						parent = $("#filter-config select[data-id=" + parent.attr("data-parent") + "]")
-					}
-				});
-			});'
-		);
+		Factory::getDocument()->getWebAssetManager()->useScript('com_config.filters');
 
 		// Get the available user groups.
 		$groups = $this->getUserGroups();
diff --git a/administrator/components/com_config/tmpl/application/default_navigation.php b/administrator/components/com_config/tmpl/application/default_navigation.php
index 86170a265e6..9147f900e69 100644
--- a/administrator/components/com_config/tmpl/application/default_navigation.php
+++ b/administrator/components/com_config/tmpl/application/default_navigation.php
@@ -14,14 +14,14 @@
 <ul class="nav flex-column">
 	<?php if ($this->userIsSuperAdmin) : ?>
 		<li class="nav-header"><?php echo Text::_('COM_CONFIG_SYSTEM'); ?></li>
-		<li class="active">
+		<li class="item active">
 			<a href="index.php?option=com_config"><?php echo Text::_('COM_CONFIG_GLOBAL_CONFIGURATION'); ?></a>
 		</li>
 		<li class="divider"></li>
 	<?php endif; ?>
 	<li class="nav-header"><?php echo Text::_('COM_CONFIG_COMPONENT_FIELDSET_LABEL'); ?></li>
 	<?php foreach ($this->components as $component) : ?>
-		<li>
+		<li class="item">
 			<a href="index.php?option=com_config&view=component&component=<?php echo $component; ?>"><?php echo Text::_($component); ?></a>
 		</li>
 	<?php endforeach; ?>
diff --git a/administrator/components/com_config/tmpl/component/default_navigation.php b/administrator/components/com_config/tmpl/component/default_navigation.php
index 684543ac797..7f8f9a68b12 100644
--- a/administrator/components/com_config/tmpl/component/default_navigation.php
+++ b/administrator/components/com_config/tmpl/component/default_navigation.php
@@ -14,7 +14,7 @@
 <ul class="nav flex-column">
 	<?php if ($this->userIsSuperAdmin) : ?>
 		<li class="nav-header"><?php echo Text::_('COM_CONFIG_SYSTEM'); ?></li>
-		<li><a href="index.php?option=com_config"><?php echo Text::_('COM_CONFIG_GLOBAL_CONFIGURATION'); ?></a></li>
+		<li class="item"><a href="index.php?option=com_config"><?php echo Text::_('COM_CONFIG_GLOBAL_CONFIGURATION'); ?></a></li>
 		<li class="divider"></li>
 	<?php endif; ?>
 	<li class="nav-header"><?php echo Text::_('COM_CONFIG_COMPONENT_FIELDSET_LABEL'); ?></li>
@@ -23,10 +23,10 @@
 		$active = '';
 		if ($this->currentComponent === $component)
 		{
-			$active = ' class="active"';
+			$active = ' active';
 		}
 		?>
-		<li<?php echo $active; ?>>
+		<li class="item<?php echo $active; ?>">
 			<a href="index.php?option=com_config&view=component&component=<?php echo $component; ?>"><?php echo Text::_($component); ?></a>
 		</li>
 	<?php endforeach; ?>
diff --git a/administrator/components/com_contact/config.xml b/administrator/components/com_contact/config.xml
index 274167111be..ea1170481a0 100644
--- a/administrator/components/com_contact/config.xml
+++ b/administrator/components/com_contact/config.xml
@@ -396,7 +396,7 @@
 	<fieldset
 		name="Icons"
 		label="COM_CONTACT_ICONS_SETTINGS"
-		description="COM_CONTACT_FIELD_CONFIG_INDIVIDUAL_CONTACT_DESC"
+		description="COM_CONTACT_ICONS_SETTINGS_DESC"
 		>
 		<field
 			name="contact_icons"
diff --git a/administrator/components/com_contact/forms/contact.xml b/administrator/components/com_contact/forms/contact.xml
index 60916a9a997..463cdf0c57a 100644
--- a/administrator/components/com_contact/forms/contact.xml
+++ b/administrator/components/com_contact/forms/contact.xml
@@ -3,7 +3,7 @@
 	<fieldset addfieldprefix="Joomla\Component\Contact\Administrator\Field">
 		<field
 			name="id"
-			type="number"
+			type="text"
 			label="JGLOBAL_FIELD_ID_LABEL"
 			default="0"
 			class="readonly"
@@ -214,60 +214,6 @@
 			class="advancedSelect"
 			multiple="true"
 		/>
-
-		<field
-			name="contact_icons"
-			type="list"
-			label="COM_CONTACT_FIELD_ICONS_SETTINGS"
-			default="0"
-			validate="options"
-			>
-			<option value="0">COM_CONTACT_FIELD_VALUE_NONE</option>
-			<option value="1">COM_CONTACT_FIELD_VALUE_TEXT</option>
-			<option value="2">COM_CONTACT_FIELD_VALUE_ICONS</option>
-		</field>
-
-		<field
-			name="icon_address"
-			type="media"
-			label="COM_CONTACT_FIELD_ICONS_ADDRESS_LABEL"
-			hide_none="1"
-		/>
-
-		<field
-			name="icon_email"
-			type="media"
-			label="COM_CONTACT_FIELD_ICONS_EMAIL_LABEL"
-			hide_none="1"
-		/>
-
-		<field
-			name="icon_telephone"
-			type="media"
-			label="COM_CONTACT_FIELD_ICONS_TELEPHONE_LABEL"
-			hide_none="1"
-		/>
-
-		<field
-			name="icon_mobile"
-			type="media"
-			label="COM_CONTACT_FIELD_ICONS_MOBILE_LABEL"
-			hide_none="1"
-		/>
-
-		<field
-			name="icon_fax"
-			type="media"
-			label="COM_CONTACT_FIELD_ICONS_FAX_LABEL"
-			hide_none="1"
-		/>
-
-		<field
-			name="icon_misc"
-			type="media"
-			label="COM_CONTACT_FIELD_ICONS_MISC_LABEL"
-			hide_none="1"
-		/>
 	</fieldset>
 
 	<fieldset name="details" label="COM_CONTACT_CONTACT_DETAILS">
@@ -868,7 +814,7 @@
 
 	<field
 		name="hits"
-		type="number"
+		type="text"
 		label="JGLOBAL_HITS"
 		class="readonly"
 		readonly="true"
diff --git a/administrator/components/com_contact/forms/filter_contacts.xml b/administrator/components/com_contact/forms/filter_contacts.xml
index f4d1243e760..f47a8646e7d 100644
--- a/administrator/components/com_contact/forms/filter_contacts.xml
+++ b/administrator/components/com_contact/forms/filter_contacts.xml
@@ -103,10 +103,10 @@
 			<option value="">JGLOBAL_SORT_BY</option>
 			<option value="a.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>
 			<option value="a.ordering DESC">JGRID_HEADING_ORDERING_DESC</option>
-			<option value="a.published ASC">JSTATUS_ASC</option>
-			<option value="a.published DESC">JSTATUS_DESC</option>
 			<option value="a.featured ASC">JFEATURED_ASC</option>
 			<option value="a.featured DESC">JFEATURED_DESC</option>
+			<option value="a.published ASC">JSTATUS_ASC</option>
+			<option value="a.published DESC">JSTATUS_DESC</option>
 			<option value="a.name ASC">JGLOBAL_TITLE_ASC</option>
 			<option value="a.name DESC">JGLOBAL_TITLE_DESC</option>
 			<option value="category_title ASC">JCATEGORY_ASC</option>
diff --git a/administrator/components/com_contact/src/Model/ContactModel.php b/administrator/components/com_contact/src/Model/ContactModel.php
index 5ef3108c616..b6fa77dc8a9 100644
--- a/administrator/components/com_contact/src/Model/ContactModel.php
+++ b/administrator/components/com_contact/src/Model/ContactModel.php
@@ -196,6 +196,12 @@ public function getForm($data = array(), $loadData = true)
 			$form->setFieldAttribute('published', 'filter', 'unset');
 		}
 
+		// Don't allow to change the created_by user if not allowed to access com_users.
+		if (!Factory::getUser()->authorise('core.manage', 'com_users'))
+		{
+			$form->setFieldAttribute('created_by', 'filter', 'unset');
+		}
+
 		return $form;
 	}
 
@@ -543,31 +549,4 @@ private function canCreateCategory()
 	{
 		return Factory::getUser()->authorise('core.create', 'com_contact');
 	}
-
-	/**
-	 * Method to validate the form data.
-	 *
-	 * @param   Form    $form   The form to validate against.
-	 * @param   array   $data   The data to validate.
-	 * @param   string  $group  The name of the field group to validate.
-	 *
-	 * @return  array|boolean  Array of filtered data if valid, false otherwise.
-	 *
-	 * @see     JFormRule
-	 * @see     JFilterInput
-	 * @since   3.9.25
-	 */
-	public function validate($form, $data, $group = null)
-	{
-		// Don't allow to change the users if not allowed to access com_users.
-		if (!Factory::getUser()->authorise('core.manage', 'com_users'))
-		{
-			if (isset($data['created_by']))
-			{
-				unset($data['created_by']);
-			}
-		}
-
-		return parent::validate($form, $data, $group);
-	}
 }
diff --git a/administrator/components/com_content/config.xml b/administrator/components/com_content/config.xml
index 51d5612ea8e..3cd59029f78 100644
--- a/administrator/components/com_content/config.xml
+++ b/administrator/components/com_content/config.xml
@@ -742,6 +742,14 @@
 			default="4"
 		/>
 
+		<field
+			name="blog_class"
+			type="text"
+			label="JGLOBAL_BLOG_CLASS"
+			description="JGLOBAL_BLOG_CLASS_NOTE_DESC"
+			validate="CssIdentifier"
+		/>
+
 		<field
 			name="num_columns"
 			type="number"
@@ -761,13 +769,6 @@
 			<option value="1">JGLOBAL_BLOG_ACROSS_OPTION</option>
 		</field>
 
-		<field
-			name="blog_class"
-			type="text"
-			label="JGLOBAL_BLOG_CLASS"
-			validate="CssIdentifier"
-		/>
-
 		<field
 			name="num_links"
 			type="number"
diff --git a/administrator/components/com_content/forms/article.xml b/administrator/components/com_content/forms/article.xml
index e87e6f4fe50..3b6ad8bcd58 100644
--- a/administrator/components/com_content/forms/article.xml
+++ b/administrator/components/com_content/forms/article.xml
@@ -3,7 +3,7 @@
 	<fieldset addfieldprefix="Joomla\Component\Content\Administrator\Field">
 		<field
 			name="id"
-			type="number"
+			type="text"
 			label="JGLOBAL_FIELD_ID_LABEL"
 			class="readonly"
 			default="0"
@@ -233,7 +233,7 @@
 
 		<field
 			name="hits"
-			type="number"
+			type="text"
 			label="JGLOBAL_HITS"
 			class="readonly"
 			readonly="true"
diff --git a/administrator/components/com_content/forms/filter_articles.xml b/administrator/components/com_content/forms/filter_articles.xml
index 7ea6d54395c..73c1bb84e6f 100644
--- a/administrator/components/com_content/forms/filter_articles.xml
+++ b/administrator/components/com_content/forms/filter_articles.xml
@@ -125,10 +125,10 @@
 			<option value="">JGLOBAL_SORT_BY</option>
 			<option value="a.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>
 			<option value="a.ordering DESC">JGRID_HEADING_ORDERING_DESC</option>
-			<option value="a.state ASC">JSTATUS_ASC</option>
-			<option value="a.state DESC">JSTATUS_DESC</option>
 			<option value="a.featured ASC">JFEATURED_ASC</option>
 			<option value="a.featured DESC">JFEATURED_DESC</option>
+			<option value="a.state ASC">JSTATUS_ASC</option>
+			<option value="a.state DESC">JSTATUS_DESC</option>
 			<option value="a.title ASC">JGLOBAL_TITLE_ASC</option>
 			<option value="a.title DESC">JGLOBAL_TITLE_DESC</option>
 			<option value="category_title ASC">JCATEGORY_ASC</option>
diff --git a/administrator/components/com_content/src/Model/ArticleModel.php b/administrator/components/com_content/src/Model/ArticleModel.php
index 8f919f29e18..bc9bd82c046 100644
--- a/administrator/components/com_content/src/Model/ArticleModel.php
+++ b/administrator/components/com_content/src/Model/ArticleModel.php
@@ -586,6 +586,12 @@ public function getForm($data = array(), $loadData = true)
 			$form->setFieldAttribute('state', 'filter', 'unset');
 		}
 
+		// Don't allow to change the created_by user if not allowed to access com_users.
+		if (!Factory::getUser()->authorise('core.manage', 'com_users'))
+		{
+			$form->setFieldAttribute('created_by', 'filter', 'unset');
+		}
+
 		return $form;
 	}
 
@@ -656,15 +662,6 @@ protected function loadFormData()
 	 */
 	public function validate($form, $data, $group = null)
 	{
-		// Don't allow to change the users if not allowed to access com_users.
-		if (!Factory::getUser()->authorise('core.manage', 'com_users'))
-		{
-			if (isset($data['created_by']))
-			{
-				unset($data['created_by']);
-			}
-		}
-
 		if (!Factory::getUser()->authorise('core.admin', 'com_content'))
 		{
 			if (isset($data['rules']))
diff --git a/administrator/components/com_contenthistory/tmpl/preview/preview.php b/administrator/components/com_contenthistory/tmpl/preview/preview.php
index f59264b0d17..a97b9f04577 100644
--- a/administrator/components/com_contenthistory/tmpl/preview/preview.php
+++ b/administrator/components/com_contenthistory/tmpl/preview/preview.php
@@ -31,8 +31,8 @@
 		</caption>
 		<thead>
 			<tr>
-				<th class="w-25"><?php echo Text::_('COM_CONTENTHISTORY_PREVIEW_FIELD'); ?></th>
-				<th><?php echo Text::_('COM_CONTENTHISTORY_PREVIEW_VALUE'); ?></th>
+				<th class="w-25" scope="col"><?php echo Text::_('COM_CONTENTHISTORY_PREVIEW_FIELD'); ?></th>
+				<th scope="col"><?php echo Text::_('COM_CONTENTHISTORY_PREVIEW_VALUE'); ?></th>
 			</tr>
 		</thead>
 		<tbody>
diff --git a/administrator/components/com_fields/forms/field.xml b/administrator/components/com_fields/forms/field.xml
index f5faffbf753..bc36848074e 100644
--- a/administrator/components/com_fields/forms/field.xml
+++ b/administrator/components/com_fields/forms/field.xml
@@ -3,7 +3,7 @@
 	<fieldset>
 		<field
 			name="id"
-			type="number"
+			type="text"
 			label="JGLOBAL_FIELD_ID_LABEL"
 			default="0"
 			class="readonly"
diff --git a/administrator/components/com_fields/forms/group.xml b/administrator/components/com_fields/forms/group.xml
index 2c467804bef..2b7a43655df 100644
--- a/administrator/components/com_fields/forms/group.xml
+++ b/administrator/components/com_fields/forms/group.xml
@@ -3,7 +3,7 @@
 	<fieldset>
 		<field
 			name="id"
-			type="number"
+			type="text"
 			label="JGLOBAL_FIELD_ID_LABEL"
 			default="0"
 			class="readonly"
diff --git a/administrator/components/com_fields/src/Model/FieldModel.php b/administrator/components/com_fields/src/Model/FieldModel.php
index 847237902f5..e8ba96f4511 100644
--- a/administrator/components/com_fields/src/Model/FieldModel.php
+++ b/administrator/components/com_fields/src/Model/FieldModel.php
@@ -571,6 +571,12 @@ public function getForm($data = array(), $loadData = true)
 			$form->setFieldAttribute('state', 'filter', 'unset');
 		}
 
+		// Don't allow to change the created_user_id user if not allowed to access com_users.
+		if (!Factory::getUser()->authorise('core.manage', 'com_users'))
+		{
+			$form->setFieldAttribute('created_user_id', 'filter', 'unset');
+		}
+
 		// In case we are editing a field, field type cannot be changed, so some extra handling below is needed
 		if ($fieldId)
 		{
@@ -965,15 +971,6 @@ protected function loadFormData()
 	 */
 	public function validate($form, $data, $group = null)
 	{
-		// Don't allow to change the users if not allowed to access com_users.
-		if (!Factory::getUser()->authorise('core.manage', 'com_users'))
-		{
-			if (isset($data['created_user_id']))
-			{
-				unset($data['created_user_id']);
-			}
-		}
-
 		if (!Factory::getUser()->authorise('core.admin', 'com_fields'))
 		{
 			if (isset($data['rules']))
diff --git a/administrator/components/com_fields/src/Model/GroupModel.php b/administrator/components/com_fields/src/Model/GroupModel.php
index b577560ba04..f80736f3e70 100644
--- a/administrator/components/com_fields/src/Model/GroupModel.php
+++ b/administrator/components/com_fields/src/Model/GroupModel.php
@@ -125,7 +125,9 @@ public function getForm($data = array(), $loadData = true)
 			$data['context'] = $context;
 		}
 
-		if (!Factory::getUser()->authorise('core.edit.state', $context . '.fieldgroup.' . $jinput->get('id')))
+		$user = Factory::getUser();
+
+		if (!$user->authorise('core.edit.state', $context . '.fieldgroup.' . $jinput->get('id')))
 		{
 			// Disable fields for display.
 			$form->setFieldAttribute('ordering', 'disabled', 'true');
@@ -136,6 +138,12 @@ public function getForm($data = array(), $loadData = true)
 			$form->setFieldAttribute('state', 'filter', 'unset');
 		}
 
+		// Don't allow to change the created_by user if not allowed to access com_users.
+		if (!$user->authorise('core.manage', 'com_users'))
+		{
+			$form->setFieldAttribute('created_by', 'filter', 'unset');
+		}
+
 		return $form;
 	}
 
@@ -280,15 +288,6 @@ protected function preprocessForm(Form $form, $data, $group = 'content')
 	 */
 	public function validate($form, $data, $group = null)
 	{
-		// Don't allow to change the users if not allowed to access com_users.
-		if (!Factory::getUser()->authorise('core.manage', 'com_users'))
-		{
-			if (isset($data['created_by']))
-			{
-				unset($data['created_by']);
-			}
-		}
-
 		if (!Factory::getUser()->authorise('core.admin', 'com_fields'))
 		{
 			if (isset($data['rules']))
diff --git a/administrator/components/com_fields/tmpl/field/modal.php b/administrator/components/com_fields/tmpl/field/modal.php
deleted file mode 100644
index 977ffc2ac92..00000000000
--- a/administrator/components/com_fields/tmpl/field/modal.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-/**
- * @package     Joomla.Administrator
- * @subpackage  com_fields
- *
- * @copyright   (C) 2016 Open Source Matters, Inc. <https://www.joomla.org>
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-defined('_JEXEC') or die;
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\HTML\HTMLHelper;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\Layout\LayoutHelper;
-use Joomla\CMS\Router\Route;
-
-/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
-$wa = $this->document->getWebAssetManager();
-$wa->useScript('keepalive')
-	->useScript('form.validate')
-	->useScript('com_fields.admin-field-edit-modal');
-
-$this->useCoreUI = true;
-?>
-<div class="container-popup">
-
-	<div class="float-end">
-		<button class="btn btn-primary" type="button" onclick="Joomla.submitbutton('field.apply');"><?php echo Text::_('JTOOLBAR_APPLY') ?></button>
-		<button class="btn btn-primary" type="button" onclick="Joomla.submitbutton('field.save');"><?php echo Text::_('JTOOLBAR_SAVE') ?></button>
-		<button class="btn" type="button" onclick="Joomla.submitbutton('field.cancel');"><?php echo Text::_('JCANCEL') ?></button>
-	</div>
-
-	<hr>
-
-	<form action="<?php echo Route::_('index.php?option=com_fields&context=' . Factory::getApplication()->input->getCmd('context', 'com_content') . '&layout=modal&tmpl=component&id=' . (int) $this->item->id); ?>" method="post" name="adminForm" id="item-form" class="form-validate">
-		<?php echo LayoutHelper::render('joomla.edit.title_alias', $this); ?>
-
-		<div class="main-card">
-			<?php echo HTMLHelper::_('uitab.startTabSet', 'myTab', array('active' => 'general')); ?>
-
-			<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'general', Text::_('COM_FIELDS', true)); ?>
-			<div class="row">
-				<div class="col-lg-9">
-					<?php echo $this->form->getLabel('description'); ?>
-					<?php echo $this->form->getInput('description'); ?>
-				</div>
-				<div class="col-lg-3">
-					<?php echo LayoutHelper::render('joomla.edit.global', $this); ?>
-				</div>
-			</div>
-			<?php echo HTMLHelper::_('uitab.endTab'); ?>
-
-			<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'publishing', Text::_('COM_FIELDS_FIELDSET_PUBLISHING', true)); ?>
-			<div class="row">
-				<div class="col-md-6">
-					<?php echo LayoutHelper::render('joomla.edit.publishingdata', $this); ?>
-				</div>
-				<div class="col-md-6">
-				</div>
-			</div>
-			<?php echo HTMLHelper::_('uitab.endTab'); ?>
-
-			<?php if ($this->canDo->get('core.admin')) : ?>
-				<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'rules', Text::_('COM_FIELDS_FIELDSET_RULES', true)); ?>
-				<?php echo $this->form->getInput('rules'); ?>
-				<?php echo HTMLHelper::_('uitab.endTab'); ?>
-			<?php endif; ?>
-
-			<?php echo LayoutHelper::render('joomla.edit.params', $this); ?>
-
-			<?php echo HTMLHelper::_('uitab.endTabSet'); ?>
-
-			<?php echo $this->form->getInput('context'); ?>
-			<input type="hidden" name="task" value="">
-			<?php echo HTMLHelper::_('form.token'); ?>
-		</div>
-	</form>
-</div>
diff --git a/administrator/components/com_fields/tmpl/fields/default_batch_body.php b/administrator/components/com_fields/tmpl/fields/default_batch_body.php
index 33d26bafb1c..5c07fe160b8 100644
--- a/administrator/components/com_fields/tmpl/fields/default_batch_body.php
+++ b/administrator/components/com_fields/tmpl/fields/default_batch_body.php
@@ -17,7 +17,7 @@
 $wa->useScript('com_fields.admin-fields-batch');
 $wa->useScript('joomla.batch-copymove');
 
-$context   = $this->escape($this->state->get('filter.context'));
+$context = $this->escape($this->state->get('filter.context'));
 ?>
 
 <div class="p-3">
@@ -35,7 +35,7 @@
 	</div>
 	<div class="row">
 		<div class="form-group col-md-6">
-			<div class="controls">
+			<div class="control-group">
 				<?php $options = array(
 					HTMLHelper::_('select.option', 'c', Text::_('JLIB_HTML_BATCH_COPY')),
 					HTMLHelper::_('select.option', 'm', Text::_('JLIB_HTML_BATCH_MOVE'))
@@ -51,7 +51,7 @@
 						<?php echo HTMLHelper::_('select.options', $this->get('Groups'), 'value', 'text'); ?>
 					</select>
 				</div>
-				<div id="batch-copy-move" class="control-group radio">
+				<div id="batch-copy-move">
 					<?php echo Text::_('JLIB_HTML_BATCH_MOVE_QUESTION'); ?>
 					<?php echo HTMLHelper::_('select.radiolist', $options, 'batch[move_copy]', '', 'value', 'text', 'm'); ?>
 				</div>
diff --git a/administrator/components/com_finder/src/Controller/DisplayController.php b/administrator/components/com_finder/src/Controller/DisplayController.php
index 2584d2a6c17..aaa94590f34 100644
--- a/administrator/components/com_finder/src/Controller/DisplayController.php
+++ b/administrator/components/com_finder/src/Controller/DisplayController.php
@@ -11,9 +11,12 @@
 
 \defined('_JEXEC') or die;
 
+use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\BaseController;
+use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\Router\Route;
+use Joomla\Component\Finder\Administrator\Helper\FinderHelper;
 
 /**
  * Base controller class for Finder.
@@ -46,6 +49,23 @@ public function display($cachable = false, $urlparams = array())
 		$layout = $this->input->get('layout', 'index', 'word');
 		$filterId = $this->input->get('filter_id', null, 'int');
 
+		if ($view === 'index')
+		{
+			$pluginEnabled    = PluginHelper::isEnabled('content', 'finder');
+
+			if (!$pluginEnabled)
+			{
+				$finderPluginId   = FinderHelper::getFinderPluginId();
+				$link = HTMLHelper::_(
+					'link',
+					'#plugin' . $finderPluginId . 'Modal',
+					Text::_('COM_FINDER_CONTENT_PLUGIN'),
+					'class="alert-link" data-bs-toggle="modal" id="title-' . $finderPluginId . '"'
+				);
+				$this->app->enqueueMessage(Text::sprintf('COM_FINDER_INDEX_PLUGIN_CONTENT_NOT_ENABLED_LINK', $link), 'warning');
+			}
+		}
+
 		// Check for edit form.
 		if ($view === 'filter' && $layout === 'edit' && !$this->checkEditId('com_finder.edit.filter', $filterId))
 		{
diff --git a/administrator/components/com_finder/src/Indexer/Indexer.php b/administrator/components/com_finder/src/Indexer/Indexer.php
index 44aba97f53f..6d1e9460067 100644
--- a/administrator/components/com_finder/src/Indexer/Indexer.php
+++ b/administrator/components/com_finder/src/Indexer/Indexer.php
@@ -919,12 +919,19 @@ protected function addTokensToDb($tokens, $context = '')
 
 		$query = clone $this->addTokensToDbQueryTemplate;
 
+		// Check if a single FinderIndexerToken object was given and make it to be an array of FinderIndexerToken objects
+		$tokens = is_array($tokens) ? $tokens : array($tokens);
+
 		// Count the number of token values.
 		$values = 0;
 
-		// Iterate through the tokens to create SQL value sets.
-		if (!is_a($tokens, Token::class))
+		// Break into chunks of no more than 128 items
+		$chunks = array_chunk($tokens, 128);
+
+		foreach ($chunks as $tokens)
 		{
+			$query->clear('values');
+
 			foreach ($tokens as $token)
 			{
 				if ($filterCommon && $token->common)
@@ -946,38 +953,16 @@ protected function addTokensToDb($tokens, $context = '')
 					. (int) $context . ', '
 					. $db->quote($token->language)
 				);
-				$values++;
-
-				if ($values > 0 && ($values % 128) == 0)
-				{
-					$db->setQuery($query)->execute();
-					$query->clear('values');
-
-					// Check if we're approaching the memory limit of the token table.
-					if ($values > static::$state->options->get('memory_table_limit', 10000))
-					{
-						$this->toggleTables(false);
-					}
-				}
+				++$values;
 			}
-		}
-		else
-		{
-			$query->values(
-				$db->quote($tokens->term) . ', '
-				. $db->quote($tokens->stem) . ', '
-				. (int) $tokens->common . ', '
-				. (int) $tokens->phrase . ', '
-				. $db->escape((float) $tokens->weight) . ', '
-				. (int) $context . ', '
-				. $db->quote($tokens->language)
-			);
-			$values++;
-		}
 
-		if ($query->values)
-		{
 			$db->setQuery($query)->execute();
+
+			// Check if we're approaching the memory limit of the token table.
+			if ($values > static::$state->options->get('memory_table_limit', 10000))
+			{
+				$this->toggleTables(false);
+			}
 		}
 
 		return $values;
diff --git a/administrator/components/com_finder/src/View/Index/HtmlView.php b/administrator/components/com_finder/src/View/Index/HtmlView.php
index 465764db0a0..50021bcdf1c 100644
--- a/administrator/components/com_finder/src/View/Index/HtmlView.php
+++ b/administrator/components/com_finder/src/View/Index/HtmlView.php
@@ -11,13 +11,12 @@
 
 \defined('_JEXEC') or die;
 
-use Joomla\CMS\Factory;
 use Joomla\CMS\Helper\ContentHelper;
 use Joomla\CMS\Language\Multilanguage;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\GenericDataException;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
-use Joomla\CMS\Router\Route;
+use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\Toolbar\Toolbar;
 use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\Component\Finder\Administrator\Helper\FinderHelper;
@@ -57,6 +56,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	protected $pluginState;
 
+	/**
+	 * The id of the content - finder plugin in mysql
+	 *
+	 * @var    integer
+	 * @since  4.0.0
+	 */
+	protected $finderPluginId = 0;
+
 	/**
 	 * The model state
 	 *
@@ -138,17 +145,10 @@ public function display($tpl = null)
 			throw new GenericDataException(implode("\n", $errors), 500);
 		}
 
-		if (!$this->pluginState['plg_content_finder']->enabled)
+		// Check that the content - finder plugin is enabled
+		if (!PluginHelper::isEnabled('content', 'finder'))
 		{
-			if (Factory::getUser()->authorise('core.manage', 'com_plugin'))
-			{
-				$link = Route::_('index.php?option=com_plugins&task=plugin.edit&extension_id=' . FinderHelper::getFinderPluginId());
-				Factory::getApplication()->enqueueMessage(Text::sprintf('COM_FINDER_INDEX_PLUGIN_CONTENT_NOT_ENABLED_LINK', $link), 'warning');
-			}
-			else
-			{
-				Factory::getApplication()->enqueueMessage(Text::_('COM_FINDER_INDEX_PLUGIN_CONTENT_NOT_ENABLED'), 'warning');
-			}
+			$this->finderPluginId = FinderHelper::getFinderPluginId();
 		}
 
 		// Configure the toolbar.
diff --git a/administrator/components/com_finder/tmpl/index/default.php b/administrator/components/com_finder/tmpl/index/default.php
index 1f285706585..a55d36ad437 100644
--- a/administrator/components/com_finder/tmpl/index/default.php
+++ b/administrator/components/com_finder/tmpl/index/default.php
@@ -36,6 +36,31 @@
 		<div class="col-md-12">
 			<div id="j-main-container" class="j-main-container">
 				<?php echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
+				<?php if ($this->finderPluginId) : ?>
+					<?php $link = Route::_('index.php?option=com_plugins&client_id=0&task=plugin.edit&extension_id=' . $this->finderPluginId . '&tmpl=component&layout=modal'); ?>
+					<?php echo HTMLHelper::_(
+						'bootstrap.renderModal',
+						'plugin' . $this->finderPluginId . 'Modal',
+						array(
+							'url'         => $link,
+							'title'       => Text::_('COM_FINDER_EDIT_PLUGIN_SETTINGS'),
+							'height'      => '400px',
+							'width'       => '800px',
+							'bodyHeight'  => '70',
+							'modalWidth'  => '80',
+							'closeButton' => false,
+							'backdrop'    => 'static',
+							'keyboard'    => false,
+							'footer'      => '<button type="button" class="btn btn-secondary" data-bs-dismiss="modal"'
+								. ' onclick="Joomla.iframeButtonClick({iframeSelector: \'#plugin' . $this->finderPluginId . 'Modal\', buttonSelector: \'#closeBtn\'})">'
+								. Text::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</button>'
+								. '<button type="button" class="btn btn-primary" data-bs-dismiss="modal" onclick="Joomla.iframeButtonClick({iframeSelector: \'#plugin' . $this->finderPluginId . 'Modal\', buttonSelector: \'#saveBtn\'})">'
+								. Text::_("JSAVE") . '</button>'
+								. '<button type="button" class="btn btn-success" onclick="Joomla.iframeButtonClick({iframeSelector: \'#plugin' . $this->finderPluginId . 'Modal\', buttonSelector: \'#applyBtn\'}); return false;">'
+								. Text::_("JAPPLY") . '</button>'
+						)
+					); ?>
+				<?php endif; ?>
 				<?php if (empty($this->items)) : ?>
 					<div class="alert alert-info">
 						<span class="icon-info-circle" aria-hidden="true"></span><span class="visually-hidden"><?php echo Text::_('INFO'); ?></span>
diff --git a/administrator/components/com_joomlaupdate/restore.php b/administrator/components/com_joomlaupdate/restore.php
index a3b73de0dff..4aa1e7d1336 100644
--- a/administrator/components/com_joomlaupdate/restore.php
+++ b/administrator/components/com_joomlaupdate/restore.php
@@ -60,7 +60,7 @@
 }
 
 // fnmatch not available on non-POSIX systems
-// Thanks to soywiz@php.net for this usefull alternative function [http://gr2.php.net/fnmatch]
+// Thanks to soywiz@php.net for this useful alternative function [http://gr2.php.net/fnmatch]
 if (!function_exists('fnmatch'))
 {
 	function fnmatch($pattern, $string)
@@ -3111,7 +3111,7 @@ class AKText extends AKAbstractObject
 		'BTN_SITEFE'                      => 'Visit your site\'s frontend',
 		'BTN_SITEBE'                      => 'Visit your site\'s backend',
 		'WARNINGS'                        => 'Extraction Warnings',
-		'ERROR_OCCURED'                   => 'An error occurred',
+		'ERROR_OCCURRED'                  => 'An error occurred',
 		'STEALTH_MODE'                    => 'Stealth mode',
 		'STEALTH_URL'                     => 'HTML file to show to web visitors',
 		'ERR_NOT_A_JPS_FILE'              => 'The file is not a JPA archive',
@@ -5292,7 +5292,7 @@ public function __toString()
 		switch ($task)
 		{
 			case 'ping':
-				// ping task - realy does nothing!
+				// ping task - really does nothing!
 				$timer = AKFactory::getTimer();
 				$timer->enforce_min_exec_time();
 				break;
diff --git a/administrator/components/com_joomlaupdate/src/Model/UpdateModel.php b/administrator/components/com_joomlaupdate/src/Model/UpdateModel.php
index 10f5ebe69ca..162c72a2926 100644
--- a/administrator/components/com_joomlaupdate/src/Model/UpdateModel.php
+++ b/administrator/components/com_joomlaupdate/src/Model/UpdateModel.php
@@ -715,6 +715,9 @@ public function finaliseUpgrade()
 			return false;
 		}
 
+		// Reinitialise the installer's extensions table's properties.
+		$installer->extension->getFields(true);
+
 		// Start Joomla! 1.6.
 		ob_start();
 		ob_implicit_flush(false);
diff --git a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_preupdatecheck.php b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_preupdatecheck.php
index 43466aeccb5..e1b0831320f 100644
--- a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_preupdatecheck.php
+++ b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_preupdatecheck.php
@@ -60,22 +60,22 @@
 <div class="row">
 	<div class="col-md-6">
 		<fieldset class="options-form">
-			<?php
-			$labelClass = 'success';
-			foreach ($this->phpOptions as $option) :
-				if (!$option->state)
-				{
-					$labelClass = 'danger';
-					break;
-				}
-			endforeach;
-			?>
+			<?php $labelClass = 'success'; ?>
+			<?php foreach ($this->phpOptions as $option) : ?>
+				<?php if (!$option->state) : ?>
+					<?php $labelClass = 'danger'; ?>
+					<?php break; ?>
+				<?php endif; ?>
+			<?php endforeach; ?>
 			<legend>
 				<h3 class="alert alert-<?php echo $labelClass; ?>">
-					<?php
-					echo $labelClass === 'danger' ? Text::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_REQUIRED_SETTINGS_WARNING') : Text::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_REQUIRED_SETTINGS_PASSED');
-					?>
-					<div class="settingstoggle ms-1" data-state="closed"><?php echo Text::sprintf('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_SHOW_MORE_COMPATIBILITY_INFORMATION', '<span class="icon-chevron-right"></span>'); ?></div>
+					<?php echo $labelClass === 'danger' ? Text::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_REQUIRED_SETTINGS_WARNING') : Text::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_REQUIRED_SETTINGS_PASSED'); ?>
+					<div class="settingstoggle ms-1" data-state="closed">
+						<?php echo Text::sprintf(
+							'COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_SHOW_MORE_COMPATIBILITY_INFORMATION',
+							'<span class="icon-chevron-right"></span>'
+						); ?>
+					</div>
 				</h3>
 			</legend>
 			<div class="settingsInfo hidden">
@@ -119,23 +119,23 @@
 
 	<div class="col-md-6">
 		<fieldset class="options-form">
-			<?php
-			$labelClass = 'success';
-			foreach ($this->phpSettings as $setting) :
-				if ($setting->state !== $setting->recommended)
-				{
-					$labelClass = 'warning';
-					break;
-				}
-			endforeach;
-			?>
+			<?php $labelClass = 'success'; ?>
+			<?php foreach ($this->phpSettings as $setting) : ?>
+				<?php if ($setting->state !== $setting->recommended) : ?>
+					<?php $labelClass = 'warning'; ?>
+					<?php break; ?>
+				<?php endif; ?>
+			<?php endforeach; ?>
 
 			<legend>
 				<h3 class="alert alert-<?php echo $labelClass; ?>">
-					<?php
-					echo $labelClass === 'warning' ? Text::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_RECOMMENDED_SETTINGS_WARNING') : Text::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_RECOMMENDED_SETTINGS_PASSED');
-					?>
-					<div class="settingstoggle ms-1" data-state="closed"><?php echo Text::sprintf('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_SHOW_MORE_COMPATIBILITY_INFORMATION', '<span class="icon-chevron-right"></span>'); ?></div>
+					<?php echo $labelClass === 'warning' ? Text::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_RECOMMENDED_SETTINGS_WARNING') : Text::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_RECOMMENDED_SETTINGS_PASSED'); ?>
+					<div class="settingstoggle ms-1" data-state="closed">
+						<?php echo Text::sprintf(
+							'COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_SHOW_MORE_COMPATIBILITY_INFORMATION',
+							'<span class="icon-chevron-right"></span>'
+						); ?>
+					</div>
 				</h3>
 			</legend>
 			<div class="settingsInfo hidden">
@@ -192,7 +192,12 @@
 					<legend>
 						<h3 class="alert <?php echo $compatibilityDisplayClass; ?>">
 							<?php if ($compatibilityType !== "COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_RUNNING_PRE_UPDATE_CHECKS") : ?>
-								<div class="compatibilitytoggle" data-state="closed"><?php echo Text::sprintf('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_SHOW_MORE_COMPATIBILITY_INFORMATION', '<span class="icon-chevron-right"></span>'); ?></div>
+								<div class="compatibilitytoggle" data-state="closed">
+									<?php echo Text::sprintf(
+										'COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_SHOW_MORE_COMPATIBILITY_INFORMATION',
+										'<span class="icon-chevron-right"></span>'
+									); ?>
+								</div>
 							<?php endif; ?>
 							<?php echo Text::_($compatibilityType); ?>
 						</h3>
@@ -226,7 +231,7 @@
 							<?php foreach ($this->nonCoreExtensions as $extension) : ?>
 								<tr>
 									<td class="exname col-md-8">
-										<?php echo Text::_($extension->name); ?>
+										<?php echo $extension->name; ?>
 									</td>
 									<td class="extype col-md-4">
 										<?php echo Text::_('COM_INSTALLER_TYPE_' . strtoupper($extension->type)); ?>
diff --git a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_update.php b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_update.php
index 435b7c6f907..71a1394cafb 100644
--- a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_update.php
+++ b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_update.php
@@ -79,7 +79,7 @@
 		</div>
 	<?php endif; ?>
 
-	<div id="preupdateCheckWarning" class="alert ">
+	<div id="preupdateCheckWarning" class="alert">
 		<h4 class="alert-heading">
 			<?php echo Text::_('WARNING'); ?>
 		</h4>
@@ -91,7 +91,7 @@
 	</div>
 
 	<div id="preupdateCheckCompleteProblems" class="hidden">
-		<div class="alert ">
+		<div class="alert">
 			<h4 class="alert-heading">
 				<?php echo Text::_('WARNING'); ?>
 			</h4>
@@ -155,31 +155,26 @@
 								</td>
 								<?php endif; ?>
 							<?php endforeach; ?>
-							<?php endif;?>
+							<?php endif; ?>
 						</td>
 						<td>
-							<?php
-							$authorURL = "";
-							if (isset($nonCoreCriticalPlugin->manifest_cache->authorUrl))
-							{
-								$authorURL = $nonCoreCriticalPlugin->manifest_cache->authorUrl;
-							}
-							elseif ($nonCoreCriticalPlugin->package_id > 0)
-							{
-								foreach ($this->nonCoreExtensions as $nonCoreExtension)
-								{
-									if ($nonCoreCriticalPlugin->package_id == $nonCoreExtension->extension_id)
-									{
-										$authorURL = $nonCoreExtension->manifest_cache->authorUrl;
-									}
-								}
-							}
-							?>
+							<?php $authorURL = ''; ?>
+							<?php if (isset($nonCoreCriticalPlugin->manifest_cache->authorUrl)) : ?>
+								<?php $authorURL = $nonCoreCriticalPlugin->manifest_cache->authorUrl; ?>
+							<?php elseif ($nonCoreCriticalPlugin->package_id > 0) : ?>
+								<?php foreach ($this->nonCoreExtensions as $nonCoreExtension) : ?>
+									<?php if ($nonCoreCriticalPlugin->package_id == $nonCoreExtension->extension_id) : ?>
+										<?php $authorURL = $nonCoreExtension->manifest_cache->authorUrl; ?>
+									<?php endif; ?>
+								<?php endforeach; ?>
+							<?php endif; ?>
 							<?php if (!empty($authorURL)) : ?>
-								<a href="<?php echo $authorURL; ?>" target="_blank" >
+								<a href="<?php echo $authorURL; ?>" target="_blank">
 								<?php echo $authorURL; ?>
 								<span class="icon-out-2" aria-hidden="true"></span>
-								<span class="element-invisible"><?php echo Text::_('JBROWSERTARGET_NEW'); ?></span>
+								<span class="visually-hidden">
+									<?php echo Text::_('JBROWSERTARGET_NEW'); ?>
+								</span>
 								</a>
 							<?php endif;?>
 						</td>
diff --git a/administrator/components/com_mails/tmpl/template/edit.php b/administrator/components/com_mails/tmpl/template/edit.php
index 16fecc783dd..8164be4c345 100644
--- a/administrator/components/com_mails/tmpl/template/edit.php
+++ b/administrator/components/com_mails/tmpl/template/edit.php
@@ -65,7 +65,7 @@
 			</div>
 			<div class="col-md-3">
 				<input type="button" id="btnResetBody" class="btn btn-secondary" value="<?php echo Text::_('COM_MAILS_RESET_TO_DEFAULT_BODY'); ?>" />
-				<div class="tags-container-body <?php echo $fieldBody->disabled ? 'hidden' : ''; ?>">
+				<div class="tags-container-body mt-3 <?php echo $fieldBody->disabled ? 'hidden' : ''; ?>">
 					<h2><?php echo Text::_('COM_MAILS_FIELDSET_TAGS_LABEL'); ?></h2>
 					<?php echo MailsHelper::mailtags($this->master, 'body'); ?>
 				</div>
@@ -80,7 +80,7 @@
 			</div>
 			<div class="col-md-3">
 				<input type="button" id="btnResetHtmlBody" class="btn btn-secondary" value="<?php echo Text::_('COM_MAILS_RESET_TO_DEFAULT_HTML_BODY'); ?>" />
-				<div class="tags-container-htmlbody <?php echo $fieldHtmlBody->disabled ? 'hidden' : ''; ?>">
+				<div class="tags-container-htmlbody mt-3 <?php echo $fieldHtmlBody->disabled ? 'hidden' : ''; ?>">
 					<h2><?php echo Text::_('COM_MAILS_FIELDSET_TAGS_LABEL'); ?></h2>
 					<?php echo MailsHelper::mailtags($this->master, 'htmlbody'); ?>
 				</div>
diff --git a/administrator/components/com_mails/tmpl/templates/default.php b/administrator/components/com_mails/tmpl/templates/default.php
index 3ffa5416019..f8b0944c9fa 100644
--- a/administrator/components/com_mails/tmpl/templates/default.php
+++ b/administrator/components/com_mails/tmpl/templates/default.php
@@ -73,15 +73,19 @@
 								</td>
 								<?php if (count($this->languages) > 1) : ?>
 									<td class="text-center">
+										<ul class="list-unstyled d-flex">
 										<?php foreach ($this->languages as $language) : ?>
-											<a href="<?php echo Route::_('index.php?option=com_mails&task=template.edit&template_id=' . $item->template_id . '&language=' . $language->lang_code); ?>">
-												<?php if ($language->image) : ?>
-													<?php echo HTMLHelper::_('image', 'mod_languages/' . $language->image . '.gif', $language->title_native, array('title' => $language->title_native), true); ?>
-												<?php else : ?>
-													<span class="badge bg-secondary" title="<?php echo $language->title_native; ?>"><?php echo $language->lang_code; ?></span>
-												<?php endif; ?>
-											</a>
+											<li class="p-1">
+												<a href="<?php echo Route::_('index.php?option=com_mails&task=template.edit&template_id=' . $item->template_id . '&language=' . $language->lang_code); ?>">
+													<?php if ($language->image) : ?>
+														<?php echo HTMLHelper::_('image', 'mod_languages/' . $language->image . '.gif', $language->title_native, array('title' => $language->title_native), true); ?>
+													<?php else : ?>
+														<span class="badge bg-secondary" title="<?php echo $language->title_native; ?>"><?php echo $language->lang_code; ?></span>
+													<?php endif; ?>
+												</a>
+											</li>
 										<?php endforeach; ?>
+										</ul>
 									</td>
 								<?php endif; ?>
 								<td class="d-none d-md-table-cell">
diff --git a/administrator/components/com_media/helpers/media.php b/administrator/components/com_media/helpers/media.php
new file mode 100644
index 00000000000..9896de4ab32
--- /dev/null
+++ b/administrator/components/com_media/helpers/media.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_media
+ *
+ * @copyright   (C) 2012 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Object\CMSObject;
+
+/**
+ * Media helper class.
+ *
+ * @since       1.6
+ */
+abstract class MediaHelper
+{
+	/**
+	 * Generates the URL to the object in the action logs component
+	 *
+	 * @param   string     $contentType  The content type
+	 * @param   integer    $id           The integer id
+	 * @param   CMSObject  $mediaObject  The media object being uploaded
+	 *
+	 * @return  string  The link for the action log
+	 *
+	 * @since   3.9.27
+	 */
+	public static function getContentTypeLink($contentType, $id, CMSObject $mediaObject)
+	{
+		if ($contentType === 'com_media.file')
+		{
+			return '';
+		}
+
+		$link         = 'index.php?option=com_media';
+		$adapter      = $mediaObject->get('adapter');
+		$uploadedPath = $mediaObject->get('path');
+
+		if (!empty($adapter) && !empty($uploadedPath))
+		{
+			$link = $link . '&path=' . $adapter . ':' . $uploadedPath;
+		}
+
+		return $link;
+	}
+}
diff --git a/administrator/components/com_media/resources/scripts/app/Notifications.es6.js b/administrator/components/com_media/resources/scripts/app/Notifications.es6.js
index e23f256643d..702ce0c1059 100644
--- a/administrator/components/com_media/resources/scripts/app/Notifications.es6.js
+++ b/administrator/components/com_media/resources/scripts/app/Notifications.es6.js
@@ -36,7 +36,7 @@ class Notifications {
     }
     Joomla.renderMessages(
       {
-        [options.type]: [Joomla.JText._(message)],
+        [options.type]: [Joomla.Text._(message)],
       },
       undefined,
       true,
diff --git a/administrator/components/com_media/resources/scripts/components/breadcrumb/breadcrumb.vue b/administrator/components/com_media/resources/scripts/components/breadcrumb/breadcrumb.vue
index e12deaf9a89..3e93e76161d 100644
--- a/administrator/components/com_media/resources/scripts/components/breadcrumb/breadcrumb.vue
+++ b/administrator/components/com_media/resources/scripts/components/breadcrumb/breadcrumb.vue
@@ -1,7 +1,6 @@
 <template>
   <nav
     class="media-breadcrumb"
-    role="navigation"
     :aria-label="translate('COM_MEDIA_BREADCRUMB_LABEL')"
   >
     <ol>
diff --git a/administrator/components/com_media/resources/scripts/plugins/translate.es6.js b/administrator/components/com_media/resources/scripts/plugins/translate.es6.js
index 98cf16a4212..63904379faa 100644
--- a/administrator/components/com_media/resources/scripts/plugins/translate.es6.js
+++ b/administrator/components/com_media/resources/scripts/plugins/translate.es6.js
@@ -4,7 +4,7 @@
 
 const Translate = {
   // Translate from Joomla text
-  translate: (key) => Joomla.JText._(key, key),
+  translate: (key) => Joomla.Text._(key, key),
   sprintf: (string, ...args) => {
     // eslint-disable-next-line no-param-reassign
     string = Translate.translate(string);
diff --git a/administrator/components/com_menus/tmpl/items/default_batch_body.php b/administrator/components/com_menus/tmpl/items/default_batch_body.php
index aae69b60255..eb3ce1101ee 100644
--- a/administrator/components/com_menus/tmpl/items/default_batch_body.php
+++ b/administrator/components/com_menus/tmpl/items/default_batch_body.php
@@ -48,14 +48,14 @@
 	<div class="row">
 		<?php if ($published >= 0) : ?>
 			<div class="form-group col-md-6">
-				<div class="controls">
+				<div class="control-group">
 					<label id="batch-choose-action-lbl" for="batch-menu-id">
 						<?php echo Text::_('COM_MENUS_BATCH_MENU_LABEL'); ?>
 					</label>
 					<select class="form-select" name="batch[menu_id]" id="batch-menu-id">
 						<option value=""><?php echo Text::_('JLIB_HTML_BATCH_NO_CATEGORY'); ?></option>
 						<?php
-						$opts     = array(
+						$opts = array(
 							'published' => $this->state->get('filter.published'),
 							'checkacl'  => (int) $this->state->get('menutypeid'),
 							'clientid'  => (int) $clientId,
@@ -65,7 +65,7 @@
 					</select>
 				</div>
 
-				<div id="batch-copy-move" class="control-group radio">
+				<div id="batch-copy-move">
 					<?php echo Text::_('JLIB_HTML_BATCH_MOVE_QUESTION'); ?>
 					<?php echo HTMLHelper::_('select.radiolist', $options, 'batch[move_copy]', '', 'value', 'text', 'm'); ?>
 				</div>
diff --git a/administrator/components/com_newsfeeds/forms/newsfeed.xml b/administrator/components/com_newsfeeds/forms/newsfeed.xml
index f9a8b817368..e80384eeef5 100644
--- a/administrator/components/com_newsfeeds/forms/newsfeed.xml
+++ b/administrator/components/com_newsfeeds/forms/newsfeed.xml
@@ -5,7 +5,7 @@
 
 		<field
 			name="id"
-			type="number"
+			type="text"
 			label="JGLOBAL_FIELD_ID_LABEL"
 			default="0"
 			class="readonly"
@@ -213,6 +213,15 @@
 			filter="user_utc"
 		/>
 
+		<field
+			name="hits"
+			type="text"
+			label="JGLOBAL_HITS"
+			class="readonly"
+			readonly="true"
+			filter="unset"
+		/>
+
 		<field
 			name="access"
 			type="accesslevel"
@@ -452,15 +461,6 @@
 				cols="30"
 				filter="string"
 			/>
-
-			<field
-				name="hits"
-				type="number"
-				label="JGLOBAL_HITS"
-				class="readonly"
-				readonly="true"
-				filter="unset"
-			/>
 		</fieldset>
 	</fields>
 </form>
diff --git a/administrator/components/com_newsfeeds/src/Model/NewsfeedModel.php b/administrator/components/com_newsfeeds/src/Model/NewsfeedModel.php
index d8655224040..985184e1201 100644
--- a/administrator/components/com_newsfeeds/src/Model/NewsfeedModel.php
+++ b/administrator/components/com_newsfeeds/src/Model/NewsfeedModel.php
@@ -133,6 +133,12 @@ public function getForm($data = array(), $loadData = true)
 			$form->setFieldAttribute('publish_down', 'filter', 'unset');
 		}
 
+		// Don't allow to change the created_by user if not allowed to access com_users.
+		if (!Factory::getUser()->authorise('core.manage', 'com_users'))
+		{
+			$form->setFieldAttribute('created_by', 'filter', 'unset');
+		}
+
 		return $form;
 	}
 
@@ -448,31 +454,4 @@ private function canCreateCategory()
 	{
 		return Factory::getUser()->authorise('core.create', 'com_newsfeeds');
 	}
-
-	/**
-	 * Method to validate the form data.
-	 *
-	 * @param   Form    $form   The form to validate against.
-	 * @param   array   $data   The data to validate.
-	 * @param   string  $group  The name of the field group to validate.
-	 *
-	 * @return  array|boolean  Array of filtered data if valid, false otherwise.
-	 *
-	 * @see     JFormRule
-	 * @see     JFilterInput
-	 * @since   3.9.25
-	 */
-	public function validate($form, $data, $group = null)
-	{
-		// Don't allow to change the users if not allowed to access com_users.
-		if (!Factory::getUser()->authorise('core.manage', 'com_users'))
-		{
-			if (isset($data['created_by']))
-			{
-				unset($data['created_by']);
-			}
-		}
-
-		return parent::validate($form, $data, $group);
-	}
 }
diff --git a/administrator/components/com_postinstall/src/Controller/DisplayController.php b/administrator/components/com_postinstall/src/Controller/DisplayController.php
index c47b7a3f4ac..e9a6be0e6d1 100644
--- a/administrator/components/com_postinstall/src/Controller/DisplayController.php
+++ b/administrator/components/com_postinstall/src/Controller/DisplayController.php
@@ -46,6 +46,6 @@ public function getMenuBadgeData()
 
 		$model = $this->getModel('Messages');
 
-		echo new JsonResponse(count($model->getItems()));
+		echo new JsonResponse($model->getItemsCount());
 	}
 }
diff --git a/administrator/components/com_postinstall/src/Model/MessagesModel.php b/administrator/components/com_postinstall/src/Model/MessagesModel.php
index 7598c59d339..cb56f266f75 100644
--- a/administrator/components/com_postinstall/src/Model/MessagesModel.php
+++ b/administrator/components/com_postinstall/src/Model/MessagesModel.php
@@ -189,6 +189,56 @@ public function getItems()
 		return $result;
 	}
 
+	/**
+	 * Returns a count of all enabled messages from the #__postinstall_messages table
+	 *
+	 * @return  integer
+	 *
+	 * @since   4.0.0
+	 */
+	public function getItemsCount()
+	{
+		$db = $this->getDbo();
+		$query = $db->getQuery(true);
+		$query->select(
+			[
+				$db->quoteName('language_extension'),
+				$db->quoteName('language_client_id'),
+				$db->quoteName('condition_file'),
+				$db->quoteName('condition_method'),
+			]
+		)
+			->from($db->quoteName('#__postinstall_messages'));
+
+		// Force filter only enabled messages
+		$query->where($db->quoteName('enabled') . ' = 1');
+		$db->setQuery($query);
+
+		try
+		{
+			/** @var CallbackController $cache */
+			$cache = Factory::getContainer()->get(CacheControllerFactoryInterface::class)
+				->createCacheController('callback', ['defaultgroup' => 'com_postinstall']);
+
+			// Get the resulting data object for cache ID 'all.1' from com_postinstall group.
+			$result = $cache->get(array($db, 'loadObjectList'), array(), md5('all.1'), false);
+		}
+		catch (\RuntimeException $e)
+		{
+			$app = Factory::getApplication();
+			$app->getLogger()->warning(
+				Text::sprintf('JLIB_APPLICATION_ERROR_MODULE_LOAD', $e->getMessage()),
+				array('category' => 'jerror')
+			);
+
+			return 0;
+		}
+
+		$this->onProcessList($result);
+
+		return \count($result);
+	}
+
 	/**
 	 * Returns the name of an extension, as registered in the #__extensions table
 	 *
diff --git a/administrator/components/com_privacy/src/View/Request/HtmlView.php b/administrator/components/com_privacy/src/View/Request/HtmlView.php
index 150af8d1f61..1a49588ab1f 100644
--- a/administrator/components/com_privacy/src/View/Request/HtmlView.php
+++ b/administrator/components/com_privacy/src/View/Request/HtmlView.php
@@ -120,7 +120,7 @@ public function display($tpl = null)
 	 */
 	protected function addToolbar()
 	{
-		Factory::getApplication()->set('hidemainmenu', true);
+		Factory::getApplication()->input->set('hidemainmenu', true);
 
 		// Set the title and toolbar based on the layout
 		if ($this->getLayout() === 'edit')
diff --git a/administrator/components/com_redirect/forms/link.xml b/administrator/components/com_redirect/forms/link.xml
index 9983b818c4c..d0a8d794724 100644
--- a/administrator/components/com_redirect/forms/link.xml
+++ b/administrator/components/com_redirect/forms/link.xml
@@ -3,7 +3,7 @@
 	<fieldset addfieldprefix="Joomla\Component\Redirect\Administrator\Field">
 		<field
 			name="id"
-			type="number"
+			type="text"
 			label="JGLOBAL_FIELD_ID_LABEL"
 			default="0"
 			readonly="true"
@@ -78,7 +78,7 @@
 
 		<field
 			name="hits"
-			type="number"
+			type="text"
 			label="JGLOBAL_HITS"
 			class="readonly"
 			readonly="true"
diff --git a/administrator/components/com_redirect/tmpl/links/default.php b/administrator/components/com_redirect/tmpl/links/default.php
index 82e1a062652..95c65fba1dc 100644
--- a/administrator/components/com_redirect/tmpl/links/default.php
+++ b/administrator/components/com_redirect/tmpl/links/default.php
@@ -44,9 +44,9 @@
 						. ' onclick="Joomla.iframeButtonClick({iframeSelector: \'#plugin' . $this->redirectPluginId . 'Modal\', buttonSelector: \'#closeBtn\'})">'
 						. Text::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</button>'
 						. '<button type="button" class="btn btn-primary" data-bs-dismiss="modal" onclick="Joomla.iframeButtonClick({iframeSelector: \'#plugin' . $this->redirectPluginId . 'Modal\', buttonSelector: \'#saveBtn\'})">'
-						. Text::_("JSAVE") . '</button>'
+						. Text::_('JSAVE') . '</button>'
 						. '<button type="button" class="btn btn-success" onclick="Joomla.iframeButtonClick({iframeSelector: \'#plugin' . $this->redirectPluginId . 'Modal\', buttonSelector: \'#applyBtn\'}); return false;">'
-						. Text::_("JAPPLY") . '</button>'
+						. Text::_('JAPPLY') . '</button>'
 				)
 			); ?>
 		<?php endif; ?>
diff --git a/administrator/components/com_redirect/tmpl/links/emptystate.php b/administrator/components/com_redirect/tmpl/links/emptystate.php
index 17581fa4f24..705387dd828 100644
--- a/administrator/components/com_redirect/tmpl/links/emptystate.php
+++ b/administrator/components/com_redirect/tmpl/links/emptystate.php
@@ -62,9 +62,9 @@
 				. ' onclick="Joomla.iframeButtonClick({iframeSelector: \'#plugin' . $this->redirectPluginId . 'Modal\', buttonSelector: \'#closeBtn\'})">'
 				. Text::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</button>'
 				. '<button type="button" class="btn btn-primary" data-bs-dismiss="modal" onclick="Joomla.iframeButtonClick({iframeSelector: \'#plugin' . $this->redirectPluginId . 'Modal\', buttonSelector: \'#saveBtn\'})">'
-				. Text::_("JSAVE") . '</button>'
+				. Text::_('JSAVE') . '</button>'
 				. '<button type="button" class="btn btn-success" onclick="Joomla.iframeButtonClick({iframeSelector: \'#plugin' . $this->redirectPluginId . 'Modal\', buttonSelector: \'#applyBtn\'}); return false;">'
-				. Text::_("JAPPLY") . '</button>'
+				. Text::_('JAPPLY') . '</button>'
 		)
 	); ?>
 <?php endif; ?>
diff --git a/administrator/components/com_tags/forms/tag.xml b/administrator/components/com_tags/forms/tag.xml
index 70ee2b2358a..592b813ca46 100644
--- a/administrator/components/com_tags/forms/tag.xml
+++ b/administrator/components/com_tags/forms/tag.xml
@@ -2,7 +2,7 @@
 <form>
 	<field
 		name="id"
-		type="number"
+		type="text"
 		label="JGLOBAL_FIELD_ID_LABEL"
 		default="0"
 		class="readonly"
@@ -11,7 +11,7 @@
 
 	<field
 		name="hits"
-		type="number"
+		type="text"
 		label="JGLOBAL_HITS"
 		class="readonly"
 		default="0"
diff --git a/administrator/components/com_users/forms/user.xml b/administrator/components/com_users/forms/user.xml
index 39c09e14866..e25af2a6ae9 100644
--- a/administrator/components/com_users/forms/user.xml
+++ b/administrator/components/com_users/forms/user.xml
@@ -134,7 +134,7 @@
 
 		<field
 			name="id"
-			type="number"
+			type="text"
 			label="JGLOBAL_FIELD_ID_LABEL"
 			class="readonly"
 			default="0"
diff --git a/administrator/components/com_workflow/forms/filter_transitions.xml b/administrator/components/com_workflow/forms/filter_transitions.xml
index 0b2b2d39f31..e43d58594eb 100644
--- a/administrator/components/com_workflow/forms/filter_transitions.xml
+++ b/administrator/components/com_workflow/forms/filter_transitions.xml
@@ -57,6 +57,10 @@
 			<option value="t.published DESC">JSTATUS_DESC</option>
 			<option value="t.title ASC">JGLOBAL_NAME_ASC</option>
 			<option value="t.title DESC">JGLOBAL_NAME_DESC</option>
+			<option value="from_stage ASC">COM_WORKFLOW_FROM_STAGE_FILTER_ASC</option>
+			<option value="from_stage DESC">COM_WORKFLOW_FROM_STAGE_FILTER_DESC</option>
+			<option value="to_stage ASC">COM_WORKFLOW_TO_STAGE_FILTER_ASC</option>
+			<option value="to_stage DESC">COM_WORKFLOW_TO_STAGE_FILTER_DESC</option>
 			<option value="t.id ASC">JGRID_HEADING_ID_ASC</option>
 			<option value="t.id DESC">JGRID_HEADING_ID_DESC</option>
 		</field>
diff --git a/administrator/language/en-GB/com_actionlogs.ini b/administrator/language/en-GB/com_actionlogs.ini
index 84d3a08acc7..93a3cd90a03 100644
--- a/administrator/language/en-GB/com_actionlogs.ini
+++ b/administrator/language/en-GB/com_actionlogs.ini
@@ -39,8 +39,8 @@ COM_ACTIONLOGS_IP_INVALID="Invalid IP"
 COM_ACTIONLOGS_IP_LOGGING_LABEL="IP Logging"
 COM_ACTIONLOGS_LOG_EXTENSIONS_LABEL="Events To Log"
 COM_ACTIONLOGS_LOG_VERBS_LABEL="Request Methods To Log"
-COM_ACTIONLOGS_MAIL_NOTIFICATION_DESC="Mail sent to administrators about new entries in the actionlog."
-COM_ACTIONLOGS_MAIL_NOTIFICATION_TITLE="Actionlogs: Notification Mail"
+COM_ACTIONLOGS_MAIL_NOTIFICATION_DESC="Mail sent to administrators about new entries in the User Actions Log."
+COM_ACTIONLOGS_MAIL_NOTIFICATION_TITLE="User Actions Log: Notification Mail"
 COM_ACTIONLOGS_MANAGER_USERLOGS="User Actions Log"
 COM_ACTIONLOGS_N_ITEMS_DELETED="%s logs deleted."
 COM_ACTIONLOGS_N_ITEMS_DELETED_1="Log deleted."
diff --git a/administrator/language/en-GB/com_admin.ini b/administrator/language/en-GB/com_admin.ini
index eecb64f37c8..72941192cc6 100644
--- a/administrator/language/en-GB/com_admin.ini
+++ b/administrator/language/en-GB/com_admin.ini
@@ -140,6 +140,8 @@ COM_ADMIN_POST_MAX_SIZE="Post Max Size"
 COM_ADMIN_POSTINSTALL_MSG_BEHIND_LOAD_BALANCER_ACTION="Enable Behind Load Balancer Setting"
 COM_ADMIN_POSTINSTALL_MSG_BEHIND_LOAD_BALANCER_DESCRIPTION="<p>For Joomla sites hosted behind Load Balancers and Reverse Proxies a new Global Configuration setting has been introduced with Joomla 3.9.26</p><p>This setting, when enabled, will allow your Load Balancer/Reverse Proxy to provide the real IP address of your visitors. This IP will then be used in your Action Logs and used for tracking voting on articles (if these features are enabled).</p><p><strong>Only sites behind a Load Balancer/Reverse Proxy will wish to enable this feature.</strong></p>"
 COM_ADMIN_POSTINSTALL_MSG_BEHIND_LOAD_BALANCER_TITLE="New Server Setting \"Behind Load Balancer\""
+COM_ADMIN_POSTINSTALL_MSG_FLOC_BLOCKER_DESCRIPTION="<p>A new technology is currently being rolled out to browsers to replace third party tracking cookies. This technology is named Federated Learning of Cohorts (FLoC) and you can read more about it <a href=\"https://github.com/WICG/floc\">here</a> and <a href=\"https://www.eff.org/deeplinks/2021/03/googles-floc-terrible-idea\">here</a>. Starting with Joomla! 3.9.27 your website blocks this technology, you can re-allow it from the Global Configuration. Additionally to disable this technology for all requests to your server, you have to update your .htaccess.</p>"
+COM_ADMIN_POSTINSTALL_MSG_FLOC_BLOCKER_TITLE="Block Federated Learning of Cohorts (FLoC)"
 COM_ADMIN_POSTINSTALL_MSG_HTACCESS_AUTOINDEX_DESCRIPTION="<p>Before 3.9.22 the default htaccess.txt file contained erroneous code meant for disabling directory listings. The security team recommends to manually apply the necessary changes to any existing .htaccess file, as this file can not be updated automatically.</p><p>The old code:</p><pre>&lt;IfModule autoindex&gt;\n  IndexIgnore *\n&lt;/IfModule&gt;</pre><p>The new code:</p><pre>&lt;IfModule mod_autoindex.c&gt;\n  IndexIgnore *\n&lt;/IfModule&gt;</pre>"
 COM_ADMIN_POSTINSTALL_MSG_HTACCESS_AUTOINDEX_TITLE=".htaccess Update Concerning Directory Listings"
 COM_ADMIN_SAVE_SUCCESS="Profile saved."
diff --git a/administrator/language/en-GB/com_associations.ini b/administrator/language/en-GB/com_associations.ini
index a79de64ed93..f86a9507a49 100644
--- a/administrator/language/en-GB/com_associations.ini
+++ b/administrator/language/en-GB/com_associations.ini
@@ -46,8 +46,8 @@ COM_ASSOCIATIONS_SELECT_TARGET_LANGUAGE="- Select Target Language -"
 COM_ASSOCIATIONS_SELECT_TARGET_LANGUAGE_LABEL="Select Target Language"
 COM_ASSOCIATIONS_TABLE_CAPTION="Table of Associations"
 COM_ASSOCIATIONS_TITLE="Associations"
-COM_ASSOCIATIONS_TITLE_EDIT="Multilingual Associations: Edit Associations (%1$s > %2$s)"
-COM_ASSOCIATIONS_TITLE_LIST="Multilingual Associations (%1$s > %2$s)"
+COM_ASSOCIATIONS_TITLE_EDIT="Multilingual Associations: Edit Associations (%1$s &rarr; %2$s)"
+COM_ASSOCIATIONS_TITLE_LIST="Multilingual Associations (%1$s &rarr; %2$s)"
 COM_ASSOCIATIONS_TITLE_LIST_SELECT="Multilingual Associations: Select Item Type and Language"
 COM_ASSOCIATIONS_XML_DESCRIPTION="Improved multilingual content management component"
 COM_ASSOCIATIONS_YOU_ARE_NOT_ALLOWED_TO_CHECKIN_THIS_ITEM="You can't check in this item"
diff --git a/administrator/language/en-GB/com_config.ini b/administrator/language/en-GB/com_config.ini
index 2638e4bc06c..1e6e9168301 100644
--- a/administrator/language/en-GB/com_config.ini
+++ b/administrator/language/en-GB/com_config.ini
@@ -81,6 +81,8 @@ COM_CONFIG_FIELD_FILTERS_DEFAULT_FORBIDDEN_LIST="Default Forbidden List"
 COM_CONFIG_FIELD_FILTERS_NO_FILTER="No Filtering"
 COM_CONFIG_FIELD_FILTERS_NO_HTML="No HTML"
 COM_CONFIG_FIELD_FILTERS_ALLOWED_LIST="Allowed List"
+COM_CONFIG_FIELD_FLOC_BLOCKER_DESC="Send a header to not support the tracking through the FLoC method."
+COM_CONFIG_FIELD_FLOC_BLOCKER_LABEL="Block FLoC"
 COM_CONFIG_FIELD_FORCE_SSL_LABEL="Force HTTPS"
 COM_CONFIG_FIELD_FORCE_SSL_DESC="HTTPS must be enabled on your server or load balancer to utilise this option. Enable 'Behind Load Balancer' if your SSL terminates on your load balancer but your site is served on http on its webserver."
 COM_CONFIG_FIELD_GZIP_COMPRESSION_LABEL="Gzip Page Compression"
diff --git a/administrator/language/en-GB/com_contact.ini b/administrator/language/en-GB/com_contact.ini
index ba97bb7e9ce..1e5598c34bc 100644
--- a/administrator/language/en-GB/com_contact.ini
+++ b/administrator/language/en-GB/com_contact.ini
@@ -37,7 +37,7 @@ COM_CONTACT_FIELD_CONFIG_CONTACT_FORM="Form"
 COM_CONTACT_FIELD_CONFIG_COUNTRY_LABEL="Country"
 COM_CONTACT_FIELD_CONFIG_CUSTOM_REPLY_LABEL="Custom Reply"
 COM_CONTACT_FIELD_CONFIG_FAX_LABEL="Fax"
-COM_CONTACT_FIELD_CONFIG_INDIVIDUAL_CONTACT_DESC="These settings apply for single Contact unless they are changed for a specific menu item or Contact."
+COM_CONTACT_FIELD_CONFIG_INDIVIDUAL_CONTACT_DESC="These settings apply for a single Contact unless they are changed for a specific menu item or Contact."
 COM_CONTACT_FIELD_CONFIG_INDIVIDUAL_CONTACT_DISPLAY="Contact"
 COM_CONTACT_FIELD_CONFIG_MOBILE_LABEL="Mobile"
 COM_CONTACT_FIELD_CONFIG_PHONE_LABEL="Phone"
@@ -144,6 +144,7 @@ COM_CONTACT_FORM_TITLE_EDIT="Edit Contact"
 COM_CONTACT_FORM_TITLE_NEW="New Contact"
 COM_CONTACT_HEADING_ASSOCIATION="Association"
 COM_CONTACT_ICONS_SETTINGS="Icons"
+COM_CONTACT_ICONS_SETTINGS_DESC="These settings apply to all single Contact views."
 COM_CONTACT_ID_LABEL="ID"
 COM_CONTACT_MAIL_FIELDSET_LABEL="Mail Options"
 COM_CONTACT_MAIL_MAIL_COPY_DESC="Sent to the submitter of a mail with the contact form if the optional &quot;Send Copy to Submitter&quot; is enabled and selected."
diff --git a/administrator/language/en-GB/com_cpanel.ini b/administrator/language/en-GB/com_cpanel.ini
index 358122047a6..9c4f8bfed75 100644
--- a/administrator/language/en-GB/com_cpanel.ini
+++ b/administrator/language/en-GB/com_cpanel.ini
@@ -26,7 +26,7 @@ COM_CPANEL_MSG_ROBOTS_BODY="A change to the default robots.txt files was made in
 COM_CPANEL_MSG_ROBOTS_TITLE="robots.txt Update"
 COM_CPANEL_MSG_STATS_COLLECTION_BODY="<p>Since Joomla! 3.5 a statistics plugin will submit anonymous data to the Joomla Project. This will only submit the Joomla version, PHP version, database engine and version, and server operating system.</p><p>This data is collected to ensure that future versions of Joomla can take advantage of the latest database and PHP features without affecting significant numbers of users. The need for this became clear when a minimum of PHP 5.3.10 was required when Joomla! 3.3 implemented the more secure Bcrypt passwords.</p><p>In the interest of full transparency and to help developers <a href=\"https://developer.joomla.org/about/stats.html\">this data is publicly available.</a> An API and graphs will show the Joomla version, PHP versions and database engines in use.</p><p>If you do not wish to provide the Joomla Project with this information you can disable the plugin called System - Joomla Statistics.</p>"
 COM_CPANEL_MSG_STATS_COLLECTION_TITLE="Stats Collection in Joomla"
-COM_CPANEL_MSG_TEXTFILTER3919_BODY="<p>As part of our security team's review, we have made some changes to the default settings for the global text filters in a new Joomla installation. The default setting for the 'Public', 'Guest' and 'Registered' groups is now 'No HTML'. As these changes are only applied to new installations, we strongly recommend that you review these changes and update your site from: System -> Global Configuration -> Text Filters</p>"
+COM_CPANEL_MSG_TEXTFILTER3919_BODY="<p>As part of our security team's review, we have made some changes to the default settings for the global text filters in a new Joomla installation. The default setting for the 'Public', 'Guest' and 'Registered' groups is now 'No HTML'. As these changes are only applied to new installations, we strongly recommend that you review these changes and update your site from: System &rarr; Global Configuration &rarr; Text Filters</p>"
 COM_CPANEL_MSG_TEXTFILTER3919_TITLE="Updated Text Filter Recommendations"
 COM_CPANEL_TITLE_SYSTEM_PANEL="System Panel"
 COM_CPANEL_UNPUBLISH_MODULE_ERROR="Error unpublishing the module"
diff --git a/administrator/language/en-GB/com_finder.ini b/administrator/language/en-GB/com_finder.ini
index 9551090b247..ceb5f3dd30f 100644
--- a/administrator/language/en-GB/com_finder.ini
+++ b/administrator/language/en-GB/com_finder.ini
@@ -53,8 +53,10 @@ COM_FINDER_CONFIG_TUPLECOUNT_LABEL="Search for Phrases"
 COM_FINDER_CONFIG_TUPLECOUNT_PHRASE_DISABLED="Disabled (Improved performance)"
 COM_FINDER_CONFIG_TUPLECOUNT_PHRASE_ENABLED="Enabled (Improved search results)"
 COM_FINDER_CONFIGURATION="Smart Search: Options"
+COM_FINDER_CONTENT_PLUGIN="Smart Search Content Plugin"
 COM_FINDER_CREATE_FILTER="Create a filter."
 COM_FINDER_EDIT_FILTER="Edit Filter"
+COM_FINDER_EDIT_PLUGIN_SETTINGS="Edit Plugin Settings"
 COM_FINDER_EMPTYSTATE_BUTTON_ADD="Start the indexer"
 COM_FINDER_EMPTYSTATE_CONTENT="No content has been indexed or you have deleted all your maps. Please visit the Smart Search Index page to reindex your content."
 COM_FINDER_EMPTYSTATE_SEARCHES_CONTENT="There are no phrases used for site searching to view yet."
@@ -70,12 +72,12 @@ COM_FINDER_FILTER_END_DATE_LABEL="End Date"
 COM_FINDER_FILTER_FIELDSET_PARAMS="Filter Timeline"
 COM_FINDER_FILTER_FORM_TITLE_EDIT="Edit Filter"
 COM_FINDER_FILTER_FORM_TITLE_NEW="New Filter"
-COM_FINDER_FILTER_HIDE_ALL="Collapse all"
+COM_FINDER_FILTER_HIDE_ALL="Collapse All"
 COM_FINDER_FILTER_MAP_COUNT="Map Count"
 COM_FINDER_FILTER_NEW_TOOLBAR_TITLE="Smart Search: New Filter"
 COM_FINDER_FILTER_SELECT_ALL_LABEL="Search All"
 COM_FINDER_FILTER_SELECT_CONTENT_MAP="- Select Content Map -"
-COM_FINDER_FILTER_SHOW_ALL="Expand all"
+COM_FINDER_FILTER_SHOW_ALL="Expand All"
 COM_FINDER_FILTER_START_DATE_DESCRIPTION="Format YYYY-MM-DD"
 COM_FINDER_FILTER_START_DATE_LABEL="Start Date"
 COM_FINDER_FILTER_TIMESTAMP="Created On"
@@ -132,7 +134,7 @@ COM_FINDER_INDEX_HEADING_LINK_URL_DESC="Raw URL descending"
 COM_FINDER_INDEX_NO_CONTENT="No content matches your search criteria."
 COM_FINDER_INDEX_NO_DATA="No content has been indexed."
 COM_FINDER_INDEX_PLUGIN_CONTENT_NOT_ENABLED="The Smart Search Content Plugin is disabled. Changes to content will not update the Smart Search index until the Plugin is enabled."
-COM_FINDER_INDEX_PLUGIN_CONTENT_NOT_ENABLED_LINK="The <a href=\"%s\">Smart Search Content Plugin</a> is disabled. Changes to content will not update the Smart Search index if you do not enable this plugin."
+COM_FINDER_INDEX_PLUGIN_CONTENT_NOT_ENABLED_LINK="The %s is disabled. Changes to content will not update the Smart Search index if you do not enable this plugin."
 COM_FINDER_INDEX_PURGE_FAILED="Failed to delete selected items."
 COM_FINDER_INDEX_PURGE_SUCCESS="All items have been deleted."
 COM_FINDER_INDEX_SEARCH_DESC="Search in title, URL and last updated date."
diff --git a/administrator/language/en-GB/com_joomlaupdate.ini b/administrator/language/en-GB/com_joomlaupdate.ini
index 7a3be09bc25..ac4620cb471 100644
--- a/administrator/language/en-GB/com_joomlaupdate.ini
+++ b/administrator/language/en-GB/com_joomlaupdate.ini
@@ -26,15 +26,15 @@ COM_JOOMLAUPDATE_MINIMUM_STABILITY_RC="Release Candidate"
 COM_JOOMLAUPDATE_MINIMUM_STABILITY_STABLE="Stable"
 COM_JOOMLAUPDATE_OVERVIEW="Joomla Update"
 COM_JOOMLAUPDATE_PREUPDATE_CHECK_CAPTION="Table of server settings to check before update."
+COM_JOOMLAUPDATE_PREUPDATE_CHECK_COMPLETED_YOU_HAVE_DANGEROUS_PLUGINS="There are plugins installed and enabled that could interfere with the Joomla upgrade and result in a failed upgrade that leaves the site inaccessible.<br><br>You are strongly advised to upgrade, disable or uninstall these plugins before upgrading."
+COM_JOOMLAUPDATE_PREUPDATE_CHECK_EXTENSION_AUTHOR_URL="Extension Author URL"
+COM_JOOMLAUPDATE_PREUPDATE_CHECK_NOT_COMPLETE="Pre-Update checks have not been completed yet - please wait."
 COM_JOOMLAUPDATE_PREUPDATE_HEADING_CHECKED="Checked"
 COM_JOOMLAUPDATE_PREUPDATE_HEADING_REQUIREMENT="Requirement"
 COM_JOOMLAUPDATE_PREUPDATE_UNKNOWN_EXTENSION_MANIFESTCACHE_VERSION="Unknown Version"
 COM_JOOMLAUPDATE_SYSTEM_CHECK="System Check"
 COM_JOOMLAUPDATE_TOOLBAR_CHECK="Check for Updates"
 COM_JOOMLAUPDATE_UPDATE_CHECK="Update Check"
-COM_JOOMLAUPDATE_PREUPDATE_CHECK_EXTENSION_AUTHOR_URL="Extension Author URL"
-COM_JOOMLAUPDATE_PREUPDATE_CHECK_NOT_COMPLETE="Pre-Update checks have not been completed yet - please wait."
-COM_JOOMLAUPDATE_PREUPDATE_CHECK_COMPLETED_YOU_HAVE_DANGEROUS_PLUGINS="There are plugins installed and enabled that could interfere with the Joomla upgrade and result in a failed upgrade that leaves the site inaccessible.<br><br>You are strongly advised to upgrade, disable or uninstall these plugins before upgrading."
 COM_JOOMLAUPDATE_UPDATE_LOG_CLEANUP="Cleaning up after installation."
 COM_JOOMLAUPDATE_UPDATE_LOG_COMPLETE="Update to version %s is complete."
 COM_JOOMLAUPDATE_UPDATE_LOG_DELETE_FILES="Deleting removed files and folders."
@@ -58,18 +58,6 @@ COM_JOOMLAUPDATE_VIEW_DEFAULT_DESCRIPTION_UPDATE_REQUIRED="Extensions marked wit
 COM_JOOMLAUPDATE_VIEW_DEFAULT_DIRECTIVE="Directive"
 COM_JOOMLAUPDATE_VIEW_DEFAULT_DOWNLOAD_IN_PROGRESS="Downloading update file. Please wait ..."
 COM_JOOMLAUPDATE_VIEW_DEFAULT_EXPLANATION_AND_LINK_TO_DOCS="The pre-update check provides you with information about the readiness of your server, settings and installed extensions for the update.<br>You can find more information about this page and how to prepare for updating Joomla in the <a class='pre-update-docs' href='https://docs.joomla.org/Pre-Update_Check' target='_blank' rel='noopener noreferrer'>pre-update check documentation</a>."
-COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_RUNNING_PRE_UPDATE_CHECKS="Running Pre-Update Checks"
-COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_RUNNING_PRE_UPDATE_CHECKS_NOTES="Please be patient whilst we run the pre-update checks on your extensions."
-COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_PRE_UPDATE_CHECKS_FAILED="Pre-Update Checks Failed"
-COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_PRE_UPDATE_CHECKS_FAILED_NOTES="It was not possible to check the compatibility of these plugins. The request to the update server either timed out or returned an error."
-COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_PROBABLY_COMPATIBLE="No Update Required"
-COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_PROBABLY_COMPATIBLE_NOTES="<p>The extension developer states that the currently installed version is compatible.</p><p id='updateyellowwarning' class='hidden'>Please note that if you see a version highlighted as <span class='label label-warning'>X.X.X</span> then the extension developer is offering a newer version of the extension for your current version of Joomla than they do for the new version of Joomla. You should check with the extension developer if this is correct before you ugprade Joomla.</p>"
-COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_REQUIRING_UPDATES_TO_BE_COMPATIBLE="Update Required"
-COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_REQUIRING_UPDATES_TO_BE_COMPATIBLE_NOTES="<p>Please update these extensions before updating Joomla.</p><p id='updateorangewarning' class='hidden'>Please take extra care if this updated version of the extension is not also listed as compatible with your current version of Joomla.</p>"
-COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_UPDATE_SERVER_OFFERS_NO_COMPATIBLE_VERSION="Update Information Unavailable"
-COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_UPDATE_SERVER_OFFERS_NO_COMPATIBLE_VERSION_NOTES="Extension does not offer a compatible version for the selected target version of Joomla. This could mean the extension does not use the Joomla update system or the developer has not provided compatibility information for this Joomla version yet."
-COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_SHOW_LESS_COMPATIBILITY_INFORMATION="[ Less Detail %s ]"
-COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_SHOW_MORE_COMPATIBILITY_INFORMATION="[ More Detail %s ]"
 COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSION_COMPATIBLE="Compatible"
 COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSION_COMPATIBLE_WITH_JOOMLA_VERSION="Joomla %s Compatible Version"
 COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSION_INSTALLED_VERSION="Installed Version"
@@ -82,12 +70,18 @@ COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSION_WARNING_UNKNOWN="Unknown error"
 COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS="Extensions Pre-Update Check"
 COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_DESC="Table of extensions to check before update."
 COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_NONE="No extensions installed."
-COM_JOOMLAUPDATE_VIEW_DEFAULT_NON_CORE_PLUGIN_BEING_CHECKED="The system is currently checking these plugins to see if they could cause problems during the upgrade.<br><br>Please be patient while the checks are completed."
-COM_JOOMLAUPDATE_VIEW_DEFAULT_NON_CORE_PLUGIN_CONFIRMATION="Do you wish to ignore the warnings about potentially incompatible plugins and to proceed with the upgrade?"
-COM_JOOMLAUPDATE_VIEW_DEFAULT_POTENTIALLY_DANGEROUS_PLUGIN="Potentially Serious Problem."
-COM_JOOMLAUPDATE_VIEW_DEFAULT_POTENTIALLY_DANGEROUS_PLUGIN_CONFIRM_MESSAGE="Are you sure you want to ignore the warnings about potentially incompatible plugins and proceed with the upgrade?"
-COM_JOOMLAUPDATE_VIEW_DEFAULT_POTENTIALLY_DANGEROUS_PLUGIN_DESC="This extension includes a plugin that could cause the upgrade to fail.<br><br>To perform the Joomla upgrade safely you should either upgrade this extension to a version compatible with your target version of Joomla or disable the relevant plugin(s) and check again.<br><br>For more information about the relevant plugins please check the 'Live Update' tab."
-COM_JOOMLAUPDATE_VIEW_DEFAULT_POTENTIALLY_DANGEROUS_PLUGIN_LIST="The following plugins could cause problems during the upgrade"
+COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_PRE_UPDATE_CHECKS_FAILED="Pre-Update Checks Failed"
+COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_PRE_UPDATE_CHECKS_FAILED_NOTES="It was not possible to check the compatibility of these plugins. The request to the update server either timed out or returned an error."
+COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_PROBABLY_COMPATIBLE="No Update Required"
+COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_PROBABLY_COMPATIBLE_NOTES="<p>The extension developer states that the currently installed version is compatible.</p><p id='updateyellowwarning' class='hidden'>Please note that if you see a version highlighted as <span class='label label-warning'>X.X.X</span> then the extension developer is offering a newer version of the extension for your current version of Joomla than they do for the new version of Joomla. You should check with the extension developer if this is correct before you ugprade Joomla.</p>"
+COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_REQUIRING_UPDATES_TO_BE_COMPATIBLE="Update Required"
+COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_REQUIRING_UPDATES_TO_BE_COMPATIBLE_NOTES="<p>Please update these extensions before updating Joomla.</p><p id='updateorangewarning' class='hidden'>Please take extra care if this updated version of the extension is not also listed as compatible with your current version of Joomla.</p>"
+COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_RUNNING_PRE_UPDATE_CHECKS="Running Pre-Update Checks"
+COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_RUNNING_PRE_UPDATE_CHECKS_NOTES="Please be patient whilst we run the pre-update checks on your extensions."
+COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_SHOW_LESS_COMPATIBILITY_INFORMATION="[ Less Detail %s ]"
+COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_SHOW_MORE_COMPATIBILITY_INFORMATION="[ More Detail %s ]"
+COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_UPDATE_SERVER_OFFERS_NO_COMPATIBLE_VERSION="Update Information Unavailable"
+COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_UPDATE_SERVER_OFFERS_NO_COMPATIBLE_VERSION_NOTES="Extension does not offer a compatible version for the selected target version of Joomla. This could mean the extension does not use the Joomla update system or the developer has not provided compatibility information for this Joomla version yet."
 COM_JOOMLAUPDATE_VIEW_DEFAULT_HELP="More Information."
 COM_JOOMLAUPDATE_VIEW_DEFAULT_INFOURL="Additional Information"
 COM_JOOMLAUPDATE_VIEW_DEFAULT_INSTALL_SELF_UPDATE_FIRST="You must update to the latest version of the Joomla Update Component before you can update Joomla!"
@@ -99,17 +93,23 @@ COM_JOOMLAUPDATE_VIEW_DEFAULT_NO_DOWNLOAD_URL="We can't find a download URL"
 COM_JOOMLAUPDATE_VIEW_DEFAULT_NO_DOWNLOAD_URL_DESC="An update to Joomla %1$s was found, but it wasn't possible to fetch the download URL for that update. Either the update to Joomla %1$s is not available for your stability level or there is a problem with the Joomla Update Server.<br>Please try to download the update package from <a href=\"https://downloads.joomla.org/latest\">the official Joomla download page</a> and use the Upload and Update tab."
 COM_JOOMLAUPDATE_VIEW_DEFAULT_NO_LIVE_UPDATE="Live Update is not available"
 COM_JOOMLAUPDATE_VIEW_DEFAULT_NO_LIVE_UPDATE_DESC="There is a new version of the Joomla Update Component that needs to be installed first. <a class=\"alert-link\" href=\"index.php?option=com_installer&view=update\">Click here to update the component</a>."
+COM_JOOMLAUPDATE_VIEW_DEFAULT_NON_CORE_PLUGIN_BEING_CHECKED="The system is currently checking these plugins to see if they could cause problems during the upgrade.<br><br>Please be patient while the checks are completed."
+COM_JOOMLAUPDATE_VIEW_DEFAULT_NON_CORE_PLUGIN_CONFIRMATION="Do you wish to ignore the warnings about potentially incompatible plugins and to proceed with the upgrade?"
 COM_JOOMLAUPDATE_VIEW_DEFAULT_NOUPDATES="No updates available"
 COM_JOOMLAUPDATE_VIEW_DEFAULT_NOUPDATESNOTICE="You already have the latest Joomla version, %s."
 COM_JOOMLAUPDATE_VIEW_DEFAULT_PACKAGE="Update package URL"
 COM_JOOMLAUPDATE_VIEW_DEFAULT_PACKAGE_REINSTALL="Reinstall package URL"
 COM_JOOMLAUPDATE_VIEW_DEFAULT_PHP_VERSION_NOT_SUPPORTED="Your PHP version is not supported"
 COM_JOOMLAUPDATE_VIEW_DEFAULT_PHP_VERSION_NOT_SUPPORTED_DESC="An update to Joomla %1$s was found, but your currently installed PHP version does not match <a href=\"https://downloads.joomla.org/technical-requirements\">the minimum requirements for Joomla %1$s</a>."
+COM_JOOMLAUPDATE_VIEW_DEFAULT_POTENTIALLY_DANGEROUS_PLUGIN="Potentially Serious Problem."
+COM_JOOMLAUPDATE_VIEW_DEFAULT_POTENTIALLY_DANGEROUS_PLUGIN_CONFIRM_MESSAGE="Are you sure you want to ignore the warnings about potentially incompatible plugins and proceed with the upgrade?"
+COM_JOOMLAUPDATE_VIEW_DEFAULT_POTENTIALLY_DANGEROUS_PLUGIN_DESC="This extension includes a plugin that could cause the upgrade to fail.<br><br>To perform the Joomla upgrade safely you should either upgrade this extension to a version compatible with your target version of Joomla or disable the relevant plugin(s) and check again.<br><br>For more information about the relevant plugins please check the 'Live Update' tab."
+COM_JOOMLAUPDATE_VIEW_DEFAULT_POTENTIALLY_DANGEROUS_PLUGIN_LIST="The following plugins could cause problems during the upgrade"
 COM_JOOMLAUPDATE_VIEW_DEFAULT_PREUPDATE_CHECK="Pre-Update Check for Joomla %s"
 COM_JOOMLAUPDATE_VIEW_DEFAULT_RECOMMENDED="Recommended"
+COM_JOOMLAUPDATE_VIEW_DEFAULT_RECOMMENDED_SETTINGS_DESC="These settings are recommended for PHP in order to ensure full compatibility with Joomla. However, Joomla! will still operate if your settings do not quite match the recommended configuration."
 COM_JOOMLAUPDATE_VIEW_DEFAULT_RECOMMENDED_SETTINGS_PASSED="Recommended PHP Settings : Passed"
 COM_JOOMLAUPDATE_VIEW_DEFAULT_RECOMMENDED_SETTINGS_WARNING="Recommended PHP Settings : Warning"
-COM_JOOMLAUPDATE_VIEW_DEFAULT_RECOMMENDED_SETTINGS_DESC="These settings are recommended for PHP in order to ensure full compatibility with Joomla. However, Joomla! will still operate if your settings do not quite match the recommended configuration."
 COM_JOOMLAUPDATE_VIEW_DEFAULT_REQUIRED_SETTINGS_PASSED="Required PHP & Database Settings : Passed"
 COM_JOOMLAUPDATE_VIEW_DEFAULT_REQUIRED_SETTINGS_WARNING="Required PHP & Database Settings : Warning"
 COM_JOOMLAUPDATE_VIEW_DEFAULT_TAB_ONLINE="Live Update"
diff --git a/administrator/language/en-GB/com_messages.ini b/administrator/language/en-GB/com_messages.ini
index fc441e212e5..fe28ca83639 100644
--- a/administrator/language/en-GB/com_messages.ini
+++ b/administrator/language/en-GB/com_messages.ini
@@ -5,6 +5,7 @@
 
 COM_MESSAGES="Messaging"
 COM_MESSAGES_ADD="New Private Message"
+COM_MESSAGES_CONFIGURATION="Messages: Options"
 COM_MESSAGES_CONFIG_FORM="My Settings"
 COM_MESSAGES_CONFIG_SAVED="Configuration saved."
 COM_MESSAGES_EMPTYSTATE_BUTTON_ADD="Send a message"
diff --git a/administrator/language/en-GB/com_modules.ini b/administrator/language/en-GB/com_modules.ini
index 0958eb86ac8..cfb0cc3c87b 100644
--- a/administrator/language/en-GB/com_modules.ini
+++ b/administrator/language/en-GB/com_modules.ini
@@ -94,7 +94,7 @@ COM_MODULES_MODULE_TEMPLATE_POSITION="%1$s (%2$s)"
 COM_MODULES_MODULES="Modules"
 COM_MODULES_MODULES_FILTER_SEARCH_DESC="Search in module title and note. Prefix with ID: to search for a module ID."
 COM_MODULES_MODULES_FILTER_SEARCH_LABEL="Search Modules"
-COM_MODULES_MSG_MANAGE_EXTENSION_DISABLED="The '%s' module is disabled. Use System > Manage > Extensions to enable it."
+COM_MODULES_MSG_MANAGE_EXTENSION_DISABLED="The '%s' module is disabled. Use System &rarr; Manage &rarr; Extensions to enable it."
 COM_MODULES_MSG_MANAGE_NO_MODULES="There are no modules matching your query"
 COM_MODULES_N_ITEMS_ARCHIVED="%d modules archived."
 COM_MODULES_N_ITEMS_ARCHIVED_1="Module archived."
diff --git a/administrator/language/en-GB/com_workflow.ini b/administrator/language/en-GB/com_workflow.ini
index eb2d89ff3ab..9f32556fdb8 100644
--- a/administrator/language/en-GB/com_workflow.ini
+++ b/administrator/language/en-GB/com_workflow.ini
@@ -34,6 +34,8 @@ COM_WORKFLOW_FILTER_SEARCH_LABEL="Search"
 COM_WORKFLOW_FORM_EDIT="Edit Workflow"
 COM_WORKFLOW_FORM_NEW="New Workflow"
 COM_WORKFLOW_FROM_STAGE="Current Stage"
+COM_WORKFLOW_FROM_STAGE_FILTER_ASC="Current Stage ascending"
+COM_WORKFLOW_FROM_STAGE_FILTER_DESC="Current Stage decending"
 COM_WORKFLOW_ID="ID"
 COM_WORKFLOW_INHERIT_WORKFLOW="Inherit (%s)"
 COM_WORKFLOW_INHERIT_WORKFLOW_NEW="Inherit"
@@ -91,6 +93,8 @@ COM_WORKFLOW_STAGES_N_ITEMS_UNPUBLISHED_1="Stage disabled."
 COM_WORKFLOW_STAGES_TABLE_CAPTION="Table of Workflow Stages"
 COM_WORKFLOW_TITLE_TRANSLATION="Name (%s)"
 COM_WORKFLOW_TO_STAGE="Target Stage"
+COM_WORKFLOW_TO_STAGE_FILTER_ASC="Target Stage ascending"
+COM_WORKFLOW_TO_STAGE_FILTER_DESC="Target Stage decending"
 COM_WORKFLOW_TOO_MANY_STAGES="Only one stage can be set as the default."
 COM_WORKFLOW_TOO_MANY_WORKFLOWS="Only one workflow can be set as the default."
 COM_WORKFLOW_TOOLBAR_DEFAULT="Default"
diff --git a/administrator/language/en-GB/joomla.ini b/administrator/language/en-GB/joomla.ini
index 0056c54e344..f52986c131e 100644
--- a/administrator/language/en-GB/joomla.ini
+++ b/administrator/language/en-GB/joomla.ini
@@ -476,7 +476,7 @@ JGLOBAL_ITEM_FEATURE="Feature Item"
 JGLOBAL_ITEM_UNFEATURE="Unfeature Item"
 JGLOBAL_KEEP_TYPING="Keep typing ..."
 JGLOBAL_LANGUAGE_VERSION_NOT_PLATFORM="Language pack does not match this Joomla! version. Some strings may be missing and will be displayed in English."
-JGLOBAL_LEARN_MORE="Learn more"
+JGLOBAL_LEARN_MORE="Learn More"
 JGLOBAL_LEAST_HITS="Least Hits"
 JGLOBAL_LEFT="Left"
 JGLOBAL_LINK_AUTHOR_LABEL="Link to Author's Contact Page"
diff --git a/administrator/language/en-GB/mod_messages.ini b/administrator/language/en-GB/mod_messages.ini
index 0eb75a5245b..a02bfa1c0de 100644
--- a/administrator/language/en-GB/mod_messages.ini
+++ b/administrator/language/en-GB/mod_messages.ini
@@ -5,4 +5,4 @@
 
 MOD_MESSAGES="Messages"
 MOD_MESSAGES_PRIVATE_MESSAGES="Private Messages"
-MOD_MESSAGES_XML_DESCRIPTION="This module shows the count of private messages and is intended to be displayed in the 'status' position."
+MOD_MESSAGES_XML_DESCRIPTION="This module shows the count of private messages and is intended to be displayed in the 'status' position. It is only displayed when there are messages to read."
diff --git a/administrator/language/en-GB/mod_messages.sys.ini b/administrator/language/en-GB/mod_messages.sys.ini
index 27d095da00f..22651d04e51 100644
--- a/administrator/language/en-GB/mod_messages.sys.ini
+++ b/administrator/language/en-GB/mod_messages.sys.ini
@@ -5,4 +5,4 @@
 
 MOD_MESSAGES="Messages"
 MOD_MESSAGES_LAYOUT_DEFAULT="Default"
-MOD_MESSAGES_XML_DESCRIPTION="This module shows the count of private messages and is intended to be displayed in the 'status' position."
+MOD_MESSAGES_XML_DESCRIPTION="This module shows the count of private messages and is intended to be displayed in the 'status' position. It is only displayed when there are messages to read."
diff --git a/administrator/language/en-GB/mod_post_installation_messages.ini b/administrator/language/en-GB/mod_post_installation_messages.ini
index bede88c55b5..1800cf5669d 100644
--- a/administrator/language/en-GB/mod_post_installation_messages.ini
+++ b/administrator/language/en-GB/mod_post_installation_messages.ini
@@ -4,4 +4,4 @@
 ; Note : All ini files need to be saved as UTF-8
 
 MOD_POST_INSTALLATION_MESSAGES="Post Installation Messages"
-MOD_POST_INSTALLATION_MESSAGES_XML_DESCRIPTION="This module shows a counter and a link to the latest post installation messages."
+MOD_POST_INSTALLATION_MESSAGES_XML_DESCRIPTION="This module shows a counter and a link to the latest post installation messages. It is only displayed when there are messages to read."
diff --git a/administrator/language/en-GB/mod_post_installation_messages.sys.ini b/administrator/language/en-GB/mod_post_installation_messages.sys.ini
index bede88c55b5..1800cf5669d 100644
--- a/administrator/language/en-GB/mod_post_installation_messages.sys.ini
+++ b/administrator/language/en-GB/mod_post_installation_messages.sys.ini
@@ -4,4 +4,4 @@
 ; Note : All ini files need to be saved as UTF-8
 
 MOD_POST_INSTALLATION_MESSAGES="Post Installation Messages"
-MOD_POST_INSTALLATION_MESSAGES_XML_DESCRIPTION="This module shows a counter and a link to the latest post installation messages."
+MOD_POST_INSTALLATION_MESSAGES_XML_DESCRIPTION="This module shows a counter and a link to the latest post installation messages. It is only displayed when there are messages to read."
diff --git a/administrator/language/en-GB/plg_system_stats.ini b/administrator/language/en-GB/plg_system_stats.ini
index 68177d99951..c322fd4d7e5 100644
--- a/administrator/language/en-GB/plg_system_stats.ini
+++ b/administrator/language/en-GB/plg_system_stats.ini
@@ -20,7 +20,7 @@ PLG_SYSTEM_STATS_MODE_OPTION_ALWAYS_SEND="Always send"
 PLG_SYSTEM_STATS_MODE_OPTION_NEVER_SEND="Never send"
 PLG_SYSTEM_STATS_MODE_OPTION_ON_DEMAND="On demand"
 PLG_SYSTEM_STATS_MSG_ALLOW_SENDING_DATA="Enable Joomla Statistics?"
-PLG_SYSTEM_STATS_MSG_JOOMLA_WANTS_TO_SEND_DATA="To better understand our install base and end user environments it is helpful if you send some site information back to a Joomla! controlled central server. No identifying data is captured at any point. You can change these settings later from Plugins > System - Joomla! Statistics."
+PLG_SYSTEM_STATS_MSG_JOOMLA_WANTS_TO_SEND_DATA="To better understand our install base and end user environments it is helpful if you send some site information back to a Joomla! controlled central server. No identifying data is captured at any point. You can change these settings later from Plugins &rarr; System - Joomla! Statistics."
 PLG_SYSTEM_STATS_MSG_WHAT_DATA_WILL_BE_SENT="Select here to see the information that will be sent."
 PLG_SYSTEM_STATS_RESET_UNIQUE_ID="Reset Unique ID"
 PLG_SYSTEM_STATS_SETTING="Setting"
diff --git a/administrator/language/en-GB/plg_system_updatenotification.ini b/administrator/language/en-GB/plg_system_updatenotification.ini
index 4e6259712c8..73f8d098c0b 100644
--- a/administrator/language/en-GB/plg_system_updatenotification.ini
+++ b/administrator/language/en-GB/plg_system_updatenotification.ini
@@ -16,4 +16,4 @@ PLG_SYSTEM_UPDATENOTIFICATION_MAIL_MAIL_TITLE="Joomla: Update Notification"
 PLG_SYSTEM_UPDATENOTIFICATION_POSTINSTALL_UPDATECACHETIME="The Joomla! Update Notification will not run in this configuration"
 PLG_SYSTEM_UPDATENOTIFICATION_POSTINSTALL_UPDATECACHETIME_ACTION="Set it back to the default setting (6 Hours)"
 PLG_SYSTEM_UPDATENOTIFICATION_POSTINSTALL_UPDATECACHETIME_BODY="<p>In your Installer Configuration you have set the Option Update Cache (in Hours) to 0 this means that Joomla is not caching the Update. This means an email should be sent on every page visit but this is not possible. Please increase the value (6 is default) or confirm that the Joomla! Update Notification will never send you mails.</p>"
-PLG_SYSTEM_UPDATENOTIFICATION_XML_DESCRIPTION="This plugin periodically checks for the availability of new Joomla! versions. When one is found it will send you an email, reminding you to update. You can customise the email at System > Mail Templates."
+PLG_SYSTEM_UPDATENOTIFICATION_XML_DESCRIPTION="This plugin periodically checks for the availability of new Joomla! versions. When one is found it will send you an email, reminding you to update. You can customise the email at System &rarr; Mail Templates."
diff --git a/administrator/language/en-GB/plg_system_updatenotification.sys.ini b/administrator/language/en-GB/plg_system_updatenotification.sys.ini
index 700a0c1d4cf..705dcc576ac 100644
--- a/administrator/language/en-GB/plg_system_updatenotification.sys.ini
+++ b/administrator/language/en-GB/plg_system_updatenotification.sys.ini
@@ -4,4 +4,4 @@
 ; Note : All ini files need to be saved as UTF-8
 
 PLG_SYSTEM_UPDATENOTIFICATION="System - Joomla! Update Notification"
-PLG_SYSTEM_UPDATENOTIFICATION_XML_DESCRIPTION="This plugin periodically checks for the availability of new Joomla! versions. When one is found it will send you an email, reminding you to update. You can customise the email at System > Mail Templates."
+PLG_SYSTEM_UPDATENOTIFICATION_XML_DESCRIPTION="This plugin periodically checks for the availability of new Joomla! versions. When one is found it will send you an email, reminding you to update. You can customise the email at System &rarr; Mail Templates."
diff --git a/administrator/manifests/files/joomla.xml b/administrator/manifests/files/joomla.xml
index 65189b5e9ef..659f1ffbd40 100644
--- a/administrator/manifests/files/joomla.xml
+++ b/administrator/manifests/files/joomla.xml
@@ -6,7 +6,7 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<copyright>(C) 2019 Open Source Matters, Inc.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-	<version>4.0.0-rc2-dev</version>
+	<version>4.0.0-rc3-dev</version>
 	<creationDate>June 2021</creationDate>
 	<description>FILES_JOOMLA_XML_DESCRIPTION</description>
 
diff --git a/administrator/modules/mod_post_installation_messages/mod_post_installation_messages.php b/administrator/modules/mod_post_installation_messages/mod_post_installation_messages.php
index 981efac75c9..bf371892e03 100644
--- a/administrator/modules/mod_post_installation_messages/mod_post_installation_messages.php
+++ b/administrator/modules/mod_post_installation_messages/mod_post_installation_messages.php
@@ -18,11 +18,11 @@
 	/** @var \Joomla\Component\Postinstall\Administrator\Model\MessagesModel $messagesModel */
 	$messagesModel = $app->bootComponent('com_postinstall')->getMVCFactory()
 		->createModel('Messages', 'Administrator', ['ignore_request' => true]);
-	$messages      = $messagesModel->getItems();
+	$messagesCount = $messagesModel->getItemsCount();
 }
 catch (RuntimeException $e)
 {
-	$messages = [];
+	$messagesCount = 0;
 
 	// Still render the error message from the Exception object
 	$app->enqueueMessage($e->getMessage(), 'error');
diff --git a/administrator/modules/mod_post_installation_messages/tmpl/default.php b/administrator/modules/mod_post_installation_messages/tmpl/default.php
index bf02c47b49b..8efb6503ef4 100644
--- a/administrator/modules/mod_post_installation_messages/tmpl/default.php
+++ b/administrator/modules/mod_post_installation_messages/tmpl/default.php
@@ -14,7 +14,7 @@
 
 $hideLinks = $app->input->getBool('hidemainmenu');
 
-if ($hideLinks || count($messages) < 1)
+if ($hideLinks || $messagesCount < 1)
 {
 	return;
 }
@@ -26,7 +26,7 @@
 		<div class="header-item-icon">
 			<div class="w-auto">
 				<span class="icon-bell icon-fw" aria-hidden="true"></span>
-				<small class="header-item-count"><?php echo count($messages); ?></small>
+				<small class="header-item-count"><?php echo $messagesCount; ?></small>
 			</div>
 		</div>
 		<div class="header-item-text">
diff --git a/administrator/modules/mod_quickicon/src/Helper/QuickIconHelper.php b/administrator/modules/mod_quickicon/src/Helper/QuickIconHelper.php
index 109197d5b86..08e4b2dc3fa 100644
--- a/administrator/modules/mod_quickicon/src/Helper/QuickIconHelper.php
+++ b/administrator/modules/mod_quickicon/src/Helper/QuickIconHelper.php
@@ -253,7 +253,7 @@ public function getButtons(Registry $params, CMSApplication $application = null)
 					'link'    => Route::_('index.php?option=com_cache'),
 					'name'    => 'MOD_QUICKICON_CACHE',
 					'access'  => array('core.admin', 'com_cache'),
-					'group'   => 'MOD_QUICKICON_SYTEM'
+					'group'   => 'MOD_QUICKICON_SYSTEM'
 				];
 
 				if ($params->get('show_cache') == 2)
diff --git a/administrator/templates/atum/index.php b/administrator/templates/atum/index.php
index a91bf41deb1..c64af80adcd 100644
--- a/administrator/templates/atum/index.php
+++ b/administrator/templates/atum/index.php
@@ -155,11 +155,10 @@
 		<?php if (!$cpanel) : ?>
 			<?php // Subheader ?>
 			<?php HTMLHelper::_('bootstrap.collapse', '.toggler-toolbar'); ?>
-			<button class="navbar-toggler toggler-toolbar toggler-burger collapsed" type="button" data-bs-toggle="collapse" data-bs-target=".subhead" aria-controls="subhead" aria-expanded="false" aria-label="<?php echo Text::_('TPL_ATUM_TOOLBAR'); ?>">
+			<button class="navbar-toggler toggler-toolbar toggler-burger collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#subhead-container" aria-controls="subhead-container" aria-expanded="false" aria-label="<?php echo Text::_('TPL_ATUM_TOOLBAR'); ?>">
 				<span class="toggler-toolbar-icon"></span>
 			</button>
-			<div id="subhead" class="subhead mb-3">
-				<div id="container-collapse" class="container-collapse"></div>
+			<div id="subhead-container" class="subhead mb-3">
 				<div class="row">
 					<div class="col-md-12">
 						<jdoc:include type="modules" name="toolbar" style="none" />
diff --git a/administrator/templates/atum/scss/blocks/_edit.scss b/administrator/templates/atum/scss/blocks/_edit.scss
index 9c3c2a3d70b..7a7a9e1e772 100644
--- a/administrator/templates/atum/scss/blocks/_edit.scss
+++ b/administrator/templates/atum/scss/blocks/_edit.scss
@@ -5,10 +5,6 @@
     max-width: 100%;
   }
 
-  .control-group {
-    position: relative;
-  }
-
   .form-control-feedback {
     position: absolute;
     right: 1rem;
diff --git a/administrator/templates/atum/scss/blocks/_form.scss b/administrator/templates/atum/scss/blocks/_form.scss
index afcd9e9f65a..159b5b5a0ca 100644
--- a/administrator/templates/atum/scss/blocks/_form.scss
+++ b/administrator/templates/atum/scss/blocks/_form.scss
@@ -19,6 +19,7 @@
 }
 
 .control-group {
+  position: relative;
   display: flex;
   flex-wrap: wrap;
   margin: 0 0 1rem;
@@ -70,10 +71,6 @@ td .form-control {
   width: auto;
 }
 
-legend {
-  margin-bottom: 1.1rem;
-}
-
 .checkboxes {
   padding-top: 5px;
 
diff --git a/administrator/templates/atum/scss/blocks/_sidebar-nav.scss b/administrator/templates/atum/scss/blocks/_sidebar-nav.scss
index 7bfc7108d6a..aad1b2790b7 100644
--- a/administrator/templates/atum/scss/blocks/_sidebar-nav.scss
+++ b/administrator/templates/atum/scss/blocks/_sidebar-nav.scss
@@ -4,7 +4,6 @@
   padding: 1rem 2rem;
 
   li {
-    margin-bottom: .5rem;
     font-size: .9rem;
     font-weight: $font-weight-bold;
 
@@ -13,6 +12,8 @@
     }
 
     a {
+      display: block;
+      padding: .25rem;
       font-weight: $font-weight-normal;
       color: var(--atum-text-dark);
       text-decoration: none;
@@ -29,9 +30,11 @@
       }
     }
 
-    &:hover, &.active {
+    &.item:hover, &.active {
+      background-color: var(--atum-bg-dark-60);
+
       a {
-        color: var(--atum-link-color);
+        color: var(--atum-text-light);
       }
     }
   }
diff --git a/administrator/templates/atum/scss/pages/_com_admin.scss b/administrator/templates/atum/scss/pages/_com_admin.scss
deleted file mode 100644
index 39fffaf45ec..00000000000
--- a/administrator/templates/atum/scss/pages/_com_admin.scss
+++ /dev/null
@@ -1,9 +0,0 @@
-// com_admin
-
-.sysinfo {
-  .table {
-    th {
-      font-weight: $font-weight-bold;
-    }
-  }
-}
diff --git a/administrator/templates/atum/scss/pages/_com_cpanel.scss b/administrator/templates/atum/scss/pages/_com_cpanel.scss
index 8d212be9781..2b55f3e30c0 100644
--- a/administrator/templates/atum/scss/pages/_com_cpanel.scss
+++ b/administrator/templates/atum/scss/pages/_com_cpanel.scss
@@ -178,6 +178,10 @@
       text-decoration: underline;
     }
 
+    .btn {
+      text-decoration: none;
+    }
+
     .list-group-item a > span {
       &[class^="#{$jicon-css-prefix}-"],
       &[class*=" #{$jicon-css-prefix}-"],
@@ -196,17 +200,19 @@
     }
   }
 
-  .list-group-item a > span.home-image {
+  .list-group-item span.home-image {
     &[class^="#{$jicon-css-prefix}-"],
     &[class*=" #{$jicon-css-prefix}-"],
     &[class^="#{$fa-css-prefix}-"],
     &[class*=" #{$fa-css-prefix}-"] {
       display: inline-block;
       padding: 0;
+      margin: 0 .85rem;
       font-size: .9rem;
       color: rgba(1, 1, 1, 1);
       background: var(--white-offset);
       box-shadow: none;
+      transform: scale(1.2);
     }
   }
 
diff --git a/administrator/templates/atum/scss/pages/_com_finder.scss b/administrator/templates/atum/scss/pages/_com_finder.scss
deleted file mode 100644
index af0e1c1ec23..00000000000
--- a/administrator/templates/atum/scss/pages/_com_finder.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-// com_finder statistics
-
-.caption-top {
-  caption-side: top;
-}
diff --git a/administrator/templates/atum/scss/pages/_com_joomlaupdate.scss b/administrator/templates/atum/scss/pages/_com_joomlaupdate.scss
deleted file mode 100644
index b6cbeff7d04..00000000000
--- a/administrator/templates/atum/scss/pages/_com_joomlaupdate.scss
+++ /dev/null
@@ -1,7 +0,0 @@
-// com_joomlaupdate
-
-.com_joomlaupdate {
-  caption {
-    caption-side: top;
-  }
-}
diff --git a/administrator/templates/atum/scss/template.scss b/administrator/templates/atum/scss/template.scss
index 110a2d01339..0d70e14a1ac 100644
--- a/administrator/templates/atum/scss/template.scss
+++ b/administrator/templates/atum/scss/template.scss
@@ -58,12 +58,9 @@
 
 // Also these DO NOT BELONG HERE!!!
 // Page specifics
-@import "pages/com_admin";
 @import "pages/com_config";
 @import "pages/com_content";
 @import "pages/com_cpanel";
-@import "pages/com_finder";
-@import "pages/com_joomlaupdate";
 @import "pages/com_modules";
 @import "pages/com_tags";
 @import "pages/com_privacy";
diff --git a/api/components/com_contenthistory/src/Controller/HistoryController.php b/api/components/com_contenthistory/src/Controller/HistoryController.php
index 92ee9838159..34802e9f606 100644
--- a/api/components/com_contenthistory/src/Controller/HistoryController.php
+++ b/api/components/com_contenthistory/src/Controller/HistoryController.php
@@ -50,7 +50,7 @@ public function displayList()
 	{
 		$this->modelState->set('type_alias', $this->getTypeAliasFromInput());
 		$this->modelState->set('type_id', $this->getTypeIdFromInput());
-		$this->modelState->set('item_id', $this->getItemIdFromInput());
+		$this->modelState->set('item_id', $this->getTypeAliasFromInput() . '.' . $this->getItemIdFromInput());
 		$this->modelState->set('list.ordering', 'h.save_date');
 		$this->modelState->set('list.direction', 'DESC');
 
diff --git a/api/language/en-GB/joomla.ini b/api/language/en-GB/joomla.ini
index 8c83f815474..d77a4d87690 100644
--- a/api/language/en-GB/joomla.ini
+++ b/api/language/en-GB/joomla.ini
@@ -474,6 +474,7 @@ JGLOBAL_ITEM_FEATURE="Feature Item"
 JGLOBAL_ITEM_UNFEATURE="Unfeature Item"
 JGLOBAL_KEEP_TYPING="Keep typing ..."
 JGLOBAL_LANGUAGE_VERSION_NOT_PLATFORM="Language pack does not match this Joomla! version. Some strings may be missing and will be displayed in English."
+JGLOBAL_LEARN_MORE="Learn More"
 JGLOBAL_LEAST_HITS="Least Hits"
 JGLOBAL_LEFT="Left"
 JGLOBAL_LINK_AUTHOR_LABEL="Link to Author's Contact Page"
diff --git a/build/media_source/com_associations/js/admin-associations-default.es6.js b/build/media_source/com_associations/js/admin-associations-default.es6.js
index a12f9a0be4e..b5378dfa9d3 100644
--- a/build/media_source/com_associations/js/admin-associations-default.es6.js
+++ b/build/media_source/com_associations/js/admin-associations-default.es6.js
@@ -5,7 +5,7 @@
 Joomla.submitbutton = (pressbutton) => {
   if (pressbutton === 'associations.purge') {
     // eslint-disable-next-line no-restricted-globals
-    if (confirm(Joomla.JText._('COM_ASSOCIATIONS_PURGE_CONFIRM_PROMPT'))) {
+    if (confirm(Joomla.Text._('COM_ASSOCIATIONS_PURGE_CONFIRM_PROMPT'))) {
       Joomla.submitform(pressbutton);
     } else {
       return false;
diff --git a/build/media_source/com_associations/js/associations-edit.es6.js b/build/media_source/com_associations/js/associations-edit.es6.js
index 48666abe29a..c1e8cb8d7cc 100644
--- a/build/media_source/com_associations/js/associations-edit.es6.js
+++ b/build/media_source/com_associations/js/associations-edit.es6.js
@@ -30,7 +30,7 @@ Joomla = window.Joomla || {};
 
     if (associations) {
       const html = document.createElement('joomla-alert');
-      html.innerHTML = Joomla.JText._('JGLOBAL_ASSOC_NOT_POSSIBLE');
+      html.innerText = Joomla.Text._('JGLOBAL_ASSOC_NOT_POSSIBLE');
 
       associations.insertAdjacentElement('afterbegin', html);
     }
@@ -78,7 +78,7 @@ Joomla = window.Joomla || {};
         Joomla.renderMessages({ notice: [result.message] });
       }
     } else {
-      Joomla.renderMessages({ warning: [(Joomla.JText._('JGLOBAL_ASSOCIATIONS_PROPAGATE_FAILED'))] });
+      Joomla.renderMessages({ warning: [(Joomla.Text._('JGLOBAL_ASSOCIATIONS_PROPAGATE_FAILED'))] });
     }
   };
 
@@ -134,7 +134,7 @@ Joomla = window.Joomla || {};
         Joomla.injectAssociations(JSON.parse(response), callbackFunctionPrefix);
       },
       onError: () => {
-        Joomla.renderMessages({ warning: [(Joomla.JText._('JGLOBAL_ASSOCIATIONS_PROPAGATE_FAILED'))] });
+        Joomla.renderMessages({ warning: [(Joomla.Text._('JGLOBAL_ASSOCIATIONS_PROPAGATE_FAILED'))] });
       },
     });
 
@@ -191,7 +191,7 @@ Joomla = window.Joomla || {};
 
         // If associations existed, send a warning to the user
         if (existsAssociations) {
-          Joomla.renderMessages({ warning: [Joomla.JText._('JGLOBAL_ASSOCIATIONS_RESET_WARNING')] });
+          Joomla.renderMessages({ warning: [Joomla.Text._('JGLOBAL_ASSOCIATIONS_RESET_WARNING')] });
         }
 
         // If the selected language is All hide the fields and add a message
diff --git a/build/media_source/com_associations/js/sidebyside.es5.js b/build/media_source/com_associations/js/sidebyside.es5.js
index 71c00a565c9..136d46e1533 100644
--- a/build/media_source/com_associations/js/sidebyside.es5.js
+++ b/build/media_source/com_associations/js/sidebyside.es5.js
@@ -218,13 +218,13 @@ jQuery(document).ready(function($) {
       // If we are creating a new association (before save) we need to add the new association.
       if (targetLoadedId == '0')
       {
-        document.getElementById('select-change-text').innerHTML =  document.getElementById('select-change').getAttribute('data-select');
+        document.getElementById('select-change-text').innerHTML =  Joomla.sanitizeHtml(document.getElementById('select-change').getAttribute('data-select'));
       }
       // If we are editing an association.
       else
       {
         // Show change language button
-        document.getElementById('select-change-text').innerHTML =  document.getElementById('select-change').getAttribute('data-change');
+        document.getElementById('select-change-text').innerHTML =  Joomla.sanitizeHtml(document.getElementById('select-change').getAttribute('data-change'));
         $('#remove-assoc').removeClass("hidden");
         $('#toolbar-copy').hide();
 
diff --git a/build/media_source/com_config/joomla.asset.json b/build/media_source/com_config/joomla.asset.json
index 03a98425f2b..71fb94e5a29 100644
--- a/build/media_source/com_config/joomla.asset.json
+++ b/build/media_source/com_config/joomla.asset.json
@@ -73,6 +73,29 @@
       "attributes": {
         "type": "module"
       }
+    },
+    {
+      "name": "com_config.filters.es5",
+      "type": "script",
+      "uri": "com_config/config-filters-es5.min.js",
+      "dependencies": [
+        "core"
+      ],
+      "attributes": {
+        "nomodule": true,
+        "defer": true
+      }
+    },
+    {
+      "name": "com_config.filters",
+      "type": "script",
+      "uri": "com_config/config-filters.min.js",
+      "dependencies": [
+        "com_config.filters.es5"
+      ],
+      "attributes": {
+        "type": "module"
+      }
     }
   ]
 }
diff --git a/build/media_source/com_config/js/config-filters.es6.js b/build/media_source/com_config/js/config-filters.es6.js
new file mode 100644
index 00000000000..c7f10994bff
--- /dev/null
+++ b/build/media_source/com_config/js/config-filters.es6.js
@@ -0,0 +1,30 @@
+/**
+ * @copyright   (C) 2021 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+const recursiveApplyChanges = (id) => {
+  const childs = [].slice.call(document.querySelectorAll(`#filter-config select[data-parent="${id}"]`));
+  childs.map((child) => {
+    recursiveApplyChanges(child.dataset.id);
+    child.value = 'NONE';
+    return child;
+  });
+};
+
+const applyChanges = (event) => {
+  const currentElement = event.currentTarget;
+  const currentFilter = currentElement.options[currentElement.selectedIndex].value;
+
+  if (currentFilter === 'NONE') {
+    const childs = [].slice.call(document.querySelectorAll(`#filter-config select[data-parent="${currentElement.dataset.id}"]`));
+    if (childs.length && window.confirm(Joomla.Text._('COM_CONFIG_TEXT_FILTERS_NOTE'))) {
+      childs.map((child) => {
+        recursiveApplyChanges(child.dataset.id);
+        child.value = 'NONE';
+        return child;
+      });
+    }
+  }
+};
+
+[].slice.call(document.querySelectorAll('#filter-config select')).map((select) => select.addEventListener('change', applyChanges));
diff --git a/build/media_source/com_contenthistory/js/admin-compare-compare.es6.js b/build/media_source/com_contenthistory/js/admin-compare-compare.es6.js
index be2c733be80..1ac3aef109e 100644
--- a/build/media_source/com_contenthistory/js/admin-compare-compare.es6.js
+++ b/build/media_source/com_contenthistory/js/admin-compare-compare.es6.js
@@ -8,7 +8,7 @@
   // This method is used to decode HTML entities
   const decodeHtml = (html) => {
     const textarea = document.createElement('textarea');
-    textarea.innerHTML = html;
+    textarea.innerHTML = Joomla.sanitizeHtml(html);
     return textarea.value;
   };
 
diff --git a/build/media_source/com_contenthistory/js/admin-history-modal.es6.js b/build/media_source/com_contenthistory/js/admin-history-modal.es6.js
index 10f972331ae..7fa622d4763 100644
--- a/build/media_source/com_contenthistory/js/admin-history-modal.es6.js
+++ b/build/media_source/com_contenthistory/js/admin-history-modal.es6.js
@@ -5,7 +5,7 @@
 ((document, Joomla) => {
   'use strict';
 
-  if (!Joomla || typeof Joomla.JText._ !== 'function') {
+  if (!Joomla || typeof Joomla.Text._ !== 'function') {
     throw new Error('core.js was not properly initialised');
   }
 
@@ -20,7 +20,7 @@
         }
       } else {
         // @todo use the CE Modal here
-        alert(Joomla.JText._('COM_CONTENTHISTORY_BUTTON_SELECT_ONE'));
+        alert(Joomla.Text._('COM_CONTENTHISTORY_BUTTON_SELECT_ONE'));
       }
       return false;
     });
@@ -36,7 +36,7 @@
         }
       } else {
         // @todo use the CE Modal here
-        alert(Joomla.JText._('COM_CONTENTHISTORY_BUTTON_SELECT_ONE'));
+        alert(Joomla.Text._('COM_CONTENTHISTORY_BUTTON_SELECT_ONE'));
       }
       return false;
     });
@@ -46,7 +46,7 @@
       const ids = document.querySelectorAll('input[id*="cb"]:checked');
       if (ids.length === 0) {
         // @todo use the CE Modal here
-        alert(Joomla.JText._('JLIB_HTML_PLEASE_MAKE_A_SELECTION_FROM_THE_LIST'));
+        alert(Joomla.Text._('JLIB_HTML_PLEASE_MAKE_A_SELECTION_FROM_THE_LIST'));
       } else if (ids.length === 2) {
         // Add version item ids to URL
         const url = `${document.getElementById('toolbar-compare').childNodes[1].getAttribute('data-url')}&id1=${ids[0].value}&id2=${ids[1].value}`;
@@ -55,7 +55,7 @@
         }
       } else {
         // @todo use the CE Modal here
-        alert(Joomla.JText._('COM_CONTENTHISTORY_BUTTON_SELECT_TWO'));
+        alert(Joomla.Text._('COM_CONTENTHISTORY_BUTTON_SELECT_TWO'));
       }
       return false;
     });
diff --git a/build/media_source/com_cpanel/js/admin-cpanel-default.es6.js b/build/media_source/com_cpanel/js/admin-cpanel-default.es6.js
index 4b725911bcf..c94adcde642 100644
--- a/build/media_source/com_cpanel/js/admin-cpanel-default.es6.js
+++ b/build/media_source/com_cpanel/js/admin-cpanel-default.es6.js
@@ -31,12 +31,12 @@ const debounce = (callback, time = 250, interval) => (...args) => clearTimeout(i
         wrapper.parentNode.removeChild(wrapper);
 
         Joomla.renderMessages({
-          message: [Joomla.JText._('COM_CPANEL_UNPUBLISH_MODULE_SUCCESS')],
+          message: [Joomla.Text._('COM_CPANEL_UNPUBLISH_MODULE_SUCCESS')],
         });
       },
       onError: () => {
         Joomla.renderMessages({
-          error: [Joomla.JText._('COM_CPANEL_UNPUBLISH_MODULE_ERROR')],
+          error: [Joomla.Text._('COM_CPANEL_UNPUBLISH_MODULE_ERROR')],
         });
       },
     });
diff --git a/build/media_source/com_cpanel/js/admin-system-loader.es6.js b/build/media_source/com_cpanel/js/admin-system-loader.es6.js
index 5b7da3c1c2c..40d0d2ace16 100644
--- a/build/media_source/com_cpanel/js/admin-system-loader.es6.js
+++ b/build/media_source/com_cpanel/js/admin-system-loader.es6.js
@@ -39,7 +39,7 @@
                 elem.classList.add('float-end');
                 elem.classList.add('badge');
                 elem.classList.add('bg-warning', 'text-dark');
-                elem.innerHTML = response.data;
+                elem.innerHTML = Joomla.sanitizeHtml(response.data);
 
                 element.parentNode.replaceChild(elem, element);
               } else {
diff --git a/build/media_source/com_fields/joomla.asset.json b/build/media_source/com_fields/joomla.asset.json
index b9327ace465..8fbfac96324 100644
--- a/build/media_source/com_fields/joomla.asset.json
+++ b/build/media_source/com_fields/joomla.asset.json
@@ -51,29 +51,6 @@
         "type": "module"
       }
     },
-    {
-      "name": "com_fields.admin-field-edit-modal.es5",
-      "type": "script",
-      "uri": "com_fields/admin-field-edit-modal-es5.min.js",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "com_fields.admin-field-edit-modal",
-      "type": "script",
-      "uri": "com_fields/admin-field-edit-modal.min.js",
-      "dependencies": [
-        "com_fields.admin-field-edit-modal.es5"
-      ],
-      "attributes": {
-        "type": "module"
-      }
-    },
     {
       "name": "com_fields.admin-field-typehaschanged.es5",
       "type": "script",
diff --git a/build/media_source/com_fields/js/admin-field-edit-modal.es6.js b/build/media_source/com_fields/js/admin-field-edit-modal.es6.js
deleted file mode 100644
index 43705111880..00000000000
--- a/build/media_source/com_fields/js/admin-field-edit-modal.es6.js
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * @copyright  (C) 2019 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-((Joomla) => {
-  'use strict';
-
-  Joomla.submitbutton = (task) => {
-    if (task === 'field.cancel' || document.formvalidator.isValid(document.getElementById('item-form'))) {
-      if (window.opener && (task === 'field.save' || task === 'field.cancel')) {
-        window.opener.document.closeEditWindow = window.self;
-        window.opener.setTimeout('window.document.closeEditWindow.close()', 1000);
-      }
-
-      Joomla.submitform(task, document.getElementById('item-form'));
-    }
-  };
-})(Joomla);
diff --git a/build/media_source/com_finder/js/filters.es6.js b/build/media_source/com_finder/js/filters.es6.js
index bbeccb4638c..52af982b6b7 100644
--- a/build/media_source/com_finder/js/filters.es6.js
+++ b/build/media_source/com_finder/js/filters.es6.js
@@ -11,7 +11,7 @@
 
   const onBoot = () => {
     Joomla.submitbutton = (pressbutton) => {
-      if (pressbutton === 'filters.delete' && !window.confirm(Joomla.JText._('COM_FINDER_INDEX_CONFIRM_DELETE_PROMPT'))) {
+      if (pressbutton === 'filters.delete' && !window.confirm(Joomla.Text._('COM_FINDER_INDEX_CONFIRM_DELETE_PROMPT'))) {
         return false;
       }
       Joomla.submitform(pressbutton);
diff --git a/build/media_source/com_finder/js/finder-edit.es6.js b/build/media_source/com_finder/js/finder-edit.es6.js
index a1fc4e1ce0c..c3189832b25 100644
--- a/build/media_source/com_finder/js/finder-edit.es6.js
+++ b/build/media_source/com_finder/js/finder-edit.es6.js
@@ -42,12 +42,12 @@ Joomla = window.Joomla || {};
         event.preventDefault();
         let elements;
 
-        if (event.target.innerText === Joomla.JText._('COM_FINDER_FILTER_SHOW_ALL')) {
-          event.target.innerText = Joomla.JText._('COM_FINDER_FILTER_HIDE_ALL');
+        if (event.target.innerText === Joomla.Text._('COM_FINDER_FILTER_SHOW_ALL')) {
+          event.target.innerText = Joomla.Text._('COM_FINDER_FILTER_HIDE_ALL');
 
           elements = [].slice.call(document.querySelectorAll('.accordion-button.collapsed'));
         } else {
-          event.target.innerText = Joomla.JText._('COM_FINDER_FILTER_SHOW_ALL');
+          event.target.innerText = Joomla.Text._('COM_FINDER_FILTER_SHOW_ALL');
 
           elements = [].slice.call(document.querySelectorAll('.accordion-button:not(.collapsed)'));
         }
diff --git a/build/media_source/com_finder/js/index.es6.js b/build/media_source/com_finder/js/index.es6.js
index 45c82f14be8..bc805cefa1c 100644
--- a/build/media_source/com_finder/js/index.es6.js
+++ b/build/media_source/com_finder/js/index.es6.js
@@ -11,11 +11,11 @@ Joomla = window.Joomla || {};
   document.addEventListener('DOMContentLoaded', () => {
     Joomla.submitbutton = (pressbutton) => {
       // TODO replace with joomla-alert
-      if (pressbutton === 'index.purge' && !window.confirm(Joomla.JText._('COM_FINDER_INDEX_CONFIRM_PURGE_PROMPT'))) {
+      if (pressbutton === 'index.purge' && !window.confirm(Joomla.Text._('COM_FINDER_INDEX_CONFIRM_PURGE_PROMPT'))) {
         return false;
       }
       // TODO replace with joomla-alert
-      if (pressbutton === 'index.delete' && !window.confirm(Joomla.JText._('COM_FINDER_INDEX_CONFIRM_DELETE_PROMPT'))) {
+      if (pressbutton === 'index.delete' && !window.confirm(Joomla.Text._('COM_FINDER_INDEX_CONFIRM_DELETE_PROMPT'))) {
         return false;
       }
       Joomla.submitform(pressbutton);
diff --git a/build/media_source/com_finder/js/indexer.es6.js b/build/media_source/com_finder/js/indexer.es6.js
index ca0408668d8..11ade16b274 100644
--- a/build/media_source/com_finder/js/indexer.es6.js
+++ b/build/media_source/com_finder/js/indexer.es6.js
@@ -39,7 +39,7 @@
       }
 
       if (progressMessage) {
-        progressMessage.innerHTML = message;
+        progressMessage.innerHTML = Joomla.sanitizeHtml(message);
       }
 
       if (progressBar) {
@@ -82,7 +82,7 @@
             Object.entries(json.pluginState).forEach((context) => {
               let item = `<dt class="col-sm-3">${context[0]}</dt>`;
               item += `<dd id="finder-${context[0].replace(/\s+/g, '-').toLowerCase()}" class="col-sm-9"></dd>`;
-              debuglist.insertAdjacentHTML('beforeend', item);
+              debuglist.insertAdjacentHTML('beforeend', Joomla.sanitizeHtml(item));
             });
           }
         }
@@ -90,7 +90,7 @@
         updateProgress(json.header, json.message);
         if (document.getElementById('finder-debug-data')) {
           Object.entries(json.pluginState).forEach((context) => {
-            document.getElementById(`finder-${context[0].replace(/\s+/g, '-').toLowerCase()}`).innerHTML = `${json.pluginState[context[0]].offset} of ${json.pluginState[context[0]].total}`;
+            document.getElementById(`finder-${context[0].replace(/\s+/g, '-').toLowerCase()}`).innerHTML = Joomla.sanitizeHtml(`${json.pluginState[context[0]].offset} of ${json.pluginState[context[0]].total}`);
           });
         }
         if (offset < totalItems) {
@@ -108,21 +108,21 @@
               progressHeader.classList.add('finder-error');
             }
             if (progressMessage) {
-              progressMessage.innerHTML = json.message;
+              progressMessage.innerHTML = Joomla.sanitizeHtml(json.message);
               progressMessage.classList.add('finder-error');
             }
           }
         } catch (ignore) {
           if (error === '') {
             // eslint-disable-next-line no-ex-assign
-            error = Joomla.JText._('COM_FINDER_NO_ERROR_RETURNED');
+            error = Joomla.Text._('COM_FINDER_NO_ERROR_RETURNED');
           }
           if (progressHeader) {
-            progressHeader.innerText = Joomla.JText._('COM_FINDER_AN_ERROR_HAS_OCCURRED');
+            progressHeader.innerText = Joomla.Text._('COM_FINDER_AN_ERROR_HAS_OCCURRED');
             progressHeader.classList.add('finder-error');
           }
           if (progressMessage) {
-            progressMessage.innerHTML = error;
+            progressMessage.innerHTML = Joomla.sanitizeHtml(error);
             progressMessage.classList.add('finder-error');
           }
         }
@@ -139,15 +139,15 @@
 
       removeElement('progress');
 
-      const header = data ? data.header : Joomla.JText._('COM_FINDER_AN_ERROR_HAS_OCCURRED');
-      const message = data ? data.message : `${Joomla.JText._('COM_FINDER_MESSAGE_RETURNED')}<br>${data}`;
+      const header = data ? data.header : Joomla.Text._('COM_FINDER_AN_ERROR_HAS_OCCURRED');
+      const message = data ? data.message : `${Joomla.Text._('COM_FINDER_MESSAGE_RETURNED')}<br>${data}`;
 
       if (progressHeader) {
         progressHeader.innerText = header;
         progressHeader.classList.add('finder-error');
       }
       if (progressMessage) {
-        progressMessage.innerHTML = message;
+        progressMessage.innerHTML = Joomla.sanitizeHtml(message);
         progressMessage.classList.add('finder-error');
       }
     };
diff --git a/build/media_source/com_finder/js/maps.es6.js b/build/media_source/com_finder/js/maps.es6.js
index fcc17fef095..73446c9641d 100644
--- a/build/media_source/com_finder/js/maps.es6.js
+++ b/build/media_source/com_finder/js/maps.es6.js
@@ -11,7 +11,7 @@ Joomla = window.Joomla || {};
   document.addEventListener('DOMContentLoaded', () => {
     Joomla.submitbutton = (pressbutton) => {
       // TODO replace with joomla-alert
-      if (pressbutton === 'map.delete' && !window.confirm(Joomla.JText._('COM_FINDER_MAPS_CONFIRM_DELETE_PROMPT'))) {
+      if (pressbutton === 'map.delete' && !window.confirm(Joomla.Text._('COM_FINDER_MAPS_CONFIRM_DELETE_PROMPT'))) {
         return false;
       }
       Joomla.submitform(pressbutton);
diff --git a/build/media_source/com_installer/js/changelog.es6.js b/build/media_source/com_installer/js/changelog.es6.js
index 1848e84aaf8..124e1bb9e83 100644
--- a/build/media_source/com_installer/js/changelog.es6.js
+++ b/build/media_source/com_installer/js/changelog.es6.js
@@ -45,10 +45,10 @@ Joomla = window.Joomla || {};
         } catch (exception) {
           message = exception;
         }
-        modal.innerHTML = message;
+        modal.innerHTML = Joomla.sanitizeHtml(message);
       },
       onError: function onError(xhr) {
-        modal.innerHTML = xhr.statusText;
+        modal.innerHTML = Joomla.sanitizeHtml(xhr.statusText);
       },
     });
   };
diff --git a/build/media_source/com_joomlaupdate/js/default.es6.js b/build/media_source/com_joomlaupdate/js/default.es6.js
index 3fc32a7a362..6c6a75a6aba 100644
--- a/build/media_source/com_joomlaupdate/js/default.es6.js
+++ b/build/media_source/com_joomlaupdate/js/default.es6.js
@@ -13,9 +13,9 @@ Joomla = window.Joomla || {};
 
     // do field validation
     if (form.install_package.value === '') {
-      alert(Joomla.JText._('COM_INSTALLER_MSG_INSTALL_PLEASE_SELECT_A_PACKAGE'), true);
+      alert(Joomla.Text._('COM_INSTALLER_MSG_INSTALL_PLEASE_SELECT_A_PACKAGE'), true);
     } else if (form.install_package.files[0].size > form.max_upload_size.value) {
-      alert(Joomla.JText._('COM_INSTALLER_MSG_WARNINGS_UPLOADFILETOOBIG'), true);
+      alert(Joomla.Text._('COM_INSTALLER_MSG_WARNINGS_UPLOADFILETOOBIG'), true);
     } else {
       form.submit();
     }
@@ -33,7 +33,7 @@ Joomla = window.Joomla || {};
       warningElement.classList.add('hidden');
     } else if (fileSize) {
       fileSizeElement.classList.remove('hidden');
-      fileSizeElement.innerHTML = Joomla.JText._('JGLOBAL_SELECTED_UPLOAD_FILE_SIZE').replace('%s', `${fileSizeMB.toFixed(2)} MB`);
+      fileSizeElement.innerHTML = Joomla.sanitizeHtml(Joomla.Text._('JGLOBAL_SELECTED_UPLOAD_FILE_SIZE').replace('%s', `${fileSizeMB.toFixed(2)} MB`));
 
       if (fileSize > form.max_upload_size.value) {
         warningElement.classList.remove('hidden');
@@ -99,17 +99,17 @@ Joomla = window.Joomla || {};
     [].slice.call(document.querySelectorAll('.settingstoggle')).forEach((el) => {
       el.style.float = 'right';
       el.style.cursor = 'pointer';
-      el.addEventListener('click', (toggle) => {
+      el.addEventListener('click', () => {
         const settingsfieldset = el.closest('fieldset');
-        if (toggle.target.dataset.state === 'closed') {
-          toggle.target.dataset.state = 'open';
-          toggle.target.innerHTML = Joomla.getOptions('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_SHOW_LESS_COMPATIBILITY_INFORMATION');
+        if (el.dataset.state === 'closed') {
+          el.dataset.state = 'open';
+          el.innerHTML = Joomla.sanitizeHtml(Joomla.getOptions('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_SHOW_LESS_COMPATIBILITY_INFORMATION'));
           settingsfieldset.querySelectorAll('.settingsInfo').forEach((fieldset) => {
             fieldset.classList.remove('hidden');
           });
         } else {
-          toggle.target.dataset.state = 'closed';
-          toggle.target.innerHTML = Joomla.getOptions('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_SHOW_MORE_COMPATIBILITY_INFORMATION');
+          el.dataset.state = 'closed';
+          el.innerHTML = Joomla.sanitizeHtml(Joomla.getOptions('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_SHOW_MORE_COMPATIBILITY_INFORMATION'));
           settingsfieldset.querySelectorAll('.settingsInfo').forEach((fieldset) => {
             fieldset.classList.add('hidden');
           });
@@ -148,7 +148,7 @@ Joomla = window.Joomla || {};
       const preUpdateCheckbox = document.getElementById('preupdatecheckbox').checked;
       const nonCorePluginCheckbox = document.getElementById('noncoreplugins').checked;
       if (preUpdateCheckbox && nonCorePluginCheckbox) {
-        if (window.confirm(Joomla.JText._('COM_JOOMLAUPDATE_VIEW_DEFAULT_POTENTIALLY_DANGEROUS_PLUGIN_CONFIRM_MESSAGE'))) {
+        if (window.confirm(Joomla.Text._('COM_JOOMLAUPDATE_VIEW_DEFAULT_POTENTIALLY_DANGEROUS_PLUGIN_CONFIRM_MESSAGE'))) {
           [].slice.call(document.querySelectorAll('button.submitupdate')).forEach((el) => {
             el.classList.remove('disabled');
             el.removeAttribute('disabled');
@@ -198,7 +198,7 @@ Joomla = window.Joomla || {};
 
         if (el.dataset.state === 'closed') {
           el.dataset.state = 'open';
-          el.innerHTML = Joomla.getOptions('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_SHOW_LESS_COMPATIBILITY_INFORMATION');
+          el.innerHTML = Joomla.sanitizeHtml(Joomla.getOptions('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_SHOW_LESS_COMPATIBILITY_INFORMATION'));
 
           [].slice.call(compatibilitytypes.querySelectorAll('.exname')).forEach((extension) => {
             extension.classList.remove('col-md-8');
@@ -234,7 +234,7 @@ Joomla = window.Joomla || {};
           }
         } else {
           el.dataset.state = 'closed';
-          el.innerHTML = Joomla.getOptions('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_SHOW_MORE_COMPATIBILITY_INFORMATION');
+          el.innerHTML = Joomla.sanitizeHtml(Joomla.getOptions('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_SHOW_MORE_COMPATIBILITY_INFORMATION'));
 
           [].slice.call(compatibilitytypes.querySelectorAll('.exname')).forEach((extension) => {
             extension.classList.add('col-md-8');
@@ -333,7 +333,7 @@ Joomla = window.Joomla || {};
     // Process Target Version Extension Compatibility
     if (extensionData.serverError) {
       // An error occurred -> show unknown error note
-      html = Joomla.JText._('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSION_SERVER_ERROR');
+      html = Joomla.Text._('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSION_SERVER_ERROR');
       // Force result into group 4 = Pre update checks failed
       extensionData.compatibilityData = {
         resultGroup: 4,
@@ -349,54 +349,54 @@ Joomla = window.Joomla || {};
           } else {
             // eslint-disable-next-line max-len
             html = extensionData.compatibilityData.upgradeCompatibilityStatus.compatibleVersion === false
-              ? Joomla.JText._('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSION_NO_COMPATIBILITY_INFORMATION')
+              ? Joomla.Text._('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSION_NO_COMPATIBILITY_INFORMATION')
               : extensionData.compatibilityData.upgradeCompatibilityStatus.compatibleVersion;
           }
           break;
         case PreUpdateChecker.STATE.INCOMPATIBLE:
           // No compatible version found -> display error label
-          html = Joomla.JText._('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSION_NO_COMPATIBILITY_INFORMATION');
+          html = Joomla.Text._('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSION_NO_COMPATIBILITY_INFORMATION');
           PreUpdateChecker.showorangewarning = true;
           break;
         case PreUpdateChecker.STATE.MISSING_COMPATIBILITY_TAG:
           // Could not check compatibility state -> display warning
-          html = Joomla.JText._('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSION_NO_COMPATIBILITY_INFORMATION');
+          html = Joomla.Text._('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSION_NO_COMPATIBILITY_INFORMATION');
           PreUpdateChecker.showorangewarning = true;
           break;
         default:
-          // An error occured -> show unknown error note
-          html = Joomla.JText._('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSION_WARNING_UNKNOWN');
+          // An error occurred -> show unknown error note
+          html = Joomla.Text._('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSION_WARNING_UNKNOWN');
       }
     }
 
     // Insert the generated html
-    extensionData.element.innerHTML = html;
+    extensionData.element.innerHTML = Joomla.sanitizeHtml(html);
 
     // Process Current Version Extension Compatibility
     html = '';
     if (extensionData.serverError) {
-      // An error occured -> show unknown error note
-      html = Joomla.JText._('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSION_SERVER_ERROR');
+      // An error occurred -> show unknown error note
+      html = Joomla.Text._('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSION_SERVER_ERROR');
     } else {
       // Switch the compatibility state
       switch (extensionData.compatibilityData.currentCompatibilityStatus.state) {
         case PreUpdateChecker.STATE.COMPATIBLE:
           // eslint-disable-next-line max-len
           html = extensionData.compatibilityData.currentCompatibilityStatus.compatibleVersion === false
-            ? Joomla.JText._('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSION_NO_COMPATIBILITY_INFORMATION')
+            ? Joomla.Text._('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSION_NO_COMPATIBILITY_INFORMATION')
             : extensionData.compatibilityData.currentCompatibilityStatus.compatibleVersion;
           break;
         case PreUpdateChecker.STATE.INCOMPATIBLE:
           // No compatible version found -> display error label
-          html = Joomla.JText._('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSION_NO_COMPATIBILITY_INFORMATION');
+          html = Joomla.Text._('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSION_NO_COMPATIBILITY_INFORMATION');
           break;
         case PreUpdateChecker.STATE.MISSING_COMPATIBILITY_TAG:
           // Could not check compatibility state -> display warning
-          html = Joomla.JText._('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSION_NO_COMPATIBILITY_INFORMATION');
+          html = Joomla.Text._('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSION_NO_COMPATIBILITY_INFORMATION');
           break;
         default:
-          // An error occured -> show unknown error note
-          html = Joomla.JText._('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSION_WARNING_UNKNOWN');
+          // An error occurred -> show unknown error note
+          html = Joomla.Text._('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSION_WARNING_UNKNOWN');
       }
     }
     // Insert the generated html
@@ -442,19 +442,19 @@ Joomla = window.Joomla || {};
           const tableRow = problemPluginRow.closest('tr');
           tableRow.classList.add('error');
           const pluginTitleTableCell = tableRow.querySelector('td:first-child');
-          pluginTitleTableCell.innerHTML = `${pluginTitleTableCell.innerHTML}
+          pluginTitleTableCell.innerHTML = Joomla.sanitizeHtml(`${pluginTitleTableCell.innerHTML}
               <span class="label label-warning " >
               <span class="icon-warning"></span>
-              ${Joomla.JText._('COM_JOOMLAUPDATE_VIEW_DEFAULT_POTENTIALLY_DANGEROUS_PLUGIN')}
+              ${Joomla.Text._('COM_JOOMLAUPDATE_VIEW_DEFAULT_POTENTIALLY_DANGEROUS_PLUGIN')}
               </span>
 
               <span class="label label-important hasPopover"
-              title="${Joomla.JText._('COM_JOOMLAUPDATE_VIEW_DEFAULT_POTENTIALLY_DANGEROUS_PLUGIN')} "
-              data-bs-content="${Joomla.JText._('COM_JOOMLAUPDATE_VIEW_DEFAULT_POTENTIALLY_DANGEROUS_PLUGIN_DESC')} "
+              title="${Joomla.Text._('COM_JOOMLAUPDATE_VIEW_DEFAULT_POTENTIALLY_DANGEROUS_PLUGIN')} "
+              data-bs-content="${Joomla.Text._('COM_JOOMLAUPDATE_VIEW_DEFAULT_POTENTIALLY_DANGEROUS_PLUGIN_DESC')} "
               >
               <span class="icon-help"></span>
-              ${Joomla.JText._('COM_JOOMLAUPDATE_VIEW_DEFAULT_HELP')}
-              </span>`;
+              ${Joomla.Text._('COM_JOOMLAUPDATE_VIEW_DEFAULT_HELP')}
+              </span>`);
           const popoverElement = pluginTitleTableCell.querySelector('.hasPopover');
           if (popoverElement) {
             popoverElement.style.cursor = 'pointer';
@@ -486,7 +486,7 @@ Joomla = window.Joomla || {};
         document.getElementById('preupdateCheckCompleteProblems').classList.remove('hidden');
 
         [].slice.call(document.querySelectorAll('#preupdateconfirmation .preupdateconfirmation_label h3')).forEach((el) => {
-          el.innerText = Joomla.JText._('COM_JOOMLAUPDATE_VIEW_DEFAULT_POTENTIALLY_DANGEROUS_PLUGIN_LIST');
+          el.innerText = Joomla.Text._('COM_JOOMLAUPDATE_VIEW_DEFAULT_POTENTIALLY_DANGEROUS_PLUGIN_LIST');
         });
 
         [].slice.call(document.querySelectorAll('#preupdateconfirmation .preupdateconfirmation_label')).forEach((el) => {
diff --git a/build/media_source/com_languages/js/overrider.es6.js b/build/media_source/com_languages/js/overrider.es6.js
index 2dfa3307dd8..707b51205f0 100644
--- a/build/media_source/com_languages/js/overrider.es6.js
+++ b/build/media_source/com_languages/js/overrider.es6.js
@@ -48,7 +48,7 @@
           this.states.refreshing = false;
         },
         onError: () => {
-          alert(Joomla.JText._('COM_LANGUAGES_VIEW_OVERRIDE_REQUEST_ERROR'));
+          alert(Joomla.Text._('COM_LANGUAGES_VIEW_OVERRIDE_REQUEST_ERROR'));
           this.refreshStatus.classList.remove('show');
         },
       });
@@ -144,7 +144,7 @@
           this.spinner.classList.remove('show');
         },
         onError: () => {
-          alert(Joomla.JText._('COM_LANGUAGES_VIEW_OVERRIDE_REQUEST_ERROR'));
+          alert(Joomla.Text._('COM_LANGUAGES_VIEW_OVERRIDE_REQUEST_ERROR'));
           this.moreResultsButton.disabled = true;
           this.moreResults.classList.remove('show');
           this.resultsContainer.classList.remove('show');
@@ -187,12 +187,12 @@
         key.setAttribute('id', `override_key${this.states.counter}${index}`);
         key.setAttribute('title', item.file);
         key.classList.add('result-key');
-        key.innerHTML = item.constant;
+        key.innerHTML = Joomla.sanitizeHtml(item.constant);
 
         const string = document.createElement('div');
         string.setAttribute('id', `override_string${this.states.counter}${index}`);
         string.classList.add('result-string');
-        string.innerHTML = item.string;
+        string.innerHTML = Joomla.sanitizeHtml(item.string);
 
         a.appendChild(key);
         a.appendChild(string);
@@ -202,7 +202,7 @@
       // If there aren't any results display an appropriate message
       if (!results.length) {
         const noresult = document.createElement('div');
-        noresult.innerHTML = Joomla.JText._('COM_LANGUAGES_VIEW_OVERRIDE_NO_RESULTS');
+        noresult.innerText = Joomla.Text._('COM_LANGUAGES_VIEW_OVERRIDE_NO_RESULTS');
 
         resultsDiv.appendChild(noresult);
       }
diff --git a/build/media_source/com_modules/js/admin-module-edit.es6.js b/build/media_source/com_modules/js/admin-module-edit.es6.js
index 93feea32a4b..c5f022ddd0b 100644
--- a/build/media_source/com_modules/js/admin-module-edit.es6.js
+++ b/build/media_source/com_modules/js/admin-module-edit.es6.js
@@ -39,59 +39,59 @@ Joomla = window.Joomla || {};
             }
           });
           if (updMenus === '-') {
-            tmpMenu.innerHTML = `<span class="badge bg-danger">${Joomla.JText._('JNO')}</span>`;
+            tmpMenu.innerHTML = Joomla.sanitizeHtml(`<span class="badge bg-danger">${Joomla.Text._('JNO')}</span>`);
             if (!tmpRow.classList.contains('no') || tmpRow.classList.length === 0) { tmpRow.classList.add('no'); }
           }
           if (parseInt(updMenus, 10) === 0) {
-            tmpMenu.innerHTML = `<span class="badge bg-info">${Joomla.JText._('JALL')}</span>`;
+            tmpMenu.innerHTML = Joomla.sanitizeHtml(`<span class="badge bg-info">${Joomla.Text._('JALL')}</span>`);
             if (tmpRow.classList.contains('no')) { tmpRow.classList.remove('no'); }
           }
           if (parseInt(updMenus, 10) > 0) {
             if (window.parent.inMenus.indexOf(window.parent.menuId) >= 0) {
               if (window.parent.numMenus === window.parent.inMenus.length) {
-                tmpMenu.innerHTML = `<span class="badge bg-info">${Joomla.JText._('JALL')}</span>`;
+                tmpMenu.innerHTML = Joomla.sanitizeHtml(`<span class="badge bg-info">${Joomla.Text._('JALL')}</span>`);
                 if (tmpRow.classList.contains('no') || tmpRow.classList.length === 0) { tmpRow.classList.remove('no'); }
               } else {
-                tmpMenu.innerHTML = `<span class="badge bg-success">${Joomla.JText._('JYES')}</span>`;
+                tmpMenu.innerHTML = Joomla.sanitizeHtml(`<span class="badge bg-success">${Joomla.Text._('JYES')}</span>`);
                 if (tmpRow.classList.contains('no')) { tmpRow.classList.remove('no'); }
               }
             }
             if (window.parent.inMenus.indexOf(window.parent.menuId) < 0) {
-              tmpMenu.innerHTML = `<span class="badge bg-danger">${Joomla.JText._('JNO')}</span>`;
+              tmpMenu.innerHTML = Joomla.sanitizeHtml(`<span class="badge bg-danger">${Joomla.Text._('JNO')}</span>`);
               if (!tmpRow.classList.contains('no')) { tmpRow.classList.add('no'); }
             }
           }
           if (parseInt(updMenus, 10) < 0) {
             if (window.parent.inMenus.indexOf(window.parent.menuId) >= 0) {
               if (window.parent.numMenus === window.parent.inMenus.length) {
-                tmpMenu.innerHTML = `<span class="badge bg-info">${Joomla.JText._('JALL')}</span>`;
+                tmpMenu.innerHTML = Joomla.sanitizeHtml(`<span class="badge bg-info">${Joomla.Text._('JALL')}</span>`);
                 if (tmpRow.classList.contains('no')) { tmpRow.classList.remove('no'); }
               } else {
-                tmpMenu.innerHTML = `<span class="badge bg-success">${Joomla.JText._('JYES')}</span>`;
+                tmpMenu.innerHTML = Joomla.sanitizeHtml(`<span class="badge bg-success">${Joomla.Text._('JYES')}</span>`);
                 if (tmpRow.classList.contains('no')) { tmpRow.classList.remove('no'); }
               }
             }
             if (window.parent.inMenus.indexOf(window.parent.menuId) < 0) {
-              tmpMenu.innerHTML = `<span class="badge bg-danger">${Joomla.JText._('JNO')}</span>`;
+              tmpMenu.innerHTML = Joomla.sanitizeHtml(`<span class="badge bg-danger">${Joomla.Text._('JNO')}</span>`);
               if (!tmpRow.classList.contains('no') || tmpRow.classList.length === 0) { tmpRow.classList.add('no'); }
             }
           }
           if (parseInt(updStatus, 10) === 1) {
-            tmpStatus.innerHTML = `<span class="badge bg-success">${Joomla.JText._('JYES')}</span>`;
+            tmpStatus.innerHTML = Joomla.sanitizeHtml(`<span class="badge bg-success">${Joomla.Text._('JYES')}</span>`);
             if (tmpRow.classList.contains('unpublished')) { tmpRow.classList.remove('unpublished'); }
           }
           if (parseInt(updStatus, 10) === 0) {
-            tmpStatus.innerHTML = `<span class="badge bg-danger">${Joomla.JText._('JNO')}</span>`;
+            tmpStatus.innerHTML = Joomla.sanitizeHtml(`<span class="badge bg-danger">${Joomla.Text._('JNO')}</span>`);
             if (!tmpRow.classList.contains('unpublished') || tmpRow.classList.length === 0) { tmpRow.classList.add('unpublished'); }
           }
           if (parseInt(updStatus, 10) === -2) {
-            tmpStatus.innerHTML = `<span class="badge bg-secondary">${Joomla.JText._('JTRASHED')}</span>`;
+            tmpStatus.innerHTML = Joomla.sanitizeHtml(`<span class="badge bg-secondary">${Joomla.Text._('JTRASHED')}</span>`);
             if (!tmpRow.classList.contains('unpublished') || tmpRow.classList.length === 0) { tmpRow.classList.add('unpublished'); }
           }
           if (document.formvalidator.isValid(document.getElementById('module-form'))) {
             window.parent.document.querySelector(`#title-${options.itemId}`).innerText = updTitle;
             window.parent.document.querySelector(`#position-${options.itemId}`).innerText = updPosition;
-            window.parent.document.querySelector(`#access-${options.itemId}`).innerHTML = window.parent.viewLevels[updAccess];
+            window.parent.document.querySelector(`#access-${options.itemId}`).innerHTML = Joomla.sanitizeHtml(window.parent.viewLevels[updAccess]);
           }
         }
 
diff --git a/build/media_source/com_users/js/admin-users-groups.es6.js b/build/media_source/com_users/js/admin-users-groups.es6.js
index 6727442f9c6..dd4c843f5ed 100644
--- a/build/media_source/com_users/js/admin-users-groups.es6.js
+++ b/build/media_source/com_users/js/admin-users-groups.es6.js
@@ -15,7 +15,7 @@ Joomla = window.Joomla || {};
         for (let i = 0; i < cids.length; i += 1) {
           if (cids[i].checked && cids[i].parentNode.getAttribute('data-usercount') !== '0') {
             // TODO replace with joomla-alert
-            if (window.confirm(Joomla.JText._('COM_USERS_GROUPS_CONFIRM_DELETE'))) {
+            if (window.confirm(Joomla.Text._('COM_USERS_GROUPS_CONFIRM_DELETE'))) {
               Joomla.submitform(task);
             }
             return false;
diff --git a/build/media_source/com_users/js/admin-users-mail.es6.js b/build/media_source/com_users/js/admin-users-mail.es6.js
index 97f31fe4ab6..237bdf78657 100644
--- a/build/media_source/com_users/js/admin-users-mail.es6.js
+++ b/build/media_source/com_users/js/admin-users-mail.es6.js
@@ -18,13 +18,13 @@
 
       // do field validation
       if (form.jform_subject.value === '') {
-        html.innerText = Joomla.JText._('COM_USERS_MAIL_PLEASE_FILL_IN_THE_SUBJECT');
+        html.innerText = Joomla.Text._('COM_USERS_MAIL_PLEASE_FILL_IN_THE_SUBJECT');
         form.insertAdjacentElement('afterbegin', html);
       } else if (form.jform_group.value < 0) {
-        html.innerText = Joomla.JText._('COM_USERS_MAIL_PLEASE_SELECT_A_GROUP');
+        html.innerText = Joomla.Text._('COM_USERS_MAIL_PLEASE_SELECT_A_GROUP');
         form.insertAdjacentElement('afterbegin', html);
       } else if (form.jform_message.value === '') {
-        html.innerText = Joomla.JText._('COM_USERS_MAIL_PLEASE_FILL_IN_THE_MESSAGE');
+        html.innerText = Joomla.Text._('COM_USERS_MAIL_PLEASE_FILL_IN_THE_MESSAGE');
         form.insertAdjacentElement('afterbegin', html);
       } else {
         Joomla.submitform(pressbutton);
diff --git a/build/media_source/legacy/js/ajax-chosen.es5.js b/build/media_source/legacy/js/ajax-chosen.es5.js
index 404aaea3645..9790e596793 100644
--- a/build/media_source/legacy/js/ajax-chosen.es5.js
+++ b/build/media_source/legacy/js/ajax-chosen.es5.js
@@ -28,8 +28,8 @@
       minTermLength: 3,
       afterTypeDelay: 500,
       jsonTermKey: "term",
-      keepTypingMsg: Joomla.JText._('JGLOBAL_KEEP_TYPING'),
-      lookingForMsg: Joomla.JText._('JGLOBAL_LOOKING_FOR')
+      keepTypingMsg: Joomla.Text._('JGLOBAL_KEEP_TYPING'),
+      lookingForMsg: Joomla.Text._('JGLOBAL_LOOKING_FOR')
     };
     select = this;
     chosenXhr = null;
@@ -158,4 +158,4 @@ jQuery(document).ready(function ($) {
       return results;
     });
   }
-});
\ No newline at end of file
+});
diff --git a/build/media_source/mod_menu/js/admin-menu.es6.js b/build/media_source/mod_menu/js/admin-menu.es6.js
index f837fa29df7..5b9f11e064b 100644
--- a/build/media_source/mod_menu/js/admin-menu.es6.js
+++ b/build/media_source/mod_menu/js/admin-menu.es6.js
@@ -50,19 +50,11 @@ if (sidebar && !sidebar.getAttribute('data-hidden')) {
       elem.classList.remove('child-open');
     }
 
-    if (wrapper.classList.contains('closed')) {
-      window.dispatchEvent(new CustomEvent('joomla:menu-toggle', {
-        detail: 'closed',
-        bubbles: true,
-        cancelable: true,
-      }));
-    } else {
-      window.dispatchEvent(new CustomEvent('joomla:menu-toggle', {
-        detail: 'open',
-        bubbles: true,
-        cancelable: true,
-      }));
-    }
+    window.dispatchEvent(new CustomEvent('joomla:menu-toggle', {
+      detail: wrapper.classList.contains('closed') ? 'closed' : 'open',
+      bubbles: true,
+      cancelable: true,
+    }));
   });
 
   // Sidebar Nav
@@ -74,7 +66,7 @@ if (sidebar && !sidebar.getAttribute('data-hidden')) {
 
   // Set active class
   allLinks.forEach((link) => {
-    if (currentUrl === link.href) {
+    if (currentUrl.indexOf(link.href) === 0) {
       link.setAttribute('aria-current', 'page');
       link.classList.add('mm-active');
 
diff --git a/build/media_source/plg_editors_tinymce/js/plugins/dragdrop/plugin.es5.js b/build/media_source/plg_editors_tinymce/js/plugins/dragdrop/plugin.es5.js
index 2014819e956..4d5746b6c83 100644
--- a/build/media_source/plg_editors_tinymce/js/plugins/dragdrop/plugin.es5.js
+++ b/build/media_source/plg_editors_tinymce/js/plugins/dragdrop/plugin.es5.js
@@ -42,7 +42,7 @@
           try {
             response = JSON.parse(resp);
           } catch (e) {
-            editor.windowManager.alert(Joomla.Text._('JERROR') + ": {e}");
+            editor.windowManager.alert(Joomla.Text._('ERROR') + ": {e}");
           }
 
           if (response.data && response.data.path) {
@@ -153,7 +153,7 @@
       });
     } else {
       Joomla.renderMessages({
-        error: [Joomla.JText._('PLG_TINY_ERR_UNSUPPORTEDBROWSER')]
+        error: [Joomla.Text._('PLG_TINY_ERR_UNSUPPORTEDBROWSER')]
       });
       editor.on('drop', function (e) {
         e.preventDefault();
diff --git a/build/media_source/plg_editors_tinymce/js/tinymce-builder.es6.js b/build/media_source/plg_editors_tinymce/js/tinymce-builder.es6.js
index 398d3bbd03b..3171b0e3ddb 100644
--- a/build/media_source/plg_editors_tinymce/js/tinymce-builder.es6.js
+++ b/build/media_source/plg_editors_tinymce/js/tinymce-builder.es6.js
@@ -219,9 +219,7 @@ Joomla = window.Joomla || {};
       const name = `${options.formControl}[${set}][${group}][]`;
       const value = element.getAttribute('data-name');
 
-      const input = `<input type="hidden" name="${name}" value="${value}">`;
-
-      element.innerHTML += input;
+      element.innerHTML += Joomla.sanitizeHtml(`<input type="hidden" name="${name}" value="${value}">`);
     };
 
     /**
@@ -284,7 +282,7 @@ Joomla = window.Joomla || {};
 
         if (item) {
           $btn = createButton(name, item, type);
-          box.innerHTML += $btn;
+          box.innerHTML += Joomla.sanitizeHtml($btn);
 
           const newbutton = box.querySelector('.tox-mbtn:last-child');
 
diff --git a/build/media_source/plg_editors_tinymce/js/tinymce.es6.js b/build/media_source/plg_editors_tinymce/js/tinymce.es6.js
index 8fcd295a675..795dc92d7f1 100644
--- a/build/media_source/plg_editors_tinymce/js/tinymce.es6.js
+++ b/build/media_source/plg_editors_tinymce/js/tinymce.es6.js
@@ -125,7 +125,7 @@
           });
 
           editor.ui.registry.addMenuButton('jxtdbuttons', {
-            text: Joomla.JText._('PLG_TINY_CORE_BUTTONS'),
+            text: Joomla.Text._('PLG_TINY_CORE_BUTTONS'),
             icon: 'joomla',
             fetch: (callback) => callback(buttonValues),
           });
diff --git a/build/media_source/plg_installer_webinstaller/js/client.es6.js b/build/media_source/plg_installer_webinstaller/js/client.es6.js
index 87b167b60d3..7485530af47 100644
--- a/build/media_source/plg_installer_webinstaller/js/client.es6.js
+++ b/build/media_source/plg_installer_webinstaller/js/client.es6.js
@@ -7,433 +7,424 @@ if (!Joomla) {
   throw new Error('Joomla API is not properly initialised');
 }
 
-((window, document, Joomla) => {
-  'use strict';
-
-  const webInstallerOptions = {
-    view: 'dashboard',
-    id: 0,
-    ordering: '',
-    version: 'current',
-    list: 0,
-    options: Joomla.getOptions('plg_installer_webinstaller', {}),
-  };
-
-  let instance;
-
-  class WebInstaller {
-    initialise() {
-      webInstallerOptions.loaded = 1;
-
-      const cancelButton = document.getElementById('uploadform-web-cancel');
-      cancelButton.addEventListener('click', () => {
-        document.getElementById('uploadform-web').classList.add('hidden');
-
-        if (webInstallerOptions.list && document.querySelector('.list-view')) {
-          document.querySelector('.list-view').click();
-        }
-      });
+const allowList = {
+  button: ['type'],
+  input: ['type', 'name', 'placeholder', 'inputmode'],
+  select: ['name'],
+  option: ['value', 'selected'],
+};
+
+const webInstallerOptions = {
+  view: 'dashboard',
+  id: 0,
+  ordering: '',
+  version: 'current',
+  list: 0,
+  options: Joomla.getOptions('plg_installer_webinstaller', {}),
+};
+
+let instance;
+
+class WebInstaller {
+  initialise() {
+    webInstallerOptions.loaded = 1;
+
+    const cancelButton = document.getElementById('uploadform-web-cancel');
+    cancelButton.addEventListener('click', () => {
+      document.getElementById('uploadform-web').classList.add('hidden');
+
+      if (webInstallerOptions.list && document.querySelector('.list-view')) {
+        document.querySelector('.list-view').click();
+      }
+    });
 
-      const installButton = document.getElementById('uploadform-web-install');
-      installButton.addEventListener('click', () => {
-        if (webInstallerOptions.options.installFrom === 4) {
-          this.submitButtonUrl();
-        } else {
-          this.submitButtonWeb();
-        }
-      });
+    const installButton = document.getElementById('uploadform-web-install');
+    installButton.addEventListener('click', () => {
+      if (webInstallerOptions.options.installFrom === 4) {
+        this.submitButtonUrl();
+      } else {
+        this.submitButtonWeb();
+      }
+    });
 
-      this.loadweb(`${webInstallerOptions.options.base_url}index.php?format=json&option=com_apps&view=dashboard`);
+    this.loadweb(`${webInstallerOptions.options.base_url}index.php?format=json&option=com_apps&view=dashboard`);
 
-      this.clickforlinks();
+    this.clickforlinks();
+  }
+
+  loadweb(url) {
+    if (!url) {
+      return false;
     }
 
-    loadweb(url) {
-      if (!url) {
-        return false;
-      }
+    const pattern1 = new RegExp(webInstallerOptions.options.base_url);
+    const pattern2 = new RegExp('^index.php');
 
-      const pattern1 = new RegExp(webInstallerOptions.options.base_url);
-      const pattern2 = new RegExp('^index.php');
+    if (!(pattern1.test(url) || pattern2.test(url))) {
+      window.open(url, '_blank');
 
-      if (!(pattern1.test(url) || pattern2.test(url))) {
-        window.open(url, '_blank');
+      return false;
+    }
 
-        return false;
-      }
+    let requestUrl = `${url}&product=${webInstallerOptions.options.product}&release=${webInstallerOptions.options.release}&dev_level=${webInstallerOptions.options.dev_level}&list=${webInstallerOptions.list ? 'list' : 'grid'}&lang=${webInstallerOptions.options.language}`;
 
-      let requestUrl = `${url}&product=${webInstallerOptions.options.product}&release=${webInstallerOptions.options.release}&dev_level=${webInstallerOptions.options.dev_level}&list=${webInstallerOptions.list ? 'list' : 'grid'}&lang=${webInstallerOptions.options.language}`;
+    const orderingSelect = document.getElementById('com-apps-ordering');
+    const versionSelect = document.getElementById('com-apps-filter-joomla-version');
 
-      const orderingSelect = document.getElementById('com-apps-ordering');
-      const versionSelect = document.getElementById('com-apps-filter-joomla-version');
+    if (webInstallerOptions.ordering !== '' && orderingSelect && orderingSelect.value) {
+      webInstallerOptions.ordering = orderingSelect.value;
+      requestUrl += `&ordering=${webInstallerOptions.ordering}`;
+    }
 
-      if (webInstallerOptions.ordering !== '' && orderingSelect && orderingSelect.value) {
-        webInstallerOptions.ordering = orderingSelect.value;
-        requestUrl += `&ordering=${webInstallerOptions.ordering}`;
-      }
+    if (webInstallerOptions.version !== '' && versionSelect && versionSelect.value) {
+      webInstallerOptions.version = versionSelect.value;
+      requestUrl += `&filter_version=${webInstallerOptions.version}`;
+    }
 
-      if (webInstallerOptions.version !== '' && versionSelect && versionSelect.value) {
-        webInstallerOptions.version = versionSelect.value;
-        requestUrl += `&filter_version=${webInstallerOptions.version}`;
-      }
+    WebInstaller.showLoadingLayer();
 
-      WebInstaller.showLoadingLayer();
+    new Promise((resolve, reject) => {
+      Joomla.request({
+        url: requestUrl,
+        onSuccess: (resp) => {
+          let response;
 
-      new Promise((resolve, reject) => {
-        Joomla.request({
-          url: requestUrl,
-          onSuccess: (resp) => {
-            let response;
+          try {
+            response = JSON.parse(resp);
+          } catch (error) {
+            throw new Error('Failed to parse JSON');
+          }
 
-            try {
-              response = JSON.parse(resp);
-            } catch (error) {
-              throw new Error('Failed to parse JSON');
-            }
+          if (document.getElementById('web-loader')) {
+            document.getElementById('web-loader').classList.add('hidden');
+          }
+
+          const jedContainer = document.getElementById('jed-container');
+          jedContainer.innerHTML = Joomla.sanitizeHtml(response.data.html, allowList);
 
-            if (document.getElementById('web-loader')) {
-              document.getElementById('web-loader').classList.add('hidden');
+          document.getElementById('com-apps-searchbox').addEventListener('keypress', ({ which }) => {
+            if (which === 13) {
+              this.initiateSearch();
             }
+          });
 
-            const jedContainer = document.getElementById('jed-container');
-            jedContainer.innerHTML = response.data.html;
+          document.getElementById('search-extensions').addEventListener('click', () => {
+            this.initiateSearch();
+          });
 
-            document.getElementById('com-apps-searchbox').addEventListener('keypress', ({ which }) => {
-              if (which === 13) {
-                this.initiateSearch();
-              }
-            });
+          document.getElementById('search-reset').addEventListener('click', () => {
+            const searchBox = document.getElementById('com-apps-searchbox');
+            searchBox.value = '';
+            this.initiateSearch();
+            document.getElementById('search-reset').setAttribute('disabled', 'disabled');
+          });
 
-            document.getElementById('search-extensions').addEventListener('click', () => {
-              this.initiateSearch();
+          if (document.getElementById('com-apps-searchbox').value === '') {
+            document.getElementById('search-reset').setAttribute('disabled', 'disabled');
+          }
+
+          document.getElementById('search-reset').innerHTML = Joomla.sanitizeHtml(Joomla.Text._('JSEARCH_FILTER_CLEAR'));
+
+          // eslint-disable-next-line no-shadow
+          const orderingSelect = document.getElementById('com-apps-ordering');
+          // eslint-disable-next-line no-shadow
+          const versionSelect = document.getElementById('com-apps-filter-joomla-version');
+
+          if (orderingSelect) {
+            orderingSelect.addEventListener('change', () => {
+              const index = orderingSelect.selectedIndex;
+              webInstallerOptions.ordering = orderingSelect.options[index].value;
+              this.installfromwebajaxsubmit();
             });
+          }
 
-            document.getElementById('search-reset').addEventListener('click', () => {
-              const searchBox = document.getElementById('com-apps-searchbox');
-              searchBox.value = '';
-              this.initiateSearch();
-              document.getElementById('search-reset').setAttribute('disabled', 'disabled');
+          if (versionSelect) {
+            versionSelect.addEventListener('change', () => {
+              const index = versionSelect.selectedIndex;
+              webInstallerOptions.version = versionSelect.options[index].value;
+              this.installfromwebajaxsubmit();
             });
+          }
 
-            if (document.getElementById('com-apps-searchbox').value === '') {
-              document.getElementById('search-reset').setAttribute('disabled', 'disabled');
-            }
+          if (webInstallerOptions.options.installfrom_url !== '') {
+            WebInstaller.installfromweb(webInstallerOptions.options.installfrom_url);
+          }
 
-            document.getElementById('search-reset').innerHTML = Joomla.JText._('JSEARCH_FILTER_CLEAR');
+          resolve();
+        },
+        onError: (request) => {
+          const errorContainer = document.getElementById('web-loader-error');
+          const loaderContainer = document.getElementById('web-loader');
 
-            // eslint-disable-next-line no-shadow
-            const orderingSelect = document.getElementById('com-apps-ordering');
-            // eslint-disable-next-line no-shadow
-            const versionSelect = document.getElementById('com-apps-filter-joomla-version');
+          if (request.responseText && errorContainer) {
+            errorContainer.innerHTML = Joomla.sanitizeHtml(request.responseText);
+          }
 
-            if (orderingSelect) {
-              orderingSelect.addEventListener('change', () => {
-                const index = orderingSelect.selectedIndex;
-                webInstallerOptions.ordering = orderingSelect.options[index].value;
-                this.installfromwebajaxsubmit();
-              });
-            }
+          if (loaderContainer) {
+            loaderContainer.classList.add('hidden');
+            errorContainer.classList.remove('hidden');
+          }
+          Joomla.renderMessages({ danger: [Joomla.Text._('PLG_INSTALLER_WEBINSTALLER_INSTALL_WEB_LOADING_ERROR')] }, '#web-loader-error');
 
-            if (versionSelect) {
-              versionSelect.addEventListener('change', () => {
-                const index = versionSelect.selectedIndex;
-                webInstallerOptions.version = versionSelect.options[index].value;
-                this.installfromwebajaxsubmit();
-              });
-            }
+          reject();
+        },
+      });
+    }).finally(() => {
+      // Promise has been settled.
+      // Run the following whether or not it was a success.
 
-            if (webInstallerOptions.options.installfrom_url !== '') {
-              WebInstaller.installfromweb(webInstallerOptions.options.installfrom_url);
-            }
+      const installAtField = document.getElementById('joomlaapsinstallatinput');
 
-            resolve();
-          },
-          onError: (request) => {
-            const errorContainer = document.getElementById('web-loader-error');
-            const loaderContainer = document.getElementById('web-loader');
+      if (installAtField) {
+        installAtField.value = webInstallerOptions.options.installat_url;
+      }
 
-            if (request.responseText && errorContainer) {
-              errorContainer.innerHTML = request.responseText;
-            }
+      this.clickforlinks();
+      WebInstaller.clicker();
 
-            if (loaderContainer) {
-              loaderContainer.classList.add('hidden');
-              errorContainer.classList.remove('hidden');
-            }
-            Joomla.renderMessages({ danger: [Joomla.Text._('PLG_INSTALLER_WEBINSTALLER_INSTALL_WEB_LOADING_ERROR')] }, '#web-loader-error');
+      if (webInstallerOptions.view !== 'extension') {
+        [].slice.call(document.querySelectorAll('div.load-extension')).forEach((element) => {
+          element.addEventListener('click', (event) => {
+            event.preventDefault();
+            this.processLinkClick(element.getAttribute('data-url'));
+          });
 
-            reject();
-          },
+          element.setAttribute('href', '#');
         });
-      }).finally(() => {
-        // Promise has been settled.
-        // Run the following whether or not it was a success.
+      }
 
-        const installAtField = document.getElementById('joomlaapsinstallatinput');
+      if (webInstallerOptions.view === 'extension') {
+        const installExtensionButton = document.getElementById('install-extension');
+        const installExtensionFromExternalButton = document.getElementById('install-extension-from-external');
 
-        if (installAtField) {
-          installAtField.value = webInstallerOptions.options.installat_url;
+        if (installExtensionButton) {
+          installExtensionButton.addEventListener('click', () => {
+            WebInstaller.installfromweb(installExtensionButton.getAttribute('data-downloadurl'), installExtensionButton.getAttribute('data-name'));
+            document.getElementById('uploadform-web-install').scrollIntoView({ behavior: 'smooth', block: 'start' });
+          });
         }
 
-        this.clickforlinks();
-        WebInstaller.clicker();
+        if (installExtensionFromExternalButton) {
+          installExtensionFromExternalButton.addEventListener('click', () => {
+            const redirectUrl = installExtensionFromExternalButton.getAttribute('data-downloadurl');
+            const redirectConfirm = window.confirm(Joomla.Text._('PLG_INSTALLER_WEBINSTALLER_REDIRECT_TO_EXTERNAL_SITE_TO_INSTALL').replace('[SITEURL]', redirectUrl));
 
-        if (webInstallerOptions.view !== 'extension') {
-          [].slice.call(document.querySelectorAll('div.load-extension')).forEach((element) => {
-            element.addEventListener('click', (event) => {
-              event.preventDefault();
-              this.processLinkClick(element.getAttribute('data-url'));
-            });
+            if (redirectConfirm !== true) {
+              return;
+            }
 
-            element.setAttribute('href', '#');
+            document.getElementById('adminForm').setAttribute('action', redirectUrl);
+            document.querySelector('input[name=task]').setAttribute('disabled', true);
+            document.querySelector('input[name=install_directory]').setAttribute('disabled', true);
+            document.querySelector('input[name=install_url]').setAttribute('disabled', true);
+            document.querySelector('input[name=installtype]').setAttribute('disabled', true);
+            document.querySelector('input[name=filter_search]').setAttribute('disabled', true);
+
+            document.getElementById('adminForm').submit();
           });
         }
+      }
 
-        if (webInstallerOptions.view === 'extension') {
-          const installExtensionButton = document.getElementById('install-extension');
-          const installExtensionFromExternalButton = document.getElementById('install-extension-from-external');
+      if (webInstallerOptions.list && document.querySelector('.list-view')) {
+        document.querySelector('.list-view').click();
+      }
 
-          if (installExtensionButton) {
-            installExtensionButton.addEventListener('click', () => {
-              WebInstaller.installfromweb(installExtensionButton.getAttribute('data-downloadurl'), installExtensionButton.getAttribute('data-name'));
-              document.getElementById('uploadform-web-install').scrollIntoView({ behavior: 'smooth', block: 'start' });
-            });
-          }
+      WebInstaller.hideLoadingLayer();
+    });
 
-          if (installExtensionFromExternalButton) {
-            installExtensionFromExternalButton.addEventListener('click', () => {
-              const redirectUrl = installExtensionFromExternalButton.getAttribute('data-downloadurl');
-              const redirectConfirm = window.confirm(Joomla.Text._('PLG_INSTALLER_WEBINSTALLER_REDIRECT_TO_EXTERNAL_SITE_TO_INSTALL').replace('[SITEURL]', redirectUrl));
+    return true;
+  }
 
-              if (redirectConfirm !== true) {
-                return;
-              }
+  clickforlinks() {
+    [].slice.call(document.querySelectorAll('a.transcode')).forEach((element) => {
+      const ajaxurl = element.getAttribute('href');
 
-              document.getElementById('adminForm').setAttribute('action', redirectUrl);
-              document.querySelector('input[name=task]').setAttribute('disabled', true);
-              document.querySelector('input[name=install_directory]').setAttribute('disabled', true);
-              document.querySelector('input[name=install_url]').setAttribute('disabled', true);
-              document.querySelector('input[name=installtype]').setAttribute('disabled', true);
-              document.querySelector('input[name=filter_search]').setAttribute('disabled', true);
+      element.addEventListener('click', (event) => {
+        event.preventDefault();
+        this.processLinkClick(ajaxurl);
+      });
 
-              document.getElementById('adminForm').submit();
-            });
-          }
-        }
+      element.setAttribute('href', '#');
+    });
+  }
 
-        if (webInstallerOptions.list && document.querySelector('.list-view')) {
-          document.querySelector('.list-view').click();
-        }
+  initiateSearch() {
+    document.getElementById('search-reset').removeAttribute('disabled');
+    webInstallerOptions.view = 'dashboard';
+    this.installfromwebajaxsubmit();
+  }
 
-        WebInstaller.hideLoadingLayer();
-      });
+  installfromwebajaxsubmit() {
+    let tail = `&view=${webInstallerOptions.view}`;
 
-      return true;
+    if (webInstallerOptions.id) {
+      tail += `&id=${webInstallerOptions.id}`;
     }
 
-    clickforlinks() {
-      [].slice.call(document.querySelectorAll('a.transcode')).forEach((element) => {
-        const ajaxurl = element.getAttribute('href');
+    if (document.getElementById('com-apps-searchbox').value) {
+      const value = encodeURI(document.getElementById('com-apps-searchbox').value.toLowerCase().replace(/ +/g, '_').replace(/[^a-z0-9-_]/g, '').trim());
+      tail += `&filter_search=${value}`;
+    }
 
-        element.addEventListener('click', (event) => {
-          event.preventDefault();
-          this.processLinkClick(ajaxurl);
-        });
+    const orderingSelect = document.getElementById('com-apps-ordering');
+    const versionSelect = document.getElementById('com-apps-filter-joomla-version');
 
-        element.setAttribute('href', '#');
-      });
+    if (webInstallerOptions.ordering !== '' && orderingSelect && orderingSelect.value) {
+      webInstallerOptions.ordering = orderingSelect.value;
     }
 
-    initiateSearch() {
-      document.getElementById('search-reset').removeAttribute('disabled');
-      webInstallerOptions.view = 'dashboard';
-      this.installfromwebajaxsubmit();
+    if (webInstallerOptions.ordering) {
+      tail += `&ordering=${webInstallerOptions.ordering}`;
     }
 
-    installfromwebajaxsubmit() {
-      let tail = `&view=${webInstallerOptions.view}`;
-
-      if (webInstallerOptions.id) {
-        tail += `&id=${webInstallerOptions.id}`;
-      }
-
-      if (document.getElementById('com-apps-searchbox').value) {
-        const value = encodeURI(document.getElementById('com-apps-searchbox').value.toLowerCase().replace(/ +/g, '_').replace(/[^a-z0-9-_]/g, '').trim());
-        tail += `&filter_search=${value}`;
-      }
+    if (webInstallerOptions.version !== '' && versionSelect && versionSelect.value) {
+      webInstallerOptions.version = versionSelect.value;
+    }
 
-      const orderingSelect = document.getElementById('com-apps-ordering');
-      const versionSelect = document.getElementById('com-apps-filter-joomla-version');
+    if (webInstallerOptions.version) {
+      tail += `&filter_version=${webInstallerOptions.version}`;
+    }
 
-      if (webInstallerOptions.ordering !== '' && orderingSelect && orderingSelect.value) {
-        webInstallerOptions.ordering = orderingSelect.value;
-      }
+    this.loadweb(`${webInstallerOptions.options.base_url}index.php?format=json&option=com_apps${tail}`);
+  }
 
-      if (webInstallerOptions.ordering) {
-        tail += `&ordering=${webInstallerOptions.ordering}`;
-      }
+  processLinkClick(url) {
+    const pattern1 = new RegExp(webInstallerOptions.options.base_url);
+    const pattern2 = new RegExp('^index.php');
 
-      if (webInstallerOptions.version !== '' && versionSelect && versionSelect.value) {
-        webInstallerOptions.version = versionSelect.value;
-      }
+    if (pattern1.test(url) || pattern2.test(url)) {
+      webInstallerOptions.view = url.replace(/^.+[&?]view=(\w+).*$/, '$1');
 
-      if (webInstallerOptions.version) {
-        tail += `&filter_version=${webInstallerOptions.version}`;
+      if (webInstallerOptions.view === 'dashboard') {
+        webInstallerOptions.id = 0;
+      } else if (webInstallerOptions.view === 'category') {
+        webInstallerOptions.id = url.replace(/^.+[&?]id=(\d+).*$/, '$1');
       }
 
-      this.loadweb(`${webInstallerOptions.options.base_url}index.php?format=json&option=com_apps${tail}`);
+      this.loadweb(webInstallerOptions.options.base_url + url);
+    } else {
+      this.loadweb(url);
     }
+  }
 
-    processLinkClick(url) {
-      const pattern1 = new RegExp(webInstallerOptions.options.base_url);
-      const pattern2 = new RegExp('^index.php');
-
-      if (pattern1.test(url) || pattern2.test(url)) {
-        webInstallerOptions.view = url.replace(/^.+[&?]view=(\w+).*$/, '$1');
-
-        if (webInstallerOptions.view === 'dashboard') {
-          webInstallerOptions.id = 0;
-        } else if (webInstallerOptions.view === 'category') {
-          webInstallerOptions.id = url.replace(/^.+[&?]id=(\d+).*$/, '$1');
-        }
+  static showLoadingLayer() {
+    document.getElementById('web').appendChild(document.createElement('joomla-core-loader'));
+  }
 
-        this.loadweb(webInstallerOptions.options.base_url + url);
-      } else {
-        this.loadweb(url);
-      }
-    }
+  static hideLoadingLayer() {
+    const spinnerElement = document.querySelector('#web joomla-core-loader');
+    spinnerElement.parentNode.removeChild(spinnerElement);
+  }
 
-    static showLoadingLayer() {
-      document.getElementById('web').appendChild(document.createElement('joomla-core-loader'));
+  static clicker() {
+    if (document.querySelector('.grid-view')) {
+      document.querySelector('.grid-view').addEventListener('click', () => {
+        webInstallerOptions.list = 0;
+        document.querySelector('.list-container').classList.add('hidden');
+        document.querySelector('.grid-container').classList.remove('hidden');
+        document.getElementById('btn-list-view').classList.remove('active');
+        document.getElementById('btn-grid-view').classList.remove('active');
+      });
     }
 
-    static hideLoadingLayer() {
-      const spinnerElement = document.querySelector('#web joomla-core-loader');
-      spinnerElement.parentNode.removeChild(spinnerElement);
+    if (document.querySelector('.list-view')) {
+      document.querySelector('.list-view').addEventListener('click', () => {
+        webInstallerOptions.list = 1;
+        document.querySelector('.grid-container').classList.add('hidden');
+        document.querySelector('.list-container').classList.remove('hidden');
+        document.getElementById('btn-grid-view').classList.remove('active');
+        document.getElementById('btn-list-view').classList.add('active');
+      });
     }
+  }
 
-    static clicker() {
-      if (document.querySelector('.grid-view')) {
-        document.querySelector('.grid-view').addEventListener('click', () => {
-          webInstallerOptions.list = 0;
-          document.querySelector('.list-container').classList.add('hidden');
-          document.querySelector('.grid-container').classList.remove('hidden');
-          document.getElementById('btn-list-view').classList.remove('active');
-          document.getElementById('btn-grid-view').classList.remove('active');
-        });
-      }
+  /**
+   * @param {string} installUrl
+   * @param {string} name
+   * @returns {boolean}
+   */
+  static installfromweb(installUrl, name = null) {
+    if (!installUrl) {
+      Joomla.renderMessages({ warning: [Joomla.Text._('PLG_INSTALLER_WEBINSTALLER_CANNOT_INSTALL_EXTENSION_IN_PLUGIN')] });
 
-      if (document.querySelector('.list-view')) {
-        document.querySelector('.list-view').addEventListener('click', () => {
-          webInstallerOptions.list = 1;
-          document.querySelector('.grid-container').classList.add('hidden');
-          document.querySelector('.list-container').classList.remove('hidden');
-          document.getElementById('btn-grid-view').classList.remove('active');
-          document.getElementById('btn-list-view').classList.add('active');
-        });
-      }
+      return false;
     }
 
-    /**
-     * @param {string} installUrl
-     * @param {string} name
-     * @returns {boolean}
-     */
-    static installfromweb(installUrl, name = null) {
-      if (!installUrl) {
-        Joomla.renderMessages({ warning: [Joomla.Text._('PLG_INSTALLER_WEBINSTALLER_CANNOT_INSTALL_EXTENSION_IN_PLUGIN')] });
-
-        return false;
-      }
-
-      document.getElementById('install_url').value = installUrl;
-      document.getElementById('uploadform-web-url').innerText = installUrl;
-
-      if (name) {
-        document.getElementById('uploadform-web-name').innerText = name;
-        document.getElementById('uploadform-web-name-label').classList.remove('hidden');
-      } else {
-        document.getElementById('uploadform-web-name-label').classList.add('hidden');
-      }
-
-      document.getElementById('uploadform-web').classList.remove('hidden');
+    document.getElementById('install_url').value = installUrl;
+    document.getElementById('uploadform-web-url').innerText = installUrl;
 
-      return true;
+    if (name) {
+      document.getElementById('uploadform-web-name').innerText = name;
+      document.getElementById('uploadform-web-name-label').classList.remove('hidden');
+    } else {
+      document.getElementById('uploadform-web-name-label').classList.add('hidden');
     }
 
-    // eslint-disable-next-line class-methods-use-this
-    submitButtonUrl() {
-      const form = document.getElementById('adminForm');
+    document.getElementById('uploadform-web').classList.remove('hidden');
 
-      // do field validation
-      if (form.install_url.value === '' || form.install_url.value === 'http://' || form.install_url.value === 'https://') {
-        Joomla.renderMessages({ warning: [Joomla.Text._('COM_INSTALLER_MSG_INSTALL_ENTER_A_URL')] });
-      } else {
-        const loading = document.getElementById('loading');
-        if (loading) {
-          loading.classList.remove('hidden');
-        }
+    return true;
+  }
 
-        form.installtype.value = 'url';
-        form.submit();
+  // eslint-disable-next-line class-methods-use-this
+  submitButtonUrl() {
+    const form = document.getElementById('adminForm');
+
+    // do field validation
+    if (form.install_url.value === '' || form.install_url.value === 'http://' || form.install_url.value === 'https://') {
+      Joomla.renderMessages({ warning: [Joomla.Text._('COM_INSTALLER_MSG_INSTALL_ENTER_A_URL')] });
+    } else {
+      const loading = document.getElementById('loading');
+      if (loading) {
+        loading.classList.remove('hidden');
       }
-    }
 
-    submitButtonWeb() {
-      const form = document.getElementById('adminForm');
-
-      // do field validation
-      if (form.install_url.value !== '' || form.install_url.value !== 'http://' || form.install_url.value !== 'https://') {
-        this.submitButtonUrl();
-      } else if (form.install_url.value === '') {
-        Joomla.renderMessages({ warning: [Joomla.apps.options.btntxt] });
-      } else {
-        document.querySelector('#appsloading').classList.remove('hidden');
-        form.installtype.value = 'web';
-        form.submit();
-      }
+      form.installtype.value = 'url';
+      form.submit();
     }
   }
 
-  document.addEventListener('DOMContentLoaded', () => {
-    const initialiser = () => {
-      const installerTabs = document.getElementById('myTab');
-
-      // Need to wait for the CE to have inserted the tabs list
-      if (installerTabs.firstElementChild.tagName !== 'UL') {
-        window.setTimeout(initialiser, 50);
-
-        return;
-      }
-
-      const link = installerTabs.querySelector('#tab-web');
+  submitButtonWeb() {
+    const form = document.getElementById('adminForm');
+
+    // do field validation
+    if (form.install_url.value !== '' || form.install_url.value !== 'http://' || form.install_url.value !== 'https://') {
+      this.submitButtonUrl();
+    } else if (form.install_url.value === '') {
+      Joomla.renderMessages({ warning: [Joomla.apps.options.btntxt] });
+    } else {
+      document.querySelector('#appsloading').classList.remove('hidden');
+      form.installtype.value = 'web';
+      form.submit();
+    }
+  }
+}
 
-      // Abort if the IFW tab cannot be found
-      if (!link) {
-        return;
-      }
+customElements.whenDefined('joomla-tab').then(() => {
+  const installerTabs = document.getElementById('myTab');
+  const link = installerTabs.querySelector('#tab-web');
 
-      if (webInstallerOptions.options.installfromon) {
-        link.click();
-      }
+  // Abort if the IFW tab cannot be found
+  if (!link) {
+    return;
+  }
 
-      if (link.hasAttribute('active') && !instance) {
-        instance = new WebInstaller();
-        instance.initialise();
-      }
+  if (webInstallerOptions.options.installfromon) {
+    link.click();
+  }
 
-      if (webInstallerOptions.options.installfrom_url !== '') {
-        link.click();
-      }
+  if (link.hasAttribute('active') && !instance) {
+    instance = new WebInstaller();
+    instance.initialise();
+  }
 
-      link.addEventListener('joomla.tab.shown', () => {
-        if (!instance) {
-          instance = new WebInstaller();
-          instance.initialise();
-        }
-      });
-    };
+  if (webInstallerOptions.options.installfrom_url !== '') {
+    link.click();
+  }
 
-    window.setTimeout(initialiser, 50);
+  link.addEventListener('joomla.tab.shown', () => {
+    if (!instance) {
+      instance = new WebInstaller();
+      instance.initialise();
+    }
   });
-})(window, document, Joomla);
+});
diff --git a/build/media_source/plg_quickicon_extensionupdate/js/extensionupdatecheck.es6.js b/build/media_source/plg_quickicon_extensionupdate/js/extensionupdatecheck.es6.js
index e86e4843eb4..e448213962c 100644
--- a/build/media_source/plg_quickicon_extensionupdate/js/extensionupdatecheck.es6.js
+++ b/build/media_source/plg_quickicon_extensionupdate/js/extensionupdatecheck.es6.js
@@ -21,7 +21,7 @@
 
         if (linkSpans.length) {
           linkSpans.forEach((span) => {
-            span.innerHTML = text;
+            span.innerHTML = Joomla.sanitizeHtml(text);
           });
         }
       };
diff --git a/build/media_source/plg_quickicon_joomlaupdate/js/jupdatecheck.es6.js b/build/media_source/plg_quickicon_joomlaupdate/js/jupdatecheck.es6.js
index 75378f08d46..f0717d75c80 100644
--- a/build/media_source/plg_quickicon_joomlaupdate/js/jupdatecheck.es6.js
+++ b/build/media_source/plg_quickicon_joomlaupdate/js/jupdatecheck.es6.js
@@ -15,7 +15,7 @@ if (Joomla && Joomla.getOptions('js-extensions-update')) {
 
     if (linkSpans.length) {
       linkSpans.forEach((span) => {
-        span.innerHTML = text;
+        span.innerHTML = Joomla.sanitizeHtml(text);
       });
     }
   };
diff --git a/build/media_source/plg_quickicon_overridecheck/js/overridecheck.es6.js b/build/media_source/plg_quickicon_overridecheck/js/overridecheck.es6.js
index 8ba10b266d9..f243aa3cca3 100644
--- a/build/media_source/plg_quickicon_overridecheck/js/overridecheck.es6.js
+++ b/build/media_source/plg_quickicon_overridecheck/js/overridecheck.es6.js
@@ -24,7 +24,7 @@
 
         if (linkSpans.length) {
           linkSpans.forEach((span) => {
-            span.innerHTML = text;
+            span.innerHTML = Joomla.sanitizeHtml(text);
           });
         }
       };
@@ -46,7 +46,7 @@
                 // Scroll to page top
                 window.scrollTo(0, 0);
 
-                update('danger', Joomla.JText._('PLG_QUICKICON_OVERRIDECHECK_OVERRIDEFOUND').replace('%s', `<span class="badge text-dark bg-light">${updateInfoList.length}</span>`), '');
+                update('danger', Joomla.Text._('PLG_QUICKICON_OVERRIDECHECK_OVERRIDEFOUND').replace('%s', `<span class="badge text-dark bg-light">${updateInfoList.length}</span>`), '');
               }
             } else {
               // An error occurred
diff --git a/build/media_source/plg_system_stats/js/stats-message.es6.js b/build/media_source/plg_system_stats/js/stats-message.es6.js
index fc59145456e..8fc75fa01ae 100644
--- a/build/media_source/plg_system_stats/js/stats-message.es6.js
+++ b/build/media_source/plg_system_stats/js/stats-message.es6.js
@@ -9,6 +9,19 @@ Joomla = window.Joomla || {};
 ((Joomla, document) => {
   'use strict';
 
+  const allowed = {
+    input: ['type', 'name', 'value'],
+    'joomla-alert': ['type', 'dismiss', 'role'],
+    button: ['type'],
+    table: [],
+    tbody: [],
+    thead: [],
+    caption: [],
+    th: ['scope'],
+    tr: [],
+    td: [],
+  };
+
   const initStatsEvents = (callback) => {
     const messageContainer = document.getElementById('system-message-container');
     const joomlaAlert = messageContainer.querySelector('.js-pstats-alert');
@@ -71,7 +84,7 @@ Joomla = window.Joomla || {};
         try {
           const json = JSON.parse(response);
           if (json && json.html) {
-            messageContainer.insertAdjacentHTML('beforeend', json.html);
+            messageContainer.insertAdjacentHTML('beforeend', Joomla.sanitizeHtml(json.html, allowed));
             messageContainer.querySelector('.js-pstats-alert').classList.remove('hidden');
             initStatsEvents(getJson);
           }
diff --git a/build/media_source/plg_system_webauthn/js/login.es6.js b/build/media_source/plg_system_webauthn/js/login.es6.js
index 6ef308abc08..e3717ba9bf1 100644
--- a/build/media_source/plg_system_webauthn/js/login.es6.js
+++ b/build/media_source/plg_system_webauthn/js/login.es6.js
@@ -141,7 +141,7 @@ window.Joomla = window.Joomla || {};
     };
 
     if (!publicKey.challenge) {
-      handleLoginError(Joomla.JText._('PLG_SYSTEM_WEBAUTHN_ERR_INVALID_USERNAME'));
+      handleLoginError(Joomla.Text._('PLG_SYSTEM_WEBAUTHN_ERR_INVALID_USERNAME'));
 
       return;
     }
@@ -202,7 +202,7 @@ window.Joomla = window.Joomla || {};
     const elReturn = lookForField(elFormContainer, 'input[name=return]');
 
     if (elUsername === null) {
-      Joomla.renderMessages({ error: [Joomla.JText._('PLG_SYSTEM_WEBAUTHN_ERR_CANNOT_FIND_USERNAME')] });
+      Joomla.renderMessages({ error: [Joomla.Text._('PLG_SYSTEM_WEBAUTHN_ERR_CANNOT_FIND_USERNAME')] });
 
       return false;
     }
@@ -212,7 +212,7 @@ window.Joomla = window.Joomla || {};
 
     // No username? We cannot proceed. We need a username to find the acceptable public keys :(
     if (username === '') {
-      Joomla.renderMessages({ error: [Joomla.JText._('PLG_SYSTEM_WEBAUTHN_ERR_EMPTY_USERNAME')] });
+      Joomla.renderMessages({ error: [Joomla.Text._('PLG_SYSTEM_WEBAUTHN_ERR_EMPTY_USERNAME')] });
 
       return false;
     }
diff --git a/build/media_source/plg_system_webauthn/js/management.es6.js b/build/media_source/plg_system_webauthn/js/management.es6.js
index f61e5e948ab..ca37c3cb385 100644
--- a/build/media_source/plg_system_webauthn/js/management.es6.js
+++ b/build/media_source/plg_system_webauthn/js/management.es6.js
@@ -71,7 +71,7 @@ window.Joomla = window.Joomla || {};
   Joomla.plgSystemWebauthnCreateCredentials = (storeID, interfaceSelector) => {
     // Make sure the browser supports Webauthn
     if (!('credentials' in navigator)) {
-      Joomla.renderMessages({ error: [Joomla.JText._('PLG_SYSTEM_WEBAUTHN_ERR_NO_BROWSER_SUPPORT')] });
+      Joomla.renderMessages({ error: [Joomla.Text._('PLG_SYSTEM_WEBAUTHN_ERR_NO_BROWSER_SUPPORT')] });
 
       return;
     }
@@ -207,7 +207,7 @@ window.Joomla = window.Joomla || {};
 
     const elSave = document.createElement('button');
     elSave.className = 'btn btn-success btn-sm';
-    elSave.innerText = Joomla.JText._('PLG_SYSTEM_WEBAUTHN_MANAGE_BTN_SAVE_LABEL');
+    elSave.innerText = Joomla.Text._('PLG_SYSTEM_WEBAUTHN_MANAGE_BTN_SAVE_LABEL');
     elSave.addEventListener('click', () => {
       const elNewLabel = elInput.value;
 
@@ -238,13 +238,13 @@ window.Joomla = window.Joomla || {};
 
             if (result !== true) {
               handleCreationError(
-                Joomla.JText._('PLG_SYSTEM_WEBAUTHN_ERR_LABEL_NOT_SAVED'),
+                Joomla.Text._('PLG_SYSTEM_WEBAUTHN_ERR_LABEL_NOT_SAVED'),
               );
             }
           },
           onError: (xhr) => {
             handleCreationError(
-              `${Joomla.JText._('PLG_SYSTEM_WEBAUTHN_ERR_LABEL_NOT_SAVED')
+              `${Joomla.Text._('PLG_SYSTEM_WEBAUTHN_ERR_LABEL_NOT_SAVED')
               } -- ${xhr.status} ${xhr.statusText}`,
             );
           },
@@ -260,7 +260,7 @@ window.Joomla = window.Joomla || {};
 
     const elCancel = document.createElement('button');
     elCancel.className = 'btn btn-danger btn-sm';
-    elCancel.innerText = Joomla.JText._('PLG_SYSTEM_WEBAUTHN_MANAGE_BTN_CANCEL_LABEL');
+    elCancel.innerText = Joomla.Text._('PLG_SYSTEM_WEBAUTHN_MANAGE_BTN_CANCEL_LABEL');
     elCancel.addEventListener('click', () => {
       elLabelTD.innerText = oldLabel;
       elEdit.disabled = false;
@@ -335,7 +335,7 @@ window.Joomla = window.Joomla || {};
 
         if (result !== true) {
           handleCreationError(
-            Joomla.JText._('PLG_SYSTEM_WEBAUTHN_ERR_NOT_DELETED'),
+            Joomla.Text._('PLG_SYSTEM_WEBAUTHN_ERR_NOT_DELETED'),
           );
 
           return;
@@ -347,7 +347,7 @@ window.Joomla = window.Joomla || {};
         elEdit.disabled = false;
         elDelete.disabled = false;
         handleCreationError(
-          `${Joomla.JText._('PLG_SYSTEM_WEBAUTHN_ERR_NOT_DELETED')
+          `${Joomla.Text._('PLG_SYSTEM_WEBAUTHN_ERR_NOT_DELETED')
           } -- ${xhr.status} ${xhr.statusText}`,
         );
       },
diff --git a/build/media_source/plg_user_token/js/token.es6.js b/build/media_source/plg_user_token/js/token.es6.js
index bf0312bdca3..6c7c469831d 100644
--- a/build/media_source/plg_user_token/js/token.es6.js
+++ b/build/media_source/plg_user_token/js/token.es6.js
@@ -13,9 +13,9 @@
     try {
       const copy = document.execCommand('copy');
       if (copy) {
-        Joomla.renderMessages({ message: [Joomla.JText._('PLG_USER_TOKEN_COPY_SUCCESS')] });
+        Joomla.renderMessages({ message: [Joomla.Text._('PLG_USER_TOKEN_COPY_SUCCESS')] });
       } else {
-        Joomla.renderMessages({ error: [Joomla.JText._('PLG_USER_TOKEN_COPY_FAIL')] });
+        Joomla.renderMessages({ error: [Joomla.Text._('PLG_USER_TOKEN_COPY_FAIL')] });
       }
     } catch (err) {
       Joomla.renderMessages({ error: [err] });
@@ -34,9 +34,9 @@
       }
 
       navigator.clipboard.writeText(input.value).then(() => {
-        Joomla.renderMessages({ message: [Joomla.JText._('PLG_USER_TOKEN_COPY_SUCCESS')] });
+        Joomla.renderMessages({ message: [Joomla.Text._('PLG_USER_TOKEN_COPY_SUCCESS')] });
       }, () => {
-        Joomla.renderMessages({ error: [Joomla.JText._('PLG_USER_TOKEN_COPY_FAIL')] });
+        Joomla.renderMessages({ error: [Joomla.Text._('PLG_USER_TOKEN_COPY_FAIL')] });
       });
     });
   };
diff --git a/build/media_source/system/js/draggable.es6.js b/build/media_source/system/js/draggable.es6.js
index a97c012ff6f..5bd329d60b2 100644
--- a/build/media_source/system/js/draggable.es6.js
+++ b/build/media_source/system/js/draggable.es6.js
@@ -120,7 +120,18 @@ if (container) {
     mirrorContainer: container,
   })
     .on('drag', (el) => {
-      dragElementIndex = parseInt(el.querySelector('[name="order[]"]').dataset.order, 10) - 1;
+      let rowSelector;
+      const groupId = el.dataset.draggableGroup;
+
+      if (groupId) {
+        rowSelector = `tr[data-draggable-group="${groupId}"]`;
+      } else {
+        rowSelector = 'tr';
+      }
+
+      const rowElements = [].slice.call(container.querySelectorAll(rowSelector));
+
+      dragElementIndex = rowElements.indexOf(el);
     })
     .on('cloned', () => {
 
@@ -128,25 +139,25 @@ if (container) {
     .on('drop', (el) => {
       let orderSelector;
       let inputSelector;
+      let rowSelector;
 
       const groupId = el.dataset.draggableGroup;
+
       if (groupId) {
+        rowSelector = `tr[data-draggable-group="${groupId}"]`;
         orderSelector = `[data-draggable-group="${groupId}"] [name="order[]"]`;
         inputSelector = `[data-draggable-group="${groupId}"] [name="cid[]"]`;
       } else {
+        rowSelector = 'tr';
         orderSelector = '[name="order[]"]';
         inputSelector = '[name="cid[]"]';
       }
 
+      const rowElements = [].slice.call(container.querySelectorAll(rowSelector));
       const rows = [].slice.call(container.querySelectorAll(orderSelector));
       const inputRows = [].slice.call(container.querySelectorAll(inputSelector));
 
-      for (let i = 0, l = rows.length - 1; l > i; i += 1) {
-        if (rows[i].dataset.order === el.querySelector('[name="order[]"]').dataset.order) {
-          dropElementIndex = i;
-          break;
-        }
-      }
+      dropElementIndex = rowElements.indexOf(el);
 
       if (url) {
         // Detach task field if exists
diff --git a/build/media_source/system/js/fields/calendar.es5.js b/build/media_source/system/js/fields/calendar.es5.js
index 3e19ed6e736..1e267505ac3 100644
--- a/build/media_source/system/js/fields/calendar.es5.js
+++ b/build/media_source/system/js/fields/calendar.es5.js
@@ -234,10 +234,6 @@
 		}
 		this.inputField.value = this.date.print(this.params.dateFormat, this.params.dateType, true);
 
-		if (typeof this.inputField.onchange == "function") {
-			this.inputField.onchange();
-		}
-
 		if (this.dateClicked && typeof this.params.onUpdate === "function") {
 			this.params.onUpdate(this);
 		}
@@ -590,9 +586,9 @@
 				cell.calendar = cal;
 				cell.navtype = navtype;
 				if (navtype !== 0 && Math.abs(navtype) <= 2) {
-					cell.innerHTML = "<a " + classes + " style='display:inline;padding:2px 6px;cursor:pointer;text-decoration:none;' unselectable='on'>" + text + "</a>";
+					cell.innerHTML = Joomla.sanitizeHtml("<a " + classes + " style='display:inline;padding:2px 6px;cursor:pointer;text-decoration:none;' unselectable='on'>" + text + "</a>");
 				} else {
-					cell.innerHTML = cs ? "<div unselectable='on'" + classes + ">" + text + "</div>" : text;
+					cell.innerHTML = cs ? Joomla.sanitizeHtml("<div unselectable='on'" + classes + ">" + text + "</div>") : Joomla.sanitizeHtml(text);
 					if (!cs && classes) {
 						cell.className = classes;
 					}
@@ -621,7 +617,7 @@
 		if (this.params.weekNumbers) {
 			cell = createElement("td", row);
 			cell.className = "day-name wn";
-			cell.innerHTML = JoomlaCalLocale.wk;
+			cell.innerHTML = Joomla.sanitizeHtml(JoomlaCalLocale.wk);
 		}
 		for (var i = 7; i > 0; --i) {
 			cell = createElement("td", row);
@@ -648,7 +644,7 @@
 				cell.classList.add("weekend");
 			}
 
-			cell.innerHTML = JoomlaCalLocale.shortDays[(i + fdow) % 7];
+			cell.innerHTML = Joomla.sanitizeHtml(JoomlaCalLocale.shortDays[(i + fdow) % 7]);
 			cell = cell.nextSibling;
 		}
 
@@ -781,9 +777,6 @@
 				self.inputField.setAttribute('data-alt-value', "0000-00-00 00:00:00");
 				self.inputField.setAttribute('value', '');
 				self.inputField.value = '';
-				if (self.inputField.onchange) {
-					self.inputField.onchange();
-				}
 				self.inputField.dispatchEvent(new CustomEvent('change', {bubbles: true, cancelable: true}));
 			});
 
@@ -878,7 +871,7 @@
 			var cell = row.firstChild;
 			if (this.params.weekNumbers) {
 				cell.className = "day wn";
-				cell.innerHTML = date.getLocalWeekNumber(this.params.dateType); //date.convertNumbers();
+				cell.innerHTML = Joomla.sanitizeHtml(date.getLocalWeekNumber(this.params.dateType)); //date.convertNumbers();
 				cell = cell.nextSibling;
 			}
 
@@ -911,7 +904,7 @@
 					cell.style.cursor = "pointer";
 				}
 				cell.disabled = false;
-				cell.innerHTML = this.params.debug ? iday : Date.convertNumbers(iday);          // translated day number for each cell
+				cell.innerHTML = this.params.debug ? Joomla.sanitizeHtml(iday) : Joomla.sanitizeHtml(Date.convertNumbers(iday));          // translated day number for each cell
 				if (!cell.disabled) {
 					cell.caldate = new Date(date);
 					if (current_month && iday === mday) {
diff --git a/build/media_source/system/js/fields/joomla-field-media.w-c.es6.js b/build/media_source/system/js/fields/joomla-field-media.w-c.es6.js
index 5caf026f6aa..60dd9d1434b 100644
--- a/build/media_source/system/js/fields/joomla-field-media.w-c.es6.js
+++ b/build/media_source/system/js/fields/joomla-field-media.w-c.es6.js
@@ -175,7 +175,7 @@
         const { value } = this.inputElement;
 
         if (!value) {
-          this.previewElement.innerHTML = '<span class="field-media-preview-icon"></span>';
+          this.previewElement.innerHTML = Joomla.sanitizeHtml('<span class="field-media-preview-icon"></span>');
         } else {
           this.previewElement.innerHTML = '';
           const imgPreview = new Image();
diff --git a/build/media_source/system/js/fields/joomla-field-module-order.w-c.es6.js b/build/media_source/system/js/fields/joomla-field-module-order.w-c.es6.js
index 22b10455cb4..89114e46390 100644
--- a/build/media_source/system/js/fields/joomla-field-module-order.w-c.es6.js
+++ b/build/media_source/system/js/fields/joomla-field-module-order.w-c.es6.js
@@ -74,7 +74,7 @@ customElements.define('joomla-field-module-order', class extends HTMLElement {
       // eslint-disable-next-line prefer-destructuring
       node.value = item[1];
       // eslint-disable-next-line prefer-destructuring
-      node.innerHTML = item[2];
+      node.innerHTML = Joomla.sanitizeHtml(item[2]);
 
       if ((originalPositionName && originalPositionValue === item[1])
         || (!originalPositionName && i === 0)) {
diff --git a/build/media_source/system/js/fields/joomla-field-permissions.w-c.es6.js b/build/media_source/system/js/fields/joomla-field-permissions.w-c.es6.js
index f54cbb1bea3..4a65e499b1c 100644
--- a/build/media_source/system/js/fields/joomla-field-permissions.w-c.es6.js
+++ b/build/media_source/system/js/fields/joomla-field-permissions.w-c.es6.js
@@ -137,7 +137,7 @@ window.customElements.define('joomla-field-permissions', class extends HTMLEleme
           const badgeSpan = target.parentNode.parentNode.nextElementSibling.querySelector('span');
           badgeSpan.removeAttribute('class');
           badgeSpan.setAttribute('class', response.data.class);
-          badgeSpan.innerHTML = response.data.text;
+          badgeSpan.innerHTML = Joomla.sanitizeHtml(response.data.text);
         }
 
         // Render messages, if any. There are only message in case of errors.
diff --git a/build/media_source/system/js/fields/joomla-field-simple-color.w-c.es6.js b/build/media_source/system/js/fields/joomla-field-simple-color.w-c.es6.js
index f8a1fe96006..d0816802740 100644
--- a/build/media_source/system/js/fields/joomla-field-simple-color.w-c.es6.js
+++ b/build/media_source/system/js/fields/joomla-field-simple-color.w-c.es6.js
@@ -237,7 +237,7 @@
         el.style.backgroundColor = color;
         el.setAttribute('type', 'button');
         const a11yColor = color === 'transparent' ? this.textTransp : this.getColorName(color);
-        el.innerHTML = `<span class="visually-hidden">${a11yColor}</span>`;
+        el.innerHTML = Joomla.sanitizeHtml(`<span class="visually-hidden">${a11yColor}</span>`);
 
         this.buttons.push(el);
       });
@@ -246,7 +246,7 @@
       const close = document.createElement('button');
       close.setAttribute('class', 'btn-close');
       close.setAttribute('type', 'button');
-      close.innerHTML = this.textClose;
+      close.innerHTML = Joomla.sanitizeHtml(this.textClose);
 
       this.buttons.push(close);
 
@@ -268,7 +268,7 @@
       this.icon.setAttribute('type', 'button');
       this.icon.setAttribute('tabindex', '0');
       this.icon.style.backgroundColor = color;
-      this.icon.innerHTML = `<span class="visually-hidden">${this.textSelect}</span>`;
+      this.icon.innerHTML = Joomla.sanitizeHtml(`<span class="visually-hidden">${this.textSelect}</span>`);
       this.icon.id = uniqueId;
       this.select.insertAdjacentElement('beforebegin', this.icon);
       this.icon.addEventListener('click', this.show.bind(this));
diff --git a/build/media_source/system/js/fields/joomla-field-subform.w-c.es6.js b/build/media_source/system/js/fields/joomla-field-subform.w-c.es6.js
index f7e9ca1af50..25e2cdaaa1b 100644
--- a/build/media_source/system/js/fields/joomla-field-subform.w-c.es6.js
+++ b/build/media_source/system/js/fields/joomla-field-subform.w-c.es6.js
@@ -96,8 +96,8 @@
 
           // Check active, with extra check for nested joomla-field-subform
           if (btnAdd && btnAdd.closest('joomla-field-subform') === that) {
-            let row = btnAdd.closest('joomla-field-subform');
-            row = row.closest(that.repeatableElement) === that ? row : null;
+            let row = btnAdd.closest(that.repeatableElement);
+            row = row && row.closest('joomla-field-subform') === that ? row : null;
             that.addRow(row);
             event.preventDefault();
           } else if (btnRem && btnRem.closest('joomla-field-subform') === that) {
@@ -113,8 +113,9 @@
           const isRem = that.buttonRemove && event.target.matches(that.buttonRemove);
 
           if ((isAdd || isRem) && event.target.closest('joomla-field-subform') === that) {
-            let row = event.target.closest('joomla-field-subform');
-            row = row.closest(that.repeatableElement) === that ? row : null;
+            let row = event.target.closest(that.repeatableElement);
+            row = row && row.closest('joomla-field-subform') === that ? row : null;
+
             if (isRem && row) {
               that.removeRow(row);
             } else if (isAdd) {
diff --git a/build/media_source/system/js/fields/passwordstrength.es6.js b/build/media_source/system/js/fields/passwordstrength.es6.js
index a00d38df6f6..fc035307054 100644
--- a/build/media_source/system/js/fields/passwordstrength.es6.js
+++ b/build/media_source/system/js/fields/passwordstrength.es6.js
@@ -104,9 +104,9 @@ class PasswordStrength {
     const label = element.parentNode.parentNode.querySelector(`#password-${i}`);
 
     if (score === 100) {
-      label.innerText = Joomla.JText._('JFIELD_PASSWORD_INDICATE_COMPLETE');
+      label.innerText = Joomla.Text._('JFIELD_PASSWORD_INDICATE_COMPLETE');
     } else {
-      label.innerText = Joomla.JText._('JFIELD_PASSWORD_INDICATE_INCOMPLETE');
+      label.innerText = Joomla.Text._('JFIELD_PASSWORD_INDICATE_INCOMPLETE');
     }
     meter.value = score;
 
diff --git a/build/media_source/system/js/fields/validate.es6.js b/build/media_source/system/js/fields/validate.es6.js
index b5b6f1e053a..d9a51a9c2df 100644
--- a/build/media_source/system/js/fields/validate.es6.js
+++ b/build/media_source/system/js/fields/validate.es6.js
@@ -117,11 +117,11 @@ class JFormValidator {
       const elMsg = document.createElement('span');
       elMsg.classList.add('form-control-feedback');
       if (empty && empty === 'checkbox') {
-        elMsg.innerHTML = message || Joomla.JText._('JLIB_FORM_FIELD_REQUIRED_CHECK');
+        elMsg.innerHTML = message !== null ? Joomla.sanitizeHtml(message) : Joomla.sanitizeHtml(Joomla.Text._('JLIB_FORM_FIELD_REQUIRED_CHECK'));
       } else if (empty && empty === 'value') {
-        elMsg.innerHTML = message || Joomla.JText._('JLIB_FORM_FIELD_REQUIRED_VALUE');
+        elMsg.innerHTML = message !== null ? Joomla.sanitizeHtml(message) : Joomla.sanitizeHtml(Joomla.Text._('JLIB_FORM_FIELD_REQUIRED_VALUE'));
       } else {
-        elMsg.innerHTML = message || Joomla.JText._('JLIB_FORM_FIELD_INVALID_VALUE');
+        elMsg.innerHTML = message !== null ? Joomla.sanitizeHtml(message) : Joomla.sanitizeHtml(Joomla.Text._('JLIB_FORM_FIELD_INVALID_VALUE'));
       }
 
       if (label) {
@@ -273,7 +273,7 @@ class JFormValidator {
       if (form.getAttribute('data-validation-text')) {
         message = form.getAttribute('data-validation-text');
       } else {
-        message = Joomla.JText._('JLIB_FORM_CONTAINS_INVALID_FIELDS');
+        message = Joomla.Text._('JLIB_FORM_CONTAINS_INVALID_FIELDS');
       }
 
       error = { error: [message] };
diff --git a/build/media_source/system/js/joomla-hidden-mail.w-c.es6.js b/build/media_source/system/js/joomla-hidden-mail.w-c.es6.js
index 4da868f6e71..f45a709163b 100644
--- a/build/media_source/system/js/joomla-hidden-mail.w-c.es6.js
+++ b/build/media_source/system/js/joomla-hidden-mail.w-c.es6.js
@@ -48,7 +48,7 @@ window.customElements.define('joomla-hidden-mail', class extends HTMLElement {
       let innerStr = this.constructor.b64DecodeUnicode(this.getAttribute('text'));
 
       innerStr = innerStr.replace('src="images/', `src="${this.base}images/`).replace('src="media/', `src="${this.base}media/`);
-      this.newElement.innerHTML = innerStr;
+      this.newElement.innerHTML = Joomla.sanitizeHtml(innerStr);
     } else {
       this.newElement.innerText = `${window.atob(this.getAttribute('first'))}@${window.atob(this.getAttribute('last'))}`;
     }
diff --git a/build/media_source/system/js/searchtools.es6.js b/build/media_source/system/js/searchtools.es6.js
index 0cf7555c8a6..b3e090cd32d 100644
--- a/build/media_source/system/js/searchtools.es6.js
+++ b/build/media_source/system/js/searchtools.es6.js
@@ -286,7 +286,7 @@ Joomla = window.Joomla || {};
 
     // eslint-disable-next-line class-methods-use-this
     checkActiveStatus(cont) {
-      const els = this.getFilterFields();
+      const els = [].slice.call(this.getFilterFields());
       let activeFilterCount = 0;
 
       els.forEach((item) => {
@@ -467,7 +467,7 @@ Joomla = window.Joomla || {};
               }
 
               // Append the option and repopulate the chosen field
-              this.orderFieldName.innerHTML += $option;
+              this.orderFieldName.innerHTML += Joomla.sanitizeHtml($option);
             }
           }
         });
diff --git a/build/media_source/templates/administrator/atum/js/template.es6.js b/build/media_source/templates/administrator/atum/js/template.es6.js
index a04e3ba0ba6..39597f02d65 100644
--- a/build/media_source/templates/administrator/atum/js/template.es6.js
+++ b/build/media_source/templates/administrator/atum/js/template.es6.js
@@ -16,8 +16,8 @@ const mobile = window.matchMedia('(max-width: 992px)');
 const small = window.matchMedia('(max-width: 575.98px)');
 const tablet = window.matchMedia('(min-width: 576px) and (max-width:991.98px)');
 const menu = document.querySelector('.sidebar-menu');
-const sidebarNav = document.querySelector('.sidebar-nav');
-const subhead = document.querySelector('.subhead');
+const sidebarNav = [].slice.call(document.querySelectorAll('.sidebar-nav'));
+const subhead = document.querySelector('#subhead-container');
 const wrapper = document.querySelector('.wrapper');
 const sidebarWrapper = document.querySelector('.sidebar-wrapper');
 const logo = document.querySelector('.logo');
@@ -52,6 +52,11 @@ function changeLogo(change) {
     return;
   }
 
+  if (small.matches) {
+    logo.classList.add('small');
+    return;
+  }
+
   const state = change || getCookie();
 
   if (state === 'closed') {
@@ -149,11 +154,11 @@ function setMobile() {
   }
 
   if (small.matches) {
-    if (sidebarNav) sidebarNav.classList.add('collapse');
+    sidebarNav.map((el) => el.classList.add('collapse'));
     if (subhead) subhead.classList.add('collapse');
     if (sidebarWrapper) sidebarWrapper.classList.add('collapse');
   } else {
-    if (sidebarNav) sidebarNav.classList.remove('collapse');
+    sidebarNav.map((el) => el.classList.remove('collapse'));
     if (subhead) subhead.classList.remove('collapse');
     if (sidebarWrapper) sidebarWrapper.classList.remove('collapse');
   }
@@ -173,7 +178,7 @@ function setDesktop() {
     sidebarWrapper.classList.remove('collapse');
   }
 
-  if (sidebarNav) sidebarNav.classList.remove('collapse');
+  sidebarNav.map((el) => el.classList.remove('collapse'));
   if (subhead) subhead.classList.remove('collapse');
 
   toggleArrowIcon('top');
@@ -217,11 +222,23 @@ function subheadScrolling() {
 headerItemsInDropdown();
 reactToResize();
 subheadScrolling();
+if (mobile.matches) {
+  changeLogo('closed');
+  if (subhead) {
+    subhead.classList.remove('show');
+    subhead.classList.add('collapse');
+  }
+}
 if (!navigator.cookieEnabled) {
   Joomla.renderMessages({ error: [Joomla.Text._('JGLOBAL_WARNCOOKIES')] }, undefined, false, 6000);
 }
 window.addEventListener('joomla:menu-toggle', (event) => {
   headerItemsInDropdown();
   document.cookie = `atumSidebarState=${event.detail};`;
-  changeLogo(event.detail);
+
+  if (mobile.matches) {
+    changeLogo('closed');
+  } else {
+    changeLogo(event.detail);
+  }
 });
diff --git a/build/media_source/vendor/bootstrap/js/modal.es6.js b/build/media_source/vendor/bootstrap/js/modal.es6.js
index 6079bdb0ef7..2426895e1f6 100644
--- a/build/media_source/vendor/bootstrap/js/modal.es6.js
+++ b/build/media_source/vendor/bootstrap/js/modal.es6.js
@@ -5,6 +5,10 @@ Joomla.Modal = Joomla.Modal || {};
 window.bootstrap = window.bootstrap || {};
 window.bootstrap.Modal = Modal;
 
+const allowed = {
+  iframe: ['src', 'name', 'width', 'height'],
+};
+
 Joomla.initialiseModal = (modal, options) => {
   if (!(modal instanceof Element)) {
     return;
@@ -53,9 +57,9 @@ Joomla.initialiseModal = (modal, options) => {
           el = document.getElementById(idFieldArr[1]).value;
         }
 
-        modalBody.insertAdjacentHTML('afterbegin', `${iframeTextArr[0]}${el}${iframeTextArr[2]}`);
+        modalBody.insertAdjacentHTML('afterbegin', Joomla.sanitizeHtml(`${iframeTextArr[0]}${el}${iframeTextArr[2]}`, allowed));
       } else {
-        modalBody.insertAdjacentHTML('afterbegin', modal.dataset.iframe);
+        modalBody.insertAdjacentHTML('afterbegin', Joomla.sanitizeHtml(modal.dataset.iframe, allowed));
       }
     }
   });
diff --git a/build/media_source/vendor/bootstrap/js/tab.es6.js b/build/media_source/vendor/bootstrap/js/tab.es6.js
index 72a75c823a0..2febc9b9b33 100644
--- a/build/media_source/vendor/bootstrap/js/tab.es6.js
+++ b/build/media_source/vendor/bootstrap/js/tab.es6.js
@@ -38,12 +38,7 @@ Joomla.initialiseTabs = (el, options) => {
             link.setAttribute('role', 'tab');
             link.setAttribute('aria-controls', element.dataset.id);
             link.setAttribute('aria-selected', element.dataset.id);
-
-            /**
-             * As we are re-rendering text already displayed on the page we judge that there isn't
-             * a risk of XSS attacks
-             */
-            link.innerHTML = element.dataset.title;
+            link.innerHTML = Joomla.sanitizeHtml(element.dataset.title);
 
             const li = document.createElement('li');
             li.classList.add('nav-item');
diff --git a/components/com_content/tmpl/article/default_links.php b/components/com_content/tmpl/article/default_links.php
index 4f4be385570..51e25ed33cc 100644
--- a/components/com_content/tmpl/article/default_links.php
+++ b/components/com_content/tmpl/article/default_links.php
@@ -74,7 +74,7 @@
 									'modalWidth'  => '500',
 									'bodyHeight'  => '500',
 									'footer' => '<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" aria-hidden="true">'
-										. \Joomla\CMS\Language\Text::_("JLIB_HTML_BEHAVIOR_CLOSE") . '</button>'
+										. \Joomla\CMS\Language\Text::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</button>'
 								)
 							);
 							break;
diff --git a/components/com_menus/layouts/joomla/searchtools/default.php b/components/com_menus/layouts/joomla/searchtools/default.php
index f95bcb6e46a..456ea9279fe 100644
--- a/components/com_menus/layouts/joomla/searchtools/default.php
+++ b/components/com_menus/layouts/joomla/searchtools/default.php
@@ -95,7 +95,7 @@
 		<?php $clientIdField = $data['view']->filterForm->getField('client_id'); ?>
 		<?php if ($clientIdField) : ?>
 		<div class="js-stools-container-selector">
-			<div class="sr-only">
+			<div class="visually-hidden">
 				<?php echo $clientIdField->label; ?>
 			</div>
 			<div class="js-stools-field-selector js-stools-client_id">
diff --git a/components/com_tags/src/Service/Router.php b/components/com_tags/src/Service/Router.php
index c018bfa6b09..9f4db02b24a 100644
--- a/components/com_tags/src/Service/Router.php
+++ b/components/com_tags/src/Service/Router.php
@@ -31,7 +31,7 @@ class Router extends RouterBase
 	 *
 	 * @var DatabaseInterface
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since  4.0.0
 	 */
 	private $db;
 
diff --git a/composer.lock b/composer.lock
index 502cbef1b76..2150ca99021 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1721,21 +1721,21 @@
         },
         {
             "name": "joomla/utilities",
-            "version": "2.0.0-beta",
+            "version": "2.0.0-beta2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/joomla-framework/utilities.git",
-                "reference": "e15b14b060e524ab869504942440e14473dfb3de"
+                "reference": "30aaf824c9e6702c92c0463246b237276aa02cae"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/joomla-framework/utilities/zipball/e15b14b060e524ab869504942440e14473dfb3de",
-                "reference": "e15b14b060e524ab869504942440e14473dfb3de",
+                "url": "https://api.github.com/repos/joomla-framework/utilities/zipball/30aaf824c9e6702c92c0463246b237276aa02cae",
+                "reference": "30aaf824c9e6702c92c0463246b237276aa02cae",
                 "shasum": ""
             },
             "require": {
                 "joomla/string": "^1.3|^2.0",
-                "php": "^7.2.5"
+                "php": "^7.2.5|^8.0"
             },
             "require-dev": {
                 "joomla/coding-standards": "^2.0@alpha",
@@ -1763,7 +1763,7 @@
                 "joomla",
                 "utilities"
             ],
-            "time": "2020-06-05T11:26:55+00:00"
+            "time": "2021-06-03T11:06:46+00:00"
         },
         {
             "name": "laminas/laminas-diactoros",
diff --git a/htaccess.txt b/htaccess.txt
index fc316fe2fe8..c61b8c5ed5d 100644
--- a/htaccess.txt
+++ b/htaccess.txt
@@ -28,6 +28,13 @@ Options -Indexes
 ## Suppress mime type detection in browsers for unknown types
 <IfModule mod_headers.c>
 	Header always set X-Content-Type-Options "nosniff"
+##
+# Disable Federated Learning of Cohorts (FLoC)
+# If you uncomment the below directive you have to allow this technology in the
+# Global Configuration of Joomla. Read more about this in the Post-Installation
+# message in the backend.
+##
+# Header always set Permissions-Policy "interest-cohort=()"
 </IfModule>
 
 ## Protect against certain cross-origin requests. More information can be found here:
diff --git a/installation/language/en-GB/joomla.ini b/installation/language/en-GB/joomla.ini
index c3c588ed358..d7e89a4fa3b 100644
--- a/installation/language/en-GB/joomla.ini
+++ b/installation/language/en-GB/joomla.ini
@@ -81,7 +81,7 @@ INSTL_DATABASE_ERROR_POSTGRESQL_QUERY="PostgreSQL database query failed."
 INSTL_DATABASE_HOST_DESC="Enter the host name, usually \"localhost\" or a name provided by your host."
 INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_CREATE_FILE="We were not able to create the file. Please manually create a file named \"%1$s\" and upload it to the \"%2$s\" folder of your Joomla site. Then select \"%3$s\" to continue."
 INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE="To confirm that you are the owner of this website please delete the file named \"%1$s\" that has been created in the \"%2$s\" folder of your Joomla site. Then select \"%3$s\" to continue."
-INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="You are trying to use a database host which is not on your local server. For security reasons, you need to verify the ownership of your web hosting account. <a href=\"%s\" target=\"_blank\">Please read the documentation</a> for more information."
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="You are trying to use a database host which is not on your local server. For security reasons, you need to verify the ownership of your web hosting account. <a href=\"%s\" target=\"_blank\" rel=\"noopener noreferrer\">Please read the documentation</a> for more information."
 INSTL_DATABASE_HOST_LABEL="Host Name"
 INSTL_DATABASE_NAME_DESC="Enter the database name."
 INSTL_DATABASE_NAME_LABEL="Database Name"
@@ -94,7 +94,7 @@ INSTL_DATABASE_PREFIX_MSG="The table prefix must start with a letter, optionally
 INSTL_DATABASE_RESPONSE_ERROR="The installation process failed."
 INSTL_DATABASE_TYPE_DESC="Select the database type."
 INSTL_DATABASE_USER_DESC="Either a username you created or a username provided by your host."
-INSTL_DATABASE_VALIDATION_ERROR="Check your database credentials, database type, database name or hostname. If you have MySQL 8 installed then please read this <a href=\"https://docs.joomla.org/Joomla_and_MySQL_8#Workaround_to_get_Joomla_working_with_MySQL_8\" target=\"_blank\">wiki</a> for more information."
+INSTL_DATABASE_VALIDATION_ERROR="Check your database credentials, database type, database name or hostname. If you have MySQL 8 installed then please read this <a href=\"https://docs.joomla.org/Joomla_and_MySQL_8#Workaround_to_get_Joomla_working_with_MySQL_8\" target=\"_blank\" rel=\"noopener noreferrer\">wiki</a> for more information."
 
 INSTL_CONNECT_DB="Setup Database Connection"
 INSTL_INSTALL_JOOMLA="Install Joomla"
diff --git a/installation/sql/mysql/base.sql b/installation/sql/mysql/base.sql
index 795e0b55b8b..99199575edf 100644
--- a/installation/sql/mysql/base.sql
+++ b/installation/sql/mysql/base.sql
@@ -799,8 +799,8 @@ CREATE TABLE IF NOT EXISTS `#__template_styles` (
 --
 
 INSERT INTO `#__template_styles` (`id`, `template`, `client_id`, `home`, `title`, `inheritable`, `parent`, `params`) VALUES
-(10, 'atum', 1, '1', 'atum - Default', 0, '', '{"hue":"hsl(214, 63%, 20%)","bg-light":"#f0f4fb","text-dark":"#495057","text-light":"#ffffff","link-color":"#2a69b8","special-color":"#001b4c","monochrome":"0","loginLogo":"","loginLogoAlt":"","logoBrandLarge":"","logoBrandLargeAlt":"","logoBrandSmall":"","logoBrandSmallAlt":""}'),
-(11, 'cassiopeia', 0, '1', 'cassiopeia - Default', 0, '', '{"brand":"1","logoFile":"","siteTitle":"","siteDescription":"","useFontScheme":"0","colorName":"colors_standard","fluidContainer":"0","stickyHeader":0,"backTop":0}');
+(10, 'atum', 1, '1', 'Atum - Default', 0, '', '{"hue":"hsl(214, 63%, 20%)","bg-light":"#f0f4fb","text-dark":"#495057","text-light":"#ffffff","link-color":"#2a69b8","special-color":"#001b4c","monochrome":"0","loginLogo":"","loginLogoAlt":"","logoBrandLarge":"","logoBrandLargeAlt":"","logoBrandSmall":"","logoBrandSmallAlt":""}'),
+(11, 'cassiopeia', 0, '1', 'Cassiopeia - Default', 0, '', '{"brand":"1","logoFile":"","siteTitle":"","siteDescription":"","useFontScheme":"0","colorName":"colors_standard","fluidContainer":"0","stickyHeader":0,"backTop":0}');
 
 -- --------------------------------------------------------
 
diff --git a/installation/sql/mysql/supports.sql b/installation/sql/mysql/supports.sql
index 0c347e05aa9..80304d52448 100644
--- a/installation/sql/mysql/supports.sql
+++ b/installation/sql/mysql/supports.sql
@@ -280,6 +280,8 @@ INSERT INTO `#__postinstall_messages` (`extension_id`, `title_key`, `description
 SELECT `extension_id`, 'PLG_SYSTEM_UPDATENOTIFICATION_POSTINSTALL_UPDATECACHETIME', 'PLG_SYSTEM_UPDATENOTIFICATION_POSTINSTALL_UPDATECACHETIME_BODY', 'PLG_SYSTEM_UPDATENOTIFICATION_POSTINSTALL_UPDATECACHETIME_ACTION', 'plg_system_updatenotification', 1, 'action', 'site://plugins/system/updatenotification/postinstall/updatecachetime.php', 'updatecachetime_postinstall_action', 'site://plugins/system/updatenotification/postinstall/updatecachetime.php', 'updatecachetime_postinstall_condition', '3.6.3', 1 FROM `#__extensions` WHERE `name` = 'files_joomla';
 INSERT INTO `#__postinstall_messages` (`extension_id`, `title_key`, `description_key`, `action_key`, `language_extension`, `language_client_id`, `type`, `action_file`, `action`, `condition_file`, `condition_method`, `version_introduced`, `enabled`)
 SELECT `extension_id`, 'PLG_SYSTEM_HTTPHEADERS_POSTINSTALL_INTRODUCTION_TITLE', 'PLG_SYSTEM_HTTPHEADERS_POSTINSTALL_INTRODUCTION_BODY', 'PLG_SYSTEM_HTTPHEADERS_POSTINSTALL_INTRODUCTION_ACTION', 'plg_system_httpheaders', 1, 'action', 'site://plugins/system/httpheaders/postinstall/introduction.php', 'httpheaders_postinstall_action', 'site://plugins/system/httpheaders/postinstall/introduction.php', 'httpheaders_postinstall_condition', '4.0.0', 1 FROM `#__extensions` WHERE `name` = 'files_joomla';
+INSERT INTO `#__postinstall_messages` (`extension_id`, `title_key`, `description_key`, `action_key`, `language_extension`, `language_client_id`, `type`, `action_file`, `action`, `condition_file`, `condition_method`, `version_introduced`, `enabled`)
+SELECT `extension_id`, 'COM_ADMIN_POSTINSTALL_MSG_FLOC_BLOCKER_TITLE', 'COM_ADMIN_POSTINSTALL_MSG_FLOC_BLOCKER_DESCRIPTION', '', 'com_admin', 1, 'message', '', '', '', '', '3.9.27', 1 FROM `#__extensions` WHERE `name` = 'files_joomla';
 
 -- --------------------------------------------------------
 
diff --git a/installation/sql/postgresql/base.sql b/installation/sql/postgresql/base.sql
index f50279c8447..8cda51c8fee 100644
--- a/installation/sql/postgresql/base.sql
+++ b/installation/sql/postgresql/base.sql
@@ -814,8 +814,8 @@ CREATE INDEX "#__template_styles_idx_client_id_home" ON "#__template_styles" ("c
 -- Dumping data for table `#__template_styles`
 --
 INSERT INTO "#__template_styles" ("id", "template", "client_id", "home", "title", "inheritable", "parent", "params") VALUES
-(10, 'atum', 1, '1', 'atum - Default', 0, '', '{"hue":"hsl(214, 63%, 20%)","bg-light":"#f0f4fb","text-dark":"#495057","text-light":"#ffffff","link-color":"#2a69b8","special-color":"#001b4c","monochrome":"0","loginLogo":"","loginLogoAlt":"","logoBrandLarge":"","logoBrandLargeAlt":"","logoBrandSmall":"","logoBrandSmallAlt":""}'),
-(11, 'cassiopeia', 0, '1', 'cassiopeia - Default', 0, '', '{"brand":"1","logoFile":"","siteTitle":"","siteDescription":"","useFontScheme":"0","colorName":"colors_standard","fluidContainer":"0","stickyHeader":0,"backTop":0}');
+(10, 'atum', 1, '1', 'Atum - Default', 0, '', '{"hue":"hsl(214, 63%, 20%)","bg-light":"#f0f4fb","text-dark":"#495057","text-light":"#ffffff","link-color":"#2a69b8","special-color":"#001b4c","monochrome":"0","loginLogo":"","loginLogoAlt":"","logoBrandLarge":"","logoBrandLargeAlt":"","logoBrandSmall":"","logoBrandSmallAlt":""}'),
+(11, 'cassiopeia', 0, '1', 'Cassiopeia - Default', 0, '', '{"brand":"1","logoFile":"","siteTitle":"","siteDescription":"","useFontScheme":"0","colorName":"colors_standard","fluidContainer":"0","stickyHeader":0,"backTop":0}');
 
 SELECT setval('#__template_styles_id_seq', 12, false);
 
diff --git a/installation/sql/postgresql/supports.sql b/installation/sql/postgresql/supports.sql
index c0d18c1d8e7..121a79a1257 100644
--- a/installation/sql/postgresql/supports.sql
+++ b/installation/sql/postgresql/supports.sql
@@ -291,6 +291,8 @@ INSERT INTO "#__postinstall_messages" ("extension_id", "title_key", "description
 SELECT "extension_id", 'PLG_SYSTEM_UPDATENOTIFICATION_POSTINSTALL_UPDATECACHETIME', 'PLG_SYSTEM_UPDATENOTIFICATION_POSTINSTALL_UPDATECACHETIME_BODY', 'PLG_SYSTEM_UPDATENOTIFICATION_POSTINSTALL_UPDATECACHETIME_ACTION', 'plg_system_updatenotification', 1, 'action', 'site://plugins/system/updatenotification/postinstall/updatecachetime.php', 'updatecachetime_postinstall_action', 'site://plugins/system/updatenotification/postinstall/updatecachetime.php', 'updatecachetime_postinstall_condition', '3.6.3', 1 FROM "#__extensions" WHERE "name" = 'files_joomla';
 INSERT INTO "#__postinstall_messages" ("extension_id", "title_key", "description_key", "action_key", "language_extension", "language_client_id", "type", "action_file", "action", "condition_file", "condition_method", "version_introduced", "enabled")
 SELECT "extension_id", 'PLG_SYSTEM_HTTPHEADERS_POSTINSTALL_INTRODUCTION_TITLE', 'PLG_SYSTEM_HTTPHEADERS_POSTINSTALL_INTRODUCTION_BODY', 'PLG_SYSTEM_HTTPHEADERS_POSTINSTALL_INTRODUCTION_ACTION', 'plg_system_httpheaders', 1, 'action', 'site://plugins/system/httpheaders/postinstall/introduction.php', 'httpheaders_postinstall_action', 'site://plugins/system/httpheaders/postinstall/introduction.php', 'httpheaders_postinstall_condition', '4.0.0', 1 FROM "#__extensions" WHERE "name" = 'files_joomla';
+INSERT INTO "#__postinstall_messages" ("extension_id", "title_key", "description_key", "action_key", "language_extension", "language_client_id", "type", "action_file", "action", "condition_file", "condition_method", "version_introduced", "enabled")
+SELECT "extension_id", 'COM_ADMIN_POSTINSTALL_MSG_FLOC_BLOCKER_TITLE', 'COM_ADMIN_POSTINSTALL_MSG_FLOC_BLOCKER_DESCRIPTION', '', 'com_admin', 1, 'message', '', '', '', '', '3.9.27', 1 FROM "#__extensions" WHERE "name" = 'files_joomla';
 
 --
 -- Table structure for table `#__ucm_base`
diff --git a/installation/template/js/setup.js b/installation/template/js/setup.js
index 0cf80217a8c..3930528af90 100644
--- a/installation/template/js/setup.js
+++ b/installation/template/js/setup.js
@@ -90,7 +90,7 @@ Joomla.checkDbCredentials = function() {
         loaderElement.parentNode.removeChild(loaderElement);
         console.error('Error in DB Check Endpoint');
         console.error(response);
-        Joomla.renderMessages({'error': [Joomla.JText._('INSTL_DATABASE_RESPONSE_ERROR')]});
+        Joomla.renderMessages({'error': [Joomla.Text._('INSTL_DATABASE_RESPONSE_ERROR')]});
 
         return false;
       }
@@ -111,7 +111,7 @@ Joomla.checkDbCredentials = function() {
       }
     },
     onError:   function(xhr){
-      Joomla.renderMessages([['', Joomla.JText._('JLIB_DATABASE_ERROR_DATABASE_CONNECT', 'A Database error occurred.')]]);
+      Joomla.renderMessages([['', Joomla.Text._('JLIB_DATABASE_ERROR_DATABASE_CONNECT', 'A Database error occurred.')]]);
       //Install.goToPage('summary');
       var loaderElement = document.querySelector('joomla-core-loader');
       loaderElement.parentNode.removeChild(loaderElement);
diff --git a/installation/template/js/template.js b/installation/template/js/template.js
index e493554fdc5..963c8b8c36f 100644
--- a/installation/template/js/template.js
+++ b/installation/template/js/template.js
@@ -180,7 +180,7 @@
           spinnerElement.parentNode.removeChild(spinnerElement);
           console.error('Error in ' + task + ' Endpoint');
           console.error(response);
-          Joomla.renderMessages({'error': [Joomla.JText._('INSTL_DATABASE_RESPONSE_ERROR')]});
+          Joomla.renderMessages({'error': [Joomla.Text._('INSTL_DATABASE_RESPONSE_ERROR')]});
 
           return false;
         }
@@ -204,7 +204,7 @@
         Joomla.install(tasks, form);
       },
       onError: function(xhr){
-        Joomla.renderMessages([['', Joomla.JText._('JLIB_DATABASE_ERROR_DATABASE_CONNECT', 'A Database error occurred.')]]);
+        Joomla.renderMessages([['', Joomla.Text._('JLIB_DATABASE_ERROR_DATABASE_CONNECT', 'A Database error occurred.')]]);
         Joomla.goToPage('remove');
 
         try {
diff --git a/language/en-GB/joomla.ini b/language/en-GB/joomla.ini
index 4f85e9610ed..7a6ffb736e9 100644
--- a/language/en-GB/joomla.ini
+++ b/language/en-GB/joomla.ini
@@ -308,6 +308,7 @@ JGLOBAL_ICON_SEP="|"
 JGLOBAL_INHERIT="Inherit"
 JGLOBAL_INTRO_TEXT="Intro Text"
 JGLOBAL_KEEP_TYPING="Keep typing ..."
+JGLOBAL_LEARN_MORE="Learn More"
 JGLOBAL_LEFT="Left"
 JGLOBAL_LIST_ALIAS="(<span>Alias</span>: %s)"
 JGLOBAL_LIST_ALIAS_NOTE="(<span>Alias</span>: %s, <span>Note</span>: %s)"
diff --git a/language/en-GB/mod_login.ini b/language/en-GB/mod_login.ini
index f1d65959aea..f63a865d26f 100644
--- a/language/en-GB/mod_login.ini
+++ b/language/en-GB/mod_login.ini
@@ -25,4 +25,4 @@ MOD_LOGIN_VALUE_ICONS="Icons"
 MOD_LOGIN_VALUE_NAME="Name"
 MOD_LOGIN_VALUE_TEXT="Text"
 MOD_LOGIN_VALUE_USERNAME="Username"
-MOD_LOGIN_XML_DESCRIPTION="This module displays a username and password login form. It also displays a link to retrieve a forgotten password. If user registration is enabled (in Users > Manage > Options), another link will be shown to enable self-registration for users."
+MOD_LOGIN_XML_DESCRIPTION="This module displays a username and password login form. It also displays a link to retrieve a forgotten password. If user registration is enabled (in Users &rarr; Manage &rarr; Options), another link will be shown to enable self-registration for users."
diff --git a/language/en-GB/mod_login.sys.ini b/language/en-GB/mod_login.sys.ini
index 116dd633bed..8122d48642c 100644
--- a/language/en-GB/mod_login.sys.ini
+++ b/language/en-GB/mod_login.sys.ini
@@ -5,5 +5,5 @@
 
 MOD_LOGIN="Login"
 MOD_LOGIN_LAYOUT_DEFAULT="Default"
-MOD_LOGIN_XML_DESCRIPTION="This module displays a username and password login form. It also displays a link to retrieve a forgotten password. If user registration is enabled (in Users > Manage > Options), another link will be shown to enable self-registration for users."
+MOD_LOGIN_XML_DESCRIPTION="This module displays a username and password login form. It also displays a link to retrieve a forgotten password. If user registration is enabled (in Users &rarr; Manage &rarr; Options), another link will be shown to enable self-registration for users."
 
diff --git a/layouts/joomla/editors/buttons/modal.php b/layouts/joomla/editors/buttons/modal.php
index 099590bf606..e288d0a818f 100644
--- a/layouts/joomla/editors/buttons/modal.php
+++ b/layouts/joomla/editors/buttons/modal.php
@@ -58,6 +58,6 @@
 		'bodyHeight'  => array_key_exists('bodyHeight', $options) ? $options['bodyHeight'] : '70',
 		'modalWidth'  => array_key_exists('modalWidth', $options) ? $options['modalWidth'] : '80',
 		'footer' => $confirm . '<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">'
-			. Text::_("JLIB_HTML_BEHAVIOR_CLOSE") . '</button>'
+			. Text::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</button>'
 	)
 );
diff --git a/layouts/joomla/form/field/contenthistory.php b/layouts/joomla/form/field/contenthistory.php
index 19d97183f43..89b43ac2085 100644
--- a/layouts/joomla/form/field/contenthistory.php
+++ b/layouts/joomla/form/field/contenthistory.php
@@ -61,7 +61,7 @@
 		'modalWidth'  => '80',
 		'bodyHeight'  => '60',
 		'footer' => '<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" aria-hidden="true">'
-			. Text::_("JLIB_HTML_BEHAVIOR_CLOSE") . '</button>'
+			. Text::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</button>'
 	)
 );
 
diff --git a/layouts/joomla/form/field/media.php b/layouts/joomla/form/field/media.php
index f31fc3431de..372701e987f 100644
--- a/layouts/joomla/form/field/media.php
+++ b/layouts/joomla/form/field/media.php
@@ -163,8 +163,8 @@
 	<div class="input-group">
 		<input type="text" name="<?php echo $name; ?>" id="<?php echo $id; ?>" value="<?php echo htmlspecialchars($value, ENT_COMPAT, 'UTF-8'); ?>" readonly="readonly"<?php echo $attr; ?>>
 		<?php if ($disabled != true) : ?>
-			<button type="button" class="btn btn-success button-select"><?php echo Text::_("JLIB_FORM_BUTTON_SELECT"); ?></button>
-			<button type="button" class="btn btn-danger button-clear"><span class="icon-times" aria-hidden="true"></span><span class="visually-hidden"><?php echo Text::_("JLIB_FORM_BUTTON_CLEAR"); ?></span></button>
+			<button type="button" class="btn btn-success button-select"><?php echo Text::_('JLIB_FORM_BUTTON_SELECT'); ?></button>
+			<button type="button" class="btn btn-danger button-clear"><span class="icon-times" aria-hidden="true"></span><span class="visually-hidden"><?php echo Text::_('JLIB_FORM_BUTTON_CLEAR'); ?></span></button>
 		<?php endif; ?>
 	</div>
 </joomla-field-media>
diff --git a/layouts/joomla/form/field/subform/default.php b/layouts/joomla/form/field/subform/default.php
index d343656e759..d9396fa2ead 100644
--- a/layouts/joomla/form/field/subform/default.php
+++ b/layouts/joomla/form/field/subform/default.php
@@ -21,6 +21,7 @@
  * @var   int     $max              Count of maximum repeating in multiple mode
  * @var   string  $name             Name of the input field.
  * @var   string  $fieldname        The field name
+ * @var   string  $fieldId          The field ID
  * @var   string  $control          The forms control
  * @var   string  $label            The field label
  * @var   string  $description      The field description
diff --git a/layouts/joomla/form/field/subform/repeatable-table.php b/layouts/joomla/form/field/subform/repeatable-table.php
index 94d1c5b8c90..04c1cce94ab 100644
--- a/layouts/joomla/form/field/subform/repeatable-table.php
+++ b/layouts/joomla/form/field/subform/repeatable-table.php
@@ -24,6 +24,7 @@
  * @var   int     $max              Count of maximum repeating in multiple mode
  * @var   string  $name             Name of the input field.
  * @var   string  $fieldname        The field name
+ * @var   string  $fieldId          The field ID
  * @var   string  $control          The forms control
  * @var   string  $label            The field label
  * @var   string  $description      The field description
@@ -44,7 +45,7 @@
 if (!empty($groupByFieldset))
 {
 	foreach ($tmpl->getFieldsets() as $fieldset) {
-		$table_head .= '<th scope="col" style="width:45%">' . Text::_($fieldset->label);
+		$table_head .= '<th scope="col">' . Text::_($fieldset->label);
 
 		if ($fieldset->description)
 		{
@@ -78,19 +79,20 @@
 }
 ?>
 
-	<div class="subform-repeatable-wrapper subform-table-layout subform-table-sublayout-<?php echo $sublayout; ?>">
-		<joomla-field-subform class="subform-repeatable" name="<?php echo $name; ?>"
-			button-add=".group-add" button-remove=".group-remove" button-move="<?php echo empty($buttons['move']) ? '' : '.group-move' ?>"
-			repeatable-element=".subform-repeatable-group"
-			rows-container="tbody.subform-repeatable-container" minimum="<?php echo $min; ?>" maximum="<?php echo $max; ?>">
-		<table class="table table-responsive" id="subfieldList">
-			<caption class="visually-hidden">
-				<?php echo Text::_('JGLOBAL_REPEATABLE_FIELDS_TABLE_CAPTION'); ?>
-			</caption>
-			<thead>
-				<tr>
-					<?php echo $table_head; ?>
-					<?php if (!empty($buttons)) : ?>
+<div class="subform-repeatable-wrapper subform-table-layout subform-table-sublayout-<?php echo $sublayout; ?>">
+	<joomla-field-subform class="subform-repeatable" name="<?php echo $name; ?>"
+		button-add=".group-add" button-remove=".group-remove" button-move="<?php echo empty($buttons['move']) ? '' : '.group-move' ?>"
+		repeatable-element=".subform-repeatable-group"
+		rows-container="tbody.subform-repeatable-container" minimum="<?php echo $min; ?>" maximum="<?php echo $max; ?>">
+		<div class="table-responsive">
+			<table class="table" id="subfieldList_<?php echo $fieldId; ?>">
+				<caption class="visually-hidden">
+					<?php echo Text::_('JGLOBAL_REPEATABLE_FIELDS_TABLE_CAPTION'); ?>
+				</caption>
+				<thead>
+					<tr>
+						<?php echo $table_head; ?>
+						<?php if (!empty($buttons)) : ?>
 						<td style="width:8%;">
 							<?php if (!empty($buttons['add'])) : ?>
 								<div class="btn-group">
@@ -100,22 +102,22 @@
 								</div>
 							<?php endif; ?>
 						</td>
-					<?php endif; ?>
-				</tr>
-			</thead>
-			<tbody class="subform-repeatable-container">
-			<?php
-			foreach ($forms as $k => $form) :
-				echo $this->sublayout($sublayout, array('form' => $form, 'basegroup' => $fieldname, 'group' => $fieldname . $k, 'buttons' => $buttons));
-			endforeach;
-			?>
-			</tbody>
-		</table>
+						<?php endif; ?>
+					</tr>
+				</thead>
+				<tbody class="subform-repeatable-container">
+				<?php
+				foreach ($forms as $k => $form) :
+					echo $this->sublayout($sublayout, array('form' => $form, 'basegroup' => $fieldname, 'group' => $fieldname . $k, 'buttons' => $buttons));
+				endforeach;
+				?>
+				</tbody>
+			</table>
+		</div>
 		<?php if ($multiple) : ?>
 		<template class="subform-repeatable-template-section hidden">
-		<?php echo trim($this->sublayout($sublayout, array('form' => $tmpl, 'basegroup' => $fieldname, 'group' => $fieldname . 'X', 'buttons' => $buttons))); ?>
+			<?php echo trim($this->sublayout($sublayout, array('form' => $tmpl, 'basegroup' => $fieldname, 'group' => $fieldname . 'X', 'buttons' => $buttons))); ?>
 		</template>
 		<?php endif; ?>
-		</joomla-field-subform>
-	</div>
-
+	</joomla-field-subform>
+</div>
diff --git a/layouts/joomla/form/field/subform/repeatable-table/section.php b/layouts/joomla/form/field/subform/repeatable-table/section.php
index 5ce6722d6ea..8b76483ae46 100644
--- a/layouts/joomla/form/field/subform/repeatable-table/section.php
+++ b/layouts/joomla/form/field/subform/repeatable-table/section.php
@@ -26,7 +26,7 @@
 <tr class="subform-repeatable-group" data-base-name="<?php echo $basegroup; ?>" data-group="<?php echo $group; ?>">
 	<?php foreach ($form->getGroup('') as $field) : ?>
 		<td data-column="<?php echo strip_tags($field->label); ?>">
-			<?php echo $field->renderField(array('hiddenLabel' => true)); ?>
+			<?php echo $field->renderField(array('hiddenLabel' => true, 'hiddenDescription' => true)); ?>
 		</td>
 	<?php endforeach; ?>
 	<?php if (!empty($buttons)) : ?>
diff --git a/layouts/joomla/form/field/subform/repeatable.php b/layouts/joomla/form/field/subform/repeatable.php
index 4a78e5d047d..52b5d945e61 100644
--- a/layouts/joomla/form/field/subform/repeatable.php
+++ b/layouts/joomla/form/field/subform/repeatable.php
@@ -24,6 +24,7 @@
  * @var   int     $max              Count of maximum repeating in multiple mode
  * @var   string  $name             Name of the input field.
  * @var   string  $fieldname        The field name
+ * @var   string  $fieldId          The field ID
  * @var   string  $control          The forms control
  * @var   string  $label            The field label
  * @var   string  $description      The field description
@@ -41,29 +42,28 @@
 $sublayout = empty($groupByFieldset) ? 'section' : 'section-byfieldsets';
 ?>
 
-	<div class="subform-repeatable-wrapper subform-layout">
-		<joomla-field-subform class="subform-repeatable" name="<?php echo $name; ?>"
-			button-add=".group-add" button-remove=".group-remove" button-move="<?php echo empty($buttons['move']) ? '' : '.group-move' ?>"
-			repeatable-element=".subform-repeatable-group" minimum="<?php echo $min; ?>" maximum="<?php echo $max; ?>">
-			<?php if (!empty($buttons['add'])) : ?>
-			<div class="btn-toolbar">
-				<div class="btn-group">
-					<button type="button" class="group-add btn btn-success" aria-label="<?php echo Text::_('JGLOBAL_FIELD_ADD'); ?>">
-						<span class="icon-plus icon-white" aria-hidden="true"></span>
-					</button>
-				</div>
+<div class="subform-repeatable-wrapper subform-layout">
+	<joomla-field-subform class="subform-repeatable" name="<?php echo $name; ?>"
+		button-add=".group-add" button-remove=".group-remove" button-move="<?php echo empty($buttons['move']) ? '' : '.group-move' ?>"
+		repeatable-element=".subform-repeatable-group" minimum="<?php echo $min; ?>" maximum="<?php echo $max; ?>">
+		<?php if (!empty($buttons['add'])) : ?>
+		<div class="btn-toolbar">
+			<div class="btn-group">
+				<button type="button" class="group-add btn btn-sm button btn-success" aria-label="<?php echo Text::_('JGLOBAL_FIELD_ADD'); ?>">
+					<span class="icon-plus icon-white" aria-hidden="true"></span>
+				</button>
 			</div>
-			<?php endif; ?>
-		<?php
-		foreach ($forms as $k => $form) :
-			echo $this->sublayout($sublayout, array('form' => $form, 'basegroup' => $fieldname, 'group' => $fieldname . $k, 'buttons' => $buttons));
-		endforeach;
-		?>
-		<?php if ($multiple) : ?>
-		<template class="subform-repeatable-template-section hidden"><?php
-			echo trim($this->sublayout($sublayout, array('form' => $tmpl, 'basegroup' => $fieldname, 'group' => $fieldname . 'X', 'buttons' => $buttons)));
-		?></template>
+		</div>
 		<?php endif; ?>
-		</joomla-field-subform>
-	</div>
-
+	<?php
+	foreach ($forms as $k => $form) :
+		echo $this->sublayout($sublayout, array('form' => $form, 'basegroup' => $fieldname, 'group' => $fieldname . $k, 'buttons' => $buttons));
+	endforeach;
+	?>
+	<?php if ($multiple) : ?>
+	<template class="subform-repeatable-template-section hidden"><?php
+		echo trim($this->sublayout($sublayout, array('form' => $tmpl, 'basegroup' => $fieldname, 'group' => $fieldname . 'X', 'buttons' => $buttons)));
+	?></template>
+	<?php endif; ?>
+	</joomla-field-subform>
+</div>
diff --git a/layouts/joomla/form/renderfield.php b/layouts/joomla/form/renderfield.php
index 0385237f5df..036953e3a76 100644
--- a/layouts/joomla/form/renderfield.php
+++ b/layouts/joomla/form/renderfield.php
@@ -33,7 +33,7 @@
 $class           = empty($options['class']) ? '' : ' ' . $options['class'];
 $rel             = empty($options['rel']) ? '' : ' ' . $options['rel'];
 $id              = $name . '-desc';
-$hide            = empty($options['hiddenLabel']) ? '' : ' visually-hidden';
+$hideLabel       = !empty($options['hiddenLabel']);
 $hideDescription = empty($options['hiddenDescription']) ? false : $options['hiddenDescription'];
 
 if (!empty($parentclass))
@@ -43,7 +43,11 @@
 
 ?>
 <div class="control-group<?php echo $class; ?>"<?php echo $rel; ?>>
-	<div class="control-label<?php echo $hide; ?>"><?php echo $label; ?></div>
+	<?php if ($hideLabel) : ?>
+		<div class="visually-hidden"><?php echo $label; ?></div>
+	<?php else : ?>
+		<div class="control-label"><?php echo $label; ?></div>
+	<?php endif; ?>
 	<div class="controls">
 		<?php echo $input; ?>
 		<?php if (!$hideDescription && !empty($description)) : ?>
diff --git a/layouts/joomla/pagination/links.php b/layouts/joomla/pagination/links.php
index e4d7fdd7c01..2b5340b676a 100644
--- a/layouts/joomla/pagination/links.php
+++ b/layouts/joomla/pagination/links.php
@@ -53,7 +53,7 @@
 
 
 <?php if (!empty($pages)) : ?>
-	<nav role="navigation" aria-label="<?php echo Text::_('JLIB_HTML_PAGINATION'); ?>">
+	<nav class="pagination__wrapper" aria-label="<?php echo Text::_('JLIB_HTML_PAGINATION'); ?>">
 		<div class="pagination pagination-toolbar text-center">
 
 			<?php if ($showLimitBox) : ?>
diff --git a/layouts/joomla/pagination/list.php b/layouts/joomla/pagination/list.php
index 13f11b8d4c9..45518ffeac1 100644
--- a/layouts/joomla/pagination/list.php
+++ b/layouts/joomla/pagination/list.php
@@ -14,7 +14,7 @@
 $list = $displayData['list'];
 
 ?>
-<nav role="navigation" aria-label="<?php echo Text::_('JLIB_HTML_PAGINATION'); ?>">
+<nav class="pagination__wrapper" aria-label="<?php echo Text::_('JLIB_HTML_PAGINATION'); ?>">
 	<ul class="pagination ms-0 mb-4">
 		<?php echo $list['start']['data']; ?>
 		<?php echo $list['previous']['data']; ?>
diff --git a/layouts/joomla/searchtools/grid/sort.php b/layouts/joomla/searchtools/grid/sort.php
index 5fa0c8d135c..739272b7d4c 100644
--- a/layouts/joomla/searchtools/grid/sort.php
+++ b/layouts/joomla/searchtools/grid/sort.php
@@ -20,7 +20,7 @@
 
 if ($data->order === $data->selected) :
 	$icon = $data->orderIcon;
-	$sort = $data->direction === 'asc' ? 'ascending' : 'descending';
+	$sort = $data->direction === 'asc' ? 'descending' : 'ascending';
 	$caption = !empty($data->title) ? Text::_($data->title) . ' - ' . $sort : Text::_('JGRID_HEADING_ID');
 	$selected = ' selected';
 	$id = 'id="sorted"';
diff --git a/layouts/joomla/toolbar/batch.php b/layouts/joomla/toolbar/batch.php
index 0d6b43b68cf..9bfd0e74a8b 100644
--- a/layouts/joomla/toolbar/batch.php
+++ b/layouts/joomla/toolbar/batch.php
@@ -20,7 +20,7 @@
 $title = $displayData['title'];
 Text::script('JLIB_HTML_PLEASE_MAKE_A_SELECTION_FROM_THE_LIST');
 Text::script('ERROR');
-$message = "{'error': [Joomla.JText._('JLIB_HTML_PLEASE_MAKE_A_SELECTION_FROM_THE_LIST')]}";
+$message = "{'error': [Joomla.Text._('JLIB_HTML_PLEASE_MAKE_A_SELECTION_FROM_THE_LIST')]}";
 $alert = "Joomla.renderMessages(" . $message . ")";
 ?>
 <button<?php echo $id; ?> type="button" data-bs-toggle="modal" onclick="if (document.adminForm.boxchecked.value==0){<?php echo $alert; ?>}else{document.getElementById('collapseModal').open(); return true;}" class="btn btn-primary">
diff --git a/layouts/plugins/system/privacyconsent/label.php b/layouts/plugins/system/privacyconsent/label.php
index 29496f9c3fa..03b174c09f2 100644
--- a/layouts/plugins/system/privacyconsent/label.php
+++ b/layouts/plugins/system/privacyconsent/label.php
@@ -104,7 +104,7 @@
 			'modalWidth'  => '800',
 			'bodyHeight'  => '500',
 			'footer' => '<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" aria-hidden="true">'
-				. Text::_("JLIB_HTML_BEHAVIOR_CLOSE") . '</button>',
+				. Text::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</button>',
 		]
 	);
 }
diff --git a/layouts/plugins/user/terms/label.php b/layouts/plugins/user/terms/label.php
index 2267373b7e9..504884ab8ac 100644
--- a/layouts/plugins/user/terms/label.php
+++ b/layouts/plugins/user/terms/label.php
@@ -103,7 +103,7 @@
 			'modalWidth'  => '800',
 			'bodyHeight'  => '500',
 			'footer' => '<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" aria-hidden="true">'
-				. Text::_("JLIB_HTML_BEHAVIOR_CLOSE") . '</button>',
+				. Text::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</button>',
 		]
 	);
 }
diff --git a/libraries/src/Application/DaemonApplication.php b/libraries/src/Application/DaemonApplication.php
index 43e1ed1b52a..273fb503da0 100644
--- a/libraries/src/Application/DaemonApplication.php
+++ b/libraries/src/Application/DaemonApplication.php
@@ -466,7 +466,7 @@ protected function changeIdentity()
 		// Change the user id for the process necessary.
 		if ($uid && (posix_getuid($file) != $uid) && (!@ posix_setuid($uid)))
 		{
-			Log::add('Unable to change user ownership of the proccess.', Log::ERROR);
+			Log::add('Unable to change user ownership of the process.', Log::ERROR);
 
 			return false;
 		}
@@ -474,7 +474,7 @@ protected function changeIdentity()
 		// Change the group id for the process necessary.
 		if ($gid && (posix_getgid($file) != $gid) && (!@ posix_setgid($gid)))
 		{
-			Log::add('Unable to change group ownership of the proccess.', Log::ERROR);
+			Log::add('Unable to change group ownership of the process.', Log::ERROR);
 
 			return false;
 		}
@@ -806,15 +806,15 @@ protected function writeProcessIdFile()
 		// Write the process id file out to disk.
 		if (!file_put_contents($file, $this->processId))
 		{
-			Log::add('Unable to write proccess id file: ' . $file, Log::ERROR);
+			Log::add('Unable to write process id file: ' . $file, Log::ERROR);
 
 			return false;
 		}
 
-		// Make sure the permissions for the proccess id file are accurate.
+		// Make sure the permissions for the process id file are accurate.
 		if (!chmod($file, 0644))
 		{
-			Log::add('Unable to adjust permissions for the proccess id file: ' . $file, Log::ERROR);
+			Log::add('Unable to adjust permissions for the process id file: ' . $file, Log::ERROR);
 
 			return false;
 		}
diff --git a/libraries/src/Console/SetConfigurationCommand.php b/libraries/src/Console/SetConfigurationCommand.php
index 876c33ad539..2adc3d5ab53 100644
--- a/libraries/src/Console/SetConfigurationCommand.php
+++ b/libraries/src/Console/SetConfigurationCommand.php
@@ -341,7 +341,7 @@ public function checkDb($options): bool
 
 		if (!$model->validateDbConnection($options))
 		{
-			$this->ioStyle->error(Text::_('Failed to validate the db connection encription properties'));
+			$this->ioStyle->error(Text::_('Failed to validate the db connection encryption properties'));
 
 			return false;
 		}
diff --git a/libraries/src/Form/Field/ModulepositionField.php b/libraries/src/Form/Field/ModulepositionField.php
index 5813e6441d2..f3b072249a7 100644
--- a/libraries/src/Form/Field/ModulepositionField.php
+++ b/libraries/src/Form/Field/ModulepositionField.php
@@ -169,7 +169,7 @@ protected function getInput()
 				'modalWidth'  => '800',
 				'bodyHeight'  => '450',
 				'footer' => '<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" aria-hidden="true">'
-					. Text::_("JLIB_HTML_BEHAVIOR_CLOSE") . '</button>'
+					. Text::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</button>'
 			)
 		);
 		$html[] = '</div>';
diff --git a/libraries/src/Form/Field/SubformField.php b/libraries/src/Form/Field/SubformField.php
index 6db87706706..ed2ee8f3029 100644
--- a/libraries/src/Form/Field/SubformField.php
+++ b/libraries/src/Form/Field/SubformField.php
@@ -247,6 +247,7 @@ protected function getInput()
 		$data['control']   = $control;
 		$data['buttons']   = $this->buttons;
 		$data['fieldname'] = $this->fieldname;
+		$data['fieldId']   = $this->id;
 		$data['groupByFieldset'] = $this->groupByFieldset;
 
 		/**
@@ -369,13 +370,13 @@ public function loadSubForm()
 	/**
 	 * Binds given data to the subform and its elements.
 	 *
-	 * @param   Form  &$subForm  Form instance of the subform.
+	 * @param   Form  $subForm  Form instance of the subform.
 	 *
 	 * @return  Form[]  Array of Form instances for the rows.
 	 *
 	 * @since   3.9.7
 	 */
-	private function loadSubFormData(Form &$subForm)
+	protected function loadSubFormData(Form $subForm)
 	{
 		$value = $this->value ? (array) $this->value : array();
 
diff --git a/libraries/src/Form/FormField.php b/libraries/src/Form/FormField.php
index a1693de735d..d7b81d39875 100644
--- a/libraries/src/Form/FormField.php
+++ b/libraries/src/Form/FormField.php
@@ -1311,8 +1311,8 @@ public function postProcess($value, $group = null, Registry $input = null)
 	protected function getLayoutData()
 	{
 		// Label preprocess
-		$label = $this->element['label'] ? (string) $this->element['label'] : (string) $this->element['name'];
-		$label = $this->translateLabel ? Text::_($label) : $label;
+		$label = !empty($this->element['label']) ? (string) $this->element['label'] : null;
+		$label = $label && $this->translateLabel ? Text::_($label) : $label;
 
 		// Description preprocess
 		$description = !empty($this->description) ? $this->description : null;
diff --git a/libraries/src/Form/Rule/ModuleLayoutRule.php b/libraries/src/Form/Rule/ModuleLayoutRule.php
index 39bf263ec74..00e9136b46e 100644
--- a/libraries/src/Form/Rule/ModuleLayoutRule.php
+++ b/libraries/src/Form/Rule/ModuleLayoutRule.php
@@ -23,7 +23,7 @@ class ModuleLayoutRule extends FormRule
 	 * The regular expression to use in testing a module layout field value.
 	 *
 	 * A valid module layout field value consists of
-	 * - optionally a template name with only characters, numbers, hypens and
+	 * - optionally a template name with only characters, numbers, hyphens and
 	 *   underscores, which can also be just "_" for layouts provided by the
 	 *   module, followed by a colon.
 	 * - the base name of the layout file, not starting with a dot and with
diff --git a/libraries/src/Helper/MediaHelper.php b/libraries/src/Helper/MediaHelper.php
index 419e7c3cc19..04d88ffc524 100644
--- a/libraries/src/Helper/MediaHelper.php
+++ b/libraries/src/Helper/MediaHelper.php
@@ -145,14 +145,15 @@ private function checkMimeType($mime, $component = 'com_media'): bool
 	/**
 	 * Checks if the file can be uploaded
 	 *
-	 * @param   array   $file       File information
-	 * @param   string  $component  The option name for the component storing the parameters
+	 * @param   array   $file                File information
+	 * @param   string  $component           The option name for the component storing the parameters
+	 * @param   string  $allowedExecutables  Array of executable file types that shall be whitelisted
 	 *
 	 * @return  boolean
 	 *
 	 * @since   3.2
 	 */
-	public function canUpload($file, $component = 'com_media')
+	public function canUpload($file, $component = 'com_media', $allowedExecutables = array())
 	{
 		$app    = Factory::getApplication();
 		$params = ComponentHelper::getParams($component);
@@ -186,9 +187,15 @@ public function canUpload($file, $component = 'com_media')
 		// Media file names should never have executable extensions buried in them.
 		$executable = array(
 			'php', 'js', 'exe', 'phtml', 'java', 'perl', 'py', 'asp', 'dll', 'go', 'ade', 'adp', 'bat', 'chm', 'cmd', 'com', 'cpl', 'hta', 'ins', 'isp',
-			'jse', 'lib', 'mde', 'msc', 'msp', 'mst', 'pif', 'scr', 'sct', 'shb', 'sys', 'vb', 'vbe', 'vbs', 'vxd', 'wsc', 'wsf', 'wsh',
+			'jse', 'lib', 'mde', 'msc', 'msp', 'mst', 'pif', 'scr', 'sct', 'shb', 'sys', 'vb', 'vbe', 'vbs', 'vxd', 'wsc', 'wsf', 'wsh', 'html', 'htm',
 		);
 
+		// Remove allowed executables from array
+		if (count($allowedExecutables))
+		{
+			$executable = array_diff($executable, $allowedExecutables);
+		}
+
 		$check = array_intersect($filetypes, $executable);
 
 		if (!empty($check))
diff --git a/libraries/src/MVC/Controller/AdminController.php b/libraries/src/MVC/Controller/AdminController.php
index e1c5d51d52e..c24d3898584 100644
--- a/libraries/src/MVC/Controller/AdminController.php
+++ b/libraries/src/MVC/Controller/AdminController.php
@@ -400,6 +400,9 @@ public function checkin()
 	 */
 	public function saveOrderAjax()
 	{
+		// Check for request forgeries.
+		$this->checkToken();
+
 		// Get the input
 		$pks = $this->input->post->get('cid', array(), 'array');
 		$order = $this->input->post->get('order', array(), 'array');
diff --git a/libraries/src/Toolbar/Button/ConfirmButton.php b/libraries/src/Toolbar/Button/ConfirmButton.php
index 7634f6d4ff4..8641e2762a5 100644
--- a/libraries/src/Toolbar/Button/ConfirmButton.php
+++ b/libraries/src/Toolbar/Button/ConfirmButton.php
@@ -84,7 +84,7 @@ protected function _getCommand()
 
 		if ($this->getListCheck())
 		{
-			$message = "{'error': [Joomla.JText._('JLIB_HTML_PLEASE_MAKE_A_SELECTION_FROM_THE_LIST')]}";
+			$message = "{'error': [Joomla.Text._('JLIB_HTML_PLEASE_MAKE_A_SELECTION_FROM_THE_LIST')]}";
 			$alert = 'Joomla.renderMessages(' . $message . ')';
 			$cmd   = 'if (document.adminForm.boxchecked.value == 0) { ' . $alert . ' } else { ' . $cmd . ' }';
 		}
diff --git a/libraries/src/Toolbar/Button/StandardButton.php b/libraries/src/Toolbar/Button/StandardButton.php
index 0dbcf901e68..09df41a6de5 100644
--- a/libraries/src/Toolbar/Button/StandardButton.php
+++ b/libraries/src/Toolbar/Button/StandardButton.php
@@ -134,7 +134,7 @@ protected function _getCommand()
 
 		if ($this->getListCheck())
 		{
-			$messages = "{error: [Joomla.JText._('JLIB_HTML_PLEASE_MAKE_A_SELECTION_FROM_THE_LIST')]}";
+			$messages = "{error: [Joomla.Text._('JLIB_HTML_PLEASE_MAKE_A_SELECTION_FROM_THE_LIST')]}";
 			$alert = 'Joomla.renderMessages(' . $messages . ')';
 			$cmd   = 'if (document.adminForm.boxchecked.value == 0) { ' . $alert . ' } else { ' . $cmd . ' }';
 		}
diff --git a/libraries/src/Updater/Adapter/ExtensionAdapter.php b/libraries/src/Updater/Adapter/ExtensionAdapter.php
index ae2ce36537d..df35e30f13a 100644
--- a/libraries/src/Updater/Adapter/ExtensionAdapter.php
+++ b/libraries/src/Updater/Adapter/ExtensionAdapter.php
@@ -158,8 +158,8 @@ protected function _endElement($parser, $name)
 						// Do we have an entry for the database?
 						if (\array_key_exists($dbType, $supportedDbs))
 						{
-							$minumumVersion = $supportedDbs[$dbType];
-							$dbMatch        = version_compare($dbVersion, $minumumVersion, '>=');
+							$minimumVersion = $supportedDbs[$dbType];
+							$dbMatch        = version_compare($dbVersion, $minimumVersion, '>=');
 
 							if (!$dbMatch)
 							{
@@ -170,7 +170,7 @@ protected function _endElement($parser, $name)
 									$this->currentUpdate->version,
 									Text::_($db->name),
 									$dbVersion,
-									$minumumVersion
+									$minimumVersion
 								);
 
 								Factory::getApplication()->enqueueMessage($dbMsg, 'warning');
diff --git a/libraries/src/Updater/Update.php b/libraries/src/Updater/Update.php
index 7553e7b4ca4..4f6887ad9d8 100644
--- a/libraries/src/Updater/Update.php
+++ b/libraries/src/Updater/Update.php
@@ -369,8 +369,8 @@ public function _endElement($parser, $name)
 						// Do we have an entry for the database?
 						if (isset($supportedDbs->$dbType))
 						{
-							$minumumVersion = $supportedDbs->$dbType;
-							$dbMatch        = version_compare($dbVersion, $minumumVersion, '>=');
+							$minimumVersion = $supportedDbs->$dbType;
+							$dbMatch        = version_compare($dbVersion, $minimumVersion, '>=');
 						}
 					}
 					else
diff --git a/libraries/src/Version.php b/libraries/src/Version.php
index 0cd6382f796..a1897efced7 100644
--- a/libraries/src/Version.php
+++ b/libraries/src/Version.php
@@ -85,7 +85,7 @@ final class Version
 	 * @var    string
 	 * @since  3.5
 	 */
-	const RELDATE = '1-June-2021';
+	const RELDATE = '15-June-2021';
 
 	/**
 	 * Release time.
@@ -93,7 +93,7 @@ final class Version
 	 * @var    string
 	 * @since  3.5
 	 */
-	const RELTIME = '20:47';
+	const RELTIME = '18:15';
 
 	/**
 	 * Release timezone.
diff --git a/modules/mod_articles_popular/mod_articles_popular.php b/modules/mod_articles_popular/mod_articles_popular.php
index d9aaa7f0f4c..7f7fea873d4 100644
--- a/modules/mod_articles_popular/mod_articles_popular.php
+++ b/modules/mod_articles_popular/mod_articles_popular.php
@@ -9,9 +9,19 @@
 
 defined('_JEXEC') or die;
 
+use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Helper\ModuleHelper;
+use Joomla\CMS\Language\Text;
 use Joomla\Module\ArticlesPopular\Site\Helper\ArticlesPopularHelper;
 
+// Exit early if hits are disabled.
+if (!ComponentHelper::getParams('com_content')->get('record_hits', 1))
+{
+	echo Text::_('JGLOBAL_RECORD_HITS_DISABLED');
+
+	return;
+}
+
 $list = ArticlesPopularHelper::getList($params);
 
 require ModuleHelper::getLayoutPath('mod_articles_popular', $params->get('layout', 'default'));
diff --git a/modules/mod_articles_popular/src/Helper/ArticlesPopularHelper.php b/modules/mod_articles_popular/src/Helper/ArticlesPopularHelper.php
index a4d2a7b24db..3dff24350b1 100644
--- a/modules/mod_articles_popular/src/Helper/ArticlesPopularHelper.php
+++ b/modules/mod_articles_popular/src/Helper/ArticlesPopularHelper.php
@@ -14,7 +14,6 @@
 use Joomla\CMS\Access\Access;
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
 use Joomla\Component\Content\Administrator\Extension\ContentComponent;
 use Joomla\Component\Content\Site\Helper\RouteHelper;
@@ -37,14 +36,6 @@ public static function getList(&$params)
 	{
 		$app = Factory::getApplication();
 
-		// Exit early if hits are disabled
-		if (!ComponentHelper::getParams('com_content')->get('record_hits', 1))
-		{
-			echo Text::_('JGLOBAL_RECORD_HITS_DISABLED');
-
-			return;
-		}
-
 		// Get an instance of the generic articles model
 		$model = $app->bootComponent('com_content')
 			->getMVCFactory()->createModel('Articles', 'Site', ['ignore_request' => true]);
diff --git a/modules/mod_breadcrumbs/tmpl/default.php b/modules/mod_breadcrumbs/tmpl/default.php
index 4481b731bde..56968f9f94d 100644
--- a/modules/mod_breadcrumbs/tmpl/default.php
+++ b/modules/mod_breadcrumbs/tmpl/default.php
@@ -16,7 +16,7 @@
 use Joomla\CMS\WebAsset\WebAssetManager;
 
 ?>
-<nav role="navigation" aria-label="<?php echo $module->title; ?>">
+<nav class="mod-breadcrumbs__wrapper" aria-label="<?php echo htmlspecialchars($module->title, ENT_QUOTES, 'UTF-8'); ?>">
 	<ol itemscope itemtype="https://schema.org/BreadcrumbList" class="mod-breadcrumbs breadcrumb px-3 py-2">
 		<?php if ($params->get('showHere', 1)) : ?>
 			<li class="mod-breadcrumbs__here float-start">
diff --git a/modules/mod_menu/tmpl/collapse-default.php b/modules/mod_menu/tmpl/collapse-default.php
index 4c81542fd4e..716dd2d28c2 100644
--- a/modules/mod_menu/tmpl/collapse-default.php
+++ b/modules/mod_menu/tmpl/collapse-default.php
@@ -16,10 +16,10 @@
 ?>
 
 <nav class="navbar navbar-expand-md">
-	<button class="navbar-toggler navbar-toggler-right" type="button" data-bs-toggle="collapse" data-bs-target="#navbar" aria-controls="navbar" aria-expanded="false" aria-label="<?php echo Text::_('MOD_MENU_TOGGLE'); ?>">
+	<button class="navbar-toggler navbar-toggler-right" type="button" data-bs-toggle="collapse" data-bs-target="#navbar<?php echo $module->id; ?>" aria-controls="navbar<?php echo $module->id; ?>" aria-expanded="false" aria-label="<?php echo Text::_('MOD_MENU_TOGGLE'); ?>">
 		<span class="icon-menu" aria-hidden="true"></span>
 	</button>
-	<div class="collapse navbar-collapse" id="navbar">
+	<div class="collapse navbar-collapse" id="navbar<?php echo $module->id; ?>">
 		<?php require __DIR__ . '/default.php'; ?>
 	</div>
 </nav>
diff --git a/modules/mod_tags_popular/src/Helper/TagsPopularHelper.php b/modules/mod_tags_popular/src/Helper/TagsPopularHelper.php
index 876c43c11fa..86bce689a5b 100644
--- a/modules/mod_tags_popular/src/Helper/TagsPopularHelper.php
+++ b/modules/mod_tags_popular/src/Helper/TagsPopularHelper.php
@@ -124,6 +124,9 @@ public static function getList(&$params)
 
 			if ($params->get('order_value', 'title') === 'title')
 			{
+				// Backup bound parameters array of the original query
+				$bounded = $query->getBounded();
+
 				$query->setLimit($maximum);
 				$query->order($db->quoteName('count') . ' DESC');
 				$equery = $db->getQuery(true)
@@ -142,6 +145,12 @@ public static function getList(&$params)
 					->order($db->quoteName('a.title') . ' ' . $order_direction);
 
 				$query = $equery;
+
+				// Rebind parameters
+				foreach ($bounded as $key => $obj)
+				{
+					$query->bind($key, $obj->value, $obj->dataType);
+				}
 			}
 			else
 			{
diff --git a/package-lock.json b/package-lock.json
index 805a967cada..96d72937211 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2729,9 +2729,9 @@
       }
     },
     "node_modules/codemirror": {
-      "version": "5.61.0",
-      "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.61.0.tgz",
-      "integrity": "sha512-D3wYH90tYY1BsKlUe0oNj2JAhQ9TepkD51auk3N7q+4uz7A/cgJ5JsWHreT0PqieW1QhOuqxQ2reCXV1YXzecg=="
+      "version": "5.61.1",
+      "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.61.1.tgz",
+      "integrity": "sha512-+D1NZjAucuzE93vJGbAaXzvoBHwp9nJZWWWF9utjv25+5AZUiah6CIlfb4ikG4MoDsFsCG8niiJH5++OO2LgIQ=="
     },
     "node_modules/color": {
       "version": "3.1.3",
@@ -12235,9 +12235,9 @@
       }
     },
     "codemirror": {
-      "version": "5.61.0",
-      "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.61.0.tgz",
-      "integrity": "sha512-D3wYH90tYY1BsKlUe0oNj2JAhQ9TepkD51auk3N7q+4uz7A/cgJ5JsWHreT0PqieW1QhOuqxQ2reCXV1YXzecg=="
+      "version": "5.61.1",
+      "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.61.1.tgz",
+      "integrity": "sha512-+D1NZjAucuzE93vJGbAaXzvoBHwp9nJZWWWF9utjv25+5AZUiah6CIlfb4ikG4MoDsFsCG8niiJH5++OO2LgIQ=="
     },
     "color": {
       "version": "3.1.3",
diff --git a/plugins/actionlog/joomla/joomla.php b/plugins/actionlog/joomla/joomla.php
index 84ecef5045d..bf19667b39c 100644
--- a/plugins/actionlog/joomla/joomla.php
+++ b/plugins/actionlog/joomla/joomla.php
@@ -135,7 +135,7 @@ public function onContentAfterSave($context, $article, $isNew): void
 			'type'     => $params->text_prefix . '_TYPE_' . $params->type_title,
 			'id'       => $id,
 			'title'    => $article->get($params->title_holder),
-			'itemlink' => ActionlogsHelper::getContentTypeLink($option, $contentType, $id, $params->id_holder),
+			'itemlink' => ActionlogsHelper::getContentTypeLink($option, $contentType, $id, $params->id_holder, $article),
 		);
 
 		$this->addLog(array($message), $messageLanguageKey, $context);
@@ -284,7 +284,7 @@ public function onContentChangeState($context, $pks, $value)
 				'type'        => $params->text_prefix . '_TYPE_' . $params->type_title,
 				'id'          => $pk,
 				'title'       => $items[$pk]->{$params->title_holder},
-				'itemlink'    => ActionlogsHelper::getContentTypeLink($option, $contentType, $pk, $params->id_holder),
+				'itemlink'    => ActionlogsHelper::getContentTypeLink($option, $contentType, $pk, $params->id_holder, null),
 			);
 
 			$messages[] = $message;
diff --git a/plugins/editors/codemirror/codemirror.xml b/plugins/editors/codemirror/codemirror.xml
index 115a17864a6..8ab82841f21 100644
--- a/plugins/editors/codemirror/codemirror.xml
+++ b/plugins/editors/codemirror/codemirror.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="plugin" group="editors" method="upgrade">
 	<name>plg_editors_codemirror</name>
-	<version>5.61.0</version>
+	<version>5.61.1</version>
 	<creationDate>28 March 2011</creationDate>
 	<author>Marijn Haverbeke</author>
 	<authorEmail>marijnh@gmail.com</authorEmail>
diff --git a/plugins/editors/tinymce/tinymce.php b/plugins/editors/tinymce/tinymce.php
index 602de0b9673..65183b25305 100644
--- a/plugins/editors/tinymce/tinymce.php
+++ b/plugins/editors/tinymce/tinymce.php
@@ -532,7 +532,7 @@ public function onDisplay(
 			}
 
 			Text::script('PLG_TINY_ERR_UNSUPPORTEDBROWSER');
-			Text::script('JERROR');
+			Text::script('ERROR');
 			Text::script('PLG_TINY_DND_ADDITIONALDATA');
 			Text::script('PLG_TINY_DND_ALTTEXT');
 			Text::script('PLG_TINY_DND_LAZYLOADED');
diff --git a/plugins/installer/urlinstaller/tmpl/default.php b/plugins/installer/urlinstaller/tmpl/default.php
index e3e494bb2e7..83ed4dc8ec1 100644
--- a/plugins/installer/urlinstaller/tmpl/default.php
+++ b/plugins/installer/urlinstaller/tmpl/default.php
@@ -13,8 +13,6 @@
 
 /** @var PlgInstallerUrlInstaller $this */
 
-Text::script('PLG_INSTALLER_URLINSTALLER_NO_URL');
-
 $this->app->getDocument()->getWebAssetManager()
 	->registerAndUseScript('plg_installer_urlinstaller.urlinstaller', 'plg_installer_urlinstaller/urlinstaller.js', [], ['defer' => true], ['core']);
 
diff --git a/plugins/installer/webinstaller/webinstaller.php b/plugins/installer/webinstaller/webinstaller.php
index 0e98a21ea46..dd0b7014096 100644
--- a/plugins/installer/webinstaller/webinstaller.php
+++ b/plugins/installer/webinstaller/webinstaller.php
@@ -11,7 +11,6 @@
 
 use Joomla\CMS\Application\CMSApplication;
 use Joomla\CMS\Form\Rule\UrlRule;
-use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Plugin\CMSPlugin;
 use Joomla\CMS\Plugin\PluginHelper;
@@ -78,16 +77,13 @@ public function onInstallerAddInstallationTab()
 		Text::script('PLG_INSTALLER_WEBINSTALLER_CANNOT_INSTALL_EXTENSION_IN_PLUGIN');
 		Text::script('PLG_INSTALLER_WEBINSTALLER_REDIRECT_TO_EXTERNAL_SITE_TO_INSTALL');
 
-		// TEMPORARY - Make sure Bootstrap is booted so that our client initialisation scripts can find the tab
-		HTMLHelper::_('bootstrap.framework');
-
 		$doc->getWebAssetManager()
 			->registerAndUseStyle('plg_installer_webinstaller.client', 'plg_installer_webinstaller/client.min.css')
 			->registerAndUseScript(
 				'plg_installer_webinstaller.client',
 				'plg_installer_webinstaller/client.min.js',
 				[],
-				['defer' => true],
+				['type' => 'module'],
 				['core']
 			);
 
diff --git a/plugins/sampledata/blog/blog.php b/plugins/sampledata/blog/blog.php
index fb05e2af0cc..31ea7f86859 100644
--- a/plugins/sampledata/blog/blog.php
+++ b/plugins/sampledata/blog/blog.php
@@ -67,13 +67,13 @@ class PlgSampledataBlog extends CMSPlugin
 	/**
 	 * Get an overview of the proposed sampledata.
 	 *
-	 * @return  boolean  True on success.
+	 * @return  stdClass|void  Will be converted into the JSON response to the module.
 	 *
 	 * @since  3.8.0
 	 */
 	public function onSampledataGetOverview()
 	{
-		if (!Factory::getUser()->authorise('core.create', 'com_content'))
+		if (!$this->app->getIdentity()->authorise('core.create', 'com_content'))
 		{
 			return;
 		}
@@ -91,7 +91,7 @@ public function onSampledataGetOverview()
 	/**
 	 * First step to enter the sampledata. Content.
 	 *
-	 * @return  array or void  Will be converted into the JSON response to the module.
+	 * @return  array|void  Will be converted into the JSON response to the module.
 	 *
 	 * @since  3.8.0
 	 */
@@ -113,14 +113,15 @@ public function onAjaxSampledataApplyStep1()
 
 		// Get some metadata.
 		$access = (int) $this->app->get('access', 1);
-		$user   = Factory::getUser();
+		$user   = $this->app->getIdentity();
 
 		// Detect language to be used.
-		$language   = Multilanguage::isEnabled() ? Factory::getLanguage()->getTag() : '*';
+		$language   = Multilanguage::isEnabled() ? $this->app->getLanguage()->getTag() : '*';
 		$langSuffix = ($language !== '*') ? ' (' . $language . ')' : '';
 
 		/** @var \Joomla\Component\Tags\Administrator\Model\TagModel $model */
-		$modelTag = $this->app->bootComponent('com_tags')->getMVCFactory()->createModel('Tag', 'Administrator', ['ignore_request' => true]);
+		$modelTag = $this->app->bootComponent('com_tags')->getMVCFactory()
+			->createModel('Tag', 'Administrator', ['ignore_request' => true]);
 
 		$tagIds = array();
 
@@ -146,7 +147,7 @@ public function onAjaxSampledataApplyStep1()
 			{
 				if (!$modelTag->save($tag))
 				{
-					Factory::getLanguage()->load('com_tags');
+					$this->app->getLanguage()->load('com_tags');
 					throw new Exception(Text::_($modelTag->getError()));
 				}
 			}
@@ -162,7 +163,7 @@ public function onAjaxSampledataApplyStep1()
 			$tagIds[] = $modelTag->getItem()->id;
 		}
 
-		if (!ComponentHelper::isEnabled('com_content') || !Factory::getUser()->authorise('core.create', 'com_content'))
+		if (!ComponentHelper::isEnabled('com_content') || !$this->app->getIdentity()->authorise('core.create', 'com_content'))
 		{
 			$response            = array();
 			$response['success'] = true;
@@ -173,7 +174,7 @@ public function onAjaxSampledataApplyStep1()
 
 		if (ComponentHelper::isEnabled('com_fields') && $user->authorise('core.create', 'com_fields'))
 		{
-			Factory::getLanguage()->load('com_fields');
+			$this->app->getLanguage()->load('com_fields');
 
 			$mvcFactory = $this->app->bootComponent('com_fields')->getMVCFactory();
 
@@ -283,7 +284,7 @@ public function onAjaxSampledataApplyStep1()
 			}
 		}
 
-		if (ComponentHelper::isEnabled('com_workflow') && Factory::getUser()->authorise('core.create', 'com_workflow'))
+		if (ComponentHelper::isEnabled('com_workflow') && $this->app->getIdentity()->authorise('core.create', 'com_workflow'))
 		{
 			$this->app->bootComponent('com_workflow');
 
@@ -531,7 +532,7 @@ public function onAjaxSampledataApplyStep1()
 			{
 				if (!$categoryModel->save($category))
 				{
-					Factory::getLanguage()->load('com_categories');
+					$this->app->getLanguage()->load('com_categories');
 					throw new Exception($categoryModel->getError());
 				}
 			}
@@ -779,12 +780,11 @@ public function onAjaxSampledataApplyStep1()
 			}
 
 			// Add a value to the custom field if a value is given
-			if (ComponentHelper::isEnabled('com_fields') && Factory::getUser()->authorise('core.create', 'com_fields'))
+			if (ComponentHelper::isEnabled('com_fields') && $this->app->getIdentity()->authorise('core.create', 'com_fields'))
 			{
 				if (!empty($article['authorValue']))
 				{
 					// Store a field value
-					$query = $this->db->getQuery(true);
 
 					$valueAuthor = (object) [
 						'item_id'  => $articleModel->getItem()->id,
@@ -800,9 +800,9 @@ public function onAjaxSampledataApplyStep1()
 		$this->app->setUserState('sampledata.blog.articles', $ids);
 		$this->app->setUserState('sampledata.blog.articles.catIds', $catIds);
 
-		$response          = new stdClass;
-		$response->success = true;
-		$response->message = Text::_('PLG_SAMPLEDATA_BLOG_STEP1_SUCCESS');
+		$response            = [];
+		$response['success'] = true;
+		$response['message'] = Text::_('PLG_SAMPLEDATA_BLOG_STEP1_SUCCESS');
 
 		return $response;
 	}
@@ -810,7 +810,7 @@ public function onAjaxSampledataApplyStep1()
 	/**
 	 * Second step to enter the sampledata. Menus.
 	 *
-	 * @return  array or void  Will be converted into the JSON response to the module.
+	 * @return  array|void  Will be converted into the JSON response to the module.
 	 *
 	 * @since  3.8.0
 	 */
@@ -821,7 +821,7 @@ public function onAjaxSampledataApplyStep2()
 			return;
 		}
 
-		if (!ComponentHelper::isEnabled('com_menus') || !Factory::getUser()->authorise('core.create', 'com_menus'))
+		if (!ComponentHelper::isEnabled('com_menus') || !$this->app->getIdentity()->authorise('core.create', 'com_menus'))
 		{
 			$response            = array();
 			$response['success'] = true;
@@ -831,7 +831,7 @@ public function onAjaxSampledataApplyStep2()
 		}
 
 		// Detect language to be used.
-		$language   = Multilanguage::isEnabled() ? Factory::getLanguage()->getTag() : '*';
+		$language   = Multilanguage::isEnabled() ? $this->app->getLanguage()->getTag() : '*';
 		$langSuffix = ($language !== '*') ? ' (' . $language . ')' : '';
 
 		// Create the menu types.
@@ -858,7 +858,7 @@ public function onAjaxSampledataApplyStep2()
 
 				if (!$menuTable->check())
 				{
-					Factory::getLanguage()->load('com_menu');
+					$this->app->getLanguage()->load('com_menu');
 					throw new Exception($menuTable->getError());
 				}
 
@@ -1378,25 +1378,20 @@ public function onAjaxSampledataApplyStep2()
 	/**
 	 * Third step to enter the sampledata. Modules.
 	 *
-	 * @return  array or void  Will be converted into the JSON response to the module.
+	 * @return  array|void  Will be converted into the JSON response to the module.
 	 *
 	 * @since  3.8.0
 	 */
 	public function onAjaxSampledataApplyStep3()
 	{
-		$app = Factory::getApplication();
-
-		// Get previously entered categories ids
-		$catIds = $this->app->getUserState('sampledata.blog.articles.catIds');
-
 		if (!Session::checkToken('get') || $this->app->input->get('type') != $this->_name)
 		{
 			return;
 		}
 
-		Factory::getLanguage()->load('com_modules');
+		$this->app->getLanguage()->load('com_modules');
 
-		if (!ComponentHelper::isEnabled('com_modules') || !Factory::getUser()->authorise('core.create', 'com_modules'))
+		if (!ComponentHelper::isEnabled('com_modules') || !$this->app->getIdentity()->authorise('core.create', 'com_modules'))
 		{
 			$response            = array();
 			$response['success'] = true;
@@ -1406,7 +1401,7 @@ public function onAjaxSampledataApplyStep3()
 		}
 
 		// Detect language to be used.
-		$language   = Multilanguage::isEnabled() ? Factory::getLanguage()->getTag() : '*';
+		$language   = Multilanguage::isEnabled() ? $this->app->getLanguage()->getTag() : '*';
 		$langSuffix = ($language !== '*') ? ' (' . $language . ')' : '';
 
 		// Add Include Paths.
@@ -1421,6 +1416,7 @@ public function onAjaxSampledataApplyStep3()
 		// Get previously entered Data from UserStates
 		$menuTypes = $this->app->getUserState('sampledata.blog.menutypes');
 
+		// Get previously entered categories ids
 		$catIds = $this->app->getUserState('sampledata.blog.articles.catIds');
 
 		// Link to article "typography" in banner module
@@ -1735,7 +1731,7 @@ public function onAjaxSampledataApplyStep3()
 
 		if (!isset($home))
 		{
-			$home = $app->getMenu('site')->getDefault()->id;
+			$home = $this->app->getMenu('site')->getDefault()->id;
 		}
 
 		foreach ($modules as $module)
@@ -1835,7 +1831,7 @@ public function onAjaxSampledataApplyStep3()
 	/**
 	 * Final step to show completion of sampledata.
 	 *
-	 * @return  array or void  Will be converted into the JSON response to the module.
+	 * @return  array|void  Will be converted into the JSON response to the module.
 	 *
 	 * @since  4.0.0
 	 */
@@ -1868,11 +1864,10 @@ private function addMenuItems(array $menuItems, $level)
 	{
 		$itemIds = array();
 		$access  = (int) $this->app->get('access', 1);
-		$user    = Factory::getUser();
-		$app     = Factory::getApplication();
+		$user    = $this->app->getIdentity();
 
 		// Detect language to be used.
-		$language   = Multilanguage::isEnabled() ? Factory::getLanguage()->getTag() : '*';
+		$language   = Multilanguage::isEnabled() ? $this->app->getLanguage()->getTag() : '*';
 		$langSuffix = ($language !== '*') ? ' (' . $language . ')' : '';
 
 		foreach ($menuItems as $menuItem)
@@ -1888,9 +1883,9 @@ private function addMenuItems(array $menuItems, $level)
 			// Set unicodeslugs if alias is empty
 			if (trim(str_replace('-', '', $menuItem['alias']) == ''))
 			{
-				$unicode = $app->set('unicodeslugs', 1);
+				$unicode = $this->app->set('unicodeslugs', 1);
 				$menuItem['alias'] = ApplicationHelper::stringURLSafe($menuItem['title']);
-				$app->set('unicodeslugs', $unicode);
+				$this->app->set('unicodeslugs', $unicode);
 			}
 
 			// Append language suffix to title.
diff --git a/plugins/sampledata/multilang/multilang.php b/plugins/sampledata/multilang/multilang.php
index 0ef220994cb..9aa01dde53e 100644
--- a/plugins/sampledata/multilang/multilang.php
+++ b/plugins/sampledata/multilang/multilang.php
@@ -58,15 +58,6 @@ class PlgSampledataMultilang extends CMSPlugin
 	 */
 	protected $autoloadLanguage = true;
 
-	/**
-	 * Holds the menuitem model
-	 *
-	 * @var     MenusModelItem
-	 *
-	 * @since   4.0.0
-	 */
-	private $menuItemModel;
-
 	/**
 	 * @var     string language path
 	 *
@@ -75,7 +66,7 @@ class PlgSampledataMultilang extends CMSPlugin
 	protected $path = null;
 
 	/**
-	 * @var    Admin Id, author of all generated content.
+	 * @var    integer Id, author of all generated content.
 	 *
 	 * @since   4.0.0
 	 */
@@ -84,13 +75,13 @@ class PlgSampledataMultilang extends CMSPlugin
 	/**
 	 * Get an overview of the proposed sampledata.
 	 *
-	 * @return  boolean  True on success.
+	 * @return  stdClass|void  Will be converted into the JSON response to the module.
 	 *
 	 * @since   4.0.0
 	 */
 	public function onSampledataGetOverview()
 	{
-		if (!Factory::getUser()->authorise('core.create', 'com_content'))
+		if (!$this->app->getIdentity()->authorise('core.create', 'com_content'))
 		{
 			return;
 		}
@@ -135,7 +126,7 @@ public function onAjaxSampledataApplyStep1()
 			$response            = array();
 			$response['success'] = false;
 
-			$lang = Factory::getLanguage()->getTag();
+			$lang = $this->app->getLanguage();
 			$lang->load('plg_system_languagefilter', JPATH_ADMINISTRATOR);
 			$message = $lang->_('PLG_SYSTEM_LANGUAGEFILTER');
 
@@ -144,9 +135,9 @@ public function onAjaxSampledataApplyStep1()
 			return $response;
 		}
 
-		$response          = new stdClass;
-		$response->success = true;
-		$response->message = Text::_('PLG_SAMPLEDATA_MULTILANG_STEP1_SUCCESS');
+		$response            = [];
+		$response['success'] = true;
+		$response['message'] = Text::_('PLG_SAMPLEDATA_MULTILANG_STEP1_SUCCESS');
 
 		return $response;
 	}
@@ -165,7 +156,7 @@ public function onAjaxSampledataApplyStep2()
 			return;
 		}
 
-		if (!ComponentHelper::isEnabled('com_modules') || !Factory::getUser()->authorise('core.create', 'com_modules'))
+		if (!ComponentHelper::isEnabled('com_modules') || !$this->app->getIdentity()->authorise('core.create', 'com_modules'))
 		{
 			$response            = array();
 			$response['success'] = true;
@@ -179,7 +170,7 @@ public function onAjaxSampledataApplyStep2()
 			$response            = array();
 			$response['success'] = false;
 
-			$lang = Factory::getLanguage()->getTag();
+			$lang = $this->app->getLanguage();
 			$lang->load('mod_languages', JPATH_SITE);
 			$message = $lang->_('MOD_LANGUAGES');
 
@@ -188,9 +179,9 @@ public function onAjaxSampledataApplyStep2()
 			return $response;
 		}
 
-		$response          = new stdClass;
-		$response->success = true;
-		$response->message = Text::_('PLG_SAMPLEDATA_MULTILANG_STEP2_SUCCESS');
+		$response            = [];
+		$response['success'] = true;
+		$response['message'] = Text::_('PLG_SAMPLEDATA_MULTILANG_STEP2_SUCCESS');
 
 		return $response;
 	}
@@ -227,9 +218,9 @@ public function onAjaxSampledataApplyStep3()
 			return $response;
 		}
 
-		$response          = new stdClass;
-		$response->success = true;
-		$response->message = Text::_('PLG_SAMPLEDATA_MULTILANG_STEP3_SUCCESS');
+		$response            = [];
+		$response['success'] = true;
+		$response['message'] = Text::_('PLG_SAMPLEDATA_MULTILANG_STEP3_SUCCESS');
 
 		return $response;
 	}
@@ -248,7 +239,7 @@ public function onAjaxSampledataApplyStep4()
 			return;
 		}
 
-		if (!ComponentHelper::isEnabled('com_menus') || !Factory::getUser()->authorise('core.create', 'com_menus'))
+		if (!ComponentHelper::isEnabled('com_menus') || !$this->app->getIdentity()->authorise('core.create', 'com_menus'))
 		{
 			$response            = array();
 			$response['success'] = true;
@@ -291,9 +282,9 @@ public function onAjaxSampledataApplyStep4()
 			return $response;
 		}
 
-		$response          = new stdClass;
-		$response->success = true;
-		$response->message = Text::_('PLG_SAMPLEDATA_MULTILANG_STEP4_SUCCESS');
+		$response            = [];
+		$response['success'] = true;
+		$response['message'] = Text::_('PLG_SAMPLEDATA_MULTILANG_STEP4_SUCCESS');
 
 		return $response;
 	}
@@ -312,7 +303,7 @@ public function onAjaxSampledataApplyStep5()
 			return;
 		}
 
-		if (!ComponentHelper::isEnabled('com_modules') || !Factory::getUser()->authorise('core.create', 'com_modules'))
+		if (!ComponentHelper::isEnabled('com_modules') || !$this->app->getIdentity()->authorise('core.create', 'com_modules'))
 		{
 			$response            = array();
 			$response['success'] = true;
@@ -335,9 +326,9 @@ public function onAjaxSampledataApplyStep5()
 			}
 		}
 
-		$response          = new stdClass;
-		$response->success = true;
-		$response->message = Text::_('PLG_SAMPLEDATA_MULTILANG_STEP5_SUCCESS');
+		$response            = [];
+		$response['success'] = true;
+		$response['message'] = Text::_('PLG_SAMPLEDATA_MULTILANG_STEP5_SUCCESS');
 
 		return $response;
 	}
@@ -356,7 +347,7 @@ public function onAjaxSampledataApplyStep6()
 			return;
 		}
 
-		if (!ComponentHelper::isEnabled('com_content') || !Factory::getUser()->authorise('core.create', 'com_content'))
+		if (!ComponentHelper::isEnabled('com_content') || !$this->app->getIdentity()->authorise('core.create', 'com_content'))
 		{
 			$response            = array();
 			$response['success'] = true;
@@ -365,7 +356,7 @@ public function onAjaxSampledataApplyStep6()
 			return $response;
 		}
 
-		if (!ComponentHelper::isEnabled('com_categories') || !Factory::getUser()->authorise('core.create', 'com_content.category'))
+		if (!ComponentHelper::isEnabled('com_categories') || !$this->app->getIdentity()->authorise('core.create', 'com_content.category'))
 		{
 			$response            = array();
 			$response['success'] = true;
@@ -423,9 +414,9 @@ public function onAjaxSampledataApplyStep6()
 			return $response;
 		}
 
-		$response          = new stdClass;
-		$response->success = true;
-		$response->message = Text::_('PLG_SAMPLEDATA_MULTILANG_STEP6_SUCCESS');
+		$response            = [];
+		$response['success'] = true;
+		$response['message'] = Text::_('PLG_SAMPLEDATA_MULTILANG_STEP6_SUCCESS');
 
 		return $response;
 	}
@@ -462,9 +453,9 @@ public function onAjaxSampledataApplyStep7()
 			return $response;
 		}
 
-		$response          = new stdClass;
-		$response->success = true;
-		$response->message = Text::_('PLG_SAMPLEDATA_MULTILANG_STEP7_SUCCESS');
+		$response            = [];
+		$response['success'] = true;
+		$response['message'] = Text::_('PLG_SAMPLEDATA_MULTILANG_STEP7_SUCCESS');
 
 		return $response;
 	}
@@ -472,7 +463,7 @@ public function onAjaxSampledataApplyStep7()
 	/**
 	 * Final step to show completion of sampledata.
 	 *
-	 * @return  array or void  Will be converted into the JSON response to the module.
+	 * @return  array|void  Will be converted into the JSON response to the module.
 	 *
 	 * @since  4.0.0
 	 */
diff --git a/plugins/system/httpheaders/httpheaders.php b/plugins/system/httpheaders/httpheaders.php
index 57453c75c63..a355a887627 100644
--- a/plugins/system/httpheaders/httpheaders.php
+++ b/plugins/system/httpheaders/httpheaders.php
@@ -266,6 +266,34 @@ public function setHttpHeaders(): void
 		{
 			$this->setCspHeader();
 		}
+
+		if ($this->app->get('block_floc', 1))
+		{
+			$headers = $this->app->getHeaders();
+
+			$notPresent = true;
+
+			foreach ($headers as $header)
+			{
+				if (strtolower($header['name']) === 'permissions-policy')
+				{
+					// Append interest-cohort if the Permissions-Policy is not set
+					if (strpos($header['value'], 'interest-cohort') === false)
+					{
+						$this->app->setHeader('Permissions-Policy', $header['value'] . ', interest-cohort=()', true);
+					}
+
+					$notPresent = false;
+
+					break;
+				}
+			}
+
+			if ($notPresent)
+			{
+				$this->app->setHeader('Permissions-Policy', 'interest-cohort=()');
+			}
+		}
 	}
 
 	/**
diff --git a/plugins/user/profile/src/Field/TosField.php b/plugins/user/profile/src/Field/TosField.php
index 1c2875b7f94..aa01a286ec0 100644
--- a/plugins/user/profile/src/Field/TosField.php
+++ b/plugins/user/profile/src/Field/TosField.php
@@ -134,7 +134,7 @@ protected function getLabel()
 					'modalWidth'  => '800',
 					'bodyHeight'  => '500',
 					'footer' => '<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" aria-hidden="true">'
-						. Text::_("JLIB_HTML_BEHAVIOR_CLOSE") . '</button>',
+						. Text::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</button>',
 				]
 			);
 		}
diff --git a/plugins/webservices/banners/banners.php b/plugins/webservices/banners/banners.php
index 6b39fc70503..cf80f97a5fe 100644
--- a/plugins/webservices/banners/banners.php
+++ b/plugins/webservices/banners/banners.php
@@ -79,9 +79,9 @@ private function createContentHistoryRoutes(&$router)
 		$getDefaults = array_merge(['public' => false], $defaults);
 
 		$routes = [
-			new Route(['GET'], 'v1/banners/contenthistory/:id', 'history.displayList', ['id' => '(\d+)'], $getDefaults),
-			new Route(['PATCH'], 'v1/banners/contenthistory/keep/:id', 'history.keep', ['id' => '(\d+)'], $defaults),
-			new Route(['DELETE'], 'v1/banners/contenthistory/:id', 'history.delete', ['id' => '(\d+)'], $defaults),
+			new Route(['GET'], 'v1/banners/:id/contenthistory', 'history.displayList', ['id' => '(\d+)'], $getDefaults),
+			new Route(['PATCH'], 'v1/banners/:id/contenthistory/keep', 'history.keep', ['id' => '(\d+)'], $defaults),
+			new Route(['DELETE'], 'v1/banners/:id/contenthistory', 'history.delete', ['id' => '(\d+)'], $defaults),
 		];
 
 		$router->addRoutes($routes);
diff --git a/plugins/webservices/contact/contact.php b/plugins/webservices/contact/contact.php
index 4fd696ad922..7e49fd6b9c5 100644
--- a/plugins/webservices/contact/contact.php
+++ b/plugins/webservices/contact/contact.php
@@ -133,9 +133,9 @@ private function createContentHistoryRoutes(&$router)
 		$getDefaults = array_merge(['public' => false], $defaults);
 
 		$routes = [
-			new Route(['GET'], 'v1/contacts/contenthistory/:id', 'history.displayList', ['id' => '(\d+)'], $getDefaults),
-			new Route(['PATCH'], 'v1/contacts/contenthistory/keep/:id', 'history.keep', ['id' => '(\d+)'], $defaults),
-			new Route(['DELETE'], 'v1/contacts/contenthistory/:id', 'history.delete', ['id' => '(\d+)'], $defaults),
+			new Route(['GET'], 'v1/contacts/:id/contenthistory', 'history.displayList', ['id' => '(\d+)'], $getDefaults),
+			new Route(['PATCH'], 'v1/contacts/:id/contenthistory/keep', 'history.keep', ['id' => '(\d+)'], $defaults),
+			new Route(['DELETE'], 'v1/contacts/:id/contenthistory', 'history.delete', ['id' => '(\d+)'], $defaults),
 		];
 
 		$router->addRoutes($routes);
diff --git a/plugins/webservices/content/content.php b/plugins/webservices/content/content.php
index 81e09333432..cecdf43aafe 100644
--- a/plugins/webservices/content/content.php
+++ b/plugins/webservices/content/content.php
@@ -111,9 +111,9 @@ private function createContentHistoryRoutes(&$router)
 		$getDefaults = array_merge(['public' => false], $defaults);
 
 		$routes = [
-			new Route(['GET'], 'v1/content/articles/contenthistory/:id', 'history.displayList', ['id' => '(\d+)'], $getDefaults),
-			new Route(['PATCH'], 'v1/content/articles/contenthistory/keep/:id', 'history.keep', ['id' => '(\d+)'], $defaults),
-			new Route(['DELETE'], 'v1/content/articles/contenthistory/:id', 'history.delete', ['id' => '(\d+)'], $defaults),
+			new Route(['GET'], 'v1/content/articles/:id/contenthistory', 'history.displayList', ['id' => '(\d+)'], $getDefaults),
+			new Route(['PATCH'], 'v1/content/articles/:id/contenthistory/keep', 'history.keep', ['id' => '(\d+)'], $defaults),
+			new Route(['DELETE'], 'v1/content/articles/:id/contenthistory', 'history.delete', ['id' => '(\d+)'], $defaults),
 		];
 
 		$router->addRoutes($routes);
diff --git a/templates/cassiopeia/html/mod_menu/collapse-metismenu.php b/templates/cassiopeia/html/mod_menu/collapse-metismenu.php
index 81847d0982f..d84baf07a0b 100644
--- a/templates/cassiopeia/html/mod_menu/collapse-metismenu.php
+++ b/templates/cassiopeia/html/mod_menu/collapse-metismenu.php
@@ -16,10 +16,10 @@
 ?>
 
 <nav class="navbar navbar-expand-md">
-	<button class="navbar-toggler navbar-toggler-right" type="button" data-bs-toggle="collapse" data-bs-target="#navbar" aria-controls="navbar" aria-expanded="false" aria-label="<?php echo Text::_('MOD_MENU_TOGGLE'); ?>">
+	<button class="navbar-toggler navbar-toggler-right" type="button" data-bs-toggle="collapse" data-bs-target="#navbar<?php echo $module->id; ?>" aria-controls="navbar<?php echo $module->id; ?>" aria-expanded="false" aria-label="<?php echo Text::_('MOD_MENU_TOGGLE'); ?>">
 		<span class="icon-menu" aria-hidden="true"></span>
 	</button>
-	<div class="collapse navbar-collapse" id="navbar">
+	<div class="collapse navbar-collapse" id="navbar<?php echo $module->id; ?>">
 		<?php require __DIR__ . '/dropdown-metismenu.php'; ?>
 	</div>
 </nav>
diff --git a/templates/cassiopeia/scss/vendor/bootstrap/_table.scss b/templates/cassiopeia/scss/vendor/bootstrap/_table.scss
index 5ec1361a264..c892edbe973 100644
--- a/templates/cassiopeia/scss/vendor/bootstrap/_table.scss
+++ b/templates/cassiopeia/scss/vendor/bootstrap/_table.scss
@@ -2,6 +2,10 @@
 
 .table {
 
+  th {
+    font-weight: 500;
+  }
+
   thead th {
     white-space: nowrap;
     border-bottom-width: 1px;