diff --git a/administrator/components/com_banners/src/View/Banner/HtmlView.php b/administrator/components/com_banners/src/View/Banner/HtmlView.php
index d92a9f998b630..8d746ad885bfc 100644
--- a/administrator/components/com_banners/src/View/Banner/HtmlView.php
+++ b/administrator/components/com_banners/src/View/Banner/HtmlView.php
@@ -142,7 +142,7 @@ function (Toolbar $childBar) use ($checkedOut, $canDo, $user, $isNew) {
         } else {
             $toolbar->cancel('banner.cancel');
 
-            if (ComponentHelper::isEnabled('com_contenthistory') && $this->state->params->get('save_history', 0) && $canDo->get('core.edit')) {
+            if (ComponentHelper::isEnabled('com_contenthistory') && $this->state->get('params')->get('save_history', 0) && $canDo->get('core.edit')) {
                 $toolbar->versions('com_banners.banner', $this->item->id);
             }
         }
diff --git a/administrator/components/com_banners/src/View/Client/HtmlView.php b/administrator/components/com_banners/src/View/Client/HtmlView.php
index fd365a3a50fa1..e0b28273c26eb 100644
--- a/administrator/components/com_banners/src/View/Client/HtmlView.php
+++ b/administrator/components/com_banners/src/View/Client/HtmlView.php
@@ -151,7 +151,7 @@ function (Toolbar $childBar) use ($checkedOut, $canDo, $isNew) {
         } else {
             $toolbar->cancel('client.cancel');
 
-            if (ComponentHelper::isEnabled('com_contenthistory') && $this->state->params->get('save_history', 0) && $canDo->get('core.edit')) {
+            if (ComponentHelper::isEnabled('com_contenthistory') && $this->state->get('params')->get('save_history', 0) && $canDo->get('core.edit')) {
                 $toolbar->versions('com_banners.client', $this->item->id);
             }
         }
diff --git a/administrator/components/com_contact/src/View/Contact/HtmlView.php b/administrator/components/com_contact/src/View/Contact/HtmlView.php
index ff0c64325efe7..9ff1d23cd78d5 100644
--- a/administrator/components/com_contact/src/View/Contact/HtmlView.php
+++ b/administrator/components/com_contact/src/View/Contact/HtmlView.php
@@ -200,7 +200,7 @@ function (Toolbar $childBar) use ($checkedOut, $itemEditable, $canDo, $user) {
 
             $toolbar->cancel('contact.cancel');
 
-            if (ComponentHelper::isEnabled('com_contenthistory') && $this->state->params->get('save_history', 0) && $itemEditable) {
+            if (ComponentHelper::isEnabled('com_contenthistory') && $this->state->get('params')->get('save_history', 0) && $itemEditable) {
                 $toolbar->versions('com_contact.contact', $this->item->id);
             }
 
diff --git a/administrator/components/com_content/src/View/Article/HtmlView.php b/administrator/components/com_content/src/View/Article/HtmlView.php
index 83f31df49212d..8dd50e4ee4a59 100644
--- a/administrator/components/com_content/src/View/Article/HtmlView.php
+++ b/administrator/components/com_content/src/View/Article/HtmlView.php
@@ -230,7 +230,7 @@ function (Toolbar $childBar) use ($checkedOut, $itemEditable, $canDo, $user) {
             $toolbar->cancel('article.cancel', 'JTOOLBAR_CLOSE');
 
             if (!$isNew) {
-                if (ComponentHelper::isEnabled('com_contenthistory') && $this->state->params->get('save_history', 0) && $itemEditable) {
+                if (ComponentHelper::isEnabled('com_contenthistory') && $this->state->get('params')->get('save_history', 0) && $itemEditable) {
                     $toolbar->versions('com_content.article', $this->item->id);
                 }
 
diff --git a/administrator/components/com_contenthistory/src/View/History/HtmlView.php b/administrator/components/com_contenthistory/src/View/History/HtmlView.php
index 279adb37c1b0c..0b1eabc117533 100644
--- a/administrator/components/com_contenthistory/src/View/History/HtmlView.php
+++ b/administrator/components/com_contenthistory/src/View/History/HtmlView.php
@@ -105,7 +105,7 @@ protected function addToolbar(): Toolbar
 
         // Clean up input to ensure a clean url.
         $filter     = InputFilter::getInstance();
-        $aliasArray = explode('.', $this->state->item_id);
+        $aliasArray = explode('.', $this->state->get('item_id'));
 
         if ($aliasArray[1] === 'category') {
             $option = 'com_categories';
diff --git a/administrator/components/com_fields/src/Plugin/FieldsPlugin.php b/administrator/components/com_fields/src/Plugin/FieldsPlugin.php
index d5cbbdcd2fa33..5fe553b791db6 100644
--- a/administrator/components/com_fields/src/Plugin/FieldsPlugin.php
+++ b/administrator/components/com_fields/src/Plugin/FieldsPlugin.php
@@ -45,6 +45,8 @@ abstract class FieldsPlugin extends CMSPlugin
      *
      * @var    \Joomla\CMS\Application\CMSApplication
      * @since  4.0.0
+     *
+     * @deprecated  __DEPLOY_VERSION__ will be removed in 7.0 use $this->getApplication() instead
      */
     protected $app;
 
@@ -138,6 +140,7 @@ public function onCustomFieldsGetTypes()
             return $types_cache[$this->_type . $this->_name];
         }
 
+        $app   = $this->getApplication() ?: $this->app;
         $types = [];
 
         // The root of the plugin
@@ -160,11 +163,11 @@ public function onCustomFieldsGetTypes()
             // Needed attributes
             $data['type'] = $layout;
 
-            if ($this->app->getLanguage()->hasKey('PLG_FIELDS_' . $key . '_LABEL')) {
+            if ($app->getLanguage()->hasKey('PLG_FIELDS_' . $key . '_LABEL')) {
                 $data['label'] = Text::sprintf('PLG_FIELDS_' . $key . '_LABEL', strtolower($key));
 
                 // Fix wrongly set parentheses in RTL languages
-                if ($this->app->getLanguage()->isRtl()) {
+                if ($app->getLanguage()->isRtl()) {
                     $data['label'] .= '‎';
                 }
             } else {
diff --git a/administrator/components/com_finder/src/View/Searches/HtmlView.php b/administrator/components/com_finder/src/View/Searches/HtmlView.php
index 120b56b81ccd9..7c8f1cffa384e 100644
--- a/administrator/components/com_finder/src/View/Searches/HtmlView.php
+++ b/administrator/components/com_finder/src/View/Searches/HtmlView.php
@@ -112,7 +112,7 @@ public function display($tpl = null)
         $this->state         = $model->getState();
         $this->filterForm    = $model->getFilterForm();
         $this->activeFilters = $model->getActiveFilters();
-        $this->enabled       = $this->state->params->get('gather_search_statistics', 0);
+        $this->enabled       = $this->state->get('params')->get('gather_search_statistics', 0);
         $this->canDo         = ContentHelper::getActions('com_finder');
         $uri                 = Uri::getInstance();
         $link                = 'index.php?option=com_config&view=component&component=com_finder&return=' . base64_encode($uri);
diff --git a/administrator/components/com_newsfeeds/src/View/Newsfeed/HtmlView.php b/administrator/components/com_newsfeeds/src/View/Newsfeed/HtmlView.php
index d92b4838268b4..bdc37dd02d883 100644
--- a/administrator/components/com_newsfeeds/src/View/Newsfeed/HtmlView.php
+++ b/administrator/components/com_newsfeeds/src/View/Newsfeed/HtmlView.php
@@ -178,7 +178,7 @@ function (Toolbar $childBar) use ($checkedOut, $canDo, $user, $isNew) {
         } else {
             $toolbar->cancel('newsfeed.cancel');
 
-            if (ComponentHelper::isEnabled('com_contenthistory') && $this->state->params->get('save_history', 0) && $canDo->get('core.edit')) {
+            if (ComponentHelper::isEnabled('com_contenthistory') && $this->state->get('params')->get('save_history', 0) && $canDo->get('core.edit')) {
                 $toolbar->versions('com_newsfeeds.newsfeed', $this->item->id);
             }
         }
diff --git a/administrator/components/com_tags/src/View/Tag/HtmlView.php b/administrator/components/com_tags/src/View/Tag/HtmlView.php
index 2960f57bb7c1c..297c1f9ff0519 100644
--- a/administrator/components/com_tags/src/View/Tag/HtmlView.php
+++ b/administrator/components/com_tags/src/View/Tag/HtmlView.php
@@ -173,7 +173,7 @@ function (Toolbar $childBar) use ($checkedOut, $itemEditable, $canDo) {
 
             $toolbar->cancel('tag.cancel');
 
-            if (ComponentHelper::isEnabled('com_contenthistory') && $this->state->params->get('save_history', 0) && $itemEditable) {
+            if (ComponentHelper::isEnabled('com_contenthistory') && $this->state->get('params')->get('save_history', 0) && $itemEditable) {
                 $toolbar->versions('com_tags.tag', $this->item->id);
             }
         }
diff --git a/administrator/components/com_users/src/View/Note/HtmlView.php b/administrator/components/com_users/src/View/Note/HtmlView.php
index 1b20546027236..fca605ef56b33 100644
--- a/administrator/components/com_users/src/View/Note/HtmlView.php
+++ b/administrator/components/com_users/src/View/Note/HtmlView.php
@@ -142,7 +142,7 @@ function (Toolbar $childBar) use ($checkedOut, $canDo, $user, $isNew) {
         } else {
             $toolbar->cancel('note.cancel');
 
-            if (ComponentHelper::isEnabled('com_contenthistory') && $this->state->params->get('save_history', 0) && $canDo->get('core.edit')) {
+            if (ComponentHelper::isEnabled('com_contenthistory') && $this->state->get('params')->get('save_history', 0) && $canDo->get('core.edit')) {
                 $toolbar->versions('com_users.note', $this->item->id);
             }
         }
diff --git a/administrator/language/en-GB/com_content.ini b/administrator/language/en-GB/com_content.ini
index 12a57f2e70fa1..dc5e50a580ad1 100644
--- a/administrator/language/en-GB/com_content.ini
+++ b/administrator/language/en-GB/com_content.ini
@@ -97,6 +97,8 @@ COM_CONTENT_FIELD_URLS_OPTIONS="URL Options"
 COM_CONTENT_FIELD_URLSPOSITION_LABEL="Positioning of the Links"
 COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS="Use Article Settings"
 COM_CONTENT_FIELD_VERSION_LABEL="Revision"
+COM_CONTENT_FIELD_YEAR_SORT_DESC="The order in which years will appear in the year sort dropdown. Oldest First shows years in ascending order (2011, 2012...). Most Recent First shows years in descending order (2025, 2024...)."
+COM_CONTENT_FIELD_YEAR_SORT_LABEL="Year Sort Order"
 COM_CONTENT_FIELDS_ARTICLE_FIELD_ADD_TITLE="Articles: New Field"
 COM_CONTENT_FIELDS_ARTICLE_FIELD_EDIT_TITLE="Articles: Edit Field"
 COM_CONTENT_FIELDS_ARTICLE_FIELDS_TITLE="Articles: Fields"
diff --git a/administrator/language/en-GB/com_users.ini b/administrator/language/en-GB/com_users.ini
index e124341ad6801..6b10ea5c8b589 100644
--- a/administrator/language/en-GB/com_users.ini
+++ b/administrator/language/en-GB/com_users.ini
@@ -127,9 +127,12 @@ COM_USERS_FIELD_LOGOUT_REDIRECTMENU_LABEL="Menu Item Logout Redirect"
 COM_USERS_FIELD_LOGOUT_REDIRECT_CHOICE_DESC="'Internal URL' lets you manually enter any internal URL in the Redirect field. 'Menu Item' lets you directly select an existing menu item.<br>For a multilingual site, it is recommended to use 'Menu Item'."
 COM_USERS_FIELD_LOGOUT_REDIRECT_CHOICE_LABEL="Choose Logout Redirect Type"
 COM_USERS_FIELD_LOGOUT_REDIRECT_ERROR="Only one of the logout redirect fields should have a value."
+COM_USERS_FIELD_REGISTRATION_DESC="Set a Menu Item to utilize a custom registration page."
+COM_USERS_FIELD_REGISTRATION_LABEL="Registration Page"
 COM_USERS_FIELD_NOTEBODY_LABEL="Note"
 COM_USERS_FIELD_OPTIONS_LOGIN="Login"
 COM_USERS_FIELD_OPTIONS_LOGOUT="Logout"
+COM_USERS_FIELD_OPTIONS_REGISTRATION="Registration"
 COM_USERS_FIELD_REVIEW_TIME_LABEL="Review Date"
 COM_USERS_FIELD_SUBJECT_LABEL="Subject"
 COM_USERS_FIELD_USER_ID_LABEL="User"
diff --git a/administrator/modules/mod_menu/src/Dispatcher/Dispatcher.php b/administrator/modules/mod_menu/src/Dispatcher/Dispatcher.php
index f04dc6454a979..c4b9558516914 100644
--- a/administrator/modules/mod_menu/src/Dispatcher/Dispatcher.php
+++ b/administrator/modules/mod_menu/src/Dispatcher/Dispatcher.php
@@ -11,6 +11,8 @@
 namespace Joomla\Module\Menu\Administrator\Dispatcher;
 
 use Joomla\CMS\Dispatcher\AbstractModuleDispatcher;
+use Joomla\CMS\Factory;
+use Joomla\Database\DatabaseInterface;
 use Joomla\Module\Menu\Administrator\Menu\CssMenu;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -33,11 +35,12 @@ class Dispatcher extends AbstractModuleDispatcher
      */
     protected function getLayoutData()
     {
+        $db   = Factory::getContainer()->get(DatabaseInterface::class);
         $data = parent::getLayoutData();
 
         $data['enabled'] = !$data['app']->getInput()->getBool('hidemainmenu');
 
-        $data['menu']        = new CssMenu($data['app']);
+        $data['menu']        = new CssMenu($data['app'], $db);
         $data['root']        = $data['menu']->load($data['params'], $data['enabled']);
         $data['root']->level = 0;
 
diff --git a/administrator/modules/mod_menu/src/Menu/CssMenu.php b/administrator/modules/mod_menu/src/Menu/CssMenu.php
index 0026469a139c6..5554c73a18392 100644
--- a/administrator/modules/mod_menu/src/Menu/CssMenu.php
+++ b/administrator/modules/mod_menu/src/Menu/CssMenu.php
@@ -13,11 +13,15 @@
 use Joomla\CMS\Application\CMSApplication;
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Event\Menu\PreprocessMenuItemsEvent;
+use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Associations;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Menu\AdministratorMenuItem;
 use Joomla\CMS\Uri\Uri;
 use Joomla\Component\Menus\Administrator\Helper\MenusHelper;
+use Joomla\Database\DatabaseAwareInterface;
+use Joomla\Database\DatabaseAwareTrait;
+use Joomla\Database\DatabaseInterface;
 use Joomla\Registry\Registry;
 use Joomla\Utilities\ArrayHelper;
 
@@ -30,8 +34,10 @@
  *
  * @since  1.5
  */
-class CssMenu
+class CssMenu implements DatabaseAwareInterface
 {
+    use DatabaseAwareTrait;
+
     /**
      * The root of the menu
      *
@@ -89,12 +95,24 @@ class CssMenu
     /**
      * CssMenu constructor.
      *
-     * @param   CMSApplication  $application  The application
+     * @param   CMSApplication      $application  The application
+     * @param   ?DatabaseInterface  $db           The database
      *
      * @since 4.0.0
      */
-    public function __construct(CMSApplication $application)
+    public function __construct(CMSApplication $application, ?DatabaseInterface $db = null)
     {
+        if ($db === null) {
+            @trigger_error(
+                __CLASS__ . ': The $db parameter must be set for the constructor.',
+                \E_USER_DEPRECATED
+            );
+
+            $db = Factory::getContainer()->get(DatabaseInterface::class);
+        }
+
+        $this->setDatabase($db);
+
         $this->application = $application;
         $this->root        = new AdministratorMenuItem();
     }
@@ -230,7 +248,7 @@ protected function check($node, Registry $params)
             $uri = clone Uri::getInstance();
             $uri->setVar('recover_menu', 1);
 
-            $table    = $this->application->bootComponent('com_menu')->getMVCFactory()->createTable('MenuType');
+            $table    = new \Joomla\CMS\Table\MenuType($this->getDatabase());
             $menutype = $params->get('menutype');
 
             $table->load(['menutype' => $menutype]);
diff --git a/administrator/modules/mod_submenu/mod_submenu.php b/administrator/modules/mod_submenu/mod_submenu.php
deleted file mode 100644
index 1a5ed3285d9a3..0000000000000
--- a/administrator/modules/mod_submenu/mod_submenu.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/**
- * @package     Joomla.Administrator
- * @subpackage  mod_submenu
- *
- * @copyright   (C) 2006 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\Helper\ModuleHelper;
-use Joomla\Component\Menus\Administrator\Helper\MenusHelper;
-use Joomla\Module\Submenu\Administrator\Menu\Menu;
-
-$menutype = $params->get('menutype', '*');
-$root     = false;
-
-if ($menutype === '*') {
-    $name   = $params->get('preset', 'system');
-    $root   = MenusHelper::loadPreset($name);
-} else {
-    $root = MenusHelper::getMenuItems($menutype, true);
-}
-
-if ($root && $root->hasChildren()) {
-    Factory::getLanguage()->load(
-        'mod_menu',
-        JPATH_ADMINISTRATOR,
-        Factory::getLanguage()->getTag(),
-        true
-    );
-
-    Menu::preprocess($root);
-
-    // Render the module layout
-    require ModuleHelper::getLayoutPath('mod_submenu', $params->get('layout', 'default'));
-}
diff --git a/administrator/modules/mod_submenu/mod_submenu.xml b/administrator/modules/mod_submenu/mod_submenu.xml
index 7db0d8887c8a3..aeadaf802baa5 100644
--- a/administrator/modules/mod_submenu/mod_submenu.xml
+++ b/administrator/modules/mod_submenu/mod_submenu.xml
@@ -11,7 +11,7 @@
 	<description>MOD_SUBMENU_XML_DESCRIPTION</description>
 	<namespace path="src">Joomla\Module\Submenu</namespace>
 	<files>
-		<filename module="mod_submenu">mod_submenu.php</filename>
+		<folder module="mod_submenu">services</folder>
 		<folder>src</folder>
 		<folder>tmpl</folder>
 	</files>
diff --git a/administrator/modules/mod_submenu/services/provider.php b/administrator/modules/mod_submenu/services/provider.php
new file mode 100644
index 0000000000000..82ea44bee9d0b
--- /dev/null
+++ b/administrator/modules/mod_submenu/services/provider.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  mod_submenu
+ *
+ * @copyright   (C) 2025 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\Extension\Service\Provider\Module;
+use Joomla\CMS\Extension\Service\Provider\ModuleDispatcherFactory;
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+
+/**
+ * The administrator dashboard menu module service provider.
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+return new class () implements ServiceProviderInterface {
+    /**
+     * Registers the service provider with a DI container.
+     *
+     * @param   Container  $container  The DI container.
+     *
+     * @return  void
+     *
+     * @since   __DEPLOY_VERSION__
+     */
+    public function register(Container $container)
+    {
+        $container->registerServiceProvider(new ModuleDispatcherFactory('\\Joomla\\Module\\Submenu'));
+
+        $container->registerServiceProvider(new Module());
+    }
+};
diff --git a/administrator/modules/mod_submenu/src/Dispatcher/Dispatcher.php b/administrator/modules/mod_submenu/src/Dispatcher/Dispatcher.php
new file mode 100644
index 0000000000000..eff55fc15a049
--- /dev/null
+++ b/administrator/modules/mod_submenu/src/Dispatcher/Dispatcher.php
@@ -0,0 +1,62 @@
+<?php
+
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  mod_submenu
+ *
+ * @copyright   (C) 2025 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\Module\Submenu\Administrator\Dispatcher;
+
+use Joomla\CMS\Dispatcher\AbstractModuleDispatcher;
+use Joomla\Component\Menus\Administrator\Helper\MenusHelper;
+use Joomla\Module\Submenu\Administrator\Menu\Menu;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Dispatcher class for mod_submenu
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class Dispatcher extends AbstractModuleDispatcher
+{
+    /**
+     * Returns the layout data.
+     *
+     * @return  array
+     *
+     * @since   __DEPLOY_VERSION__
+     */
+    protected function getLayoutData()
+    {
+        $data = parent::getLayoutData();
+
+        $menutype         = $data['params']->get('menutype', '*');
+        $data['root']     = false;
+
+        if ($menutype === '*') {
+            $name           = $data['params']->get('preset', 'system');
+            $data['root']   = MenusHelper::loadPreset($name);
+        } else {
+            $data['root'] = MenusHelper::getMenuItems($menutype, true);
+        }
+
+        if ($data['root'] && $data['root']->hasChildren()) {
+            $data['app']->getLanguage()->load(
+                'mod_menu',
+                JPATH_ADMINISTRATOR,
+                $data['app']->getLanguage()->getTag(),
+                true
+            );
+
+            Menu::preprocess($data['root']);
+        }
+
+        return $data;
+    }
+}
diff --git a/administrator/modules/mod_submenu/src/Menu/Menu.php b/administrator/modules/mod_submenu/src/Menu/Menu.php
index b210bf056fd98..adf939c2ea12a 100644
--- a/administrator/modules/mod_submenu/src/Menu/Menu.php
+++ b/administrator/modules/mod_submenu/src/Menu/Menu.php
@@ -45,7 +45,7 @@ public static function preprocess($parent)
         $app        = Factory::getApplication();
         $user       = $app->getIdentity();
         $children   = $parent->getChildren();
-        $language   = Factory::getLanguage();
+        $language   = $app->getLanguage();
         $dispatcher = $app->getDispatcher();
 
         /**
diff --git a/build/media_source/templates/administrator/atum/scss/vendor/choicesjs/choices.scss b/build/media_source/templates/administrator/atum/scss/vendor/choicesjs/choices.scss
index e365273dda4ce..d4c4d40b33abf 100644
--- a/build/media_source/templates/administrator/atum/scss/vendor/choicesjs/choices.scss
+++ b/build/media_source/templates/administrator/atum/scss/vendor/choicesjs/choices.scss
@@ -60,7 +60,7 @@
   position: relative;
   margin: 2px;
   color: $choices-list-multiple-item; //$white;
-  background-color: $choices-list-multiple-item-bg; // var(--template-bg-dark);
+  background-color: $choices-list-multiple-item-bg !important; // var(--template-bg-dark);
   margin-inline-end: 2px;
   border: 0;
   border-radius: $border-radius;
diff --git a/components/com_config/tmpl/config/default.php b/components/com_config/tmpl/config/default.php
index f4c7fc3b4151a..a23b745790583 100644
--- a/components/com_config/tmpl/config/default.php
+++ b/components/com_config/tmpl/config/default.php
@@ -33,7 +33,7 @@
         </h1>
     </div>
 <?php endif; ?>
-<form action="<?php echo Route::_('index.php?option=com_config'); ?>" id="application-form" method="post" name="adminForm" class="form-validate">
+<form action="<?php echo Route::_('index.php'); ?>" method="post" name="adminForm" id="application-form" class="form-validate">
 
     <div class="mb-2 d-flex">
         <button type="button" class="btn btn-sm btn-outline-info button-inlinehelp ms-auto">
diff --git a/components/com_config/tmpl/modules/default.php b/components/com_config/tmpl/modules/default.php
index a1d187d7bd6f1..d8cd0a117d3e8 100644
--- a/components/com_config/tmpl/modules/default.php
+++ b/components/com_config/tmpl/modules/default.php
@@ -41,7 +41,7 @@
 }
 ?>
 
-<form action="<?php echo Route::_('index.php?option=com_config'); ?>" method="post" name="adminForm" id="modules-form" class="form-validate">
+<form action="<?php echo Route::_('index.php'); ?>" method="post" name="adminForm" id="modules-form" class="form-validate">
     <div class="row">
         <div class="col-md-12">
             <legend><?php echo Text::_('COM_CONFIG_MODULES_SETTINGS_TITLE'); ?></legend>
diff --git a/components/com_config/tmpl/templates/default.php b/components/com_config/tmpl/templates/default.php
index bdd22bb4ea600..383a7074cb96a 100644
--- a/components/com_config/tmpl/templates/default.php
+++ b/components/com_config/tmpl/templates/default.php
@@ -34,7 +34,7 @@
         </h1>
     </div>
 <?php endif; ?>
-<form action="<?php echo Route::_('index.php?option=com_config'); ?>" method="post" name="adminForm" id="templates-form" class="form-validate">
+<form action="<?php echo Route::_('index.php'); ?>" method="post" name="adminForm" id="templates-form" class="form-validate">
 
     <div id="page-site" class="tab-pane active">
         <div class="row">
diff --git a/components/com_contact/src/View/Form/HtmlView.php b/components/com_contact/src/View/Form/HtmlView.php
index 87a1c935e5d63..bd09bad3ba596 100644
--- a/components/com_contact/src/View/Form/HtmlView.php
+++ b/components/com_contact/src/View/Form/HtmlView.php
@@ -116,7 +116,7 @@ public function display($tpl = null)
         }
 
         // Create a shortcut to the parameters.
-        $this->params = $this->state->params;
+        $this->params = $this->state->get('params');
 
         // Escape strings for HTML output
         $this->pageclass_sfx = htmlspecialchars($this->params->get('pageclass_sfx', ''));
diff --git a/components/com_contact/tmpl/form/edit.php b/components/com_contact/tmpl/form/edit.php
index 5e402f04b6313..3b425f2f9fd62 100644
--- a/components/com_contact/tmpl/form/edit.php
+++ b/components/com_contact/tmpl/form/edit.php
@@ -35,7 +35,7 @@
         </div>
     <?php endif; ?>
 
-    <form action="<?php echo Route::_('index.php?option=com_contact&id=' . (int) $this->item->id); ?>" method="post"
+    <form action="<?php echo Route::_('index.php'); ?>" method="post"
         name="adminForm" id="adminForm" class="form-validate form-vertical">
         <fieldset>
             <?php echo HTMLHelper::_('uitab.startTabSet', $this->tab_name, ['active' => 'details', 'recall' => true, 'breakpoint' => 768]); ?>
diff --git a/components/com_content/src/Model/ArchiveModel.php b/components/com_content/src/Model/ArchiveModel.php
index 13e533efc6479..d08cd94041293 100644
--- a/components/com_content/src/Model/ArchiveModel.php
+++ b/components/com_content/src/Model/ArchiveModel.php
@@ -91,7 +91,7 @@ protected function populateState($ordering = null, $direction = null)
      */
     protected function getListQuery()
     {
-        $params           = $this->state->params;
+        $params           = $this->state->get('params');
         $app              = Factory::getApplication();
         $catids           = $app->getInput()->get('catid', [], 'array');
         $catids           = array_values(array_diff($catids, ['']));
@@ -158,8 +158,9 @@ public function getYears()
         $db        = $this->getDatabase();
         $nowDate   = Factory::getDate()->toSql();
         $query     = $db->getQuery(true);
-        $queryDate = QueryHelper::getQueryDate($this->state->params->get('order_date'), $db);
+        $queryDate = QueryHelper::getQueryDate($this->state->get('params')->get('order_date'), $db);
         $years     = $query->year($queryDate);
+        $yearSort  = $this->state->get('params')->get('year_sort_order', 'ASC');
 
         $query->select('DISTINCT ' . $years)
             ->from($db->quoteName('#__content', 'a'))
@@ -182,7 +183,7 @@ public function getYears()
             )
             ->bind(':publishUp', $nowDate)
             ->bind(':publishDown', $nowDate)
-            ->order('1 ASC');
+            ->order('1 ' . $yearSort);
 
         $db->setQuery($query);
 
diff --git a/components/com_content/src/Model/CategoryModel.php b/components/com_content/src/Model/CategoryModel.php
index 2f561f339c2ef..cdbb490870ac9 100644
--- a/components/com_content/src/Model/CategoryModel.php
+++ b/components/com_content/src/Model/CategoryModel.php
@@ -280,7 +280,7 @@ protected function _buildContentOrderBy()
     {
         $app       = Factory::getApplication();
         $db        = $this->getDatabase();
-        $params    = $this->state->params;
+        $params    = $this->state->get('params');
         $itemid    = $app->getInput()->get('id', 0, 'int') . ':' . $app->getInput()->get('Itemid', 0, 'int');
         $orderCol  = $app->getUserStateFromRequest('com_content.category.list.' . $itemid . '.filter_order', 'filter_order', '', 'string');
         $orderDirn = $app->getUserStateFromRequest('com_content.category.list.' . $itemid . '.filter_order_Dir', 'filter_order_Dir', '', 'cmd');
@@ -335,8 +335,8 @@ public function getPagination()
     public function getCategory()
     {
         if (!\is_object($this->_item)) {
-            if (isset($this->state->params)) {
-                $params                = $this->state->params;
+            if (!empty($this->state->get('params'))) {
+                $params                = $this->state->get('params');
                 $options               = [];
                 $options['countItems'] = $params->get('show_cat_num_articles', 1) || !$params->get('show_empty_categories_cat', 0);
                 $options['access']     = $params->get('check_access_rights', 1);
diff --git a/components/com_content/src/Model/FeaturedModel.php b/components/com_content/src/Model/FeaturedModel.php
index 2473a9d687959..ad4f33798f871 100644
--- a/components/com_content/src/Model/FeaturedModel.php
+++ b/components/com_content/src/Model/FeaturedModel.php
@@ -59,7 +59,7 @@ protected function populateState($ordering = null, $direction = null)
         $limitstart = $input->getUint('limitstart', 0);
         $this->setState('list.start', $limitstart);
 
-        $params = $this->state->params;
+        $params = $this->state->get('params');
 
         if ($menu = $app->getMenu()->getActive()) {
             $menuParams = $menu->getParams();
diff --git a/components/com_content/src/View/Archive/HtmlView.php b/components/com_content/src/View/Archive/HtmlView.php
index 2bcdfb554dcc2..3d0d925897c8b 100644
--- a/components/com_content/src/View/Archive/HtmlView.php
+++ b/components/com_content/src/View/Archive/HtmlView.php
@@ -132,7 +132,7 @@ public function display($tpl = null)
         $pagination->hideEmptyLimitstart = true;
 
         // Get the page/component configuration
-        $params = &$state->params;
+        $params = $state->get('params');
 
         PluginHelper::importPlugin('content');
 
diff --git a/components/com_content/src/View/Featured/HtmlView.php b/components/com_content/src/View/Featured/HtmlView.php
index a9f36ffa3b47a..8702ab24890d5 100644
--- a/components/com_content/src/View/Featured/HtmlView.php
+++ b/components/com_content/src/View/Featured/HtmlView.php
@@ -122,7 +122,7 @@ public function display($tpl = null)
         }
 
         /** @var \Joomla\Registry\Registry $params */
-        $params = $state->params;
+        $params = $state->get('params');
 
         // PREPARE THE DATA
 
diff --git a/components/com_content/src/View/Form/HtmlView.php b/components/com_content/src/View/Form/HtmlView.php
index 7bedd5f77d123..558dcafb42214 100644
--- a/components/com_content/src/View/Form/HtmlView.php
+++ b/components/com_content/src/View/Form/HtmlView.php
@@ -122,9 +122,9 @@ public function display($tpl = null)
         $this->return_page = $model->getReturnPage();
 
         if (empty($this->item->id)) {
-            $catid = $this->state->params->get('catid');
+            $catid = $this->state->get('params')->get('catid');
 
-            if ($this->state->params->get('enable_category') == 1 && $catid) {
+            if ($this->state->get('params')->get('enable_category') == 1 && $catid) {
                 $authorised = $user->authorise('core.create', 'com_content.category.' . $catid);
             } else {
                 $authorised = $user->authorise('core.create', 'com_content') || \count($user->getAuthorisedCategories('com_content', 'core.create'));
@@ -160,7 +160,7 @@ public function display($tpl = null)
         }
 
         // Create a shortcut to the parameters.
-        $params = &$this->state->params;
+        $params = $this->state->get('params');
 
         // Escape strings for HTML output
         $this->pageclass_sfx = htmlspecialchars($params->get('pageclass_sfx', ''));
diff --git a/components/com_content/tmpl/archive/default.xml b/components/com_content/tmpl/archive/default.xml
index f5bf865581002..7e0fb8ececd38 100644
--- a/components/com_content/tmpl/archive/default.xml
+++ b/components/com_content/tmpl/archive/default.xml
@@ -67,6 +67,18 @@
 				<option value="published">JPUBLISHED</option>
 			</field>
 
+			<field
+				name="year_sort_order"
+				type="list"
+				label="COM_CONTENT_FIELD_YEAR_SORT_LABEL"
+				description="COM_CONTENT_FIELD_YEAR_SORT_DESC"
+				default="ASC"
+				validate="options"
+				>
+				<option value="ASC">JGLOBAL_OLDEST_FIRST</option>
+				<option value="DESC">JGLOBAL_MOST_RECENT_FIRST</option>
+			</field>
+
 			<field
 				name="display_num"
 				type="list"
diff --git a/components/com_content/tmpl/form/edit.php b/components/com_content/tmpl/form/edit.php
index 7760308ef968a..a17f30af7ab35 100644
--- a/components/com_content/tmpl/form/edit.php
+++ b/components/com_content/tmpl/form/edit.php
@@ -44,7 +44,7 @@
     </div>
     <?php endif; ?>
 
-    <form action="<?php echo Route::_('index.php?option=com_content&a_id=' . (int) $this->item->id); ?>" method="post" name="adminForm" id="adminForm" class="form-validate form-vertical">
+    <form action="<?php echo Route::_('index.php'); ?>" method="post" name="adminForm" id="adminForm" class="form-validate form-vertical">
         <fieldset>
             <?php echo HTMLHelper::_('uitab.startTabSet', $this->tab_name, ['active' => 'editor', 'recall' => true, 'breakpoint' => 768]); ?>
 
diff --git a/components/com_privacy/src/View/Confirm/HtmlView.php b/components/com_privacy/src/View/Confirm/HtmlView.php
index 4b5bf2cfbfeda..46d793e6ef6a1 100644
--- a/components/com_privacy/src/View/Confirm/HtmlView.php
+++ b/components/com_privacy/src/View/Confirm/HtmlView.php
@@ -78,7 +78,7 @@ public function display($tpl = null)
         $model        = $this->getModel();
         $this->form   = $model->getForm();
         $this->state  = $model->getState();
-        $this->params = $this->state->params;
+        $this->params = $this->state->get('params');
 
         // Check for errors.
         if (\count($errors = $model->getErrors())) {
diff --git a/components/com_privacy/src/View/Remind/HtmlView.php b/components/com_privacy/src/View/Remind/HtmlView.php
index c292400eca20d..bf86dd655c6e3 100644
--- a/components/com_privacy/src/View/Remind/HtmlView.php
+++ b/components/com_privacy/src/View/Remind/HtmlView.php
@@ -78,7 +78,7 @@ public function display($tpl = null)
         $model        = $this->getModel();
         $this->form   = $model->getForm();
         $this->state  = $model->getState();
-        $this->params = $this->state->params;
+        $this->params = $this->state->get('params');
 
         // Check for errors.
         if (\count($errors = $model->getErrors())) {
diff --git a/components/com_privacy/src/View/Request/HtmlView.php b/components/com_privacy/src/View/Request/HtmlView.php
index 040e2e86ee66e..fd7c379613a62 100644
--- a/components/com_privacy/src/View/Request/HtmlView.php
+++ b/components/com_privacy/src/View/Request/HtmlView.php
@@ -86,7 +86,7 @@ public function display($tpl = null)
         $model                 = $this->getModel();
         $this->form            = $model->getForm();
         $this->state           = $model->getState();
-        $this->params          = $this->state->params;
+        $this->params          = $this->state->get('params');
         $this->sendMailEnabled = (bool) Factory::getApplication()->get('mailonline', 1);
 
         // Check for errors.
diff --git a/components/com_privacy/tmpl/confirm/default.php b/components/com_privacy/tmpl/confirm/default.php
index 57bd8110b92b2..efb2afce1f6e4 100644
--- a/components/com_privacy/tmpl/confirm/default.php
+++ b/components/com_privacy/tmpl/confirm/default.php
@@ -29,7 +29,7 @@
             </h1>
         </div>
     <?php endif; ?>
-    <form action="<?php echo Route::_('index.php?option=com_privacy&task=request.confirm'); ?>" method="post" class="form-validate form-horizontal well">
+    <form action="<?php echo Route::_('index.php?task=request.confirm'); ?>" method="post" class="form-validate form-horizontal well">
         <?php foreach ($this->form->getFieldsets() as $fieldset) : ?>
             <fieldset>
                 <?php if (!empty($fieldset->label)) : ?>
diff --git a/components/com_privacy/tmpl/remind/default.php b/components/com_privacy/tmpl/remind/default.php
index cf602a2c492da..6155c3c13cccb 100644
--- a/components/com_privacy/tmpl/remind/default.php
+++ b/components/com_privacy/tmpl/remind/default.php
@@ -29,7 +29,7 @@
             </h1>
         </div>
     <?php endif; ?>
-    <form action="<?php echo Route::_('index.php?option=com_privacy&task=request.remind'); ?>" method="post" class="form-validate form-horizontal well">
+        <form action="<?php echo Route::_('index.php?task=request.remind'); ?>" method="post" class="form-validate form-horizontal well">
         <?php foreach ($this->form->getFieldsets() as $fieldset) : ?>
             <fieldset>
                 <?php if (!empty($fieldset->label)) : ?>
diff --git a/components/com_privacy/tmpl/request/default.php b/components/com_privacy/tmpl/request/default.php
index 97a1b5294b168..1c5e10371955d 100644
--- a/components/com_privacy/tmpl/request/default.php
+++ b/components/com_privacy/tmpl/request/default.php
@@ -30,7 +30,7 @@
         </div>
     <?php endif; ?>
     <?php if ($this->sendMailEnabled) : ?>
-        <form action="<?php echo Route::_('index.php?option=com_privacy&task=request.submit'); ?>" method="post" class="form-validate form-horizontal well">
+        <form action="<?php echo Route::_('index.php?task=request.submit'); ?>" method="post" class="form-validate form-horizontal well">
             <?php foreach ($this->form->getFieldsets() as $fieldset) : ?>
                 <fieldset>
                     <?php if (!empty($fieldset->label)) : ?>
diff --git a/components/com_tags/src/Model/TagModel.php b/components/com_tags/src/Model/TagModel.php
index 5d288f2963dfb..8fe1181846741 100644
--- a/components/com_tags/src/Model/TagModel.php
+++ b/components/com_tags/src/Model/TagModel.php
@@ -108,7 +108,7 @@ public function getItems()
             );
 
             // Get display date
-            switch ($this->state->params->get('tag_list_show_date')) {
+            switch ($this->state->get('params')->get('tag_list_show_date')) {
                 case 'modified':
                     $item->displayDate = $item->core_modified_time;
                     break;
@@ -139,7 +139,7 @@ protected function getListQuery()
 
         $typesr          = $this->getState('tag.typesr');
         $orderByOption   = $this->getState('list.ordering', 'c.core_title');
-        $includeChildren = $this->state->params->get('include_children', 0);
+        $includeChildren = $this->getState('params')->get('include_children', 0);
         $orderDir        = $this->getState('list.direction', 'ASC');
         $matchAll        = $this->getState('params')->get('return_any_or_all', 1);
         $language        = $this->getState('tag.language');
@@ -231,7 +231,7 @@ protected function populateState($ordering = 'c.core_title', $direction = 'ASC')
 
         $itemid   = $pkString . ':' . $app->getInput()->get('Itemid', 0, 'int');
         $orderCol = $app->getUserStateFromRequest('com_tags.tag.list.' . $itemid . '.filter_order', 'filter_order', '', 'string');
-        $orderCol = !$orderCol ? $this->state->params->get('tag_list_orderby', 'c.core_title') : $orderCol;
+        $orderCol = !$orderCol ? $this->state->get('params')->get('tag_list_orderby', 'c.core_title') : $orderCol;
 
         if (!\in_array($orderCol, $this->filter_fields)) {
             $orderCol = 'c.core_title';
@@ -240,7 +240,7 @@ protected function populateState($ordering = 'c.core_title', $direction = 'ASC')
         $this->setState('list.ordering', $orderCol);
 
         $listOrder = $app->getUserStateFromRequest('com_tags.tag.list.' . $itemid . '.filter_order_direction', 'filter_order_Dir', '', 'string');
-        $listOrder = !$listOrder ? $this->state->params->get('tag_list_orderby_direction', 'ASC') : $listOrder;
+        $listOrder = !$listOrder ? $this->state->get('params')->get('tag_list_orderby_direction', 'ASC') : $listOrder;
 
         if (!\in_array(strtoupper($listOrder), ['ASC', 'DESC', ''])) {
             $listOrder = 'ASC';
diff --git a/components/com_tags/src/Model/TagsModel.php b/components/com_tags/src/Model/TagsModel.php
index 42a05f5ab0fed..60e81d16a6e53 100644
--- a/components/com_tags/src/Model/TagsModel.php
+++ b/components/com_tags/src/Model/TagsModel.php
@@ -96,9 +96,9 @@ protected function getListQuery()
         $user           = $this->getCurrentUser();
         $groups         = $user->getAuthorisedViewLevels();
         $pid            = (int) $this->getState('tag.parent_id');
-        $orderby        = $this->state->params->get('all_tags_orderby', 'title');
-        $published      = (int) $this->state->params->get('published', 1);
-        $orderDirection = $this->state->params->get('all_tags_orderby_direction', 'ASC');
+        $orderby        = $this->state->get('params')->get('all_tags_orderby', 'title');
+        $published      = (int) $this->state->get('params')->get('published', 1);
+        $orderDirection = $this->state->get('params')->get('all_tags_orderby_direction', 'ASC');
         $language       = $this->getState('tag.language');
 
         // Create a new query object.
@@ -138,10 +138,10 @@ protected function getListQuery()
         if ($format === 'feed') {
             $limit = $app->get('feed_limit');
         } else {
-            if ($this->state->params->get('show_pagination_limit')) {
+            if ($this->state->get('params')->get('show_pagination_limit')) {
                 $limit = $app->getUserStateFromRequest('global.list.limit', 'limit', $app->get('list_limit'), 'uint');
             } else {
-                $limit = $this->state->params->get('maximum', 20);
+                $limit = $this->state->get('params')->get('maximum', 20);
             }
         }
 
diff --git a/components/com_users/src/View/Remind/HtmlView.php b/components/com_users/src/View/Remind/HtmlView.php
index d3ba845863994..030924230a516 100644
--- a/components/com_users/src/View/Remind/HtmlView.php
+++ b/components/com_users/src/View/Remind/HtmlView.php
@@ -72,7 +72,7 @@ public function display($tpl = null)
         $model        = $this->getModel();
         $this->form   = $model->getForm();
         $this->state  = $model->getState();
-        $this->params = $this->state->params;
+        $this->params = $this->state->get('params');
 
         // Check for errors.
         if (\count($errors = $model->getErrors())) {
diff --git a/components/com_users/src/View/Reset/HtmlView.php b/components/com_users/src/View/Reset/HtmlView.php
index ef24fef0a5940..bc3ff5241219e 100644
--- a/components/com_users/src/View/Reset/HtmlView.php
+++ b/components/com_users/src/View/Reset/HtmlView.php
@@ -87,7 +87,7 @@ public function display($tpl = null)
         }
 
         $this->state  = $model->getState();
-        $this->params = $this->state->params;
+        $this->params = $this->state->get('params');
 
         // Check for errors.
         if (\count($errors = $model->getErrors())) {
diff --git a/components/com_users/tmpl/captive/default.php b/components/com_users/tmpl/captive/default.php
index 231a448392239..d99864080ce8f 100644
--- a/components/com_users/tmpl/captive/default.php
+++ b/components/com_users/tmpl/captive/default.php
@@ -58,9 +58,9 @@ class="btn btn-sm btn-secondary"
         </div>
     <?php endif; ?>
 
-    <form action="<?php echo Route::_('index.php?option=com_users&task=captive.validate&record_id=' . ((int) $this->record->id)) ?>"
-            id="users-mfa-captive-form"
+    <form action="<?php echo Route::_('index.php?task=captive.validate&record_id=' . ((int) $this->record->id)) ?>"
             method="post"
+            id="users-mfa-captive-form"
             class="form-horizontal"
     >
         <?php echo HTMLHelper::_('form.token') ?>
diff --git a/components/com_users/tmpl/login/default.xml b/components/com_users/tmpl/login/default.xml
index 0abcef5ed20c3..d85c92ef9a809 100644
--- a/components/com_users/tmpl/login/default.xml
+++ b/components/com_users/tmpl/login/default.xml
@@ -180,6 +180,22 @@
 					description="COM_USERS_FIELD_IMAGE_ALT_EMPTY_DESC"
 				/>
 			</fieldset>
+
+			<fieldset name="registration" label="COM_USERS_FIELD_OPTIONS_REGISTRATION">
+				<field
+					name="customRegLinkMenu"
+					type="modal_menu"
+					label="COM_USERS_FIELD_REGISTRATION_LABEL"
+					description="COM_USERS_FIELD_REGISTRATION_DESC"
+					disable="separator,alias,heading,url"
+					select="true"
+					new="true"
+					edit="true"
+					clear="true"
+					>
+					<option value="">JOPTION_SELECT_MENU_ITEM</option>
+				</field>
+			</fieldset>
 		</fieldset>
 	</fields>
-</metadata>
+</metadata>
\ No newline at end of file
diff --git a/components/com_users/tmpl/login/default_login.php b/components/com_users/tmpl/login/default_login.php
index ce3da53728853..93d5ba4a0a3ec 100644
--- a/components/com_users/tmpl/login/default_login.php
+++ b/components/com_users/tmpl/login/default_login.php
@@ -11,6 +11,7 @@
 defined('_JEXEC') or die;
 
 use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Plugin\PluginHelper;
@@ -51,7 +52,7 @@
     </div>
     <?php endif; ?>
 
-    <form action="<?php echo Route::_('index.php?option=com_users&task=user.login'); ?>" method="post" class="com-users-login__form form-validate form-horizontal well" id="com-users-login__form">
+    <form action="<?php echo Route::_('index.php?task=user.login'); ?>" method="post" id="com-users-login__form" class="com-users-login__form form-validate form-horizontal well">
 
         <fieldset>
             <?php echo $this->form->renderFieldset('credentials', ['class' => 'com-users-login__input']); ?>
@@ -118,8 +119,21 @@ class="btn btn-secondary w-100 <?php echo $button['class'] ?? '' ?>"
         <a class="com-users-login__remind list-group-item" href="<?php echo Route::_('index.php?option=com_users&view=remind'); ?>">
             <?php echo Text::_('COM_USERS_LOGIN_REMIND'); ?>
         </a>
-        <?php if ($usersConfig->get('allowUserRegistration')) : ?>
-            <a class="com-users-login__register list-group-item" href="<?php echo Route::_('index.php?option=com_users&view=registration'); ?>">
+        <?php
+        if ($usersConfig->get('allowUserRegistration')) :
+            $regLinkMenuId = $this->params->get('customRegLinkMenu');
+            $regLink = 'index.php?option=com_users&view=registration';
+
+            if ($regLinkMenuId) {
+                $menu = Factory::getApplication()->getMenu();
+                $item = $menu->getItem($regLinkMenuId);
+
+                if ($item) {
+                    $regLink = 'index.php?Itemid=' . $regLinkMenuId;
+                }
+            }
+            ?>
+            <a class="com-users-login__register list-group-item" href="<?php echo Route::_($regLink); ?>">
                 <?php echo Text::_('COM_USERS_LOGIN_REGISTER'); ?>
             </a>
         <?php endif; ?>
diff --git a/components/com_users/tmpl/login/default_logout.php b/components/com_users/tmpl/login/default_logout.php
index a83fbabab9810..31c4681d0d7a9 100644
--- a/components/com_users/tmpl/login/default_logout.php
+++ b/components/com_users/tmpl/login/default_logout.php
@@ -41,7 +41,7 @@
         </div>
     <?php endif; ?>
 
-    <form action="<?php echo Route::_('index.php?option=com_users&task=user.logout'); ?>" method="post" class="com-users-logout__form form-horizontal well">
+    <form action="<?php echo Route::_('index.php?task=user.logout'); ?>" method="post" class="com-users-logout__form form-horizontal well">
         <div class="com-users-logout__submit control-group">
             <div class="controls">
                 <button type="submit" class="btn btn-primary">
diff --git a/components/com_users/tmpl/method/edit.php b/components/com_users/tmpl/method/edit.php
index e3c4952c2d44f..c369063528bb8 100644
--- a/components/com_users/tmpl/method/edit.php
+++ b/components/com_users/tmpl/method/edit.php
@@ -32,8 +32,8 @@
 $hideSubmit   = !$this->renderOptions['show_submit'] && !$this->isEditExisting
 ?>
 <div class="card card-body">
-    <form action="<?php echo Route::_(sprintf("index.php?option=com_users&task=method.save&id=%d&method=%s&user_id=%d", $recordId, $method, $userId)) ?>"
-          class="form form-horizontal" id="com-users-method-edit" method="post">
+    <form action="<?php echo Route::_(sprintf("index.php?task=method.save&id=%d&method=%s&user_id=%d", $recordId, $method, $userId)) ?>"
+        method="post" id="com-users-method-edit" class="form form-horizontal">
         <?php echo HTMLHelper::_('form.token') ?>
         <?php if (!empty($this->returnURL)) : ?>
         <input type="hidden" name="returnurl" value="<?php echo $this->escape($this->returnURL) ?>">
diff --git a/components/com_users/tmpl/profile/edit.php b/components/com_users/tmpl/profile/edit.php
index 5f9206efc335b..bf99c1e2137b4 100644
--- a/components/com_users/tmpl/profile/edit.php
+++ b/components/com_users/tmpl/profile/edit.php
@@ -37,7 +37,7 @@
         </div>
     <?php endif; ?>
 
-    <form id="member-profile" action="<?php echo Route::_('index.php?option=com_users'); ?>" method="post" class="com-users-profile__edit-form form-validate form-horizontal well" enctype="multipart/form-data">
+    <form id="member-profile" action="<?php echo Route::_('index.php'); ?>" method="post" class="com-users-profile__edit-form form-validate form-horizontal well" enctype="multipart/form-data">
         <?php // Iterate through the form fieldsets and display each one. ?>
         <?php foreach ($this->form->getFieldsets() as $group => $fieldset) : ?>
             <?php $fields = $this->form->getFieldset($group); ?>
diff --git a/components/com_users/tmpl/registration/default.php b/components/com_users/tmpl/registration/default.php
index c33b27063f5ae..26de906bfa92b 100644
--- a/components/com_users/tmpl/registration/default.php
+++ b/components/com_users/tmpl/registration/default.php
@@ -27,7 +27,7 @@
         </div>
     <?php endif; ?>
 
-    <form id="member-registration" action="<?php echo Route::_('index.php?option=com_users&task=registration.register'); ?>" method="post" class="com-users-registration__form form-validate" enctype="multipart/form-data">
+    <form id="member-registration" action="<?php echo Route::_('index.php?task=registration.register'); ?>" method="post" class="com-users-registration__form form-validate" enctype="multipart/form-data">
         <?php // Iterate through the form fieldsets and display each one. ?>
         <?php foreach ($this->form->getFieldsets() as $fieldset) : ?>
             <?php if ($fieldset->name === 'captcha' && $this->captchaEnabled) : ?>
diff --git a/components/com_users/tmpl/remind/default.php b/components/com_users/tmpl/remind/default.php
index 913e380b67ab4..59110d441fc48 100644
--- a/components/com_users/tmpl/remind/default.php
+++ b/components/com_users/tmpl/remind/default.php
@@ -28,7 +28,7 @@
             </h1>
         </div>
     <?php endif; ?>
-    <form id="user-registration" action="<?php echo Route::_('index.php?option=com_users&task=remind.remind'); ?>" method="post" class="com-users-remind__form form-validate form-horizontal well">
+    <form action="<?php echo Route::_('index.php?task=remind.remind'); ?>" method="post" id="user-registration" class="com-users-remind__form form-validate form-horizontal well">
         <?php foreach ($this->form->getFieldsets() as $fieldset) : ?>
             <fieldset>
                 <?php if (isset($fieldset->label)) : ?>
diff --git a/components/com_users/tmpl/reset/complete.php b/components/com_users/tmpl/reset/complete.php
index 3e8ef3a1f14d3..13fe66290e8dc 100644
--- a/components/com_users/tmpl/reset/complete.php
+++ b/components/com_users/tmpl/reset/complete.php
@@ -29,7 +29,7 @@
             </h1>
         </div>
     <?php endif; ?>
-    <form action="<?php echo Route::_('index.php?option=com_users&task=reset.complete'); ?>" method="post" class="com-users-reset-complete__form form-validate form-horizontal well">
+    <form action="<?php echo Route::_('index.php?task=reset.complete'); ?>" method="post" class="com-users-reset-complete__form form-validate form-horizontal well">
         <?php foreach ($this->form->getFieldsets() as $fieldset) : ?>
             <fieldset>
                 <?php if (isset($fieldset->label)) : ?>
diff --git a/components/com_users/tmpl/reset/confirm.php b/components/com_users/tmpl/reset/confirm.php
index 38ad662ed4af3..85144d02a204d 100644
--- a/components/com_users/tmpl/reset/confirm.php
+++ b/components/com_users/tmpl/reset/confirm.php
@@ -28,7 +28,7 @@
             </h1>
         </div>
     <?php endif; ?>
-    <form action="<?php echo Route::_('index.php?option=com_users&task=reset.confirm'); ?>" method="post" class="com-users-reset-confirm__form form-validate form-horizontal well">
+    <form action="<?php echo Route::_('index.php?task=reset.confirm'); ?>" method="post" class="com-users-reset-confirm__form form-validate form-horizontal well">
         <?php foreach ($this->form->getFieldsets() as $fieldset) : ?>
             <fieldset>
                 <?php if (isset($fieldset->label)) : ?>
diff --git a/components/com_users/tmpl/reset/default.php b/components/com_users/tmpl/reset/default.php
index a925733926652..5995f31512080 100644
--- a/components/com_users/tmpl/reset/default.php
+++ b/components/com_users/tmpl/reset/default.php
@@ -28,7 +28,7 @@
             </h1>
         </div>
     <?php endif; ?>
-    <form id="user-registration" action="<?php echo Route::_('index.php?option=com_users&task=reset.request'); ?>" method="post" class="com-users-reset__form form-validate form-horizontal well">
+    <form action="<?php echo Route::_('index.php?task=reset.request'); ?>" method="post" id="user-registration" class="com-users-reset__form form-validate form-horizontal well">
         <?php foreach ($this->form->getFieldsets() as $fieldset) : ?>
             <fieldset>
                 <?php if (isset($fieldset->label)) : ?>
diff --git a/installation/sql/mysql/base.sql b/installation/sql/mysql/base.sql
index 88067a242eb34..b3faa1e3ebf12 100644
--- a/installation/sql/mysql/base.sql
+++ b/installation/sql/mysql/base.sql
@@ -336,15 +336,15 @@ INSERT INTO `#__extensions` (`package_id`, `name`, `type`, `element`, `folder`,
 (0, 'plg_quickicon_eos', 'plugin', 'eos', 'quickicon', 0, 1, 1, 0, 1, '', '', '', 8, 0),
 (0, 'plg_sampledata_blog', 'plugin', 'blog', 'sampledata', 0, 1, 1, 0, 1, '', '', '', 1, 0),
 (0, 'plg_sampledata_multilang', 'plugin', 'multilang', 'sampledata', 0, 1, 1, 0, 1, '', '', '', 2, 0),
-(0, 'plg_schemaorg_article', 'plugin', 'article', 'schemaorg', 0, 1, 1, 0, 0, '', '{}', '', 1, 0),
-(0, 'plg_schemaorg_blogposting', 'plugin', 'blogposting', 'schemaorg', 0, 1, 1, 0, 0, '', '{}', '', 2, 0),
-(0, 'plg_schemaorg_book', 'plugin', 'book', 'schemaorg', 0, 1, 1, 0, 0, '', '{}', '', 3, 0),
-(0, 'plg_schemaorg_event', 'plugin', 'event', 'schemaorg', 0, 1, 1, 0, 0, '', '{}', '', 4, 0),
-(0, 'plg_schemaorg_jobposting', 'plugin', 'jobposting', 'schemaorg', 0, 1, 1, 0, 0, '', '{}', '', 5, 0),
-(0, 'plg_schemaorg_organization', 'plugin', 'organization', 'schemaorg', 0, 1, 1, 0, 0, '', '{}', '', 6, 0),
-(0, 'plg_schemaorg_person', 'plugin', 'person', 'schemaorg', 0, 1, 1, 0, 0, '', '{}', '', 7, 0),
-(0, 'plg_schemaorg_recipe', 'plugin', 'recipe', 'schemaorg', 0, 1, 1, 0, 0, '', '{}', '', 8, 0),
-(0, 'plg_schemaorg_custom', 'plugin', 'custom', 'schemaorg', 0, 1, 1, 0, 0, '', '{}', '', 9, 0),
+(0, 'plg_schemaorg_article', 'plugin', 'article', 'schemaorg', 0, 1, 1, 0, 1, '', '{}', '', 1, 0),
+(0, 'plg_schemaorg_blogposting', 'plugin', 'blogposting', 'schemaorg', 0, 1, 1, 0, 1, '', '{}', '', 2, 0),
+(0, 'plg_schemaorg_book', 'plugin', 'book', 'schemaorg', 0, 1, 1, 0, 1, '', '{}', '', 3, 0),
+(0, 'plg_schemaorg_event', 'plugin', 'event', 'schemaorg', 0, 1, 1, 0, 1, '', '{}', '', 4, 0),
+(0, 'plg_schemaorg_jobposting', 'plugin', 'jobposting', 'schemaorg', 0, 1, 1, 0, 1, '', '{}', '', 5, 0),
+(0, 'plg_schemaorg_organization', 'plugin', 'organization', 'schemaorg', 0, 1, 1, 0, 1, '', '{}', '', 6, 0),
+(0, 'plg_schemaorg_person', 'plugin', 'person', 'schemaorg', 0, 1, 1, 0, 1, '', '{}', '', 7, 0),
+(0, 'plg_schemaorg_recipe', 'plugin', 'recipe', 'schemaorg', 0, 1, 1, 0, 1, '', '{}', '', 8, 0),
+(0, 'plg_schemaorg_custom', 'plugin', 'custom', 'schemaorg', 0, 1, 1, 0, 1, '', '{}', '', 9, 0),
 (0, 'plg_system_accessibility', 'plugin', 'accessibility', 'system', 0, 0, 1, 0, 1, '', '{}', '', 1, 0),
 (0, 'plg_system_actionlogs', 'plugin', 'actionlogs', 'system', 0, 1, 1, 0, 1, '', '{}', '', 2, 0),
 (0, 'plg_system_cache', 'plugin', 'cache', 'system', 0, 0, 1, 0, 1, '', '{"browsercache":"0","cachetime":"15"}', '', 3, 0),
@@ -361,7 +361,7 @@ INSERT INTO `#__extensions` (`package_id`, `name`, `type`, `element`, `folder`,
 (0, 'plg_system_redirect', 'plugin', 'redirect', 'system', 0, 0, 1, 0, 1, '', '', '', 15, 0),
 (0, 'plg_system_remember', 'plugin', 'remember', 'system', 0, 1, 1, 0, 1, '', '', '', 16, 0),
 (0, 'plg_system_schedulerunner', 'plugin', 'schedulerunner', 'system', 0, 1, 1, 0, 1, '', '{}', '', 17, 0),
-(0, 'plg_system_schemaorg', 'plugin', 'schemaorg', 'system', 0, 1, 1, 0, 0, '', '{}', '', 18, 0),
+(0, 'plg_system_schemaorg', 'plugin', 'schemaorg', 'system', 0, 1, 1, 0, 1, '', '{}', '', 18, 0),
 (0, 'plg_system_sef', 'plugin', 'sef', 'system', 0, 1, 1, 0, 1, '', '{"domain":"","indexphp":"1","trailingslash":"0","enforcesuffix":"1","strictrouting":"1"}', '', 19, 0),
 (0, 'plg_system_shortcut', 'plugin', 'shortcut', 'system', 0, 1, 1, 0, 1, '', '{}', '', 21, 0),
 (0, 'plg_system_skipto', 'plugin', 'skipto', 'system', 0, 1, 1, 0, 1, '', '{}', '', 22, 0),
@@ -370,7 +370,7 @@ INSERT INTO `#__extensions` (`package_id`, `name`, `type`, `element`, `folder`,
 (0, 'plg_system_webauthn', 'plugin', 'webauthn', 'system', 0, 1, 1, 0, 1, '', '{}', '', 26, 0),
 (0, 'plg_task_checkfiles', 'plugin', 'checkfiles', 'task', 0, 1, 1, 0, 1, '', '{}', '', 1, 0),
 (0, 'plg_task_deleteactionlogs', 'plugin', 'deleteactionlogs', 'task', 0, 1, 1, 0, 1, '', '{}', '', 2, 0),
-(0, 'plg_task_globalcheckin', 'plugin', 'globalcheckin', 'task', 0, 1, 1, 0, 0, '', '{}', '', 3, 0),
+(0, 'plg_task_globalcheckin', 'plugin', 'globalcheckin', 'task', 0, 1, 1, 0, 1, '', '{}', '', 3, 0),
 (0, 'plg_task_requests', 'plugin', 'requests', 'task', 0, 1, 1, 0, 1, '', '{}', '', 4, 0),
 (0, 'plg_task_privacyconsent', 'plugin', 'privacyconsent', 'task', 0, 1, 1, 0, 1, '', '{}', '', 5, 0),
 (0, 'plg_task_rotatelogs', 'plugin', 'rotatelogs', 'task', 0, 1, 1, 0, 1, '', '{}', '', 6, 0),
diff --git a/installation/sql/postgresql/base.sql b/installation/sql/postgresql/base.sql
index be60da89bcd33..a8004370cc44c 100644
--- a/installation/sql/postgresql/base.sql
+++ b/installation/sql/postgresql/base.sql
@@ -342,15 +342,15 @@ INSERT INTO "#__extensions" ("package_id", "name", "type", "element", "folder",
 (0, 'plg_quickicon_eos', 'plugin', 'eos', 'quickicon', 0, 1, 1, 0, 1, '', '', '', 8, 0),
 (0, 'plg_sampledata_blog', 'plugin', 'blog', 'sampledata', 0, 1, 1, 0, 1, '', '', '', 1, 0),
 (0, 'plg_sampledata_multilang', 'plugin', 'multilang', 'sampledata', 0, 1, 1, 0, 1, '', '', '', 2, 0),
-(0, 'plg_schemaorg_article', 'plugin', 'article', 'schemaorg', 0, 1, 1, 0, 0, '', '{}', '', 1, 0),
-(0, 'plg_schemaorg_blogposting', 'plugin', 'blogposting', 'schemaorg', 0, 1, 1, 0, 0, '', '{}', '', 2, 0),
-(0, 'plg_schemaorg_book', 'plugin', 'book', 'schemaorg', 0, 1, 1, 0, 0, '', '{}', '', 3, 0),
-(0, 'plg_schemaorg_event', 'plugin', 'event', 'schemaorg', 0, 1, 1, 0, 0, '', '{}', '', 4, 0),
-(0, 'plg_schemaorg_jobposting', 'plugin', 'jobposting', 'schemaorg', 0, 1, 1, 0, 0, '', '{}', '', 5, 0),
-(0, 'plg_schemaorg_organization', 'plugin', 'organization', 'schemaorg', 0, 1, 1, 0, 0, '', '{}', '', 6, 0),
-(0, 'plg_schemaorg_person', 'plugin', 'person', 'schemaorg', 0, 1, 1, 0, 0, '', '{}', '', 7, 0),
-(0, 'plg_schemaorg_recipe', 'plugin', 'recipe', 'schemaorg', 0, 1, 1, 0, 0, '', '{}', '', 8, 0),
-(0, 'plg_schemaorg_custom', 'plugin', 'custom', 'schemaorg', 0, 1, 1, 0, 0, '', '{}', '', 9, 0),
+(0, 'plg_schemaorg_article', 'plugin', 'article', 'schemaorg', 0, 1, 1, 0, 1, '', '{}', '', 1, 0),
+(0, 'plg_schemaorg_blogposting', 'plugin', 'blogposting', 'schemaorg', 0, 1, 1, 0, 1, '', '{}', '', 2, 0),
+(0, 'plg_schemaorg_book', 'plugin', 'book', 'schemaorg', 0, 1, 1, 0, 1, '', '{}', '', 3, 0),
+(0, 'plg_schemaorg_event', 'plugin', 'event', 'schemaorg', 0, 1, 1, 0, 1, '', '{}', '', 4, 0),
+(0, 'plg_schemaorg_jobposting', 'plugin', 'jobposting', 'schemaorg', 0, 1, 1, 0, 1, '', '{}', '', 5, 0),
+(0, 'plg_schemaorg_organization', 'plugin', 'organization', 'schemaorg', 0, 1, 1, 0, 1, '', '{}', '', 6, 0),
+(0, 'plg_schemaorg_person', 'plugin', 'person', 'schemaorg', 0, 1, 1, 0, 1, '', '{}', '', 7, 0),
+(0, 'plg_schemaorg_recipe', 'plugin', 'recipe', 'schemaorg', 0, 1, 1, 0, 1, '', '{}', '', 8, 0),
+(0, 'plg_schemaorg_custom', 'plugin', 'custom', 'schemaorg', 0, 1, 1, 0, 1, '', '{}', '', 9, 0),
 (0, 'plg_system_accessibility', 'plugin', 'accessibility', 'system', 0, 0, 1, 0, 1, '', '{}', '', 1, 0),
 (0, 'plg_system_actionlogs', 'plugin', 'actionlogs', 'system', 0, 1, 1, 0, 1, '', '{}', '', 2, 0),
 (0, 'plg_system_cache', 'plugin', 'cache', 'system', 0, 0, 1, 0, 1, '', '{"browsercache":"0","cachetime":"15"}', '', 3, 0),
@@ -367,7 +367,7 @@ INSERT INTO "#__extensions" ("package_id", "name", "type", "element", "folder",
 (0, 'plg_system_redirect', 'plugin', 'redirect', 'system', 0, 0, 1, 0, 1, '', '', '', 15, 0),
 (0, 'plg_system_remember', 'plugin', 'remember', 'system', 0, 1, 1, 0, 1, '', '', '', 16, 0),
 (0, 'plg_system_schedulerunner', 'plugin', 'schedulerunner', 'system', 0, 1, 1, 0, 1, '', '{}', '', 17, 0),
-(0, 'plg_system_schemaorg', 'plugin', 'schemaorg', 'system', 0, 1, 1, 0, 0, '', '{}', '', 18, 0),
+(0, 'plg_system_schemaorg', 'plugin', 'schemaorg', 'system', 0, 1, 1, 0, 1, '', '{}', '', 18, 0),
 (0, 'plg_system_sef', 'plugin', 'sef', 'system', 0, 1, 1, 0, 1, '', '{"domain":"","indexphp":"1","trailingslash":"0","enforcesuffix":"1","strictrouting":"1"}', '', 19, 0),
 (0, 'plg_system_shortcut', 'plugin', 'shortcut', 'system', 0, 1, 1, 0, 1, '', '{}', '', 21, 0),
 (0, 'plg_system_skipto', 'plugin', 'skipto', 'system', 0, 1, 1, 0, 1, '', '{}', '', 22, 0),
@@ -376,7 +376,7 @@ INSERT INTO "#__extensions" ("package_id", "name", "type", "element", "folder",
 (0, 'plg_system_webauthn', 'plugin', 'webauthn', 'system', 0, 1, 1, 0, 1, '', '{}', '', 26, 0),
 (0, 'plg_task_checkfiles', 'plugin', 'checkfiles', 'task', 0, 1, 1, 0, 1, '', '{}', '', 1, 0),
 (0, 'plg_task_deleteactionlogs', 'plugin', 'deleteactionlogs', 'task', 0, 1, 1, 0, 1, '', '{}', '', 2, 0),
-(0, 'plg_task_globalcheckin', 'plugin', 'globalcheckin', 'task', 0, 1, 1, 0, 0, '', '{}', '', 3, 0),
+(0, 'plg_task_globalcheckin', 'plugin', 'globalcheckin', 'task', 0, 1, 1, 0, 1, '', '{}', '', 3, 0),
 (0, 'plg_task_requests', 'plugin', 'requests', 'task', 0, 1, 1, 0, 1, '', '{}', '', 4, 0),
 (0, 'plg_task_privacyconsent', 'plugin', 'privacyconsent', 'task', 0, 1, 1, 0, 1, '', '{}', '', 5, 0),
 (0, 'plg_task_rotatelogs', 'plugin', 'rotatelogs', 'task', 0, 1, 1, 0, 1, '', '{}', '', 6, 0),
diff --git a/libraries/loader.php b/libraries/loader.php
index 29fa62acb460d..5883847634300 100644
--- a/libraries/loader.php
+++ b/libraries/loader.php
@@ -282,7 +282,7 @@ class_alias($original, $class);
      *
      * @since       1.7.0
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              Classes should be autoloaded. Use JLoader::registerPrefix() or JLoader::registerNamespace() to
      *              register an autoloader for your files.
      */
diff --git a/libraries/src/Application/EventAware.php b/libraries/src/Application/EventAware.php
index 2617effb67f79..76ca8c95ae1b5 100644
--- a/libraries/src/Application/EventAware.php
+++ b/libraries/src/Application/EventAware.php
@@ -84,7 +84,7 @@ public function registerEvent($event, callable $handler)
      * @since       4.0.0
      * @throws      \InvalidArgumentException
      *
-     * @deprecated  4.0 will be removed in 6.0
+     * @deprecated  4.0 will be removed in 7.0
      *              Use the Dispatcher method instead
      *              Example: Factory::getApplication()->getDispatcher()->dispatch($eventName, $event);
      *
diff --git a/libraries/src/Application/EventAwareInterface.php b/libraries/src/Application/EventAwareInterface.php
index c77d9d8a90395..c5ae193027629 100644
--- a/libraries/src/Application/EventAwareInterface.php
+++ b/libraries/src/Application/EventAwareInterface.php
@@ -21,7 +21,7 @@
  * Interface defining application that can trigger Joomla 3.x style events
  *
  * @since       4.0.0
- * @deprecated  4.3 will be removed in 6.0
+ * @deprecated  4.3 will be removed in 7.0
  *              This interface will be removed without replacement as the Joomla 3.x compatibility layer will be removed
  * @todo        Move to compat plugin
  */
@@ -54,7 +54,7 @@ public function getDispatcher();
      * @since       4.0.0
      * @throws      \InvalidArgumentException
      *
-     * @deprecated  4.0 will be removed in 6.0
+     * @deprecated  4.0 will be removed in 7.0
      *              Use the Dispatcher method instead
      *              Example: Factory::getApplication()->getDispatcher()->dispatch($eventName, $event);
      */
diff --git a/libraries/src/Captcha/Captcha.php b/libraries/src/Captcha/Captcha.php
index 260e81f1cc922..5cc2b1d89811b 100644
--- a/libraries/src/Captcha/Captcha.php
+++ b/libraries/src/Captcha/Captcha.php
@@ -86,7 +86,7 @@ public function __construct($captcha, $options)
             $this->provider = $registry->get($captcha);
         } else {
             @trigger_error(
-                'Use of legacy Captcha is deprecated. Use onCaptchaSetup event to register your Captcha provider.',
+                'Use of legacy Captcha is deprecated. Use onCaptchaSetup event to register your Captcha provider. Will be removed in 7.0.',
                 E_USER_DEPRECATED
             );
 
@@ -130,10 +130,10 @@ public static function getInstance($captcha, array $options = [])
      *
      * @return  boolean  True on success
      *
-     * @since   2.5
      * @throws  \RuntimeException
      *
-     * @deprecated  Without replacement
+     * @since   2.5
+     * @deprecated  Without replacement. Will be removed in 7.0.
      */
     public function initialise($id)
     {
@@ -253,7 +253,7 @@ public function setupField(CaptchaField $field, \SimpleXMLElement $element)
      *
      * @since   4.0.0
      *
-     * @deprecated  Without replacement
+     * @deprecated  Without replacement. Will be removed in 7.0.
      */
     private function update($name, &$args)
     {
@@ -271,10 +271,10 @@ private function update($name, &$args)
      *
      * @return  void
      *
-     * @since   2.5
      * @throws  \RuntimeException
      *
-     * @deprecated  Should use CaptchaRegistry
+     * @since   2.5
+     * @deprecated  Should use CaptchaRegistry. Will be removed in 7.0.
      */
     private function _load(array $options = [])
     {
diff --git a/libraries/src/Document/Renderer/Html/ModulesRenderer.php b/libraries/src/Document/Renderer/Html/ModulesRenderer.php
index 3255350ef0479..f245e57f1b425 100644
--- a/libraries/src/Document/Renderer/Html/ModulesRenderer.php
+++ b/libraries/src/Document/Renderer/Html/ModulesRenderer.php
@@ -60,7 +60,7 @@ public function render($position, $params = [], $content = null)
 
         // Dispatch onAfterRenderModules event
         $event = new Module\AfterRenderModulesEvent('onAfterRenderModules', [
-            'content'    => &$buffer, // @todo: Remove reference in Joomla 6, see AfterRenderModulesEvent::__constructor()
+            'content'    => &$buffer, // @todo: Remove reference in Joomla 7, see AfterRenderModulesEvent::__constructor()
             'attributes' => $params,
         ]);
         $app->getDispatcher()->dispatch('onAfterRenderModules', $event);
diff --git a/libraries/src/Editor/Button/Button.php b/libraries/src/Editor/Button/Button.php
index 4d862041ff7cd..584c4b59745e1 100644
--- a/libraries/src/Editor/Button/Button.php
+++ b/libraries/src/Editor/Button/Button.php
@@ -79,7 +79,7 @@ public function get(string $name, $default = null)
     {
         if ($name === 'options') {
             @trigger_error(
-                'Accessing options property is deprecated. To access the Button options use getOptions() method.',
+                'Accessing options property is deprecated. To access the Button options use getOptions() method. Will be removed in 7.0.',
                 \E_USER_DEPRECATED
             );
 
@@ -102,7 +102,7 @@ public function set(string $name, $value): ButtonInterface
     {
         if ($name === 'options') {
             @trigger_error(
-                'Accessing options property is deprecated. To set the Button options use setOptions() method.',
+                'Accessing options property is deprecated. To set the Button options use setOptions() method.  Will be removed in 7.0.',
                 \E_USER_DEPRECATED
             );
 
@@ -148,11 +148,11 @@ public function setOptions(array $options): ButtonInterface
      * @return string|null A value if the property name is valid, null otherwise.
      *
      * @since       5.0.0
-     * @deprecated  6.0  This is a B/C proxy for deprecated read accesses
+     * @deprecated  7.0  This is a B/C proxy for deprecated read accesses
      */
     public function __get($name)
     {
-        @trigger_error('Property access is deprecated in Joomla\CMS\Editor\Button class, use get/set methods.', \E_USER_DEPRECATED);
+        @trigger_error('Property access is deprecated in Joomla\CMS\Editor\Button class, use get/set methods. Will be removed in 7.0.', \E_USER_DEPRECATED);
 
         return $this->get($name);
     }
@@ -166,11 +166,11 @@ public function __get($name)
      * @return void
      *
      * @since       5.0.0
-     * @deprecated  6.0  This is a B/C proxy for deprecated write accesses
+     * @deprecated  7.0  This is a B/C proxy for deprecated write accesses
      */
     public function __set($name, $value)
     {
-        @trigger_error('Property access is deprecated in Joomla\CMS\Editor\Button class, use get/set methods.', \E_USER_DEPRECATED);
+        @trigger_error('Property access is deprecated in Joomla\CMS\Editor\Button class, use get/set methods. Will be removed in 7.0.', \E_USER_DEPRECATED);
 
         $this->set($name, $value);
     }
diff --git a/libraries/src/Editor/Button/ButtonsRegistry.php b/libraries/src/Editor/Button/ButtonsRegistry.php
index cbae9287a935f..287c6c2cf0016 100644
--- a/libraries/src/Editor/Button/ButtonsRegistry.php
+++ b/libraries/src/Editor/Button/ButtonsRegistry.php
@@ -121,7 +121,7 @@ public function initRegistry(array $options = []): ButtonsRegistryInterface
                 continue;
             }
 
-            @trigger_error('6.0 Button "' . $plugin->name . '" instance should be set up onEditorButtonsSetup event.', \E_USER_DEPRECATED);
+            @trigger_error('7.0 Button "' . $plugin->name . '" instance should be set up onEditorButtonsSetup event.', \E_USER_DEPRECATED);
 
             // Transform Legacy buttons to Button object
             if ($legacyButton instanceof CMSObject || $legacyButton instanceof Registry) {
diff --git a/libraries/src/Editor/Editor.php b/libraries/src/Editor/Editor.php
index 746369b6e596b..f395f6d59e61a 100644
--- a/libraries/src/Editor/Editor.php
+++ b/libraries/src/Editor/Editor.php
@@ -104,7 +104,7 @@ public function __construct(string $editor = 'none', ?DispatcherInterface $dispa
         } else {
             // Fallback to legacy editor logic
             @trigger_error(
-                '6.0 Discovering an editor "' . $this->_name . '" outside of EditorsRegistry is deprecated.',
+                '7.0 Discovering an editor "' . $this->_name . '" outside of EditorsRegistry is deprecated.',
                 \E_USER_DEPRECATED
             );
 
@@ -120,7 +120,7 @@ public function __construct(string $editor = 'none', ?DispatcherInterface $dispa
                 'getButtons',
                 function (AbstractEvent $event) {
                     @trigger_error(
-                        '6.0 Use Button "getButtons" event is deprecated,  buttons should be set up onEditorButtonsSetup event.',
+                        '7.0 Use Button "getButtons" event is deprecated,  buttons should be set up onEditorButtonsSetup event.',
                         \E_USER_DEPRECATED
                     );
 
@@ -161,7 +161,7 @@ public static function getInstance($editor = 'none')
      *
      * @since   1.5
      *
-     * @deprecated  6.0 Without replacement
+     * @deprecated  7.0 Without replacement
      */
     public function initialise()
     {
@@ -174,7 +174,7 @@ public function initialise()
             return;
         }
 
-        @trigger_error('6.0 Method onInit() for Editor instance is deprecated, without replacement.', \E_USER_DEPRECATED);
+        @trigger_error('7.0 Method onInit() for Editor instance is deprecated, without replacement.', \E_USER_DEPRECATED);
 
         if (method_exists($this->_editor, 'onInit')) {
             \call_user_func([$this->_editor, 'onInit']);
@@ -316,7 +316,7 @@ public function getButtons($editor, $buttons = true)
      *
      * @since   1.5
      *
-     * @deprecated  6.0 Should use EditorRegistry
+     * @deprecated  7.0 Should use EditorRegistry
      */
     protected function _loadEditor($config = [])
     {
@@ -325,7 +325,7 @@ protected function _loadEditor($config = [])
             return false;
         }
 
-        @trigger_error('6.0 Editor "' . $this->_name . '" instance should be set up onEditorSetup event.', \E_USER_DEPRECATED);
+        @trigger_error('7.0 Editor "' . $this->_name . '" instance should be set up onEditorSetup event.', \E_USER_DEPRECATED);
 
         // Build the path to the needed editor plugin
         $name = InputFilter::getInstance()->clean($this->_name, 'cmd');
diff --git a/libraries/src/Event/AbstractEvent.php b/libraries/src/Event/AbstractEvent.php
index 339e1d43bf1cd..64871a783e263 100644
--- a/libraries/src/Event/AbstractEvent.php
+++ b/libraries/src/Event/AbstractEvent.php
@@ -145,7 +145,7 @@ public function getArgument($name, $default = null)
 
             @trigger_error(
                 \sprintf(
-                    'Numeric access to named event arguments is deprecated, and will not work in Joomla 6. Event %s argument %s',
+                    'Numeric access to named event arguments is deprecated, and will not work in Joomla 7. Event %s argument %s',
                     \get_class($this),
                     $name
                 ),
@@ -167,7 +167,7 @@ public function getArgument($name, $default = null)
         if (method_exists($this, $methodName2)) {
             @trigger_error(
                 \sprintf(
-                    'Use method "%s" for value pre-processing is deprecated, and will not work in Joomla 6. Use "%s" instead. Event %s',
+                    'Use method "%s" for value pre-processing is deprecated, and will not work in Joomla 7. Use "%s" instead. Event %s',
                     $methodName2,
                     $methodName1,
                     \get_class($this)
@@ -210,7 +210,7 @@ public function setArgument($name, $value)
 
             @trigger_error(
                 \sprintf(
-                    'Numeric access to named event arguments is deprecated, and will not work in Joomla 6. Event %s argument %s',
+                    'Numeric access to named event arguments is deprecated, and will not work in Joomla 7. Event %s argument %s',
                     \get_class($this),
                     $name
                 ),
@@ -228,7 +228,7 @@ public function setArgument($name, $value)
         } elseif (method_exists($this, $methodName2)) {
             @trigger_error(
                 \sprintf(
-                    'Use method "%s" for value pre-processing is deprecated, and will not work in Joomla 6. Use "%s" instead. Event %s',
+                    'Use method "%s" for value pre-processing is deprecated, and will not work in Joomla 7. Use "%s" instead. Event %s',
                     $methodName2,
                     $methodName1,
                     \get_class($this)
diff --git a/libraries/src/Event/AbstractImmutableEvent.php b/libraries/src/Event/AbstractImmutableEvent.php
index d877251fba172..2c521d8bf8d27 100644
--- a/libraries/src/Event/AbstractImmutableEvent.php
+++ b/libraries/src/Event/AbstractImmutableEvent.php
@@ -69,7 +69,7 @@ public function offsetSet($name, $value)
             parent::offsetSet($name, $value);
 
             @trigger_error(
-                'Setting a result in an immutable event is deprecated, and will not work in Joomla 6. Event ' . $this->getName(),
+                'Setting a result in an immutable event is deprecated, and will not work in Joomla 7. Event ' . $this->getName(),
                 E_USER_DEPRECATED
             );
 
diff --git a/libraries/src/Event/Cache/AfterPurgeEvent.php b/libraries/src/Event/Cache/AfterPurgeEvent.php
index 36ba3c4687ec9..5de7532444900 100644
--- a/libraries/src/Event/Cache/AfterPurgeEvent.php
+++ b/libraries/src/Event/Cache/AfterPurgeEvent.php
@@ -31,7 +31,7 @@ class AfterPurgeEvent extends AbstractImmutableEvent
      * @var array
      *
      * @since  5.0.0
-     * @deprecated 5.0 will be removed in 6.0
+     * @deprecated 5.0 will be removed in 7.0
      */
     protected $legacyArgumentsOrder = ['subject'];
 
diff --git a/libraries/src/Event/Checkin/AfterCheckinEvent.php b/libraries/src/Event/Checkin/AfterCheckinEvent.php
index 7582557c1ed07..ff899318f0c54 100644
--- a/libraries/src/Event/Checkin/AfterCheckinEvent.php
+++ b/libraries/src/Event/Checkin/AfterCheckinEvent.php
@@ -31,7 +31,7 @@ class AfterCheckinEvent extends AbstractImmutableEvent
      * @var array
      *
      * @since  5.0.0
-     * @deprecated 5.0 will be removed in 6.0
+     * @deprecated 5.0 will be removed in 7.0
      */
     protected $legacyArgumentsOrder = ['subject'];
 
diff --git a/libraries/src/Event/Contact/SubmitContactEvent.php b/libraries/src/Event/Contact/SubmitContactEvent.php
index c90e78a248b2f..5f3e95fbeae87 100644
--- a/libraries/src/Event/Contact/SubmitContactEvent.php
+++ b/libraries/src/Event/Contact/SubmitContactEvent.php
@@ -31,7 +31,7 @@ class SubmitContactEvent extends AbstractImmutableEvent
      * @var array
      *
      * @since  5.0.0
-     * @deprecated 5.0 will be removed in 6.0
+     * @deprecated 5.0 will be removed in 7.0
      */
     protected $legacyArgumentsOrder = ['subject', 'data'];
 
@@ -63,8 +63,8 @@ public function __construct($name, array $arguments = [])
         }
 
         // For backward compatibility make sure the content is referenced
-        // @todo: Remove in Joomla 6
-        // @deprecated: Passing argument by reference is deprecated, and will not work in Joomla 6
+        // @todo: Remove in Joomla 7
+        // @deprecated: Passing argument by reference is deprecated, and will not work in Joomla 7
         if (key($arguments) === 0) {
             $this->arguments['data'] = &$arguments[1];
         } elseif (\array_key_exists('data', $arguments)) {
diff --git a/libraries/src/Event/Contact/ValidateContactEvent.php b/libraries/src/Event/Contact/ValidateContactEvent.php
index 3f29c683a6149..d0698cb20ed57 100644
--- a/libraries/src/Event/Contact/ValidateContactEvent.php
+++ b/libraries/src/Event/Contact/ValidateContactEvent.php
@@ -36,7 +36,7 @@ class ValidateContactEvent extends AbstractImmutableEvent implements ResultAware
      * @var array
      *
      * @since  5.0.0
-     * @deprecated 5.0 will be removed in 6.0
+     * @deprecated 5.0 will be removed in 7.0
      */
     protected $legacyArgumentsOrder = ['subject', 'data'];
 
@@ -68,8 +68,8 @@ public function __construct($name, array $arguments = [])
         }
 
         // For backward compatibility make sure the content is referenced
-        // @todo: Remove in Joomla 6
-        // @deprecated: Passing argument by reference is deprecated, and will not work in Joomla 6
+        // @todo: Remove in Joomla 7
+        // @deprecated: Passing argument by reference is deprecated, and will not work in Joomla 7
         if (key($arguments) === 0) {
             $this->arguments['data'] = &$arguments[1];
         } elseif (\array_key_exists('data', $arguments)) {
diff --git a/libraries/src/Event/Content/ContentEvent.php b/libraries/src/Event/Content/ContentEvent.php
index 842e3d2473ff4..3aeb002278014 100644
--- a/libraries/src/Event/Content/ContentEvent.php
+++ b/libraries/src/Event/Content/ContentEvent.php
@@ -31,7 +31,7 @@ abstract class ContentEvent extends AbstractImmutableEvent
      * @var array
      *
      * @since  5.0.0
-     * @deprecated 5.0 will be removed in 6.0
+     * @deprecated 5.0 will be removed in 7.0
      */
     protected $legacyArgumentsOrder = [];
 
diff --git a/libraries/src/Event/Content/ContentPrepareEvent.php b/libraries/src/Event/Content/ContentPrepareEvent.php
index 87f7f6d198414..b4540d86af5dd 100644
--- a/libraries/src/Event/Content/ContentPrepareEvent.php
+++ b/libraries/src/Event/Content/ContentPrepareEvent.php
@@ -30,7 +30,7 @@ class ContentPrepareEvent extends ContentEvent
      * @var array
      *
      * @since  5.0.0
-     * @deprecated 5.0 will be removed in 6.0
+     * @deprecated 5.0 will be removed in 7.0
      */
     protected $legacyArgumentsOrder = ['context', 'subject', 'params', 'page'];
 
@@ -63,9 +63,9 @@ protected function onSetParams($value): Registry
         if (!$value instanceof Registry) {
             $value = new Registry($value);
 
-            // @TODO: In 6.0 throw an exception
+            // @TODO: In 7.0 throw an exception
             @trigger_error(
-                \sprintf('The "params" attribute for the event "%s" must be type of Registry. In 6.0 it will throw an exception', $this->getName()),
+                \sprintf('The "params" attribute for the event "%s" must be type of Registry. In 7.0 it will throw an exception', $this->getName()),
                 E_USER_DEPRECATED
             );
         }
diff --git a/libraries/src/Event/CustomFields/AbstractPrepareFieldEvent.php b/libraries/src/Event/CustomFields/AbstractPrepareFieldEvent.php
index 1cf62cd78dceb..548ac6c56096a 100644
--- a/libraries/src/Event/CustomFields/AbstractPrepareFieldEvent.php
+++ b/libraries/src/Event/CustomFields/AbstractPrepareFieldEvent.php
@@ -26,7 +26,7 @@ abstract class AbstractPrepareFieldEvent extends CustomFieldsEvent
      * @var array
      *
      * @since  5.0.0
-     * @deprecated 5.0 will be removed in 6.0
+     * @deprecated 5.0 will be removed in 7.0
      */
     protected $legacyArgumentsOrder = ['context', 'item', 'subject'];
 
diff --git a/libraries/src/Event/CustomFields/AfterPrepareFieldEvent.php b/libraries/src/Event/CustomFields/AfterPrepareFieldEvent.php
index c66297e0fd28a..cf56cd563fe2d 100644
--- a/libraries/src/Event/CustomFields/AfterPrepareFieldEvent.php
+++ b/libraries/src/Event/CustomFields/AfterPrepareFieldEvent.php
@@ -26,7 +26,7 @@ class AfterPrepareFieldEvent extends AbstractPrepareFieldEvent
      * @var array
      *
      * @since  5.0.0
-     * @deprecated 5.0 will be removed in 6.0
+     * @deprecated 5.0 will be removed in 7.0
      */
     protected $legacyArgumentsOrder = ['context', 'item', 'subject', 'value'];
 
@@ -49,8 +49,8 @@ public function __construct($name, array $arguments = [])
         }
 
         // For backward compatibility make sure the value is referenced
-        // @todo: Remove in Joomla 6
-        // @deprecated: Passing argument by reference is deprecated, and will not work in Joomla 6
+        // @todo: Remove in Joomla 7
+        // @deprecated: Passing argument by reference is deprecated, and will not work in Joomla 7
         if (key($arguments) === 0 && \count($arguments) >= 4) {
             $this->arguments['value'] = &$arguments[3];
         } elseif (\array_key_exists('value', $arguments)) {
diff --git a/libraries/src/Event/CustomFields/CustomFieldsEvent.php b/libraries/src/Event/CustomFields/CustomFieldsEvent.php
index a7fd00a1a0ee2..2ec7c2b3cab3e 100644
--- a/libraries/src/Event/CustomFields/CustomFieldsEvent.php
+++ b/libraries/src/Event/CustomFields/CustomFieldsEvent.php
@@ -31,7 +31,7 @@ abstract class CustomFieldsEvent extends AbstractImmutableEvent
      * @var array
      *
      * @since  5.0.0
-     * @deprecated 5.0 will be removed in 6.0
+     * @deprecated 5.0 will be removed in 7.0
      */
     protected $legacyArgumentsOrder = [];
 
diff --git a/libraries/src/Event/CustomFields/PrepareDomEvent.php b/libraries/src/Event/CustomFields/PrepareDomEvent.php
index 5c948f4a26279..83d62ee1235ab 100644
--- a/libraries/src/Event/CustomFields/PrepareDomEvent.php
+++ b/libraries/src/Event/CustomFields/PrepareDomEvent.php
@@ -28,7 +28,7 @@ class PrepareDomEvent extends CustomFieldsEvent
      * @var array
      *
      * @since  5.0.0
-     * @deprecated 5.0 will be removed in 6.0
+     * @deprecated 5.0 will be removed in 7.0
      */
     protected $legacyArgumentsOrder = ['subject', 'fieldset', 'form'];
 
diff --git a/libraries/src/Event/Extension/AbstractExtensionEvent.php b/libraries/src/Event/Extension/AbstractExtensionEvent.php
index 060ceabd0003b..048d872517fc3 100644
--- a/libraries/src/Event/Extension/AbstractExtensionEvent.php
+++ b/libraries/src/Event/Extension/AbstractExtensionEvent.php
@@ -31,7 +31,7 @@ abstract class AbstractExtensionEvent extends AbstractImmutableEvent
      * @var array
      *
      * @since  5.0.0
-     * @deprecated 5.0 will be removed in 6.0
+     * @deprecated 5.0 will be removed in 7.0
      */
     protected $legacyArgumentsOrder = [];
 
diff --git a/libraries/src/Event/Extension/AbstractJoomlaUpdateEvent.php b/libraries/src/Event/Extension/AbstractJoomlaUpdateEvent.php
index 5501f55316de2..3951f4bbe4db5 100644
--- a/libraries/src/Event/Extension/AbstractJoomlaUpdateEvent.php
+++ b/libraries/src/Event/Extension/AbstractJoomlaUpdateEvent.php
@@ -31,7 +31,7 @@ abstract class AbstractJoomlaUpdateEvent extends AbstractImmutableEvent
      * @var array
      *
      * @since  5.2.0
-     * @deprecated 5.2.0 will be removed in 6.0
+     * @deprecated 5.2.0 will be removed in 7.0
      */
     protected $legacyArgumentsOrder = [];
 
diff --git a/libraries/src/Event/Extension/AfterInstallEvent.php b/libraries/src/Event/Extension/AfterInstallEvent.php
index a3b645c045975..6d8222423be25 100644
--- a/libraries/src/Event/Extension/AfterInstallEvent.php
+++ b/libraries/src/Event/Extension/AfterInstallEvent.php
@@ -28,7 +28,7 @@ class AfterInstallEvent extends AbstractExtensionEvent
      * @var array
      *
      * @since  5.0.0
-     * @deprecated 5.0 will be removed in 6.0
+     * @deprecated 5.0 will be removed in 7.0
      */
     protected $legacyArgumentsOrder = ['installer', 'eid'];
 
diff --git a/libraries/src/Event/Extension/AfterJoomlaUpdateEvent.php b/libraries/src/Event/Extension/AfterJoomlaUpdateEvent.php
index cb8642c977e93..3b0cf4b7b4f08 100644
--- a/libraries/src/Event/Extension/AfterJoomlaUpdateEvent.php
+++ b/libraries/src/Event/Extension/AfterJoomlaUpdateEvent.php
@@ -26,7 +26,7 @@ class AfterJoomlaUpdateEvent extends AbstractJoomlaUpdateEvent
      * @var array
      *
      * @since  5.2.0
-     * @deprecated 5.2.0 will be removed in 6.0
+     * @deprecated 5.2.0 will be removed in 7.0
      */
     protected $legacyArgumentsOrder = ['oldVersion'];
 
diff --git a/libraries/src/Event/Extension/AfterUninstallEvent.php b/libraries/src/Event/Extension/AfterUninstallEvent.php
index 86e4a934b45b2..c932140779405 100644
--- a/libraries/src/Event/Extension/AfterUninstallEvent.php
+++ b/libraries/src/Event/Extension/AfterUninstallEvent.php
@@ -28,7 +28,7 @@ class AfterUninstallEvent extends AbstractExtensionEvent
      * @var array
      *
      * @since  5.0.0
-     * @deprecated 5.0 will be removed in 6.0
+     * @deprecated 5.0 will be removed in 7.0
      */
     protected $legacyArgumentsOrder = ['installer', 'eid', 'removed'];
 
diff --git a/libraries/src/Event/Extension/AfterUpdateEvent.php b/libraries/src/Event/Extension/AfterUpdateEvent.php
index c1d7cdb1e137a..91ebb9c81a9ab 100644
--- a/libraries/src/Event/Extension/AfterUpdateEvent.php
+++ b/libraries/src/Event/Extension/AfterUpdateEvent.php
@@ -28,7 +28,7 @@ class AfterUpdateEvent extends AbstractExtensionEvent
      * @var array
      *
      * @since  5.0.0
-     * @deprecated 5.0 will be removed in 6.0
+     * @deprecated 5.0 will be removed in 7.0
      */
     protected $legacyArgumentsOrder = ['installer', 'eid'];
 
diff --git a/libraries/src/Event/Extension/BeforeInstallEvent.php b/libraries/src/Event/Extension/BeforeInstallEvent.php
index 9b1a48e0a9916..18ee975aae837 100644
--- a/libraries/src/Event/Extension/BeforeInstallEvent.php
+++ b/libraries/src/Event/Extension/BeforeInstallEvent.php
@@ -26,7 +26,7 @@ class BeforeInstallEvent extends AbstractExtensionEvent
      * @var array
      *
      * @since  5.0.0
-     * @deprecated 5.0 will be removed in 6.0
+     * @deprecated 5.0 will be removed in 7.0
      */
     protected $legacyArgumentsOrder = ['method', 'type', 'manifest', 'extension'];
 
diff --git a/libraries/src/Event/Extension/BeforeUninstallEvent.php b/libraries/src/Event/Extension/BeforeUninstallEvent.php
index 62cf54b3b8bdd..e7c32fd7a681e 100644
--- a/libraries/src/Event/Extension/BeforeUninstallEvent.php
+++ b/libraries/src/Event/Extension/BeforeUninstallEvent.php
@@ -26,7 +26,7 @@ class BeforeUninstallEvent extends AbstractExtensionEvent
      * @var array
      *
      * @since  5.0.0
-     * @deprecated 5.0 will be removed in 6.0
+     * @deprecated 5.0 will be removed in 7.0
      */
     protected $legacyArgumentsOrder = ['eid'];
 
diff --git a/libraries/src/Event/Extension/BeforeUpdateEvent.php b/libraries/src/Event/Extension/BeforeUpdateEvent.php
index 59770cdbde43c..013080376fe0b 100644
--- a/libraries/src/Event/Extension/BeforeUpdateEvent.php
+++ b/libraries/src/Event/Extension/BeforeUpdateEvent.php
@@ -26,7 +26,7 @@ class BeforeUpdateEvent extends AbstractExtensionEvent
      * @var array
      *
      * @since  5.0.0
-     * @deprecated 5.0 will be removed in 6.0
+     * @deprecated 5.0 will be removed in 7.0
      */
     protected $legacyArgumentsOrder = ['type', 'manifest'];
 
diff --git a/libraries/src/Event/Finder/AbstractFinderEvent.php b/libraries/src/Event/Finder/AbstractFinderEvent.php
index fb51bbdef1dc9..76b1ed9362885 100644
--- a/libraries/src/Event/Finder/AbstractFinderEvent.php
+++ b/libraries/src/Event/Finder/AbstractFinderEvent.php
@@ -31,7 +31,7 @@ abstract class AbstractFinderEvent extends AbstractImmutableEvent implements Fin
      * @var array
      *
      * @since  5.0.0
-     * @deprecated 5.0 will be removed in 6.0
+     * @deprecated 5.0 will be removed in 7.0
      */
     protected $legacyArgumentsOrder = [];
 
diff --git a/libraries/src/Event/Finder/AfterSaveEvent.php b/libraries/src/Event/Finder/AfterSaveEvent.php
index 3c06697720ce8..9c33b1700efc1 100644
--- a/libraries/src/Event/Finder/AfterSaveEvent.php
+++ b/libraries/src/Event/Finder/AfterSaveEvent.php
@@ -30,7 +30,7 @@ class AfterSaveEvent extends SaveEvent implements FinderEventInterface
      * @var array
      *
      * @since  5.0.0
-     * @deprecated 5.0 will be removed in 6.0
+     * @deprecated 5.0 will be removed in 7.0
      */
     protected $legacyArgumentsOrder = ['context', 'subject', 'isNew'];
 }
diff --git a/libraries/src/Event/Finder/BeforeSaveEvent.php b/libraries/src/Event/Finder/BeforeSaveEvent.php
index 1d7adec55df7c..220ff8195d6d0 100644
--- a/libraries/src/Event/Finder/BeforeSaveEvent.php
+++ b/libraries/src/Event/Finder/BeforeSaveEvent.php
@@ -30,7 +30,7 @@ class BeforeSaveEvent extends SaveEvent implements FinderEventInterface
      * @var array
      *
      * @since  5.0.0
-     * @deprecated 5.0 will be removed in 6.0
+     * @deprecated 5.0 will be removed in 7.0
      */
     protected $legacyArgumentsOrder = ['context', 'subject', 'isNew'];
 }
diff --git a/libraries/src/Event/Finder/PrepareContentEvent.php b/libraries/src/Event/Finder/PrepareContentEvent.php
index 46d84cd4986ab..8d1c7ef0a2c80 100644
--- a/libraries/src/Event/Finder/PrepareContentEvent.php
+++ b/libraries/src/Event/Finder/PrepareContentEvent.php
@@ -30,7 +30,7 @@ class PrepareContentEvent extends AbstractFinderEvent
      * @var array
      *
      * @since  5.0.0
-     * @deprecated 5.0 will be removed in 6.0
+     * @deprecated 5.0 will be removed in 7.0
      */
     protected $legacyArgumentsOrder = ['subject'];
 
diff --git a/libraries/src/Event/Finder/ResultEvent.php b/libraries/src/Event/Finder/ResultEvent.php
index b862cb39bfaf7..547400f7887f3 100644
--- a/libraries/src/Event/Finder/ResultEvent.php
+++ b/libraries/src/Event/Finder/ResultEvent.php
@@ -31,7 +31,7 @@ class ResultEvent extends AbstractFinderEvent
      * @var array
      *
      * @since  5.0.0
-     * @deprecated 5.0 will be removed in 6.0
+     * @deprecated 5.0 will be removed in 7.0
      */
     protected $legacyArgumentsOrder = ['subject', 'query'];
 
diff --git a/libraries/src/Event/Installer/AfterInstallerEvent.php b/libraries/src/Event/Installer/AfterInstallerEvent.php
index 803392f6b5dde..d08d5d1c9c7f2 100644
--- a/libraries/src/Event/Installer/AfterInstallerEvent.php
+++ b/libraries/src/Event/Installer/AfterInstallerEvent.php
@@ -28,7 +28,7 @@ class AfterInstallerEvent extends InstallerEvent
      * @var array
      *
      * @since  5.0.0
-     * @deprecated 5.0 will be removed in 6.0
+     * @deprecated 5.0 will be removed in 7.0
      */
     protected $legacyArgumentsOrder = ['subject', 'package', 'installer', 'installerResult', 'message'];
 
@@ -59,8 +59,8 @@ public function __construct($name, array $arguments = [])
         }
 
         // For backward compatibility make sure the values is referenced
-        // @todo: Remove in Joomla 6
-        // @deprecated: Passing argument by reference is deprecated, and will not work in Joomla 6
+        // @todo: Remove in Joomla 7
+        // @deprecated: Passing argument by reference is deprecated, and will not work in Joomla 7
         if (key($arguments) === 0) {
             $this->arguments['installerResult'] = &$arguments[3];
             $this->arguments['message']         = &$arguments[4];
diff --git a/libraries/src/Event/Installer/BeforePackageDownloadEvent.php b/libraries/src/Event/Installer/BeforePackageDownloadEvent.php
index 4994fd37ebab2..4c26643c2cae8 100644
--- a/libraries/src/Event/Installer/BeforePackageDownloadEvent.php
+++ b/libraries/src/Event/Installer/BeforePackageDownloadEvent.php
@@ -31,7 +31,7 @@ class BeforePackageDownloadEvent extends AbstractImmutableEvent
      * @var array
      *
      * @since  5.0.0
-     * @deprecated 5.0 will be removed in 6.0
+     * @deprecated 5.0 will be removed in 7.0
      */
     protected $legacyArgumentsOrder = ['url', 'headers'];
 
@@ -64,8 +64,8 @@ public function __construct($name, array $arguments = [])
         }
 
         // For backward compatibility make sure the value is referenced
-        // @todo: Remove in Joomla 6
-        // @deprecated: Passing argument by reference is deprecated, and will not work in Joomla 6
+        // @todo: Remove in Joomla 7
+        // @deprecated: Passing argument by reference is deprecated, and will not work in Joomla 7
         if (key($arguments) === 0) {
             $this->arguments['url']     = &$arguments[0];
             $this->arguments['headers'] = &$arguments[1];
diff --git a/libraries/src/Event/Installer/InstallerEvent.php b/libraries/src/Event/Installer/InstallerEvent.php
index 0610e633acd49..ee1ff95322187 100644
--- a/libraries/src/Event/Installer/InstallerEvent.php
+++ b/libraries/src/Event/Installer/InstallerEvent.php
@@ -32,7 +32,7 @@ abstract class InstallerEvent extends AbstractImmutableEvent
      * @var array
      *
      * @since  5.0.0
-     * @deprecated 5.0 will be removed in 6.0
+     * @deprecated 5.0 will be removed in 7.0
      */
     protected $legacyArgumentsOrder = ['subject', 'package'];
 
@@ -65,8 +65,8 @@ public function __construct($name, array $arguments = [])
         }
 
         // For backward compatibility make sure the package is referenced
-        // @todo: Remove in Joomla 6
-        // @deprecated: Passing argument by reference is deprecated, and will not work in Joomla 6
+        // @todo: Remove in Joomla 7
+        // @deprecated: Passing argument by reference is deprecated, and will not work in Joomla 7
         if (key($arguments) === 0) {
             $this->arguments['package'] = &$arguments[1];
         } elseif (\array_key_exists('package', $arguments)) {
diff --git a/libraries/src/Event/Mail/BeforeRenderingMailTemplateEvent.php b/libraries/src/Event/Mail/BeforeRenderingMailTemplateEvent.php
index 34d1588f279a7..1a066c631ba00 100644
--- a/libraries/src/Event/Mail/BeforeRenderingMailTemplateEvent.php
+++ b/libraries/src/Event/Mail/BeforeRenderingMailTemplateEvent.php
@@ -24,7 +24,7 @@ class BeforeRenderingMailTemplateEvent extends MailTemplateEvent
      * @var array
      *
      * @since  5.2.0
-     * @deprecated 5.2.0 will be removed in 6.0
+     * @deprecated 5.2.0 will be removed in 7.0
      */
     protected $legacyArgumentsOrder = ['templateId', 'subject'];
 }
diff --git a/libraries/src/Event/Mail/MailTemplateEvent.php b/libraries/src/Event/Mail/MailTemplateEvent.php
index 33092ece15aca..f5946c067e094 100644
--- a/libraries/src/Event/Mail/MailTemplateEvent.php
+++ b/libraries/src/Event/Mail/MailTemplateEvent.php
@@ -32,7 +32,7 @@ abstract class MailTemplateEvent extends AbstractImmutableEvent
      * @var array
      *
      * @since  5.2.0
-     * @deprecated 5.2.0 will be removed in 6.0
+     * @deprecated 5.2.0 will be removed in 7.0
      */
     protected $legacyArgumentsOrder = [];
 
diff --git a/libraries/src/Event/Menu/AfterGetMenuTypeOptionsEvent.php b/libraries/src/Event/Menu/AfterGetMenuTypeOptionsEvent.php
index 4aa516094b0af..3c97da4df4b9b 100644
--- a/libraries/src/Event/Menu/AfterGetMenuTypeOptionsEvent.php
+++ b/libraries/src/Event/Menu/AfterGetMenuTypeOptionsEvent.php
@@ -32,7 +32,7 @@ class AfterGetMenuTypeOptionsEvent extends AbstractImmutableEvent
      * @var array
      *
      * @since  5.0.0
-     * @deprecated 5.0 will be removed in 6.0
+     * @deprecated 5.0 will be removed in 7.0
      */
     protected $legacyArgumentsOrder = ['items', 'subject'];
 
@@ -64,8 +64,8 @@ public function __construct($name, array $arguments = [])
         }
 
         // For backward compatibility make sure the content is referenced
-        // @todo: Remove in Joomla 6
-        // @deprecated: Passing argument by reference is deprecated, and will not work in Joomla 6
+        // @todo: Remove in Joomla 7
+        // @deprecated: Passing argument by reference is deprecated, and will not work in Joomla 7
         if (key($arguments) === 0) {
             $this->arguments['items'] = &$arguments[0];
         } elseif (\array_key_exists('items', $arguments)) {
diff --git a/libraries/src/Event/Menu/BeforeRenderMenuItemsViewEvent.php b/libraries/src/Event/Menu/BeforeRenderMenuItemsViewEvent.php
index 4b582b93cde1f..387b4b39b705f 100644
--- a/libraries/src/Event/Menu/BeforeRenderMenuItemsViewEvent.php
+++ b/libraries/src/Event/Menu/BeforeRenderMenuItemsViewEvent.php
@@ -32,7 +32,7 @@ class BeforeRenderMenuItemsViewEvent extends AbstractImmutableEvent
      * @var array
      *
      * @since  5.0.0
-     * @deprecated 5.0 will be removed in 6.0
+     * @deprecated 5.0 will be removed in 7.0
      */
     protected $legacyArgumentsOrder = ['subject'];
 
diff --git a/libraries/src/Event/Menu/PreprocessMenuItemsEvent.php b/libraries/src/Event/Menu/PreprocessMenuItemsEvent.php
index 021fa114fdfd4..d5e1104b74df0 100644
--- a/libraries/src/Event/Menu/PreprocessMenuItemsEvent.php
+++ b/libraries/src/Event/Menu/PreprocessMenuItemsEvent.php
@@ -33,7 +33,7 @@ class PreprocessMenuItemsEvent extends AbstractImmutableEvent
      * @var array
      *
      * @since  5.0.0
-     * @deprecated 5.0 will be removed in 6.0
+     * @deprecated 5.0 will be removed in 7.0
      */
     protected $legacyArgumentsOrder = ['context', 'subject', 'params', 'enabled'];
 
@@ -65,8 +65,8 @@ public function __construct($name, array $arguments = [])
         }
 
         // For backward compatibility make sure the content is referenced
-        // @todo: Remove in Joomla 6
-        // @deprecated: Passing argument by reference is deprecated, and will not work in Joomla 6
+        // @todo: Remove in Joomla 7
+        // @deprecated: Passing argument by reference is deprecated, and will not work in Joomla 7
         if (key($arguments) === 0) {
             $this->arguments['subject'] = &$arguments[1];
         } elseif (\array_key_exists('subject', $arguments)) {
diff --git a/libraries/src/Event/Model/AfterCleanCacheEvent.php b/libraries/src/Event/Model/AfterCleanCacheEvent.php
index 3c7dcb8d0d229..59997c120c458 100644
--- a/libraries/src/Event/Model/AfterCleanCacheEvent.php
+++ b/libraries/src/Event/Model/AfterCleanCacheEvent.php
@@ -31,7 +31,7 @@ class AfterCleanCacheEvent extends AbstractImmutableEvent
      * @var array
      *
      * @since  5.0.0
-     * @deprecated 5.0 will be removed in 6.0
+     * @deprecated 5.0 will be removed in 7.0
      */
     protected $legacyArgumentsOrder = ['defaultgroup', 'cachebase', 'result'];
 
diff --git a/libraries/src/Event/Model/BeforeValidateDataEvent.php b/libraries/src/Event/Model/BeforeValidateDataEvent.php
index 38d41ebabe28b..302ce18164bda 100644
--- a/libraries/src/Event/Model/BeforeValidateDataEvent.php
+++ b/libraries/src/Event/Model/BeforeValidateDataEvent.php
@@ -37,8 +37,8 @@ public function __construct($name, array $arguments = [])
         parent::__construct($name, $arguments);
 
         // For backward compatibility make sure the content is referenced
-        // @todo: Remove in Joomla 6
-        // @deprecated: Passing argument by reference is deprecated, and will not work in Joomla 6
+        // @todo: Remove in Joomla 7
+        // @deprecated: Passing argument by reference is deprecated, and will not work in Joomla 7
         if (key($arguments) === 0) {
             $this->arguments['data'] = &$arguments[1];
         } elseif (\array_key_exists('data', $arguments)) {
diff --git a/libraries/src/Event/Model/ChangeStateEvent.php b/libraries/src/Event/Model/ChangeStateEvent.php
index b82f49e5d889f..3f68ca365a7ca 100644
--- a/libraries/src/Event/Model/ChangeStateEvent.php
+++ b/libraries/src/Event/Model/ChangeStateEvent.php
@@ -26,7 +26,7 @@ abstract class ChangeStateEvent extends ModelEvent
      * @var array
      *
      * @since  5.0.0
-     * @deprecated 5.0 will be removed in 6.0
+     * @deprecated 5.0 will be removed in 7.0
      */
     protected $legacyArgumentsOrder = ['context', 'subject', 'value'];
 
diff --git a/libraries/src/Event/Model/DeleteEvent.php b/libraries/src/Event/Model/DeleteEvent.php
index 84cf47c3aa800..450a8862b49b3 100644
--- a/libraries/src/Event/Model/DeleteEvent.php
+++ b/libraries/src/Event/Model/DeleteEvent.php
@@ -26,7 +26,7 @@ abstract class DeleteEvent extends ModelEvent
      * @var array
      *
      * @since  5.0.0
-     * @deprecated 5.0 will be removed in 6.0
+     * @deprecated 5.0 will be removed in 7.0
      */
     protected $legacyArgumentsOrder = ['context', 'subject'];
 
diff --git a/libraries/src/Event/Model/FormEvent.php b/libraries/src/Event/Model/FormEvent.php
index a645e1a9af464..07002d95e0cbc 100644
--- a/libraries/src/Event/Model/FormEvent.php
+++ b/libraries/src/Event/Model/FormEvent.php
@@ -32,7 +32,7 @@ abstract class FormEvent extends AbstractImmutableEvent
      * @var array
      *
      * @since  5.0.0
-     * @deprecated 5.0 will be removed in 6.0
+     * @deprecated 5.0 will be removed in 7.0
      */
     protected $legacyArgumentsOrder = ['subject', 'data'];
 
diff --git a/libraries/src/Event/Model/ModelEvent.php b/libraries/src/Event/Model/ModelEvent.php
index bd0168b355acd..fa040cd021de6 100644
--- a/libraries/src/Event/Model/ModelEvent.php
+++ b/libraries/src/Event/Model/ModelEvent.php
@@ -31,7 +31,7 @@ abstract class ModelEvent extends AbstractImmutableEvent
      * @var array
      *
      * @since  5.0.0
-     * @deprecated 5.0 will be removed in 6.0
+     * @deprecated 5.0 will be removed in 7.0
      */
     protected $legacyArgumentsOrder = [];
 
diff --git a/libraries/src/Event/Model/NormaliseRequestDataEvent.php b/libraries/src/Event/Model/NormaliseRequestDataEvent.php
index ed84dac962961..a57bfc5738093 100644
--- a/libraries/src/Event/Model/NormaliseRequestDataEvent.php
+++ b/libraries/src/Event/Model/NormaliseRequestDataEvent.php
@@ -28,7 +28,7 @@ class NormaliseRequestDataEvent extends BeforeValidateDataEvent
      * @var array
      *
      * @since  5.0.0
-     * @deprecated 5.0 will be removed in 6.0
+     * @deprecated 5.0 will be removed in 7.0
      */
     protected $legacyArgumentsOrder = ['context', 'data', 'subject'];
 }
diff --git a/libraries/src/Event/Model/PrepareDataEvent.php b/libraries/src/Event/Model/PrepareDataEvent.php
index a0c177631c14a..cdde8354c0b8a 100644
--- a/libraries/src/Event/Model/PrepareDataEvent.php
+++ b/libraries/src/Event/Model/PrepareDataEvent.php
@@ -28,7 +28,7 @@ class PrepareDataEvent extends ModelEvent
      * @var array
      *
      * @since  5.0.0
-     * @deprecated 5.0 will be removed in 6.0
+     * @deprecated 5.0 will be removed in 7.0
      */
     protected $legacyArgumentsOrder = ['context', 'data', 'subject'];
 
@@ -54,8 +54,8 @@ public function __construct($name, array $arguments = [])
         }
 
         // For backward compatibility make sure the content is referenced
-        // @todo: Remove in Joomla 6
-        // @deprecated: Passing argument by reference is deprecated, and will not work in Joomla 6
+        // @todo: Remove in Joomla 7
+        // @deprecated: Passing argument by reference is deprecated, and will not work in Joomla 7
         if (key($arguments) === 0) {
             $this->arguments['data'] = &$arguments[1];
         } elseif (\array_key_exists('data', $arguments)) {
diff --git a/libraries/src/Event/Model/SaveEvent.php b/libraries/src/Event/Model/SaveEvent.php
index e7f44293896a9..204a88992aae5 100644
--- a/libraries/src/Event/Model/SaveEvent.php
+++ b/libraries/src/Event/Model/SaveEvent.php
@@ -26,7 +26,7 @@ abstract class SaveEvent extends ModelEvent
      * @var array
      *
      * @since  5.0.0
-     * @deprecated 5.0 will be removed in 6.0
+     * @deprecated 5.0 will be removed in 7.0
      */
     protected $legacyArgumentsOrder = ['context', 'subject', 'isNew', 'data'];
 
diff --git a/libraries/src/Event/Module/AfterRenderModulesEvent.php b/libraries/src/Event/Module/AfterRenderModulesEvent.php
index 6bf301d58ddc7..1ab4a23bce427 100644
--- a/libraries/src/Event/Module/AfterRenderModulesEvent.php
+++ b/libraries/src/Event/Module/AfterRenderModulesEvent.php
@@ -28,7 +28,7 @@ class AfterRenderModulesEvent extends ModuleEvent
      * @var array
      *
      * @since  5.0.0
-     * @deprecated 5.0 will be removed in 6.0
+     * @deprecated 5.0 will be removed in 7.0
      */
     protected $legacyArgumentsOrder = ['content', 'attributes', 'subject'];
 
@@ -58,8 +58,8 @@ public function __construct($name, array $arguments = [])
         }
 
         // For backward compatibility make sure the content is referenced
-        // @todo: Remove in Joomla 6
-        // @deprecated: Passing argument by reference is deprecated, and will not work in Joomla 6
+        // @todo: Remove in Joomla 7
+        // @deprecated: Passing argument by reference is deprecated, and will not work in Joomla 7
         if (key($arguments) === 0) {
             $this->arguments['content'] = &$arguments[0];
         } elseif (\array_key_exists('content', $arguments)) {
diff --git a/libraries/src/Event/Module/ModuleEvent.php b/libraries/src/Event/Module/ModuleEvent.php
index 4c027e1d60d91..4934448ee7b68 100644
--- a/libraries/src/Event/Module/ModuleEvent.php
+++ b/libraries/src/Event/Module/ModuleEvent.php
@@ -31,7 +31,7 @@ abstract class ModuleEvent extends AbstractImmutableEvent
      * @var array
      *
      * @since  5.0.0
-     * @deprecated 5.0 will be removed in 6.0
+     * @deprecated 5.0 will be removed in 7.0
      */
     protected $legacyArgumentsOrder = [];
 
diff --git a/libraries/src/Event/Module/ModuleListEvent.php b/libraries/src/Event/Module/ModuleListEvent.php
index 944e1d816d11e..26914efb44b5d 100644
--- a/libraries/src/Event/Module/ModuleListEvent.php
+++ b/libraries/src/Event/Module/ModuleListEvent.php
@@ -26,7 +26,7 @@ abstract class ModuleListEvent extends ModuleEvent
      * @var array
      *
      * @since  5.0.0
-     * @deprecated 5.0 will be removed in 6.0
+     * @deprecated 5.0 will be removed in 7.0
      */
     protected $legacyArgumentsOrder = ['modules', 'subject'];
 
@@ -52,8 +52,8 @@ public function __construct($name, array $arguments = [])
         }
 
         // For backward compatibility make sure the content is referenced
-        // @todo: Remove in Joomla 6
-        // @deprecated: Passing argument by reference is deprecated, and will not work in Joomla 6
+        // @todo: Remove in Joomla 7
+        // @deprecated: Passing argument by reference is deprecated, and will not work in Joomla 7
         if (key($arguments) === 0) {
             $this->arguments['modules'] = &$arguments[0];
         } elseif (\array_key_exists('modules', $arguments)) {
diff --git a/libraries/src/Event/Module/RenderModuleEvent.php b/libraries/src/Event/Module/RenderModuleEvent.php
index 28eba9741ea44..4b1536bdaf827 100644
--- a/libraries/src/Event/Module/RenderModuleEvent.php
+++ b/libraries/src/Event/Module/RenderModuleEvent.php
@@ -26,7 +26,7 @@ abstract class RenderModuleEvent extends ModuleEvent
      * @var array
      *
      * @since  5.0.0
-     * @deprecated 5.0 will be removed in 6.0
+     * @deprecated 5.0 will be removed in 7.0
      */
     protected $legacyArgumentsOrder = ['subject', 'attributes'];
 
@@ -49,8 +49,8 @@ public function __construct($name, array $arguments = [])
         }
 
         // For backward compatibility make sure the content is referenced
-        // @todo: Remove in Joomla 6
-        // @deprecated: Passing argument by reference is deprecated, and will not work in Joomla 6
+        // @todo: Remove in Joomla 7
+        // @deprecated: Passing argument by reference is deprecated, and will not work in Joomla 7
         if (key($arguments) === 0) {
             $this->arguments['attributes'] = &$arguments[1];
         } elseif (\array_key_exists('attributes', $arguments)) {
diff --git a/libraries/src/Event/MultiFactor/BeforeDisplayMethods.php b/libraries/src/Event/MultiFactor/BeforeDisplayMethods.php
index 15864b872a972..3d67a51f67f9a 100644
--- a/libraries/src/Event/MultiFactor/BeforeDisplayMethods.php
+++ b/libraries/src/Event/MultiFactor/BeforeDisplayMethods.php
@@ -46,7 +46,7 @@ public function __construct(User $user)
      * @return  User
      * @since   4.2.0
      *
-     * @deprecated 4.4.0 will be removed in 6.0
+     * @deprecated 4.4.0 will be removed in 7.0
      *               Use counterpart with onSet prefix
      */
     public function setUser(User $value): User
diff --git a/libraries/src/Event/MultiFactor/Callback.php b/libraries/src/Event/MultiFactor/Callback.php
index 72d5be7bbb813..f26cfde4a77e0 100644
--- a/libraries/src/Event/MultiFactor/Callback.php
+++ b/libraries/src/Event/MultiFactor/Callback.php
@@ -43,7 +43,7 @@ public function __construct(string $method)
      * @throws  \DomainException
      * @since   4.2.0
      *
-     * @deprecated 4.4.0 will be removed in 6.0
+     * @deprecated 4.4.0 will be removed in 7.0
      *                Use counterpart with onSet prefix
      */
     public function setMethod(string $value): string
diff --git a/libraries/src/Event/MultiFactor/Captive.php b/libraries/src/Event/MultiFactor/Captive.php
index 13bbe1001b4eb..ffd0c314cebb4 100644
--- a/libraries/src/Event/MultiFactor/Captive.php
+++ b/libraries/src/Event/MultiFactor/Captive.php
@@ -55,7 +55,7 @@ public function __construct(MfaTable $record)
      * @return  MfaTable
      * @since   4.2.0
      *
-     * @deprecated 4.4.0 will be removed in 6.0
+     * @deprecated 4.4.0 will be removed in 7.0
      *                Use counterpart with onSet prefix
      */
     public function setRecord(MfaTable $value): MfaTable
diff --git a/libraries/src/Event/MultiFactor/GetSetup.php b/libraries/src/Event/MultiFactor/GetSetup.php
index ed3ea61520702..a2e0d5f6a6902 100644
--- a/libraries/src/Event/MultiFactor/GetSetup.php
+++ b/libraries/src/Event/MultiFactor/GetSetup.php
@@ -55,7 +55,7 @@ public function __construct(MfaTable $record)
      * @return  MfaTable
      * @since   4.2.0
      *
-     * @deprecated 4.4.0 will be removed in 6.0
+     * @deprecated 4.4.0 will be removed in 7.0
      *                Use counterpart with onSet prefix
      */
     public function setRecord(MfaTable $value): MfaTable
diff --git a/libraries/src/Event/MultiFactor/SaveSetup.php b/libraries/src/Event/MultiFactor/SaveSetup.php
index 014df273b5cc8..0c25e522b763a 100644
--- a/libraries/src/Event/MultiFactor/SaveSetup.php
+++ b/libraries/src/Event/MultiFactor/SaveSetup.php
@@ -59,7 +59,7 @@ public function __construct(MfaTable $record, Input $input)
      * @return  MfaTable
      * @since   4.2.0
      *
-     * @deprecated 4.4.0 will be removed in 6.0
+     * @deprecated 4.4.0 will be removed in 7.0
      *                Use counterpart with onSet prefix
      */
     public function setRecord(MfaTable $value): MfaTable
@@ -79,7 +79,7 @@ public function setRecord(MfaTable $value): MfaTable
      * @return  Input
      * @since   4.2.0
      *
-     * @deprecated 4.4.0 will be removed in 6.0
+     * @deprecated 4.4.0 will be removed in 7.0
      *                Use counterpart with onSet prefix
      */
     public function setInput(Input $value): Input
diff --git a/libraries/src/Event/MultiFactor/Validate.php b/libraries/src/Event/MultiFactor/Validate.php
index 272c59c0cec84..c3cbee999d6ab 100644
--- a/libraries/src/Event/MultiFactor/Validate.php
+++ b/libraries/src/Event/MultiFactor/Validate.php
@@ -59,7 +59,7 @@ public function __construct(MfaTable $record, User $user, string $code)
      * @return  MfaTable
      * @since   4.2.0
      *
-     * @deprecated 4.4.0 will be removed in 6.0
+     * @deprecated 4.4.0 will be removed in 7.0
      *                Use counterpart with onSet prefix
      */
     public function setRecord(MfaTable $value): MfaTable
@@ -79,7 +79,7 @@ public function setRecord(MfaTable $value): MfaTable
      * @return  User
      * @since   4.2.0
      *
-     * @deprecated 4.4.0 will be removed in 6.0
+     * @deprecated 4.4.0 will be removed in 7.0
      *                Use counterpart with onSet prefix
      */
     public function setUser(User $value): User
@@ -99,7 +99,7 @@ public function setUser(User $value): User
      * @return  string|null
      * @since   4.2.0
      *
-     * @deprecated 4.4.0 will be removed in 6.0
+     * @deprecated 4.4.0 will be removed in 7.0
      *                Use counterpart with onSet prefix
      */
     public function setCode(?string $value): ?string
diff --git a/libraries/src/Event/Plugin/System/Stats/GetStatsDataEvent.php b/libraries/src/Event/Plugin/System/Stats/GetStatsDataEvent.php
index aacca8bc32d7a..5dadcf835cc6f 100644
--- a/libraries/src/Event/Plugin/System/Stats/GetStatsDataEvent.php
+++ b/libraries/src/Event/Plugin/System/Stats/GetStatsDataEvent.php
@@ -38,7 +38,7 @@ class GetStatsDataEvent extends AbstractImmutableEvent implements ResultAwareInt
      * @var array
      *
      * @since  5.3.0
-     * @deprecated 5.3.0 will be removed in 6.0
+     * @deprecated 5.3.0 will be removed in 7.0
      */
     protected $legacyArgumentsOrder = ['context'];
 
diff --git a/libraries/src/Event/Privacy/CanRemoveDataEvent.php b/libraries/src/Event/Privacy/CanRemoveDataEvent.php
index c0c94731a2526..ff74b7299f431 100644
--- a/libraries/src/Event/Privacy/CanRemoveDataEvent.php
+++ b/libraries/src/Event/Privacy/CanRemoveDataEvent.php
@@ -36,7 +36,7 @@ class CanRemoveDataEvent extends PrivacyEvent implements ResultAwareInterface
      * @var array
      *
      * @since  5.0.0
-     * @deprecated 5.0 will be removed in 6.0
+     * @deprecated 5.0 will be removed in 7.0
      */
     protected $legacyArgumentsOrder = ['subject', 'user'];
 
diff --git a/libraries/src/Event/Privacy/CheckPrivacyPolicyPublishedEvent.php b/libraries/src/Event/Privacy/CheckPrivacyPolicyPublishedEvent.php
index 21cc2656f8bfc..9ced2a8c03012 100644
--- a/libraries/src/Event/Privacy/CheckPrivacyPolicyPublishedEvent.php
+++ b/libraries/src/Event/Privacy/CheckPrivacyPolicyPublishedEvent.php
@@ -28,7 +28,7 @@ class CheckPrivacyPolicyPublishedEvent extends PrivacyEvent
      * @var array
      *
      * @since  5.0.0
-     * @deprecated 5.0 will be removed in 6.0
+     * @deprecated 5.0 will be removed in 7.0
      */
     protected $legacyArgumentsOrder = ['subject'];
 
@@ -51,8 +51,8 @@ public function __construct($name, array $arguments = [])
         }
 
         // For backward compatibility make sure the content is referenced
-        // @todo: Remove in Joomla 6
-        // @deprecated: Passing argument by reference is deprecated, and will not work in Joomla 6
+        // @todo: Remove in Joomla 7
+        // @deprecated: Passing argument by reference is deprecated, and will not work in Joomla 7
         if (key($arguments) === 0) {
             $this->arguments['subject'] = &$arguments[0];
         } elseif (\array_key_exists('subject', $arguments)) {
diff --git a/libraries/src/Event/Privacy/ExportRequestEvent.php b/libraries/src/Event/Privacy/ExportRequestEvent.php
index 91462ddaf2ade..105fe4164a218 100644
--- a/libraries/src/Event/Privacy/ExportRequestEvent.php
+++ b/libraries/src/Event/Privacy/ExportRequestEvent.php
@@ -36,7 +36,7 @@ class ExportRequestEvent extends PrivacyEvent implements ResultAwareInterface
      * @var array
      *
      * @since  5.0.0
-     * @deprecated 5.0 will be removed in 6.0
+     * @deprecated 5.0 will be removed in 7.0
      */
     protected $legacyArgumentsOrder = ['subject', 'user'];
 
diff --git a/libraries/src/Event/Privacy/PrivacyEvent.php b/libraries/src/Event/Privacy/PrivacyEvent.php
index a436ec7cbf6a0..005207de34602 100644
--- a/libraries/src/Event/Privacy/PrivacyEvent.php
+++ b/libraries/src/Event/Privacy/PrivacyEvent.php
@@ -31,7 +31,7 @@ abstract class PrivacyEvent extends AbstractImmutableEvent
      * @var array
      *
      * @since  5.0.0
-     * @deprecated 5.0 will be removed in 6.0
+     * @deprecated 5.0 will be removed in 7.0
      */
     protected $legacyArgumentsOrder = [];
 
diff --git a/libraries/src/Event/Privacy/RemoveDataEvent.php b/libraries/src/Event/Privacy/RemoveDataEvent.php
index d9aba07844cd9..d343c92c521be 100644
--- a/libraries/src/Event/Privacy/RemoveDataEvent.php
+++ b/libraries/src/Event/Privacy/RemoveDataEvent.php
@@ -31,7 +31,7 @@ class RemoveDataEvent extends PrivacyEvent
      * @var array
      *
      * @since  5.0.0
-     * @deprecated 5.0 will be removed in 6.0
+     * @deprecated 5.0 will be removed in 7.0
      */
     protected $legacyArgumentsOrder = ['subject', 'user'];
 
diff --git a/libraries/src/Event/QuickIcon/GetIconEvent.php b/libraries/src/Event/QuickIcon/GetIconEvent.php
index 4b7f47970dc98..aa48de346218a 100644
--- a/libraries/src/Event/QuickIcon/GetIconEvent.php
+++ b/libraries/src/Event/QuickIcon/GetIconEvent.php
@@ -55,7 +55,7 @@ public function __construct(string $name, array $arguments = [])
      *
      * @since   4.2.0
      *
-     * @deprecated 4.4.0 will be removed in 6.0
+     * @deprecated 4.4.0 will be removed in 7.0
      *                Use counterpart with onSet prefix
      */
     public function setContext(string $value)
diff --git a/libraries/src/Event/ReshapeArgumentsAware.php b/libraries/src/Event/ReshapeArgumentsAware.php
index de3b42c1b0cc9..0e40339cee42a 100644
--- a/libraries/src/Event/ReshapeArgumentsAware.php
+++ b/libraries/src/Event/ReshapeArgumentsAware.php
@@ -46,13 +46,13 @@
  * All this is achieved by the reshapeArguments() method in this trait which has to be called in the
  * constructor of the concrete event class.
  *
- * This trait is marked as deprecated with a removal target of 6.0 because in Joomla 6 we will only
+ * This trait is marked as deprecated with a removal target of 7.0 because in Joomla 7 we will only
  * be using concrete event classes with named arguments, removing legacy listeners and their
  * positional arguments headaches.
  *
  * @since  4.2.0
  *
- * @deprecated  4.3 will be removed in 6.0
+ * @deprecated  4.3 will be removed in 7.0
  *              Will be removed without replacement
  */
 trait ReshapeArgumentsAware
diff --git a/libraries/src/Event/Result/ResultAware.php b/libraries/src/Event/Result/ResultAware.php
index 9101b8e318f25..b3495ac6a935c 100644
--- a/libraries/src/Event/Result/ResultAware.php
+++ b/libraries/src/Event/Result/ResultAware.php
@@ -34,7 +34,7 @@ trait ResultAware
      * @var    boolean
      * @since  4.2.0
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              Using setResult() for the result argument will always be disallowed.
      */
     protected $preventSetArgumentResult = false;
@@ -86,7 +86,7 @@ public function addResult($data): void
      * @return  array
      * @since   4.2.0
      *
-     * @deprecated 4.4.0 will be removed in 6.0
+     * @deprecated 4.4.0 will be removed in 7.0
      *                Use counterpart with onSet prefix
      */
     protected function setResult(array $value)
diff --git a/libraries/src/Event/Result/ResultTypeArrayAware.php b/libraries/src/Event/Result/ResultTypeArrayAware.php
index b52b04e1443db..d7cd020d81b78 100644
--- a/libraries/src/Event/Result/ResultTypeArrayAware.php
+++ b/libraries/src/Event/Result/ResultTypeArrayAware.php
@@ -37,7 +37,7 @@ trait ResultTypeArrayAware
      * @var    boolean
      * @since  4.2.0
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              You should use nullable values or exceptions instead of returning boolean false results.
      */
     protected $resultIsFalseable = false;
diff --git a/libraries/src/Event/Result/ResultTypeFloatAware.php b/libraries/src/Event/Result/ResultTypeFloatAware.php
index ab5b6f4640204..4f979d2a1c106 100644
--- a/libraries/src/Event/Result/ResultTypeFloatAware.php
+++ b/libraries/src/Event/Result/ResultTypeFloatAware.php
@@ -37,7 +37,7 @@ trait ResultTypeFloatAware
      * @var    boolean
      * @since  4.2.0
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              You should use nullable values or exceptions instead of returning boolean false results.
      */
     protected $resultIsFalseable = false;
diff --git a/libraries/src/Event/Result/ResultTypeIntegerAware.php b/libraries/src/Event/Result/ResultTypeIntegerAware.php
index 6524066aa0db2..41f22d6178ade 100644
--- a/libraries/src/Event/Result/ResultTypeIntegerAware.php
+++ b/libraries/src/Event/Result/ResultTypeIntegerAware.php
@@ -37,7 +37,7 @@ trait ResultTypeIntegerAware
      * @var    boolean
      * @since  4.2.0
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              You should use nullable values or exceptions instead of returning boolean false results.
      */
     protected $resultIsFalseable = false;
diff --git a/libraries/src/Event/Result/ResultTypeNumericAware.php b/libraries/src/Event/Result/ResultTypeNumericAware.php
index f518069f49f3c..b740e5115f2ce 100644
--- a/libraries/src/Event/Result/ResultTypeNumericAware.php
+++ b/libraries/src/Event/Result/ResultTypeNumericAware.php
@@ -37,7 +37,7 @@ trait ResultTypeNumericAware
      * @var    boolean
      * @since  4.2.0
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              You should use nullable values or exceptions instead of returning boolean false results.
      */
     protected $resultIsFalseable = false;
diff --git a/libraries/src/Event/Result/ResultTypeObjectAware.php b/libraries/src/Event/Result/ResultTypeObjectAware.php
index 9fa09be12242f..920bd9a97d6d7 100644
--- a/libraries/src/Event/Result/ResultTypeObjectAware.php
+++ b/libraries/src/Event/Result/ResultTypeObjectAware.php
@@ -39,7 +39,7 @@ trait ResultTypeObjectAware
      * @var    boolean
      * @since  4.2.0
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              You should use nullable values or exceptions instead of returning boolean false results.
      */
     protected $resultIsFalseable = false;
diff --git a/libraries/src/Event/Result/ResultTypeStringAware.php b/libraries/src/Event/Result/ResultTypeStringAware.php
index 2f5493745c25d..b6b202a268ccf 100644
--- a/libraries/src/Event/Result/ResultTypeStringAware.php
+++ b/libraries/src/Event/Result/ResultTypeStringAware.php
@@ -37,7 +37,7 @@ trait ResultTypeStringAware
      * @var    boolean
      * @since  4.2.0
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              You should use nullable values or exceptions instead of returning boolean false results.
      */
     protected $resultIsFalseable = false;
diff --git a/libraries/src/Event/Table/AbstractEvent.php b/libraries/src/Event/Table/AbstractEvent.php
index f5b43129aad2c..253e014d6d8ed 100644
--- a/libraries/src/Event/Table/AbstractEvent.php
+++ b/libraries/src/Event/Table/AbstractEvent.php
@@ -49,7 +49,7 @@ public function __construct($name, array $arguments = [])
      *
      * @throws  \BadMethodCallException  If the argument is not of the expected type.
      *
-     * @deprecated 4.4.0 will be removed in 6.0
+     * @deprecated 4.4.0 will be removed in 7.0
      *                Use counterpart with onSet prefix
      */
     protected function setSubject($value)
diff --git a/libraries/src/Event/Table/AfterLoadEvent.php b/libraries/src/Event/Table/AfterLoadEvent.php
index f2f49f657a33d..5ac0b6af01a9d 100644
--- a/libraries/src/Event/Table/AfterLoadEvent.php
+++ b/libraries/src/Event/Table/AfterLoadEvent.php
@@ -55,7 +55,7 @@ public function __construct($name, array $arguments = [])
      *
      * @throws  \BadMethodCallException  if the argument is not of the expected type
      *
-     * @deprecated 4.4.0 will be removed in 6.0
+     * @deprecated 4.4.0 will be removed in 7.0
      *                Use counterpart with onSet prefix
      */
     protected function setResult($value)
@@ -72,7 +72,7 @@ protected function setResult($value)
      *
      * @throws  \BadMethodCallException  if the argument is not of the expected type
      *
-     * @deprecated 4.4.0 will be removed in 6.0
+     * @deprecated 4.4.0 will be removed in 7.0
      *                Use counterpart with onSet prefix
      */
     protected function setRow($value)
diff --git a/libraries/src/Event/Table/AfterMoveEvent.php b/libraries/src/Event/Table/AfterMoveEvent.php
index 97d6a5bbc8595..2e16d3ffd0b8d 100644
--- a/libraries/src/Event/Table/AfterMoveEvent.php
+++ b/libraries/src/Event/Table/AfterMoveEvent.php
@@ -60,7 +60,7 @@ public function __construct($name, array $arguments = [])
      *
      * @throws  \BadMethodCallException  if the argument is not of the expected type
      *
-     * @deprecated 4.4.0 will be removed in 6.0
+     * @deprecated 4.4.0 will be removed in 7.0
      *                Use counterpart with onSet prefix
      */
     protected function setRow($value)
@@ -81,7 +81,7 @@ protected function setRow($value)
      *
      * @throws  \BadMethodCallException  if the argument is not of the expected type
      *
-     * @deprecated 4.4.0 will be removed in 6.0
+     * @deprecated 4.4.0 will be removed in 7.0
      *                Use counterpart with onSet prefix
      */
     protected function setDelta($value)
@@ -102,7 +102,7 @@ protected function setDelta($value)
      *
      * @throws  \BadMethodCallException  if the argument is not of the expected type
      *
-     * @deprecated 4.4.0 will be removed in 6.0
+     * @deprecated 4.4.0 will be removed in 7.0
      *                Use counterpart with onSet prefix
      */
     protected function setWhere($value)
diff --git a/libraries/src/Event/Table/AfterReorderEvent.php b/libraries/src/Event/Table/AfterReorderEvent.php
index bb845654a0fb5..c43cfbfb1f229 100644
--- a/libraries/src/Event/Table/AfterReorderEvent.php
+++ b/libraries/src/Event/Table/AfterReorderEvent.php
@@ -51,7 +51,7 @@ public function __construct($name, array $arguments = [])
      *
      * @throws  \BadMethodCallException  if the argument is not of the expected type
      *
-     * @deprecated 4.4.0 will be removed in 6.0
+     * @deprecated 4.4.0 will be removed in 7.0
      *                Use counterpart with onSet prefix
      */
     protected function setWhere($value)
diff --git a/libraries/src/Event/Table/AfterStoreEvent.php b/libraries/src/Event/Table/AfterStoreEvent.php
index 61942b692fe42..34552400eba0b 100644
--- a/libraries/src/Event/Table/AfterStoreEvent.php
+++ b/libraries/src/Event/Table/AfterStoreEvent.php
@@ -50,7 +50,7 @@ public function __construct($name, array $arguments = [])
      *
      * @throws  \BadMethodCallException  if the argument is not of the expected type
      *
-     * @deprecated 4.4.0 will be removed in 6.0
+     * @deprecated 4.4.0 will be removed in 7.0
      *                Use counterpart with onSet prefix
      */
     protected function setResult($value)
diff --git a/libraries/src/Event/Table/BeforeBindEvent.php b/libraries/src/Event/Table/BeforeBindEvent.php
index fc0606535303f..8fc43119c8d2a 100644
--- a/libraries/src/Event/Table/BeforeBindEvent.php
+++ b/libraries/src/Event/Table/BeforeBindEvent.php
@@ -55,7 +55,7 @@ public function __construct($name, array $arguments = [])
      *
      * @throws  \BadMethodCallException  if the argument is not of the expected type
      *
-     * @deprecated 4.4.0 will be removed in 6.0
+     * @deprecated 4.4.0 will be removed in 7.0
      *                Use counterpart with onSet prefix
      */
     protected function setSrc($value)
@@ -76,7 +76,7 @@ protected function setSrc($value)
      *
      * @throws  \BadMethodCallException  if the argument is not of the expected type
      *
-     * @deprecated 4.4.0 will be removed in 6.0
+     * @deprecated 4.4.0 will be removed in 7.0
      *                Use counterpart with onSet prefix
      */
     protected function setIgnore($value)
diff --git a/libraries/src/Event/Table/BeforeCheckoutEvent.php b/libraries/src/Event/Table/BeforeCheckoutEvent.php
index 1bd023a278089..29369125baecd 100644
--- a/libraries/src/Event/Table/BeforeCheckoutEvent.php
+++ b/libraries/src/Event/Table/BeforeCheckoutEvent.php
@@ -55,7 +55,7 @@ public function __construct($name, array $arguments = [])
      *
      * @throws  \BadMethodCallException  if the argument is not of the expected type
      *
-     * @deprecated 4.4.0 will be removed in 6.0
+     * @deprecated 4.4.0 will be removed in 7.0
      *                Use counterpart with onSet prefix
      */
     protected function setUserId($value)
diff --git a/libraries/src/Event/Table/BeforeLoadEvent.php b/libraries/src/Event/Table/BeforeLoadEvent.php
index b67007d52b854..3ee393b7f2f85 100644
--- a/libraries/src/Event/Table/BeforeLoadEvent.php
+++ b/libraries/src/Event/Table/BeforeLoadEvent.php
@@ -53,7 +53,7 @@ public function __construct($name, array $arguments = [])
      *
      * @return  boolean  Normalised value
      *
-     * @deprecated 4.4.0 will be removed in 6.0
+     * @deprecated 4.4.0 will be removed in 7.0
      *                Use counterpart with onSet prefix
      */
     protected function setReset($value)
diff --git a/libraries/src/Event/Table/BeforeMoveEvent.php b/libraries/src/Event/Table/BeforeMoveEvent.php
index 2026ad5be8839..8225b4188ee40 100644
--- a/libraries/src/Event/Table/BeforeMoveEvent.php
+++ b/libraries/src/Event/Table/BeforeMoveEvent.php
@@ -62,7 +62,7 @@ public function __construct($name, array $arguments = [])
      *
      * @throws  \BadMethodCallException  if the argument is not of the expected type
      *
-     * @deprecated 4.4.0 will be removed in 6.0
+     * @deprecated 4.4.0 will be removed in 7.0
      *                Use counterpart with onSet prefix
      */
     protected function setQuery($value)
@@ -83,7 +83,7 @@ protected function setQuery($value)
      *
      * @throws  \BadMethodCallException  if the argument is not of the expected type
      *
-     * @deprecated 4.4.0 will be removed in 6.0
+     * @deprecated 4.4.0 will be removed in 7.0
      *                Use counterpart with onSet prefix
      */
     protected function setDelta($value)
@@ -104,7 +104,7 @@ protected function setDelta($value)
      *
      * @throws  \BadMethodCallException  if the argument is not of the expected type
      *
-     * @deprecated 4.4.0 will be removed in 6.0
+     * @deprecated 4.4.0 will be removed in 7.0
      *                Use counterpart with onSet prefix
      */
     protected function setWhere($value)
diff --git a/libraries/src/Event/Table/BeforePublishEvent.php b/libraries/src/Event/Table/BeforePublishEvent.php
index 83c21cbeb5871..76d4dd2d35237 100644
--- a/libraries/src/Event/Table/BeforePublishEvent.php
+++ b/libraries/src/Event/Table/BeforePublishEvent.php
@@ -60,7 +60,7 @@ public function __construct($name, array $arguments = [])
      *
      * @throws  \BadMethodCallException  if the argument is not of the expected type
      *
-     * @deprecated 4.4.0 will be removed in 6.0
+     * @deprecated 4.4.0 will be removed in 7.0
      *                Use counterpart with onSet prefix
      */
     protected function setQuery($value)
@@ -81,7 +81,7 @@ protected function setQuery($value)
      *
      * @throws  \BadMethodCallException  if the argument is not of the expected type
      *
-     * @deprecated 4.4.0 will be removed in 6.0
+     * @deprecated 4.4.0 will be removed in 7.0
      *                Use counterpart with onSet prefix
      */
     protected function setState($value)
@@ -102,7 +102,7 @@ protected function setState($value)
      *
      * @throws  \BadMethodCallException  if the argument is not of the expected type
      *
-     * @deprecated 4.4.0 will be removed in 6.0
+     * @deprecated 4.4.0 will be removed in 7.0
      *                Use counterpart with onSet prefix
      */
     protected function setUserId($value)
diff --git a/libraries/src/Event/Table/BeforeReorderEvent.php b/libraries/src/Event/Table/BeforeReorderEvent.php
index ef3b249505fcb..af42341714ee3 100644
--- a/libraries/src/Event/Table/BeforeReorderEvent.php
+++ b/libraries/src/Event/Table/BeforeReorderEvent.php
@@ -57,7 +57,7 @@ public function __construct($name, array $arguments = [])
      *
      * @throws  \BadMethodCallException  if the argument is not of the expected type
      *
-     * @deprecated 4.4.0 will be removed in 6.0
+     * @deprecated 4.4.0 will be removed in 7.0
      *                Use counterpart with onSet prefix
      */
     protected function setQuery($value)
@@ -78,7 +78,7 @@ protected function setQuery($value)
      *
      * @throws  \BadMethodCallException  if the argument is not of the expected type
      *
-     * @deprecated 4.4.0 will be removed in 6.0
+     * @deprecated 4.4.0 will be removed in 7.0
      *                Use counterpart with onSet prefix
      */
     protected function setWhere($value)
diff --git a/libraries/src/Event/Table/BeforeStoreEvent.php b/libraries/src/Event/Table/BeforeStoreEvent.php
index e53d7fad8362f..5862ed7e9732d 100644
--- a/libraries/src/Event/Table/BeforeStoreEvent.php
+++ b/libraries/src/Event/Table/BeforeStoreEvent.php
@@ -53,7 +53,7 @@ public function __construct($name, array $arguments = [])
      *
      * @return  boolean  Normalised value
      *
-     * @deprecated 4.4.0 will be removed in 6.0
+     * @deprecated 4.4.0 will be removed in 7.0
      *                Use counterpart with onSet prefix
      */
     protected function setUpdateNulls($value)
diff --git a/libraries/src/Event/Table/SetNewTagsEvent.php b/libraries/src/Event/Table/SetNewTagsEvent.php
index 41e421a09b584..9e51bc8064490 100644
--- a/libraries/src/Event/Table/SetNewTagsEvent.php
+++ b/libraries/src/Event/Table/SetNewTagsEvent.php
@@ -55,7 +55,7 @@ public function __construct($name, array $arguments = [])
      *
      * @return  boolean  Normalised value
      *
-     * @deprecated 4.4.0 will be removed in 6.0
+     * @deprecated 4.4.0 will be removed in 7.0
      *                Use counterpart with onSet prefix
      */
     protected function setReplaceTags($value)
diff --git a/libraries/src/Event/User/AbstractDeleteEvent.php b/libraries/src/Event/User/AbstractDeleteEvent.php
index 7d5aad407a688..12cb90f874498 100644
--- a/libraries/src/Event/User/AbstractDeleteEvent.php
+++ b/libraries/src/Event/User/AbstractDeleteEvent.php
@@ -26,7 +26,7 @@ abstract class AbstractDeleteEvent extends UserEvent
      * @var array
      *
      * @since  5.0.0
-     * @deprecated 5.0 will be removed in 6.0
+     * @deprecated 5.0 will be removed in 7.0
      */
     protected $legacyArgumentsOrder = ['subject'];
 
diff --git a/libraries/src/Event/User/AbstractLoginEvent.php b/libraries/src/Event/User/AbstractLoginEvent.php
index 346f5ae57b9f5..225cea86cd9b9 100644
--- a/libraries/src/Event/User/AbstractLoginEvent.php
+++ b/libraries/src/Event/User/AbstractLoginEvent.php
@@ -26,7 +26,7 @@ abstract class AbstractLoginEvent extends UserEvent
      * @var array
      *
      * @since  5.0.0
-     * @deprecated 5.0 will be removed in 6.0
+     * @deprecated 5.0 will be removed in 7.0
      */
     protected $legacyArgumentsOrder = ['subject', 'options'];
 
diff --git a/libraries/src/Event/User/AbstractLogoutEvent.php b/libraries/src/Event/User/AbstractLogoutEvent.php
index dab05e4bdb5b1..985282f662704 100644
--- a/libraries/src/Event/User/AbstractLogoutEvent.php
+++ b/libraries/src/Event/User/AbstractLogoutEvent.php
@@ -26,7 +26,7 @@ abstract class AbstractLogoutEvent extends UserEvent
      * @var array
      *
      * @since  5.0.0
-     * @deprecated 5.0 will be removed in 6.0
+     * @deprecated 5.0 will be removed in 7.0
      */
     protected $legacyArgumentsOrder = ['subject', 'options'];
 
diff --git a/libraries/src/Event/User/AbstractResetEvent.php b/libraries/src/Event/User/AbstractResetEvent.php
index ace4c76d29666..289479515df47 100644
--- a/libraries/src/Event/User/AbstractResetEvent.php
+++ b/libraries/src/Event/User/AbstractResetEvent.php
@@ -26,7 +26,7 @@ abstract class AbstractResetEvent extends UserEvent
      * @var array
      *
      * @since  5.2.0
-     * @deprecated 5.2.0 will be removed in 6.0
+     * @deprecated 5.2.0 will be removed in 7.0
      */
     protected $legacyArgumentsOrder = ['subject'];
 
diff --git a/libraries/src/Event/User/AbstractSaveEvent.php b/libraries/src/Event/User/AbstractSaveEvent.php
index 7c2f234808f81..8fde51d969936 100644
--- a/libraries/src/Event/User/AbstractSaveEvent.php
+++ b/libraries/src/Event/User/AbstractSaveEvent.php
@@ -26,7 +26,7 @@ abstract class AbstractSaveEvent extends UserEvent
      * @var array
      *
      * @since  5.0.0
-     * @deprecated 5.0 will be removed in 6.0
+     * @deprecated 5.0 will be removed in 7.0
      */
     protected $legacyArgumentsOrder = ['subject', 'isNew'];
 
diff --git a/libraries/src/Event/User/AfterDeleteEvent.php b/libraries/src/Event/User/AfterDeleteEvent.php
index 85c4c415ef7a3..bdbc76dcdd8dd 100644
--- a/libraries/src/Event/User/AfterDeleteEvent.php
+++ b/libraries/src/Event/User/AfterDeleteEvent.php
@@ -28,7 +28,7 @@ class AfterDeleteEvent extends AbstractDeleteEvent
      * @var array
      *
      * @since  5.0.0
-     * @deprecated 5.0 will be removed in 6.0
+     * @deprecated 5.0 will be removed in 7.0
      */
     protected $legacyArgumentsOrder = ['subject', 'deletingResult', 'errorMessage'];
 
diff --git a/libraries/src/Event/User/AfterLoginEvent.php b/libraries/src/Event/User/AfterLoginEvent.php
index ce95978f75179..c9eb6a86fc6bd 100644
--- a/libraries/src/Event/User/AfterLoginEvent.php
+++ b/libraries/src/Event/User/AfterLoginEvent.php
@@ -28,7 +28,7 @@ class AfterLoginEvent extends AbstractLoginEvent
      * @var array
      *
      * @since  5.0.0
-     * @deprecated 5.0 will be removed in 6.0
+     * @deprecated 5.0 will be removed in 7.0
      */
     protected $legacyArgumentsOrder = ['options', 'subject'];
 }
diff --git a/libraries/src/Event/User/AfterLogoutEvent.php b/libraries/src/Event/User/AfterLogoutEvent.php
index 3dbb0037cea3b..aa4bc4eb4d395 100644
--- a/libraries/src/Event/User/AfterLogoutEvent.php
+++ b/libraries/src/Event/User/AfterLogoutEvent.php
@@ -28,7 +28,7 @@ class AfterLogoutEvent extends AbstractLogoutEvent
      * @var array
      *
      * @since  5.0.0
-     * @deprecated 5.0 will be removed in 6.0
+     * @deprecated 5.0 will be removed in 7.0
      */
     protected $legacyArgumentsOrder = ['options', 'subject'];
 }
diff --git a/libraries/src/Event/User/AfterRemindEvent.php b/libraries/src/Event/User/AfterRemindEvent.php
index ef46cce9611f6..f5a44f58683d9 100644
--- a/libraries/src/Event/User/AfterRemindEvent.php
+++ b/libraries/src/Event/User/AfterRemindEvent.php
@@ -28,7 +28,7 @@ class AfterRemindEvent extends UserEvent
      * @var array
      *
      * @since  5.0.0
-     * @deprecated 5.0 will be removed in 6.0
+     * @deprecated 5.0 will be removed in 7.0
      */
     protected $legacyArgumentsOrder = ['subject'];
 
diff --git a/libraries/src/Event/User/AfterSaveEvent.php b/libraries/src/Event/User/AfterSaveEvent.php
index 5767aa148c7d4..05d49bddc3a7c 100644
--- a/libraries/src/Event/User/AfterSaveEvent.php
+++ b/libraries/src/Event/User/AfterSaveEvent.php
@@ -28,7 +28,7 @@ class AfterSaveEvent extends AbstractSaveEvent
      * @var array
      *
      * @since  5.0.0
-     * @deprecated 5.0 will be removed in 6.0
+     * @deprecated 5.0 will be removed in 7.0
      */
     protected $legacyArgumentsOrder = ['subject', 'isNew', 'savingResult', 'errorMessage'];
 
diff --git a/libraries/src/Event/User/AuthenticationEvent.php b/libraries/src/Event/User/AuthenticationEvent.php
index f7c75ca1210fc..8e07971ebc302 100644
--- a/libraries/src/Event/User/AuthenticationEvent.php
+++ b/libraries/src/Event/User/AuthenticationEvent.php
@@ -31,7 +31,7 @@ class AuthenticationEvent extends UserEvent
      * @var array
      *
      * @since  5.0.0
-     * @deprecated 5.0 will be removed in 6.0
+     * @deprecated 5.0 will be removed in 7.0
      */
     protected $legacyArgumentsOrder = ['credentials', 'options', 'subject'];
 
diff --git a/libraries/src/Event/User/AuthorisationEvent.php b/libraries/src/Event/User/AuthorisationEvent.php
index d5f6c143a8fad..5b93391ccc25b 100644
--- a/libraries/src/Event/User/AuthorisationEvent.php
+++ b/libraries/src/Event/User/AuthorisationEvent.php
@@ -34,7 +34,7 @@ class AuthorisationEvent extends UserEvent implements ResultAwareInterface
      * @var array
      *
      * @since  5.0.0
-     * @deprecated 5.0 will be removed in 6.0
+     * @deprecated 5.0 will be removed in 7.0
      */
     protected $legacyArgumentsOrder = ['subject', 'options'];
 
diff --git a/libraries/src/Event/User/AuthorisationFailureEvent.php b/libraries/src/Event/User/AuthorisationFailureEvent.php
index f3ea1c6ce2ee4..4f7f82edc0a98 100644
--- a/libraries/src/Event/User/AuthorisationFailureEvent.php
+++ b/libraries/src/Event/User/AuthorisationFailureEvent.php
@@ -28,7 +28,7 @@ class AuthorisationFailureEvent extends UserEvent
      * @var array
      *
      * @since  5.0.0
-     * @deprecated 5.0 will be removed in 6.0
+     * @deprecated 5.0 will be removed in 7.0
      */
     protected $legacyArgumentsOrder = ['subject', 'options'];
 
diff --git a/libraries/src/Event/User/BeforeSaveEvent.php b/libraries/src/Event/User/BeforeSaveEvent.php
index e897726887b05..9205ee77e4aab 100644
--- a/libraries/src/Event/User/BeforeSaveEvent.php
+++ b/libraries/src/Event/User/BeforeSaveEvent.php
@@ -35,7 +35,7 @@ class BeforeSaveEvent extends AbstractSaveEvent implements ResultAwareInterface
      * @var array
      *
      * @since  5.0.0
-     * @deprecated 5.0 will be removed in 6.0
+     * @deprecated 5.0 will be removed in 7.0
      */
     protected $legacyArgumentsOrder = ['subject', 'isNew', 'data'];
 
diff --git a/libraries/src/Event/User/LoginButtonsEvent.php b/libraries/src/Event/User/LoginButtonsEvent.php
index a169f99e3a8c3..f1c76c98365be 100644
--- a/libraries/src/Event/User/LoginButtonsEvent.php
+++ b/libraries/src/Event/User/LoginButtonsEvent.php
@@ -35,7 +35,7 @@ class LoginButtonsEvent extends UserEvent implements ResultAwareInterface
      * @var array
      *
      * @since  5.0.0
-     * @deprecated 5.0 will be removed in 6.0
+     * @deprecated 5.0 will be removed in 7.0
      */
     protected $legacyArgumentsOrder = ['subject'];
 
diff --git a/libraries/src/Event/User/UserEvent.php b/libraries/src/Event/User/UserEvent.php
index 1863217c8800a..2b958d91c09fb 100644
--- a/libraries/src/Event/User/UserEvent.php
+++ b/libraries/src/Event/User/UserEvent.php
@@ -31,7 +31,7 @@ abstract class UserEvent extends AbstractImmutableEvent
      * @var array
      *
      * @since  5.0.0
-     * @deprecated 5.0 will be removed in 6.0
+     * @deprecated 5.0 will be removed in 7.0
      */
     protected $legacyArgumentsOrder = [];
 
diff --git a/libraries/src/Event/User/UserGroupAfterDeleteEvent.php b/libraries/src/Event/User/UserGroupAfterDeleteEvent.php
index 2f0ad217d6af4..d19141b6e5ced 100644
--- a/libraries/src/Event/User/UserGroupAfterDeleteEvent.php
+++ b/libraries/src/Event/User/UserGroupAfterDeleteEvent.php
@@ -30,9 +30,9 @@ final class UserGroupAfterDeleteEvent extends ModelAfterDeleteEvent
      * @var array
      *
      * @since  5.0.0
-     * @deprecated 5.0 will be removed in 6.0
+     * @deprecated 5.0 will be removed in 7.0
      *
-     * @TODO: In Joomla 6 the event should use 'context', 'subject' only
+     * @TODO: In Joomla 7 the event should use 'context', 'subject' only
      */
     protected $legacyArgumentsOrder = ['data', 'deletingResult', 'errorMessage', 'context', 'subject'];
 }
diff --git a/libraries/src/Event/User/UserGroupBeforeDeleteEvent.php b/libraries/src/Event/User/UserGroupBeforeDeleteEvent.php
index 839ad71ddc604..cc15cf0d8519f 100644
--- a/libraries/src/Event/User/UserGroupBeforeDeleteEvent.php
+++ b/libraries/src/Event/User/UserGroupBeforeDeleteEvent.php
@@ -30,9 +30,9 @@ final class UserGroupBeforeDeleteEvent extends ModelBeforeDeleteEvent
      * @var array
      *
      * @since  5.0.0
-     * @deprecated 5.0 will be removed in 6.0
+     * @deprecated 5.0 will be removed in 7.0
      *
-     * @TODO: In Joomla 6 the event should use 'context', 'subject' only
+     * @TODO: In Joomla 7 the event should use 'context', 'subject' only
      */
     protected $legacyArgumentsOrder = ['data', 'context', 'subject'];
 }
diff --git a/libraries/src/Event/WebAsset/WebAssetRegistryAssetChanged.php b/libraries/src/Event/WebAsset/WebAssetRegistryAssetChanged.php
index 1c5eb06cdf2b9..c6d6373c51705 100644
--- a/libraries/src/Event/WebAsset/WebAssetRegistryAssetChanged.php
+++ b/libraries/src/Event/WebAsset/WebAssetRegistryAssetChanged.php
@@ -62,7 +62,7 @@ public function __construct($name, array $arguments = [])
      *
      * @since  4.0.0
      *
-     * @deprecated 4.4.0 will be removed in 6.0
+     * @deprecated 4.4.0 will be removed in 7.0
      *                Use counterpart with onSet prefix
      */
     protected function setSubject($value)
diff --git a/libraries/src/HTML/Helpers/StringHelper.php b/libraries/src/HTML/Helpers/StringHelper.php
index 4b521cf2f6445..2ee5da493fc33 100644
--- a/libraries/src/HTML/Helpers/StringHelper.php
+++ b/libraries/src/HTML/Helpers/StringHelper.php
@@ -40,7 +40,7 @@ abstract class StringHelper
      */
     public static function truncate($text, $length = 0, $noSplit = true, $allowHtml = true)
     {
-        // Assume a lone open tag is invalid HTML.
+        // Assume a lone open tag is invalid HTML
         if ($length === 1 && $text[0] === '<') {
             return '...';
         }
@@ -156,87 +156,80 @@ public static function truncate($text, $length = 0, $noSplit = true, $allowHtml
      */
     public static function truncateComplex($html, $maxLength = 0, $noSplit = true)
     {
-        // Start with some basic rules.
         $baseLength = \strlen($html);
 
-        // If the original HTML string is shorter than the $maxLength do nothing and return that.
-        if ($baseLength <= $maxLength || $maxLength === 0) {
+        // Early return for trivial cases
+        if ($maxLength === 0 || $baseLength <= $maxLength) {
             return $html;
         }
 
-        // Take care of short simple cases.
-        if ($maxLength <= 3 && $html[0] !== '<' && !str_contains(substr($html, 0, $maxLength - 1), '<') && $baseLength > $maxLength) {
+        // Special case: very short cutoff, plain text.
+        if ($maxLength <= 3 && $html[0] !== '<' && !str_contains(substr($html, 0, max(0, $maxLength - 1)), '<')) {
             return '...';
         }
 
-        // Deal with maximum length of 1 where the string starts with a tag.
+        // Special case: string starts with a tag and maxLength is 1
         if ($maxLength === 1 && $html[0] === '<') {
-            $endTagPos = \strlen(strstr($html, '>', true));
-            $tag       = substr($html, 1, $endTagPos);
-
-            $l = $endTagPos + 1;
-
-            if ($noSplit) {
-                return substr($html, 0, $l) . '</' . $tag . '...';
+            $endTagPos = strpos($html, '>');
+            if ($endTagPos === false) {
+                return '...';
             }
-
-            // @todo: $character doesn't seem to be used...
-            $character = substr(strip_tags($html), 0, 1);
-
-            return substr($html, 0, $l) . '</' . $tag . '...';
+            $tag = substr($html, 1, $endTagPos - 1);
+            return substr($html, 0, $endTagPos + 1) . "</$tag>...";
         }
 
-        // First get the truncated plain text string. This is the rendered text we want to end up with.
-        $ptString = HTMLHelper::_('string.truncate', $html, $maxLength, $noSplit, $allowHtml = false);
+        // Get a plain text truncated string
+        $ptString = HTMLHelper::_('string.truncate', $html, $maxLength, $noSplit, false);
 
-        // It's all HTML, just return it.
         if ($ptString === '') {
             return $html;
         }
-
-        // If the plain text is shorter than the max length the variable will not end in ...
-        // In that case we use the whole string.
         if (!str_ends_with($ptString, '...')) {
             return $html;
         }
-
-        // Regular truncate gives us the ellipsis but we want to go back for text and tags.
         if ($ptString === '...') {
             $stripped = substr(strip_tags($html), 0, $maxLength);
-            $ptString = HTMLHelper::_('string.truncate', $stripped, $maxLength, $noSplit, $allowHtml = false);
+            $ptString = HTMLHelper::_('string.truncate', $stripped, $maxLength, $noSplit, false);
         }
-
-        // We need to trim the ellipsis that truncate adds.
         $ptString = rtrim($ptString, '.');
 
-        // Now deal with more complex truncation.
         while ($maxLength <= $baseLength) {
-            // Get the truncated string assuming HTML is allowed.
-            $htmlString = HTMLHelper::_('string.truncate', $html, $maxLength, $noSplit, $allowHtml = true);
+            $htmlString = HTMLHelper::_('string.truncate', $html, $maxLength, $noSplit, true);
 
             if ($htmlString === '...' && \strlen($ptString) + 3 > $maxLength) {
-                return $htmlString;
+                return '...';
             }
 
             $htmlString = rtrim($htmlString, '.');
 
-            // Now get the plain text from the HTML string and trim it.
-            $htmlStringToPtString = HTMLHelper::_('string.truncate', $htmlString, $maxLength, $noSplit, $allowHtml = false);
+            // Get the plain text version of the truncated HTML string
+            $htmlStringToPtString = HTMLHelper::_('string.truncate', $htmlString, $maxLength, $noSplit, false);
             $htmlStringToPtString = rtrim($htmlStringToPtString, '.');
 
-            // If the new plain text string matches the original plain text string we are done.
+            // If plain text matches, we're done
             if ($ptString === $htmlStringToPtString) {
+                // Remove whitespace, non-breaking spaces, and trailing tags before the ellipsis
+                $htmlString = preg_replace('/(&nbsp;|\s)+(<\/[^>]+>)?$/u', '', $htmlString);
+
+                // If it ends with a closing tag, try to inject the ellipsis before the last closing tag
+                if (preg_match('/(<\/[^>]+>)$/', $htmlString, $matches)) {
+                    return preg_replace('/(<\/[^>]+>)$/', '...$1', $htmlString);
+                }
                 return $htmlString . '...';
             }
 
-            // Get the number of HTML tag characters in the first $maxLength characters
+            // Adjust length for HTML tags
             $diffLength = \strlen($ptString) - \strlen($htmlStringToPtString);
-
             if ($diffLength <= 0) {
+                // Remove whitespace, non-breaking spaces, and trailing tags before the ellipsis
+                $htmlString = preg_replace('/(&nbsp;|\s)+(<\/[^>]+>)?$/u', '', $htmlString);
+
+                // If it ends with a closing tag, inject the ellipsis before the last closing tag
+                if (preg_match('/(<\/[^>]+>)$/', $htmlString, $matches)) {
+                    return preg_replace('/(<\/[^>]+>)$/', '...$1', $htmlString);
+                }
                 return $htmlString . '...';
             }
-
-            // Set new $maxlength that adjusts for the HTML tags
             $maxLength += $diffLength;
         }
 
diff --git a/libraries/src/Helper/ModuleHelper.php b/libraries/src/Helper/ModuleHelper.php
index ca33cc1e5563c..c84d3c0b28815 100644
--- a/libraries/src/Helper/ModuleHelper.php
+++ b/libraries/src/Helper/ModuleHelper.php
@@ -208,7 +208,7 @@ public static function renderModule($module, $attribs = [])
         // If the $module is nulled it will return an empty content, otherwise it will render the module normally.
         $brEvent = $dispatcher->dispatch('onRenderModule', new Module\BeforeRenderModuleEvent('onRenderModule', [
             'subject'    => $module,
-            'attributes' => &$attribs, // @todo: Remove reference in Joomla 6, see BeforeRenderModuleEvent::__constructor()
+            'attributes' => &$attribs, // @todo: Remove reference in Joomla 7, see BeforeRenderModuleEvent::__constructor()
         ]));
         // Get final attributes
         $attribs = $brEvent->getArgument('attributes', $attribs);
@@ -374,7 +374,7 @@ protected static function &load()
         $modules    = [];
 
         $modules = $dispatcher->dispatch('onPrepareModuleList', new Module\PrepareModuleListEvent('onPrepareModuleList', [
-            'modules' => &$modules, // @todo: Remove reference in Joomla 6, see PrepareModuleListEvent::__constructor()
+            'modules' => &$modules, // @todo: Remove reference in Joomla 7, see PrepareModuleListEvent::__constructor()
         ]))->getArgument('modules', $modules);
 
         // If the onPrepareModuleList event returns an array of modules, then ignore the default module list creation
@@ -383,13 +383,13 @@ protected static function &load()
         }
 
         $modules = $dispatcher->dispatch('onAfterModuleList', new Module\AfterModuleListEvent('onAfterModuleList', [
-            'modules' => &$modules, // @todo: Remove reference in Joomla 6, see AfterModuleListEvent::__constructor()
+            'modules' => &$modules, // @todo: Remove reference in Joomla 7, see AfterModuleListEvent::__constructor()
         ]))->getArgument('modules', $modules);
 
         $modules = static::cleanModuleList($modules);
 
         $modules = $dispatcher->dispatch('onAfterCleanModuleList', new Module\AfterCleanModuleListEvent('onAfterCleanModuleList', [
-            'modules' => &$modules, // @todo: Remove reference in Joomla 6, see AfterCleanModuleListEvent::__constructor()
+            'modules' => &$modules, // @todo: Remove reference in Joomla 7, see AfterCleanModuleListEvent::__constructor()
         ]))->getArgument('modules', $modules);
 
         return $modules;
diff --git a/libraries/src/Installer/InstallerHelper.php b/libraries/src/Installer/InstallerHelper.php
index f5f0c58758333..cc4bf22353cf4 100644
--- a/libraries/src/Installer/InstallerHelper.php
+++ b/libraries/src/Installer/InstallerHelper.php
@@ -78,8 +78,8 @@ public static function downloadPackage($url, $target = false)
         $dispatcher = Factory::getApplication()->getDispatcher();
         PluginHelper::importPlugin('installer', null, true, $dispatcher);
         $event = new BeforePackageDownloadEvent('onInstallerBeforePackageDownload', [
-            'url'     => &$url, // @todo: Remove reference in Joomla 6, see BeforePackageDownloadEvent::__constructor()
-            'headers' => &$headers, // @todo: Remove reference in Joomla 6, see BeforePackageDownloadEvent::__constructor()
+            'url'     => &$url, // @todo: Remove reference in Joomla 7, see BeforePackageDownloadEvent::__constructor()
+            'headers' => &$headers, // @todo: Remove reference in Joomla 7, see BeforePackageDownloadEvent::__constructor()
         ]);
         $dispatcher->dispatch('onInstallerBeforePackageDownload', $event);
         $url     = $event->getArgument('url', $url);
diff --git a/libraries/src/MVC/Controller/ApiController.php b/libraries/src/MVC/Controller/ApiController.php
index 457b7aeee13f5..05f1cf38f6b88 100644
--- a/libraries/src/MVC/Controller/ApiController.php
+++ b/libraries/src/MVC/Controller/ApiController.php
@@ -17,6 +17,7 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\CMS\MVC\Model\ListModel;
+use Joomla\CMS\MVC\Model\State;
 use Joomla\CMS\MVC\View\JsonApiView;
 use Joomla\Input\Input;
 use Joomla\Registry\Registry;
@@ -86,7 +87,9 @@ class ApiController extends BaseController
     /**
      * The model state to inject
      *
-     * @var  \Joomla\Registry\Registry
+     * @var  State|\Joomla\Registry\Registry
+     *
+     * @todo   Remove the State type hint in Joomla 7.0 since it will be removed see State class
      */
     protected $modelState;
 
@@ -205,15 +208,13 @@ public function displayList()
         $offset         = null;
 
         if (\array_key_exists('offset', $paginationInfo)) {
-            $offset                      = $paginationInfo['offset'];
-            $property                    = $this->context . '.limitstart';
-            $this->modelState->$property = $offset;
+            $offset = $paginationInfo['offset'];
+            $this->modelState->set($this->context . '.limitstart', $offset);
         }
 
         if (\array_key_exists('limit', $paginationInfo)) {
-            $limit                       = $paginationInfo['limit'];
-            $property                    = $this->context . '.list.limit';
-            $this->modelState->$property = $limit;
+            $limit = $paginationInfo['limit'];
+            $this->modelState->set($this->context . '.list.limit', $limit);
         }
 
         $viewType   = $this->app->getDocument()->getType();
diff --git a/libraries/src/MVC/Controller/FormController.php b/libraries/src/MVC/Controller/FormController.php
index 231fce043c985..2da2087177f46 100644
--- a/libraries/src/MVC/Controller/FormController.php
+++ b/libraries/src/MVC/Controller/FormController.php
@@ -566,7 +566,7 @@ public function save($key = null, $urlVar = null)
             $urlVar = $key;
         }
 
-        $recordId = $this->input->getInt($urlVar);
+        $recordId = (int) $this->input->getInt($urlVar);
 
         // Populate the row id from the session.
         $data[$key] = $recordId;
diff --git a/libraries/src/MVC/Model/FormBehaviorTrait.php b/libraries/src/MVC/Model/FormBehaviorTrait.php
index ec1b97df8448a..35dede28711c0 100644
--- a/libraries/src/MVC/Model/FormBehaviorTrait.php
+++ b/libraries/src/MVC/Model/FormBehaviorTrait.php
@@ -162,7 +162,7 @@ protected function preprocessData($context, &$data, $group = 'content')
             'onContentPrepareData',
             new Model\PrepareDataEvent('onContentPrepareData', [
                 'context' => $context,
-                'data'    => &$data, // @todo: Remove reference in Joomla 6, see PrepareDataEvent::__constructor()
+                'data'    => &$data, // @todo: Remove reference in Joomla 7, see PrepareDataEvent::__constructor()
                 'subject' => new \stdClass(),
             ])
         )->getArgument('data', $data);
diff --git a/libraries/src/MVC/Model/FormModel.php b/libraries/src/MVC/Model/FormModel.php
index 8291f3061a573..0664707647d82 100644
--- a/libraries/src/MVC/Model/FormModel.php
+++ b/libraries/src/MVC/Model/FormModel.php
@@ -206,13 +206,13 @@ public function validate($form, $data, $group = null)
 
             $data = $dispatcher->dispatch('onUserBeforeDataValidation', new Model\BeforeValidateDataEvent('onUserBeforeDataValidation', [
                 'subject' => $form,
-                'data'    => &$data, // @todo: Remove reference in Joomla 6, see BeforeValidateDataEvent::__constructor()
+                'data'    => &$data, // @todo: Remove reference in Joomla 7, see BeforeValidateDataEvent::__constructor()
             ]))->getArgument('data', $data);
         }
 
         $data = $dispatcher->dispatch('onContentBeforeValidateData', new Model\BeforeValidateDataEvent('onContentBeforeValidateData', [
             'subject' => $form,
-            'data'    => &$data, // @todo: Remove reference in Joomla 6, see AfterRenderModulesEvent::__constructor()
+            'data'    => &$data, // @todo: Remove reference in Joomla 7, see AfterRenderModulesEvent::__constructor()
         ]))->getArgument('data', $data);
 
         // Filter and validate the form data.
diff --git a/libraries/src/MVC/View/CategoriesView.php b/libraries/src/MVC/View/CategoriesView.php
index dbe2b7254eb6d..b9b5c9784e5e6 100644
--- a/libraries/src/MVC/View/CategoriesView.php
+++ b/libraries/src/MVC/View/CategoriesView.php
@@ -102,7 +102,7 @@ public function display($tpl = null)
             return false;
         }
 
-        $params = &$state->params;
+        $params = $state->get('params');
 
         $items = [$parent->id => $items];
 
diff --git a/libraries/src/MVC/View/FormView.php b/libraries/src/MVC/View/FormView.php
index 326d578b411a2..9d0e421818e88 100644
--- a/libraries/src/MVC/View/FormView.php
+++ b/libraries/src/MVC/View/FormView.php
@@ -226,7 +226,7 @@ protected function addToolbar()
                 'btn-success'
             );
 
-            if (ComponentHelper::isEnabled('com_contenthistory') && $this->state->params->get('save_history', 0) && $itemEditable) {
+            if (ComponentHelper::isEnabled('com_contenthistory') && $this->state->get('params')->get('save_history', 0) && $itemEditable) {
                 ToolbarHelper::versions($this->option . '.' . $viewName, $this->item->id);
             }
 
diff --git a/modules/mod_breadcrumbs/tmpl/default.php b/modules/mod_breadcrumbs/tmpl/default.php
index df9b5f81cb8d1..b8448d058a925 100644
--- a/modules/mod_breadcrumbs/tmpl/default.php
+++ b/modules/mod_breadcrumbs/tmpl/default.php
@@ -121,7 +121,7 @@
         $wa->addInline(
             'script',
             json_encode($data, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE | $prettyPrint),
-            ['name' => 'inline.mod_breadcrumbs-schemaorg'],
+            ['name' => 'inline.breadcrumbs-schemaorg'],
             ['type' => 'application/ld+json']
         );
     }
diff --git a/modules/mod_login/mod_login.php b/modules/mod_login/mod_login.php
deleted file mode 100644
index 98c89faea69f7..0000000000000
--- a/modules/mod_login/mod_login.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * @package     Joomla.Site
- * @subpackage  mod_login
- *
- * @copyright   (C) 2005 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\Helper\AuthenticationHelper;
-use Joomla\CMS\Helper\ModuleHelper;
-use Joomla\Module\Login\Site\Helper\LoginHelper;
-
-$params->def('greeting', 1);
-
-// HTML IDs
-$formId           = 'login-form-' . $module->id;
-$type             = LoginHelper::getType();
-$return           = LoginHelper::getReturnUrl($params, $type);
-$registerLink     = LoginHelper::getRegistrationUrl($params);
-$extraButtons     = AuthenticationHelper::getLoginButtons($formId);
-$user             = Factory::getUser();
-$layout           = $params->get('layout', 'default');
-
-// Logged users must load the logout sublayout
-if (!$user->guest) {
-    $layout .= '_logout';
-}
-
-require ModuleHelper::getLayoutPath('mod_login', $layout);
diff --git a/modules/mod_login/mod_login.xml b/modules/mod_login/mod_login.xml
index 1edb11c914c8a..9c6278c8a177b 100644
--- a/modules/mod_login/mod_login.xml
+++ b/modules/mod_login/mod_login.xml
@@ -11,7 +11,7 @@
 	<description>MOD_LOGIN_XML_DESCRIPTION</description>
 	<namespace path="src">Joomla\Module\Login</namespace>
 	<files>
-		<filename module="mod_login">mod_login.php</filename>
+		<folder module="mod_login">services</folder>
 		<folder>src</folder>
 		<folder>tmpl</folder>
 	</files>
diff --git a/modules/mod_login/services/provider.php b/modules/mod_login/services/provider.php
new file mode 100644
index 0000000000000..0b99ae7fe6caa
--- /dev/null
+++ b/modules/mod_login/services/provider.php
@@ -0,0 +1,41 @@
+<?php
+
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_login
+ *
+ * @copyright   (C) 2025 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\Extension\Service\Provider\HelperFactory;
+use Joomla\CMS\Extension\Service\Provider\Module;
+use Joomla\CMS\Extension\Service\Provider\ModuleDispatcherFactory;
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+
+/**
+ * The login module service provider.
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+return new class () implements ServiceProviderInterface {
+    /**
+     * Registers the service provider with a DI container.
+     *
+     * @param   Container  $container  The DI container.
+     *
+     * @return  void
+     *
+     * @since   __DEPLOY_VERSION__
+     */
+    public function register(Container $container)
+    {
+        $container->registerServiceProvider(new ModuleDispatcherFactory('\\Joomla\\Module\\Login'));
+        $container->registerServiceProvider(new HelperFactory('\\Joomla\\Module\\Login\\Site\\Helper'));
+
+        $container->registerServiceProvider(new Module());
+    }
+};
diff --git a/modules/mod_login/src/Dispatcher/Dispatcher.php b/modules/mod_login/src/Dispatcher/Dispatcher.php
new file mode 100644
index 0000000000000..6d6d6c2c82085
--- /dev/null
+++ b/modules/mod_login/src/Dispatcher/Dispatcher.php
@@ -0,0 +1,103 @@
+<?php
+
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_login
+ *
+ * @copyright   (C) 2025 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\Module\Login\Site\Dispatcher;
+
+use Joomla\CMS\Dispatcher\AbstractModuleDispatcher;
+use Joomla\CMS\Helper\AuthenticationHelper;
+use Joomla\CMS\Helper\HelperFactoryAwareInterface;
+use Joomla\CMS\Helper\HelperFactoryAwareTrait;
+use Joomla\CMS\Helper\ModuleHelper;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Dispatcher class for mod_login
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class Dispatcher extends AbstractModuleDispatcher implements HelperFactoryAwareInterface
+{
+    use HelperFactoryAwareTrait;
+
+    /**
+     * Runs the dispatcher.
+     *
+     * @return  void
+     *
+     * @since   __DEPLOY_VERSION__
+     */
+    public function dispatch()
+    {
+        $this->loadLanguage();
+
+        $displayData = $this->getLayoutData();
+
+        // Stop when display data is false
+        if ($displayData === false) {
+            return;
+        }
+
+        // Execute the layout without the module context
+        $loader = static function (array $displayData) {
+            // If $displayData doesn't exist in extracted data, unset the variable.
+            if (!\array_key_exists('displayData', $displayData)) {
+                extract($displayData);
+                unset($displayData);
+            } else {
+                extract($displayData);
+            }
+
+            /**
+             * Extracted variables
+             * -----------------
+             * @var   \stdClass  $module
+             * @var   Registry   $params
+             */
+
+            // Logged users must load the logout sublayout
+            if (!$user->guest) {
+                $layout .= '_logout';
+            }
+
+            require ModuleHelper::getLayoutPath('mod_login', $layout);
+        };
+
+        $loader($displayData);
+    }
+
+    /**
+     * Returns the layout data.
+     *
+     * @return  array
+     *
+     * @since   __DEPLOY_VERSION__
+     */
+    protected function getLayoutData()
+    {
+        $data   = parent::getLayoutData();
+        $helper = $this->getHelperFactory()->getHelper('LoginHelper');
+
+        $data['params']->def('greeting', 1);
+
+        // HTML IDs
+        $formId               = 'login-form-' . $data['module']->id;
+        $data['user']         = $data['app']->getIdentity();
+        $type                 = $helper->getUserType($data['user']);
+        $data['return']       = $helper->getReturnUrlString($data['params'], $type, $data['app']);
+        $data['registerLink'] = $helper->getRegistrationUrlString($data['params'], $data['app']);
+        $data['extraButtons'] = AuthenticationHelper::getLoginButtons($formId);
+        $data['layout']       = $data['params']->get('layout', 'default');
+
+        return $data;
+    }
+}
diff --git a/modules/mod_login/src/Helper/LoginHelper.php b/modules/mod_login/src/Helper/LoginHelper.php
index 990729c9cb8f1..a942d8a2efa8a 100644
--- a/modules/mod_login/src/Helper/LoginHelper.php
+++ b/modules/mod_login/src/Helper/LoginHelper.php
@@ -10,9 +10,12 @@
 
 namespace Joomla\Module\Login\Site\Helper;
 
+use Joomla\CMS\Application\CMSApplicationInterface;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Multilanguage;
 use Joomla\CMS\Uri\Uri;
+use Joomla\CMS\User\User;
+use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -28,14 +31,17 @@ class LoginHelper
     /**
      * Retrieve the URL where the user should be returned after logging in
      *
-     * @param   \Joomla\Registry\Registry  $params  module parameters
-     * @param   string                     $type    return type
+     * @param   Registry  $params  module parameters
+     * @param   string    $type    return type
+     * @param   CMSApplicationInterface  $app  The application
+     *
+     * @since   __DEPLOY_VERSION__
      *
      * @return  string
      */
-    public static function getReturnUrl($params, $type)
+    public function getReturnUrlString(Registry $params, $type, CMSApplicationInterface $app): string
     {
-        $item = Factory::getApplication()->getMenu()->getItem($params->get($type));
+        $item = $app->getMenu()->getItem($params->get($type));
 
         // Stay on the same page
         $url = Uri::getInstance()->toString();
@@ -56,30 +62,34 @@ public static function getReturnUrl($params, $type)
     /**
      * Returns the current users type
      *
+     * @param   User  $user  The user object
+     *
      * @return string
+     *
+     * @since __DEPLOY_VERSION__
      */
-    public static function getType()
+    public function getUserType(User $user): string
     {
-        $user = Factory::getUser();
-
         return (!$user->guest) ? 'logout' : 'login';
     }
 
     /**
      * Retrieve the URL for the registration page
      *
-     * @param   \Joomla\Registry\Registry  $params  module parameters
+     * @param   Registry  $params  module parameters
+     *
+     * @since   __DEPLOY_VERSION__
      *
      * @return  string
      */
-    public static function getRegistrationUrl($params)
+    public function getRegistrationUrlString(Registry $params, CMSApplicationInterface $app): string
     {
         $regLink       = 'index.php?option=com_users&view=registration';
         $regLinkMenuId = $params->get('customRegLinkMenu');
 
         // If there is a custom menu item set for registration => override default
         if ($regLinkMenuId) {
-            $item = Factory::getApplication()->getMenu()->getItem($regLinkMenuId);
+            $item = $app->getMenu()->getItem($regLinkMenuId);
 
             if ($item) {
                 $regLink = 'index.php?Itemid=' . $regLinkMenuId;
@@ -92,4 +102,59 @@ public static function getRegistrationUrl($params)
 
         return $regLink;
     }
+
+    /**
+     * Retrieve the URL where the user should be returned after logging in
+     *
+     * @param   Registry  $params  module parameters
+     * @param   string    $type    return type
+     *
+     * @return  string
+     *
+     * @deprecated __DEPLOY_VERSION__ will be removed in 7.0
+     *             Use the non-static method getReturnUrlString
+     *             Example: Factory::getApplication()->bootModule('mod_login', 'site')
+     *                          ->getHelper('LoginHelper')
+     *                          ->getReturnUrlString($params, $type, Factory::getApplication())
+     */
+    public static function getReturnUrl($params, $type)
+    {
+        return (new self())->getReturnUrlString($params, $type, Factory::getApplication());
+    }
+
+    /**
+     * Returns the current users type
+     *
+     * @return     string
+     *
+     * @deprecated __DEPLOY_VERSION__ will be removed in 7.0
+     *             Use the non-static method getUserType
+     *             Example: Factory::getApplication()->bootModule('mod_login', 'site')
+     *                          ->getHelper('LoginHelper')
+     *                          ->getUserType(Factory::getApplication())
+     */
+    public static function getType()
+    {
+        $user = Factory::getApplication()->getIdentity();
+
+        return (new self())->getUserType($user);
+    }
+
+    /**
+     * Retrieve the URL for the registration page
+     *
+     * @param      Registry  $params  module parameters
+     *
+     * @return     string
+     *
+     * @deprecated __DEPLOY_VERSION__ will be removed in 7.0
+     *             Use the non-static method getRegistrationUrlString
+     *             Example: Factory::getApplication()->bootModule('mod_login', 'site')
+     *                          ->getHelper('LoginHelper')
+     *                          ->getRegistrationUrlString($params, Factory::getApplication())
+     */
+    public static function getRegistrationUrl($params)
+    {
+        return (new self())->getRegistrationUrlString($params, Factory::getApplication());
+    }
 }
diff --git a/modules/mod_menu/mod_menu.php b/modules/mod_menu/mod_menu.php
deleted file mode 100644
index f87e4cfbec556..0000000000000
--- a/modules/mod_menu/mod_menu.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-/**
- * @package     Joomla.Site
- * @subpackage  mod_menu
- *
- * @copyright   (C) 2009 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\Helper\ModuleHelper;
-use Joomla\Module\Menu\Site\Helper\MenuHelper;
-
-$list       = MenuHelper::getList($params);
-$base       = MenuHelper::getBase($params);
-$active     = MenuHelper::getActive($params);
-$default    = MenuHelper::getDefault();
-$active_id  = $active->id;
-$default_id = $default->id;
-$path       = $base->tree;
-$showAll    = $params->get('showAllChildren', 1);
-$class_sfx  = htmlspecialchars($params->get('class_sfx', ''), ENT_COMPAT, 'UTF-8');
-
-if (!$list) {
-    return;
-}
-
-require ModuleHelper::getLayoutPath('mod_menu', $params->get('layout', 'default'));
diff --git a/modules/mod_menu/mod_menu.xml b/modules/mod_menu/mod_menu.xml
index b4b32f4da297b..a4c4555466528 100644
--- a/modules/mod_menu/mod_menu.xml
+++ b/modules/mod_menu/mod_menu.xml
@@ -11,7 +11,7 @@
 	<description>MOD_MENU_XML_DESCRIPTION</description>
 	<namespace path="src">Joomla\Module\Menu</namespace>
 	<files>
-		<filename module="mod_menu">mod_menu.php</filename>
+		<folder module="mod_menu">services</folder>
 		<folder>src</folder>
 		<folder>tmpl</folder>
 	</files>
diff --git a/modules/mod_menu/services/provider.php b/modules/mod_menu/services/provider.php
new file mode 100644
index 0000000000000..69e3a09991b72
--- /dev/null
+++ b/modules/mod_menu/services/provider.php
@@ -0,0 +1,41 @@
+<?php
+
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_menu
+ *
+ * @copyright   (C) 2025 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\Extension\Service\Provider\HelperFactory;
+use Joomla\CMS\Extension\Service\Provider\Module;
+use Joomla\CMS\Extension\Service\Provider\ModuleDispatcherFactory;
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+
+/**
+ * The menu module service provider.
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+return new class () implements ServiceProviderInterface {
+    /**
+     * Registers the service provider with a DI container.
+     *
+     * @param   Container  $container  The DI container.
+     *
+     * @return  void
+     *
+     * @since   __DEPLOY_VERSION__
+     */
+    public function register(Container $container)
+    {
+        $container->registerServiceProvider(new ModuleDispatcherFactory('\\Joomla\\Module\\Menu'));
+        $container->registerServiceProvider(new HelperFactory('\\Joomla\\Module\\Menu\\Site\\Helper'));
+
+        $container->registerServiceProvider(new Module());
+    }
+};
diff --git a/modules/mod_menu/src/Dispatcher/Dispatcher.php b/modules/mod_menu/src/Dispatcher/Dispatcher.php
new file mode 100644
index 0000000000000..514d0d5c15c3b
--- /dev/null
+++ b/modules/mod_menu/src/Dispatcher/Dispatcher.php
@@ -0,0 +1,73 @@
+<?php
+
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_menu
+ *
+ * @copyright   (C) 2025 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\Module\Menu\Site\Dispatcher;
+
+use Joomla\CMS\Dispatcher\AbstractModuleDispatcher;
+use Joomla\CMS\Helper\HelperFactoryAwareInterface;
+use Joomla\CMS\Helper\HelperFactoryAwareTrait;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Dispatcher class for mod_menu
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class Dispatcher extends AbstractModuleDispatcher implements HelperFactoryAwareInterface
+{
+    use HelperFactoryAwareTrait;
+
+    /**
+     * Runs the dispatcher.
+     *
+     * @return  void
+     *
+     * @since   __DEPLOY_VERSION__
+     */
+    public function dispatch()
+    {
+        $displayData = $this->getLayoutData();
+
+        if (!$displayData['list']) {
+            return;
+        }
+
+        parent::dispatch();
+    }
+
+    /**
+     * Returns the layout data.
+     *
+     * @return  array
+     *
+     * @since   __DEPLOY_VERSION__
+     */
+    protected function getLayoutData()
+    {
+        $data = parent::getLayoutData();
+
+        $menuHelper = $this->getHelperFactory()->getHelper('MenuHelper');
+
+        $data['list']       = $menuHelper->getItems($data['params'], $data['app']);
+        $data['base']       = $menuHelper->getBaseItem($data['params'], $data['app']);
+        $data['active']     = $menuHelper->getActiveItem($data['app']);
+        $data['default']    = $menuHelper->getDefaultItem($data['app']);
+        $data['active_id']  = $data['active']->id;
+        $data['default_id'] = $data['default']->id;
+        $data['path']       = $data['base']->tree;
+        $data['showAll']    = $data['params']->get('showAllChildren', 1);
+        $data['class_sfx']  = htmlspecialchars($data['params']->get('class_sfx', ''), ENT_COMPAT, 'UTF-8');
+
+        return $data;
+    }
+}
diff --git a/modules/mod_menu/src/Helper/MenuHelper.php b/modules/mod_menu/src/Helper/MenuHelper.php
index c31ed8a1320d9..a1d7ce9b072ae 100644
--- a/modules/mod_menu/src/Helper/MenuHelper.php
+++ b/modules/mod_menu/src/Helper/MenuHelper.php
@@ -10,11 +10,13 @@
 
 namespace Joomla\Module\Menu\Site\Helper;
 
+use Joomla\CMS\Application\CMSApplicationInterface;
 use Joomla\CMS\Cache\CacheControllerFactoryInterface;
 use Joomla\CMS\Cache\Controller\OutputController;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Multilanguage;
 use Joomla\CMS\Router\Route;
+use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -30,20 +32,20 @@ class MenuHelper
     /**
      * Get a list of the menu items.
      *
-     * @param   \Joomla\Registry\Registry  &$params  The module options.
+     * @param   Registry                  &$params  The module options.
+     * @param   CMSApplicationInterface   $app      The application
      *
      * @return  array
      *
-     * @since   1.5
+     * @since   __DEPLOY_VERSION__
      */
-    public static function getList(&$params)
+    public function getItems(Registry &$params, CMSApplicationInterface $app): array
     {
-        $app   = Factory::getApplication();
         $menu  = $app->getMenu();
 
         // Get active menu item
-        $base   = self::getBase($params);
-        $levels = Factory::getUser()->getAuthorisedViewLevels();
+        $base   = $this->getBaseItem($params, $app);
+        $levels = $app->getIdentity()->getAuthorisedViewLevels();
         asort($levels);
 
         // Compose cache key
@@ -136,7 +138,7 @@ public static function getList(&$params)
 
                             // Get the language of the target menu item when site is multilingual
                             if (Multilanguage::isEnabled()) {
-                                $newItem = Factory::getApplication()->getMenu()->getItem((int) $itemParams->get('aliasoptions'));
+                                $newItem = $app->getMenu()->getItem((int) $itemParams->get('aliasoptions'));
 
                                 // Use language code if not set to ALL
                                 if ($newItem != null && $newItem->language && $newItem->language !== '*') {
@@ -183,24 +185,25 @@ public static function getList(&$params)
     /**
      * Get base menu item.
      *
-     * @param   \Joomla\Registry\Registry  &$params  The module options.
+     * @param   Registry                   &$params  The module options.
+     * @param   CMSApplicationInterface    $app      The application
      *
      * @return  object
      *
-     * @since    3.0.2
+     * @since    __DEPLOY_VERSION__
      */
-    public static function getBase(&$params)
+    public function getBaseItem(Registry &$params, CMSApplicationInterface $app): object
     {
         // Get base menu item from parameters
         if ($params->get('base')) {
-            $base = Factory::getApplication()->getMenu()->getItem($params->get('base'));
+            $base = $app->getMenu()->getItem($params->get('base'));
         } else {
             $base = false;
         }
 
         // Use active menu item if no base found
         if (!$base) {
-            $base = self::getActive($params);
+            $base = $this->getActiveItem($app);
         }
 
         return $base;
@@ -209,33 +212,114 @@ public static function getBase(&$params)
     /**
      * Get active menu item.
      *
-     * @param   \Joomla\Registry\Registry  &$params  The module options.
+     * @param   CMSApplicationInterface  $app  The application
      *
      * @return  object
      *
-     * @since    3.0.2
+     * @since    __DEPLOY_VERSION__
      */
-    public static function getActive(&$params)
+    public function getActiveItem(CMSApplicationInterface $app): object
     {
-        $menu = Factory::getApplication()->getMenu();
+        $menu = $app->getMenu();
 
-        return $menu->getActive() ?: self::getDefault();
+        return $menu->getActive() ?: $this->getDefaultItem($app);
     }
 
     /**
      * Get default menu item (home page) for current language.
      *
+     * @param   CMSApplicationInterface  $app  The application
+     *
      * @return  object
+     *
+     * @since   __DEPLOY_VERSION__
      */
-    public static function getDefault()
+    public function getDefaultItem(CMSApplicationInterface $app): object
     {
-        $menu = Factory::getApplication()->getMenu();
+        $menu = $app->getMenu();
 
         // Look for the home menu
         if (Multilanguage::isEnabled()) {
-            return $menu->getDefault(Factory::getLanguage()->getTag());
+            return $menu->getDefault($app->getLanguage()->getTag());
         }
 
         return $menu->getDefault();
     }
+
+
+    /**
+     * Get a list of the menu items.
+     *
+     * @param   Registry  &$params  The module options.
+     *
+     * @return  array
+     *
+     * @since   1.5
+     *
+     * @deprecated __DEPLOY_VERSION__ will be removed in 7.0
+     *             Use the non-static method getItems
+     *             Example: Factory::getApplication()->bootModule('mod_menu', 'site')
+     *                          ->getHelper('MenuHelper')
+     *                          ->getItems($params, $app)
+     */
+    public static function getList(&$params)
+    {
+        return (new self())->getItems($params, Factory::getApplication());
+    }
+
+    /**
+     * Get base menu item.
+     *
+     * @param   Registry  &$params  The module options.
+     *
+     * @return  object
+     *
+     * @since    3.0.2
+     *
+     * @deprecated __DEPLOY_VERSION__ will be removed in 7.0
+     *             Use the non-static method getBaseItem
+     *             Example: Factory::getApplication()->bootModule('mod_menu', 'site')
+     *                          ->getHelper('MenuHelper')
+     *                          ->getBaseItem($params, $app)
+     */
+    public static function getBase(&$params)
+    {
+        return (new self())->getBaseItem($params, Factory::getApplication());
+    }
+
+    /**
+     * Get active menu item.
+     *
+     * @param   Registry  &$params  The module options.
+     *
+     * @return  object
+     *
+     * @since    3.0.2
+     *
+     * @deprecated __DEPLOY_VERSION__ will be removed in 7.0
+     *             Use the non-static method getActiveItem
+     *             Example: Factory::getApplication()->bootModule('mod_menu', 'site')
+     *                          ->getHelper('MenuHelper')
+     *                          ->getActiveItem($app)
+     */
+    public static function getActive(&$params)
+    {
+        return (new self())->getActiveItem(Factory::getApplication());
+    }
+
+    /**
+     * Get default menu item (home page) for current language.
+     *
+     * @return  object
+     *
+     * @deprecated __DEPLOY_VERSION__ will be removed in 7.0
+     *             Use the non-static method getDefaultItem
+     *             Example: Factory::getApplication()->bootModule('mod_menu', 'site')
+     *                          ->getHelper('MenuHelper')
+     *                          ->getDefaultItem($app)
+     */
+    public static function getDefault()
+    {
+        return (new self())->getDefaultItem(Factory::getApplication());
+    }
 }
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 943de366b7e39..a60bae831b7cb 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -39,7 +39,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method register\(\) of class JLoader\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Classes should be autoloaded\. Use JLoader\:\:registerPrefix\(\) or JLoader\:\:registerNamespace\(\) to
 				             register an autoloader for your files\.$#
 			'''
@@ -809,7 +809,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method register\(\) of class JLoader\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Classes should be autoloaded\. Use JLoader\:\:registerPrefix\(\) or JLoader\:\:registerNamespace\(\) to
 				             register an autoloader for your files\.$#
 			'''
@@ -854,7 +854,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method register\(\) of class JLoader\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Classes should be autoloaded\. Use JLoader\:\:registerPrefix\(\) or JLoader\:\:registerNamespace\(\) to
 				             register an autoloader for your files\.$#
 			'''
@@ -894,7 +894,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method triggerEvent\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -944,24 +944,6 @@ parameters:
 			count: 1
 			path: administrator/components/com_categories/src/View/Category/HtmlView.php
 
-		-
-			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\String\\Inflector\:
-				3\.0  Use static methods without a class instance instead\.$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: administrator/components/com_categories/tmpl/categories/default.php
-
-		-
-			message: '''
-				#^Call to deprecated method toPlural\(\) of class Joomla\\String\\Inflector\:
-				3\.0  Use Doctrine\\Common\\Inflector\\Inflector\:\:pluralize\(\) instead\.$#
-			'''
-			identifier: method.deprecated
-			count: 1
-			path: administrator/components/com_categories/tmpl/categories/default.php
-
 		-
 			message: '#^Access to an undefined property Joomla\\Component\\Categories\\Administrator\\View\\Category\\HtmlView\:\:\$useCoreUI\.$#'
 			identifier: property.notFound
@@ -1113,7 +1095,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method triggerEvent\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -1449,7 +1431,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method getDispatcher\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -1557,7 +1539,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method getDispatcher\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -1576,7 +1558,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method triggerEvent\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -1950,6 +1932,15 @@ parameters:
 			count: 1
 			path: administrator/components/com_fields/src/Model/GroupModel.php
 
+		-
+			message: '''
+				#^Access to deprecated property \$app of class Joomla\\Component\\Fields\\Administrator\\Plugin\\FieldsPlugin\:
+				__DEPLOY_VERSION__ will be removed in 7\.0 use \$this\-\>getApplication\(\) instead$#
+			'''
+			identifier: property.deprecated
+			count: 1
+			path: administrator/components/com_fields/src/Plugin/FieldsPlugin.php
+
 		-
 			message: '''
 				#^Call to deprecated method getUser\(\) of class Joomla\\CMS\\Factory\:
@@ -2194,7 +2185,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method triggerEvent\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -2216,7 +2207,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method getDispatcher\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -2226,7 +2217,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method triggerEvent\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -2248,7 +2239,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method triggerEvent\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -2370,7 +2361,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method triggerEvent\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -2413,7 +2404,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method triggerEvent\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -2658,7 +2649,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method getDispatcher\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -2723,7 +2714,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method triggerEvent\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -2937,7 +2928,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method register\(\) of class JLoader\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Classes should be autoloaded\. Use JLoader\:\:registerPrefix\(\) or JLoader\:\:registerNamespace\(\) to
 				             register an autoloader for your files\.$#
 			'''
@@ -3095,7 +3086,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method triggerEvent\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -3184,7 +3175,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method getDispatcher\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -3276,7 +3267,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method register\(\) of class JLoader\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Classes should be autoloaded\. Use JLoader\:\:registerPrefix\(\) or JLoader\:\:registerNamespace\(\) to
 				             register an autoloader for your files\.$#
 			'''
@@ -3308,7 +3299,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method getDispatcher\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -3477,6 +3468,17 @@ parameters:
 			count: 2
 			path: administrator/components/com_languages/src/Controller/InstalledController.php
 
+		-
+			message: '''
+				#^Call to deprecated method getError\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
+				3\.1\.4 will be removed in 7\.0
+				             Will be removed without replacement
+				             Catch thrown Exceptions instead of getError$#
+			'''
+			identifier: method.deprecated
+			count: 2
+			path: administrator/components/com_languages/src/Controller/InstalledController.php
+
 		-
 			message: '''
 				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Language\\Language\:
@@ -3522,6 +3524,17 @@ parameters:
 			count: 1
 			path: administrator/components/com_languages/src/Controller/OverrideController.php
 
+		-
+			message: '''
+				#^Call to deprecated method getError\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
+				3\.1\.4 will be removed in 7\.0
+				             Will be removed without replacement
+				             Catch thrown Exceptions instead of getError$#
+			'''
+			identifier: method.deprecated
+			count: 1
+			path: administrator/components/com_languages/src/Controller/OverridesController.php
+
 		-
 			message: '''
 				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
@@ -3609,7 +3622,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method triggerEvent\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -3907,7 +3920,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method triggerEvent\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -3949,7 +3962,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method triggerEvent\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -4023,7 +4036,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method triggerEvent\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -4033,7 +4046,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method getDispatcher\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -4043,7 +4056,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method triggerEvent\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -4053,7 +4066,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method triggerEvent\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -4233,7 +4246,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method getDispatcher\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -4287,7 +4300,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method triggerEvent\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -4353,7 +4366,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method triggerEvent\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -4697,7 +4710,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method triggerEvent\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -5222,7 +5235,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method getDispatcher\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -5545,7 +5558,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method getDispatcher\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -5798,7 +5811,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method triggerEvent\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -5862,24 +5875,6 @@ parameters:
 			count: 1
 			path: administrator/components/com_tags/tmpl/tag/edit.php
 
-		-
-			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\String\\Inflector\:
-				3\.0  Use static methods without a class instance instead\.$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: administrator/components/com_tags/tmpl/tags/default.php
-
-		-
-			message: '''
-				#^Call to deprecated method toPlural\(\) of class Joomla\\String\\Inflector\:
-				3\.0  Use Doctrine\\Common\\Inflector\\Inflector\:\:pluralize\(\) instead\.$#
-			'''
-			identifier: method.deprecated
-			count: 1
-			path: administrator/components/com_tags/tmpl/tags/default.php
-
 		-
 			message: '''
 				#^Call to deprecated method getError\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
@@ -5961,7 +5956,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method triggerEvent\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -6163,7 +6158,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method getDispatcher\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -6173,7 +6168,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method getDispatcher\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -6205,7 +6200,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method getDispatcher\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -6215,7 +6210,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method getDispatcher\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -6303,7 +6298,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method getDispatcher\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -6325,7 +6320,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method getDispatcher\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -6480,7 +6475,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method getDispatcher\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -6523,7 +6518,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method triggerEvent\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -6599,7 +6594,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method triggerEvent\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -6690,7 +6685,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method getDispatcher\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -6766,7 +6761,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method getDispatcher\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -7069,12 +7064,6 @@ parameters:
 			count: 1
 			path: administrator/components/com_users/tmpl/user/edit_groups.php
 
-		-
-			message: '#^Call to method pluralize\(\) of deprecated class Doctrine\\Common\\Inflector\\Inflector\.$#'
-			identifier: staticMethod.deprecatedClass
-			count: 1
-			path: administrator/components/com_workflow/src/Controller/DisplayController.php
-
 		-
 			message: '''
 				#^Call to deprecated method getError\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
@@ -7327,7 +7316,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method getDispatcher\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -7337,7 +7326,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method triggerEvent\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -7347,7 +7336,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method getDispatcher\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -7357,7 +7346,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method triggerEvent\(\) of class Joomla\\CMS\\Application\\WebApplication\:
-				4\.0 will be removed in 6\.0
+				4\.0 will be removed in 7\.0
 				             Use the Dispatcher method instead
 				             Example\: Factory\:\:getApplication\(\)\-\>getDispatcher\(\)\-\>dispatch\(\$eventName, \$event\);$#
 			'''
@@ -7365,34 +7354,10 @@ parameters:
 			count: 1
 			path: administrator/modules/mod_stats_admin/src/Helper/StatsAdminHelper.php
 
-		-
-			message: '''
-				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
-				             Use the language service in the DI container or get from the application object
-				             Example\:
-				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 2
-			path: administrator/modules/mod_submenu/mod_submenu.php
-
-		-
-			message: '''
-				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
-				             Use the language service in the DI container or get from the application object
-				             Example\:
-				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: administrator/modules/mod_submenu/src/Menu/Menu.php
-
 		-
 			message: '''
 				#^Call to method getDispatcher\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -7504,7 +7469,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method register\(\) of class JLoader\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Classes should be autoloaded\. Use JLoader\:\:registerPrefix\(\) or JLoader\:\:registerNamespace\(\) to
 				             register an autoloader for your files\.$#
 			'''
@@ -7561,7 +7526,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method triggerEvent\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -7730,7 +7695,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method triggerEvent\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -7803,7 +7768,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method triggerEvent\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -8115,7 +8080,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method triggerEvent\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -8165,7 +8130,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method triggerEvent\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -8197,7 +8162,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method triggerEvent\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -8236,7 +8201,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method triggerEvent\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -8336,7 +8301,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method triggerEvent\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -8630,7 +8595,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method register\(\) of class JLoader\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Classes should be autoloaded\. Use JLoader\:\:registerPrefix\(\) or JLoader\:\:registerNamespace\(\) to
 				             register an autoloader for your files\.$#
 			'''
@@ -8694,7 +8659,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method triggerEvent\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -8848,7 +8813,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method triggerEvent\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -8891,7 +8856,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method getDispatcher\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -8923,7 +8888,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method triggerEvent\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -9230,7 +9195,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method register\(\) of class JLoader\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Classes should be autoloaded\. Use JLoader\:\:registerPrefix\(\) or JLoader\:\:registerNamespace\(\) to
 				             register an autoloader for your files\.$#
 			'''
@@ -9289,7 +9254,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method register\(\) of class JLoader\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Classes should be autoloaded\. Use JLoader\:\:registerPrefix\(\) or JLoader\:\:registerNamespace\(\) to
 				             register an autoloader for your files\.$#
 			'''
@@ -9718,7 +9683,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method register\(\) of class JLoader\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Classes should be autoloaded\. Use JLoader\:\:registerPrefix\(\) or JLoader\:\:registerNamespace\(\) to
 				             register an autoloader for your files\.$#
 			'''
@@ -9729,7 +9694,7 @@ parameters:
 		-
 			message: '''
 				#^Interface Joomla\\CMS\\Application\\CMSApplicationInterface extends deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: interface.extendsDeprecatedInterface
@@ -9755,7 +9720,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method register\(\) of class JLoader\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Classes should be autoloaded\. Use JLoader\:\:registerPrefix\(\) or JLoader\:\:registerNamespace\(\) to
 				             register an autoloader for your files\.$#
 			'''
@@ -9985,7 +9950,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method register\(\) of class JLoader\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Classes should be autoloaded\. Use JLoader\:\:registerPrefix\(\) or JLoader\:\:registerNamespace\(\) to
 				             register an autoloader for your files\.$#
 			'''
@@ -10008,7 +9973,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method _load\(\) of class Joomla\\CMS\\Captcha\\Captcha\:
-				Should use CaptchaRegistry$#
+				Should use CaptchaRegistry\. Will be removed in 7\.0\.$#
 			'''
 			identifier: method.deprecated
 			count: 1
@@ -10017,7 +9982,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method getDispatcher\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -10250,7 +10215,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method triggerEvent\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -10260,7 +10225,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method register\(\) of class JLoader\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Classes should be autoloaded\. Use JLoader\:\:registerPrefix\(\) or JLoader\:\:registerNamespace\(\) to
 				             register an autoloader for your files\.$#
 			'''
@@ -10455,7 +10420,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method getDispatcher\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -10590,7 +10555,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method setResult\(\) of class Joomla\\CMS\\Event\\Application\\BeforeSaveConfigurationEvent\:
-				4\.4\.0 will be removed in 6\.0
+				4\.4\.0 will be removed in 7\.0
 				               Use counterpart with onSet prefix$#
 			'''
 			identifier: method.deprecated
@@ -10600,7 +10565,7 @@ parameters:
 		-
 			message: '''
 				#^Access to deprecated property \$legacyArgumentsOrder of class Joomla\\CMS\\Event\\Cache\\AfterPurgeEvent\:
-				5\.0 will be removed in 6\.0$#
+				5\.0 will be removed in 7\.0$#
 			'''
 			identifier: property.deprecated
 			count: 2
@@ -10609,7 +10574,7 @@ parameters:
 		-
 			message: '''
 				#^Usage of deprecated trait Joomla\\CMS\\Event\\ReshapeArgumentsAware in class Joomla\\CMS\\Event\\Cache\\AfterPurgeEvent\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Will be removed without replacement$#
 			'''
 			identifier: traitUse.deprecatedTrait
@@ -10619,7 +10584,7 @@ parameters:
 		-
 			message: '''
 				#^Access to deprecated property \$legacyArgumentsOrder of class Joomla\\CMS\\Event\\Checkin\\AfterCheckinEvent\:
-				5\.0 will be removed in 6\.0$#
+				5\.0 will be removed in 7\.0$#
 			'''
 			identifier: property.deprecated
 			count: 2
@@ -10628,7 +10593,7 @@ parameters:
 		-
 			message: '''
 				#^Usage of deprecated trait Joomla\\CMS\\Event\\ReshapeArgumentsAware in class Joomla\\CMS\\Event\\Checkin\\AfterCheckinEvent\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Will be removed without replacement$#
 			'''
 			identifier: traitUse.deprecatedTrait
@@ -10638,7 +10603,7 @@ parameters:
 		-
 			message: '''
 				#^Access to deprecated property \$legacyArgumentsOrder of class Joomla\\CMS\\Event\\Contact\\SubmitContactEvent\:
-				5\.0 will be removed in 6\.0$#
+				5\.0 will be removed in 7\.0$#
 			'''
 			identifier: property.deprecated
 			count: 2
@@ -10647,7 +10612,7 @@ parameters:
 		-
 			message: '''
 				#^Usage of deprecated trait Joomla\\CMS\\Event\\ReshapeArgumentsAware in class Joomla\\CMS\\Event\\Contact\\SubmitContactEvent\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Will be removed without replacement$#
 			'''
 			identifier: traitUse.deprecatedTrait
@@ -10657,7 +10622,7 @@ parameters:
 		-
 			message: '''
 				#^Access to deprecated property \$legacyArgumentsOrder of class Joomla\\CMS\\Event\\Contact\\ValidateContactEvent\:
-				5\.0 will be removed in 6\.0$#
+				5\.0 will be removed in 7\.0$#
 			'''
 			identifier: property.deprecated
 			count: 2
@@ -10666,7 +10631,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method setResult\(\) of class Joomla\\CMS\\Event\\Contact\\ValidateContactEvent\:
-				4\.4\.0 will be removed in 6\.0
+				4\.4\.0 will be removed in 7\.0
 				               Use counterpart with onSet prefix$#
 			'''
 			identifier: method.deprecated
@@ -10676,7 +10641,7 @@ parameters:
 		-
 			message: '''
 				#^Usage of deprecated trait Joomla\\CMS\\Event\\ReshapeArgumentsAware in class Joomla\\CMS\\Event\\Contact\\ValidateContactEvent\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Will be removed without replacement$#
 			'''
 			identifier: traitUse.deprecatedTrait
@@ -10686,7 +10651,7 @@ parameters:
 		-
 			message: '''
 				#^Access to deprecated property \$resultIsFalseable of class Joomla\\CMS\\Event\\Content\\AfterDisplayEvent\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             You should use nullable values or exceptions instead of returning boolean false results\.$#
 			'''
 			identifier: property.deprecated
@@ -10696,7 +10661,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method setResult\(\) of class Joomla\\CMS\\Event\\Content\\AfterDisplayEvent\:
-				4\.4\.0 will be removed in 6\.0
+				4\.4\.0 will be removed in 7\.0
 				               Use counterpart with onSet prefix$#
 			'''
 			identifier: method.deprecated
@@ -10706,7 +10671,7 @@ parameters:
 		-
 			message: '''
 				#^Access to deprecated property \$resultIsFalseable of class Joomla\\CMS\\Event\\Content\\AfterTitleEvent\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             You should use nullable values or exceptions instead of returning boolean false results\.$#
 			'''
 			identifier: property.deprecated
@@ -10716,7 +10681,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method setResult\(\) of class Joomla\\CMS\\Event\\Content\\AfterTitleEvent\:
-				4\.4\.0 will be removed in 6\.0
+				4\.4\.0 will be removed in 7\.0
 				               Use counterpart with onSet prefix$#
 			'''
 			identifier: method.deprecated
@@ -10726,7 +10691,7 @@ parameters:
 		-
 			message: '''
 				#^Access to deprecated property \$resultIsFalseable of class Joomla\\CMS\\Event\\Content\\BeforeDisplayEvent\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             You should use nullable values or exceptions instead of returning boolean false results\.$#
 			'''
 			identifier: property.deprecated
@@ -10736,7 +10701,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method setResult\(\) of class Joomla\\CMS\\Event\\Content\\BeforeDisplayEvent\:
-				4\.4\.0 will be removed in 6\.0
+				4\.4\.0 will be removed in 7\.0
 				               Use counterpart with onSet prefix$#
 			'''
 			identifier: method.deprecated
@@ -10746,7 +10711,7 @@ parameters:
 		-
 			message: '''
 				#^Access to deprecated property \$legacyArgumentsOrder of class Joomla\\CMS\\Event\\Content\\ContentEvent\:
-				5\.0 will be removed in 6\.0$#
+				5\.0 will be removed in 7\.0$#
 			'''
 			identifier: property.deprecated
 			count: 2
@@ -10755,7 +10720,7 @@ parameters:
 		-
 			message: '''
 				#^Usage of deprecated trait Joomla\\CMS\\Event\\ReshapeArgumentsAware in class Joomla\\CMS\\Event\\Content\\ContentEvent\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Will be removed without replacement$#
 			'''
 			identifier: traitUse.deprecatedTrait
@@ -10765,7 +10730,7 @@ parameters:
 		-
 			message: '''
 				#^Access to deprecated property \$legacyArgumentsOrder of class Joomla\\CMS\\Event\\CustomFields\\CustomFieldsEvent\:
-				5\.0 will be removed in 6\.0$#
+				5\.0 will be removed in 7\.0$#
 			'''
 			identifier: property.deprecated
 			count: 2
@@ -10774,7 +10739,7 @@ parameters:
 		-
 			message: '''
 				#^Usage of deprecated trait Joomla\\CMS\\Event\\ReshapeArgumentsAware in class Joomla\\CMS\\Event\\CustomFields\\CustomFieldsEvent\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Will be removed without replacement$#
 			'''
 			identifier: traitUse.deprecatedTrait
@@ -10784,7 +10749,7 @@ parameters:
 		-
 			message: '''
 				#^Access to deprecated property \$resultIsFalseable of class Joomla\\CMS\\Event\\CustomFields\\GetTypesEvent\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             You should use nullable values or exceptions instead of returning boolean false results\.$#
 			'''
 			identifier: property.deprecated
@@ -10794,7 +10759,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method setResult\(\) of class Joomla\\CMS\\Event\\CustomFields\\GetTypesEvent\:
-				4\.4\.0 will be removed in 6\.0
+				4\.4\.0 will be removed in 7\.0
 				               Use counterpart with onSet prefix$#
 			'''
 			identifier: method.deprecated
@@ -10804,7 +10769,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method setResult\(\) of class Joomla\\CMS\\Event\\CustomFields\\PrepareFieldEvent\:
-				4\.4\.0 will be removed in 6\.0
+				4\.4\.0 will be removed in 7\.0
 				               Use counterpart with onSet prefix$#
 			'''
 			identifier: method.deprecated
@@ -10814,7 +10779,7 @@ parameters:
 		-
 			message: '''
 				#^Access to deprecated property \$legacyArgumentsOrder of class Joomla\\CMS\\Event\\Extension\\AbstractExtensionEvent\:
-				5\.0 will be removed in 6\.0$#
+				5\.0 will be removed in 7\.0$#
 			'''
 			identifier: property.deprecated
 			count: 2
@@ -10823,7 +10788,7 @@ parameters:
 		-
 			message: '''
 				#^Usage of deprecated trait Joomla\\CMS\\Event\\ReshapeArgumentsAware in class Joomla\\CMS\\Event\\Extension\\AbstractExtensionEvent\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Will be removed without replacement$#
 			'''
 			identifier: traitUse.deprecatedTrait
@@ -10833,7 +10798,7 @@ parameters:
 		-
 			message: '''
 				#^Access to deprecated property \$legacyArgumentsOrder of class Joomla\\CMS\\Event\\Extension\\AbstractJoomlaUpdateEvent\:
-				5\.2\.0 will be removed in 6\.0$#
+				5\.2\.0 will be removed in 7\.0$#
 			'''
 			identifier: property.deprecated
 			count: 2
@@ -10842,7 +10807,7 @@ parameters:
 		-
 			message: '''
 				#^Usage of deprecated trait Joomla\\CMS\\Event\\ReshapeArgumentsAware in class Joomla\\CMS\\Event\\Extension\\AbstractJoomlaUpdateEvent\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Will be removed without replacement$#
 			'''
 			identifier: traitUse.deprecatedTrait
@@ -10852,7 +10817,7 @@ parameters:
 		-
 			message: '''
 				#^Access to deprecated property \$legacyArgumentsOrder of class Joomla\\CMS\\Event\\Finder\\AbstractFinderEvent\:
-				5\.0 will be removed in 6\.0$#
+				5\.0 will be removed in 7\.0$#
 			'''
 			identifier: property.deprecated
 			count: 2
@@ -10861,7 +10826,7 @@ parameters:
 		-
 			message: '''
 				#^Usage of deprecated trait Joomla\\CMS\\Event\\ReshapeArgumentsAware in class Joomla\\CMS\\Event\\Finder\\AbstractFinderEvent\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Will be removed without replacement$#
 			'''
 			identifier: traitUse.deprecatedTrait
@@ -10871,7 +10836,7 @@ parameters:
 		-
 			message: '''
 				#^Access to deprecated property \$resultIsFalseable of class Joomla\\CMS\\Event\\Installer\\AddInstallationTabEvent\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             You should use nullable values or exceptions instead of returning boolean false results\.$#
 			'''
 			identifier: property.deprecated
@@ -10881,7 +10846,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method setResult\(\) of class Joomla\\CMS\\Event\\Installer\\AddInstallationTabEvent\:
-				4\.4\.0 will be removed in 6\.0
+				4\.4\.0 will be removed in 7\.0
 				               Use counterpart with onSet prefix$#
 			'''
 			identifier: method.deprecated
@@ -10891,7 +10856,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method setResult\(\) of class Joomla\\CMS\\Event\\Installer\\BeforeInstallationEvent\:
-				4\.4\.0 will be removed in 6\.0
+				4\.4\.0 will be removed in 7\.0
 				               Use counterpart with onSet prefix$#
 			'''
 			identifier: method.deprecated
@@ -10901,7 +10866,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method setResult\(\) of class Joomla\\CMS\\Event\\Installer\\BeforeInstallerEvent\:
-				4\.4\.0 will be removed in 6\.0
+				4\.4\.0 will be removed in 7\.0
 				               Use counterpart with onSet prefix$#
 			'''
 			identifier: method.deprecated
@@ -10911,7 +10876,7 @@ parameters:
 		-
 			message: '''
 				#^Access to deprecated property \$legacyArgumentsOrder of class Joomla\\CMS\\Event\\Installer\\BeforePackageDownloadEvent\:
-				5\.0 will be removed in 6\.0$#
+				5\.0 will be removed in 7\.0$#
 			'''
 			identifier: property.deprecated
 			count: 2
@@ -10920,7 +10885,7 @@ parameters:
 		-
 			message: '''
 				#^Usage of deprecated trait Joomla\\CMS\\Event\\ReshapeArgumentsAware in class Joomla\\CMS\\Event\\Installer\\BeforePackageDownloadEvent\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Will be removed without replacement$#
 			'''
 			identifier: traitUse.deprecatedTrait
@@ -10930,7 +10895,7 @@ parameters:
 		-
 			message: '''
 				#^Access to deprecated property \$legacyArgumentsOrder of class Joomla\\CMS\\Event\\Installer\\InstallerEvent\:
-				5\.0 will be removed in 6\.0$#
+				5\.0 will be removed in 7\.0$#
 			'''
 			identifier: property.deprecated
 			count: 2
@@ -10939,7 +10904,7 @@ parameters:
 		-
 			message: '''
 				#^Usage of deprecated trait Joomla\\CMS\\Event\\ReshapeArgumentsAware in class Joomla\\CMS\\Event\\Installer\\InstallerEvent\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Will be removed without replacement$#
 			'''
 			identifier: traitUse.deprecatedTrait
@@ -10949,7 +10914,7 @@ parameters:
 		-
 			message: '''
 				#^Access to deprecated property \$legacyArgumentsOrder of class Joomla\\CMS\\Event\\Mail\\MailTemplateEvent\:
-				5\.2\.0 will be removed in 6\.0$#
+				5\.2\.0 will be removed in 7\.0$#
 			'''
 			identifier: property.deprecated
 			count: 2
@@ -10958,7 +10923,7 @@ parameters:
 		-
 			message: '''
 				#^Usage of deprecated trait Joomla\\CMS\\Event\\ReshapeArgumentsAware in class Joomla\\CMS\\Event\\Mail\\MailTemplateEvent\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Will be removed without replacement$#
 			'''
 			identifier: traitUse.deprecatedTrait
@@ -10968,7 +10933,7 @@ parameters:
 		-
 			message: '''
 				#^Access to deprecated property \$legacyArgumentsOrder of class Joomla\\CMS\\Event\\Menu\\AfterGetMenuTypeOptionsEvent\:
-				5\.0 will be removed in 6\.0$#
+				5\.0 will be removed in 7\.0$#
 			'''
 			identifier: property.deprecated
 			count: 2
@@ -10977,7 +10942,7 @@ parameters:
 		-
 			message: '''
 				#^Usage of deprecated trait Joomla\\CMS\\Event\\ReshapeArgumentsAware in class Joomla\\CMS\\Event\\Menu\\AfterGetMenuTypeOptionsEvent\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Will be removed without replacement$#
 			'''
 			identifier: traitUse.deprecatedTrait
@@ -10987,7 +10952,7 @@ parameters:
 		-
 			message: '''
 				#^Access to deprecated property \$legacyArgumentsOrder of class Joomla\\CMS\\Event\\Menu\\BeforeRenderMenuItemsViewEvent\:
-				5\.0 will be removed in 6\.0$#
+				5\.0 will be removed in 7\.0$#
 			'''
 			identifier: property.deprecated
 			count: 2
@@ -10996,7 +10961,7 @@ parameters:
 		-
 			message: '''
 				#^Usage of deprecated trait Joomla\\CMS\\Event\\ReshapeArgumentsAware in class Joomla\\CMS\\Event\\Menu\\BeforeRenderMenuItemsViewEvent\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Will be removed without replacement$#
 			'''
 			identifier: traitUse.deprecatedTrait
@@ -11006,7 +10971,7 @@ parameters:
 		-
 			message: '''
 				#^Access to deprecated property \$legacyArgumentsOrder of class Joomla\\CMS\\Event\\Menu\\PreprocessMenuItemsEvent\:
-				5\.0 will be removed in 6\.0$#
+				5\.0 will be removed in 7\.0$#
 			'''
 			identifier: property.deprecated
 			count: 2
@@ -11015,7 +10980,7 @@ parameters:
 		-
 			message: '''
 				#^Usage of deprecated trait Joomla\\CMS\\Event\\ReshapeArgumentsAware in class Joomla\\CMS\\Event\\Menu\\PreprocessMenuItemsEvent\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Will be removed without replacement$#
 			'''
 			identifier: traitUse.deprecatedTrait
@@ -11025,7 +10990,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method setResult\(\) of class Joomla\\CMS\\Event\\Model\\AfterChangeStateEvent\:
-				4\.4\.0 will be removed in 6\.0
+				4\.4\.0 will be removed in 7\.0
 				               Use counterpart with onSet prefix$#
 			'''
 			identifier: method.deprecated
@@ -11035,7 +11000,7 @@ parameters:
 		-
 			message: '''
 				#^Access to deprecated property \$legacyArgumentsOrder of class Joomla\\CMS\\Event\\Model\\AfterCleanCacheEvent\:
-				5\.0 will be removed in 6\.0$#
+				5\.0 will be removed in 7\.0$#
 			'''
 			identifier: property.deprecated
 			count: 2
@@ -11044,7 +11009,7 @@ parameters:
 		-
 			message: '''
 				#^Usage of deprecated trait Joomla\\CMS\\Event\\ReshapeArgumentsAware in class Joomla\\CMS\\Event\\Model\\AfterCleanCacheEvent\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Will be removed without replacement$#
 			'''
 			identifier: traitUse.deprecatedTrait
@@ -11054,7 +11019,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method setResult\(\) of class Joomla\\CMS\\Event\\Model\\BeforeChangeStateEvent\:
-				4\.4\.0 will be removed in 6\.0
+				4\.4\.0 will be removed in 7\.0
 				               Use counterpart with onSet prefix$#
 			'''
 			identifier: method.deprecated
@@ -11064,7 +11029,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method setResult\(\) of class Joomla\\CMS\\Event\\Model\\BeforeDeleteEvent\:
-				4\.4\.0 will be removed in 6\.0
+				4\.4\.0 will be removed in 7\.0
 				               Use counterpart with onSet prefix$#
 			'''
 			identifier: method.deprecated
@@ -11074,7 +11039,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method setResult\(\) of class Joomla\\CMS\\Event\\Model\\BeforeSaveEvent\:
-				4\.4\.0 will be removed in 6\.0
+				4\.4\.0 will be removed in 7\.0
 				               Use counterpart with onSet prefix$#
 			'''
 			identifier: method.deprecated
@@ -11084,7 +11049,7 @@ parameters:
 		-
 			message: '''
 				#^Access to deprecated property \$legacyArgumentsOrder of class Joomla\\CMS\\Event\\Model\\FormEvent\:
-				5\.0 will be removed in 6\.0$#
+				5\.0 will be removed in 7\.0$#
 			'''
 			identifier: property.deprecated
 			count: 2
@@ -11093,7 +11058,7 @@ parameters:
 		-
 			message: '''
 				#^Usage of deprecated trait Joomla\\CMS\\Event\\ReshapeArgumentsAware in class Joomla\\CMS\\Event\\Model\\FormEvent\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Will be removed without replacement$#
 			'''
 			identifier: traitUse.deprecatedTrait
@@ -11103,7 +11068,7 @@ parameters:
 		-
 			message: '''
 				#^Access to deprecated property \$legacyArgumentsOrder of class Joomla\\CMS\\Event\\Model\\ModelEvent\:
-				5\.0 will be removed in 6\.0$#
+				5\.0 will be removed in 7\.0$#
 			'''
 			identifier: property.deprecated
 			count: 2
@@ -11112,7 +11077,7 @@ parameters:
 		-
 			message: '''
 				#^Usage of deprecated trait Joomla\\CMS\\Event\\ReshapeArgumentsAware in class Joomla\\CMS\\Event\\Model\\ModelEvent\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Will be removed without replacement$#
 			'''
 			identifier: traitUse.deprecatedTrait
@@ -11122,7 +11087,7 @@ parameters:
 		-
 			message: '''
 				#^Access to deprecated property \$legacyArgumentsOrder of class Joomla\\CMS\\Event\\Module\\ModuleEvent\:
-				5\.0 will be removed in 6\.0$#
+				5\.0 will be removed in 7\.0$#
 			'''
 			identifier: property.deprecated
 			count: 2
@@ -11131,7 +11096,7 @@ parameters:
 		-
 			message: '''
 				#^Usage of deprecated trait Joomla\\CMS\\Event\\ReshapeArgumentsAware in class Joomla\\CMS\\Event\\Module\\ModuleEvent\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Will be removed without replacement$#
 			'''
 			identifier: traitUse.deprecatedTrait
@@ -11141,7 +11106,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method setResult\(\) of class Joomla\\CMS\\Event\\MultiFactor\\BeforeDisplayMethods\:
-				4\.4\.0 will be removed in 6\.0
+				4\.4\.0 will be removed in 7\.0
 				               Use counterpart with onSet prefix$#
 			'''
 			identifier: method.deprecated
@@ -11151,7 +11116,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method setUser\(\) of class Joomla\\CMS\\Event\\MultiFactor\\BeforeDisplayMethods\:
-				4\.4\.0 will be removed in 6\.0
+				4\.4\.0 will be removed in 7\.0
 				              Use counterpart with onSet prefix$#
 			'''
 			identifier: method.deprecated
@@ -11161,7 +11126,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method setMethod\(\) of class Joomla\\CMS\\Event\\MultiFactor\\Callback\:
-				4\.4\.0 will be removed in 6\.0
+				4\.4\.0 will be removed in 7\.0
 				               Use counterpart with onSet prefix$#
 			'''
 			identifier: method.deprecated
@@ -11171,7 +11136,7 @@ parameters:
 		-
 			message: '''
 				#^Access to deprecated property \$resultIsFalseable of class Joomla\\CMS\\Event\\MultiFactor\\Captive\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             You should use nullable values or exceptions instead of returning boolean false results\.$#
 			'''
 			identifier: property.deprecated
@@ -11181,7 +11146,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method setRecord\(\) of class Joomla\\CMS\\Event\\MultiFactor\\Captive\:
-				4\.4\.0 will be removed in 6\.0
+				4\.4\.0 will be removed in 7\.0
 				               Use counterpart with onSet prefix$#
 			'''
 			identifier: method.deprecated
@@ -11191,7 +11156,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method setResult\(\) of class Joomla\\CMS\\Event\\MultiFactor\\Captive\:
-				4\.4\.0 will be removed in 6\.0
+				4\.4\.0 will be removed in 7\.0
 				               Use counterpart with onSet prefix$#
 			'''
 			identifier: method.deprecated
@@ -11201,7 +11166,7 @@ parameters:
 		-
 			message: '''
 				#^Access to deprecated property \$resultIsFalseable of class Joomla\\CMS\\Event\\MultiFactor\\GetMethod\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             You should use nullable values or exceptions instead of returning boolean false results\.$#
 			'''
 			identifier: property.deprecated
@@ -11211,7 +11176,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method setResult\(\) of class Joomla\\CMS\\Event\\MultiFactor\\GetMethod\:
-				4\.4\.0 will be removed in 6\.0
+				4\.4\.0 will be removed in 7\.0
 				               Use counterpart with onSet prefix$#
 			'''
 			identifier: method.deprecated
@@ -11221,7 +11186,7 @@ parameters:
 		-
 			message: '''
 				#^Access to deprecated property \$resultIsFalseable of class Joomla\\CMS\\Event\\MultiFactor\\GetSetup\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             You should use nullable values or exceptions instead of returning boolean false results\.$#
 			'''
 			identifier: property.deprecated
@@ -11231,7 +11196,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method setRecord\(\) of class Joomla\\CMS\\Event\\MultiFactor\\GetSetup\:
-				4\.4\.0 will be removed in 6\.0
+				4\.4\.0 will be removed in 7\.0
 				               Use counterpart with onSet prefix$#
 			'''
 			identifier: method.deprecated
@@ -11241,7 +11206,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method setResult\(\) of class Joomla\\CMS\\Event\\MultiFactor\\GetSetup\:
-				4\.4\.0 will be removed in 6\.0
+				4\.4\.0 will be removed in 7\.0
 				               Use counterpart with onSet prefix$#
 			'''
 			identifier: method.deprecated
@@ -11251,7 +11216,7 @@ parameters:
 		-
 			message: '''
 				#^Access to deprecated property \$resultIsFalseable of class Joomla\\CMS\\Event\\MultiFactor\\SaveSetup\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             You should use nullable values or exceptions instead of returning boolean false results\.$#
 			'''
 			identifier: property.deprecated
@@ -11261,7 +11226,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method setInput\(\) of class Joomla\\CMS\\Event\\MultiFactor\\SaveSetup\:
-				4\.4\.0 will be removed in 6\.0
+				4\.4\.0 will be removed in 7\.0
 				               Use counterpart with onSet prefix$#
 			'''
 			identifier: method.deprecated
@@ -11271,7 +11236,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method setRecord\(\) of class Joomla\\CMS\\Event\\MultiFactor\\SaveSetup\:
-				4\.4\.0 will be removed in 6\.0
+				4\.4\.0 will be removed in 7\.0
 				               Use counterpart with onSet prefix$#
 			'''
 			identifier: method.deprecated
@@ -11281,7 +11246,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method setResult\(\) of class Joomla\\CMS\\Event\\MultiFactor\\SaveSetup\:
-				4\.4\.0 will be removed in 6\.0
+				4\.4\.0 will be removed in 7\.0
 				               Use counterpart with onSet prefix$#
 			'''
 			identifier: method.deprecated
@@ -11291,7 +11256,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method setCode\(\) of class Joomla\\CMS\\Event\\MultiFactor\\Validate\:
-				4\.4\.0 will be removed in 6\.0
+				4\.4\.0 will be removed in 7\.0
 				               Use counterpart with onSet prefix$#
 			'''
 			identifier: method.deprecated
@@ -11301,7 +11266,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method setRecord\(\) of class Joomla\\CMS\\Event\\MultiFactor\\Validate\:
-				4\.4\.0 will be removed in 6\.0
+				4\.4\.0 will be removed in 7\.0
 				               Use counterpart with onSet prefix$#
 			'''
 			identifier: method.deprecated
@@ -11311,7 +11276,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method setResult\(\) of class Joomla\\CMS\\Event\\MultiFactor\\Validate\:
-				4\.4\.0 will be removed in 6\.0
+				4\.4\.0 will be removed in 7\.0
 				               Use counterpart with onSet prefix$#
 			'''
 			identifier: method.deprecated
@@ -11321,7 +11286,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method setUser\(\) of class Joomla\\CMS\\Event\\MultiFactor\\Validate\:
-				4\.4\.0 will be removed in 6\.0
+				4\.4\.0 will be removed in 7\.0
 				               Use counterpart with onSet prefix$#
 			'''
 			identifier: method.deprecated
@@ -11331,7 +11296,7 @@ parameters:
 		-
 			message: '''
 				#^Access to deprecated property \$resultIsFalseable of class Joomla\\CMS\\Event\\PageCache\\GetKeyEvent\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             You should use nullable values or exceptions instead of returning boolean false results\.$#
 			'''
 			identifier: property.deprecated
@@ -11341,7 +11306,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method setResult\(\) of class Joomla\\CMS\\Event\\PageCache\\GetKeyEvent\:
-				4\.4\.0 will be removed in 6\.0
+				4\.4\.0 will be removed in 7\.0
 				               Use counterpart with onSet prefix$#
 			'''
 			identifier: method.deprecated
@@ -11351,7 +11316,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method setResult\(\) of class Joomla\\CMS\\Event\\PageCache\\IsExcludedEvent\:
-				4\.4\.0 will be removed in 6\.0
+				4\.4\.0 will be removed in 7\.0
 				               Use counterpart with onSet prefix$#
 			'''
 			identifier: method.deprecated
@@ -11361,7 +11326,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method setResult\(\) of class Joomla\\CMS\\Event\\PageCache\\SetCachingEvent\:
-				4\.4\.0 will be removed in 6\.0
+				4\.4\.0 will be removed in 7\.0
 				               Use counterpart with onSet prefix$#
 			'''
 			identifier: method.deprecated
@@ -11371,7 +11336,7 @@ parameters:
 		-
 			message: '''
 				#^Access to deprecated property \$legacyArgumentsOrder of class Joomla\\CMS\\Event\\Plugin\\System\\Stats\\GetStatsDataEvent\:
-				5\.3\.0 will be removed in 6\.0$#
+				5\.3\.0 will be removed in 7\.0$#
 			'''
 			identifier: property.deprecated
 			count: 2
@@ -11380,7 +11345,7 @@ parameters:
 		-
 			message: '''
 				#^Access to deprecated property \$resultIsFalseable of class Joomla\\CMS\\Event\\Plugin\\System\\Stats\\GetStatsDataEvent\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             You should use nullable values or exceptions instead of returning boolean false results\.$#
 			'''
 			identifier: property.deprecated
@@ -11390,7 +11355,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method setResult\(\) of class Joomla\\CMS\\Event\\Plugin\\System\\Stats\\GetStatsDataEvent\:
-				4\.4\.0 will be removed in 6\.0
+				4\.4\.0 will be removed in 7\.0
 				               Use counterpart with onSet prefix$#
 			'''
 			identifier: method.deprecated
@@ -11400,7 +11365,7 @@ parameters:
 		-
 			message: '''
 				#^Usage of deprecated trait Joomla\\CMS\\Event\\ReshapeArgumentsAware in class Joomla\\CMS\\Event\\Plugin\\System\\Stats\\GetStatsDataEvent\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Will be removed without replacement$#
 			'''
 			identifier: traitUse.deprecatedTrait
@@ -11410,7 +11375,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method setResult\(\) of class Joomla\\CMS\\Event\\Plugin\\System\\Webauthn\\AjaxChallenge\:
-				4\.4\.0 will be removed in 6\.0
+				4\.4\.0 will be removed in 7\.0
 				               Use counterpart with onSet prefix$#
 			'''
 			identifier: method.deprecated
@@ -11420,7 +11385,7 @@ parameters:
 		-
 			message: '''
 				#^Access to deprecated property \$resultIsFalseable of class Joomla\\CMS\\Event\\Plugin\\System\\Webauthn\\AjaxCreate\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             You should use nullable values or exceptions instead of returning boolean false results\.$#
 			'''
 			identifier: property.deprecated
@@ -11430,7 +11395,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method setResult\(\) of class Joomla\\CMS\\Event\\Plugin\\System\\Webauthn\\AjaxCreate\:
-				4\.4\.0 will be removed in 6\.0
+				4\.4\.0 will be removed in 7\.0
 				               Use counterpart with onSet prefix$#
 			'''
 			identifier: method.deprecated
@@ -11440,7 +11405,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method setResult\(\) of class Joomla\\CMS\\Event\\Plugin\\System\\Webauthn\\AjaxDelete\:
-				4\.4\.0 will be removed in 6\.0
+				4\.4\.0 will be removed in 7\.0
 				               Use counterpart with onSet prefix$#
 			'''
 			identifier: method.deprecated
@@ -11450,7 +11415,7 @@ parameters:
 		-
 			message: '''
 				#^Access to deprecated property \$resultIsFalseable of class Joomla\\CMS\\Event\\Plugin\\System\\Webauthn\\AjaxInitCreate\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             You should use nullable values or exceptions instead of returning boolean false results\.$#
 			'''
 			identifier: property.deprecated
@@ -11460,7 +11425,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method setResult\(\) of class Joomla\\CMS\\Event\\Plugin\\System\\Webauthn\\AjaxInitCreate\:
-				4\.4\.0 will be removed in 6\.0
+				4\.4\.0 will be removed in 7\.0
 				               Use counterpart with onSet prefix$#
 			'''
 			identifier: method.deprecated
@@ -11470,7 +11435,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method setResult\(\) of class Joomla\\CMS\\Event\\Plugin\\System\\Webauthn\\AjaxSaveLabel\:
-				4\.4\.0 will be removed in 6\.0
+				4\.4\.0 will be removed in 7\.0
 				               Use counterpart with onSet prefix$#
 			'''
 			identifier: method.deprecated
@@ -11480,7 +11445,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method setResult\(\) of class Joomla\\CMS\\Event\\Privacy\\CanRemoveDataEvent\:
-				4\.4\.0 will be removed in 6\.0
+				4\.4\.0 will be removed in 7\.0
 				               Use counterpart with onSet prefix$#
 			'''
 			identifier: method.deprecated
@@ -11490,7 +11455,7 @@ parameters:
 		-
 			message: '''
 				#^Access to deprecated property \$resultIsFalseable of class Joomla\\CMS\\Event\\Privacy\\CollectCapabilitiesEvent\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             You should use nullable values or exceptions instead of returning boolean false results\.$#
 			'''
 			identifier: property.deprecated
@@ -11500,7 +11465,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method setResult\(\) of class Joomla\\CMS\\Event\\Privacy\\CollectCapabilitiesEvent\:
-				4\.4\.0 will be removed in 6\.0
+				4\.4\.0 will be removed in 7\.0
 				               Use counterpart with onSet prefix$#
 			'''
 			identifier: method.deprecated
@@ -11510,7 +11475,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method setResult\(\) of class Joomla\\CMS\\Event\\Privacy\\ExportRequestEvent\:
-				4\.4\.0 will be removed in 6\.0
+				4\.4\.0 will be removed in 7\.0
 				               Use counterpart with onSet prefix$#
 			'''
 			identifier: method.deprecated
@@ -11520,7 +11485,7 @@ parameters:
 		-
 			message: '''
 				#^Access to deprecated property \$legacyArgumentsOrder of class Joomla\\CMS\\Event\\Privacy\\PrivacyEvent\:
-				5\.0 will be removed in 6\.0$#
+				5\.0 will be removed in 7\.0$#
 			'''
 			identifier: property.deprecated
 			count: 2
@@ -11529,7 +11494,7 @@ parameters:
 		-
 			message: '''
 				#^Usage of deprecated trait Joomla\\CMS\\Event\\ReshapeArgumentsAware in class Joomla\\CMS\\Event\\Privacy\\PrivacyEvent\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Will be removed without replacement$#
 			'''
 			identifier: traitUse.deprecatedTrait
@@ -11539,7 +11504,7 @@ parameters:
 		-
 			message: '''
 				#^Access to deprecated property \$resultIsFalseable of class Joomla\\CMS\\Event\\QuickIcon\\GetIconEvent\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             You should use nullable values or exceptions instead of returning boolean false results\.$#
 			'''
 			identifier: property.deprecated
@@ -11549,7 +11514,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method setContext\(\) of class Joomla\\CMS\\Event\\QuickIcon\\GetIconEvent\:
-				4\.4\.0 will be removed in 6\.0
+				4\.4\.0 will be removed in 7\.0
 				               Use counterpart with onSet prefix$#
 			'''
 			identifier: method.deprecated
@@ -11559,7 +11524,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method setResult\(\) of class Joomla\\CMS\\Event\\QuickIcon\\GetIconEvent\:
-				4\.4\.0 will be removed in 6\.0
+				4\.4\.0 will be removed in 7\.0
 				               Use counterpart with onSet prefix$#
 			'''
 			identifier: method.deprecated
@@ -11569,7 +11534,7 @@ parameters:
 		-
 			message: '''
 				#^Usage of deprecated trait Joomla\\CMS\\Event\\ReshapeArgumentsAware in class Joomla\\CMS\\Event\\QuickIcon\\GetIconEvent\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Will be removed without replacement$#
 			'''
 			identifier: traitUse.deprecatedTrait
@@ -11579,7 +11544,7 @@ parameters:
 		-
 			message: '''
 				#^Access to deprecated property \$resultIsFalseable of class Joomla\\CMS\\Event\\SampleData\\GetOverviewEvent\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             You should use nullable values or exceptions instead of returning boolean false results\.$#
 			'''
 			identifier: property.deprecated
@@ -11589,7 +11554,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method setResult\(\) of class Joomla\\CMS\\Event\\SampleData\\GetOverviewEvent\:
-				4\.4\.0 will be removed in 6\.0
+				4\.4\.0 will be removed in 7\.0
 				               Use counterpart with onSet prefix$#
 			'''
 			identifier: method.deprecated
@@ -11599,7 +11564,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method setSubject\(\) of class Joomla\\CMS\\Event\\Table\\AbstractEvent\:
-				4\.4\.0 will be removed in 6\.0
+				4\.4\.0 will be removed in 7\.0
 				               Use counterpart with onSet prefix$#
 			'''
 			identifier: method.deprecated
@@ -11609,7 +11574,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method setResult\(\) of class Joomla\\CMS\\Event\\Table\\AfterLoadEvent\:
-				4\.4\.0 will be removed in 6\.0
+				4\.4\.0 will be removed in 7\.0
 				               Use counterpart with onSet prefix$#
 			'''
 			identifier: method.deprecated
@@ -11619,7 +11584,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method setRow\(\) of class Joomla\\CMS\\Event\\Table\\AfterLoadEvent\:
-				4\.4\.0 will be removed in 6\.0
+				4\.4\.0 will be removed in 7\.0
 				               Use counterpart with onSet prefix$#
 			'''
 			identifier: method.deprecated
@@ -11629,7 +11594,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method setDelta\(\) of class Joomla\\CMS\\Event\\Table\\AfterMoveEvent\:
-				4\.4\.0 will be removed in 6\.0
+				4\.4\.0 will be removed in 7\.0
 				               Use counterpart with onSet prefix$#
 			'''
 			identifier: method.deprecated
@@ -11639,7 +11604,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method setRow\(\) of class Joomla\\CMS\\Event\\Table\\AfterMoveEvent\:
-				4\.4\.0 will be removed in 6\.0
+				4\.4\.0 will be removed in 7\.0
 				               Use counterpart with onSet prefix$#
 			'''
 			identifier: method.deprecated
@@ -11649,7 +11614,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method setWhere\(\) of class Joomla\\CMS\\Event\\Table\\AfterMoveEvent\:
-				4\.4\.0 will be removed in 6\.0
+				4\.4\.0 will be removed in 7\.0
 				               Use counterpart with onSet prefix$#
 			'''
 			identifier: method.deprecated
@@ -11659,7 +11624,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method setWhere\(\) of class Joomla\\CMS\\Event\\Table\\AfterReorderEvent\:
-				4\.4\.0 will be removed in 6\.0
+				4\.4\.0 will be removed in 7\.0
 				               Use counterpart with onSet prefix$#
 			'''
 			identifier: method.deprecated
@@ -11669,7 +11634,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method setResult\(\) of class Joomla\\CMS\\Event\\Table\\AfterStoreEvent\:
-				4\.4\.0 will be removed in 6\.0
+				4\.4\.0 will be removed in 7\.0
 				               Use counterpart with onSet prefix$#
 			'''
 			identifier: method.deprecated
@@ -11679,7 +11644,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method setIgnore\(\) of class Joomla\\CMS\\Event\\Table\\BeforeBindEvent\:
-				4\.4\.0 will be removed in 6\.0
+				4\.4\.0 will be removed in 7\.0
 				               Use counterpart with onSet prefix$#
 			'''
 			identifier: method.deprecated
@@ -11689,7 +11654,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method setSrc\(\) of class Joomla\\CMS\\Event\\Table\\BeforeBindEvent\:
-				4\.4\.0 will be removed in 6\.0
+				4\.4\.0 will be removed in 7\.0
 				               Use counterpart with onSet prefix$#
 			'''
 			identifier: method.deprecated
@@ -11699,7 +11664,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method setUserId\(\) of class Joomla\\CMS\\Event\\Table\\BeforeCheckoutEvent\:
-				4\.4\.0 will be removed in 6\.0
+				4\.4\.0 will be removed in 7\.0
 				               Use counterpart with onSet prefix$#
 			'''
 			identifier: method.deprecated
@@ -11709,7 +11674,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method setReset\(\) of class Joomla\\CMS\\Event\\Table\\BeforeLoadEvent\:
-				4\.4\.0 will be removed in 6\.0
+				4\.4\.0 will be removed in 7\.0
 				               Use counterpart with onSet prefix$#
 			'''
 			identifier: method.deprecated
@@ -11719,7 +11684,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method setDelta\(\) of class Joomla\\CMS\\Event\\Table\\BeforeMoveEvent\:
-				4\.4\.0 will be removed in 6\.0
+				4\.4\.0 will be removed in 7\.0
 				               Use counterpart with onSet prefix$#
 			'''
 			identifier: method.deprecated
@@ -11729,7 +11694,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method setQuery\(\) of class Joomla\\CMS\\Event\\Table\\BeforeMoveEvent\:
-				4\.4\.0 will be removed in 6\.0
+				4\.4\.0 will be removed in 7\.0
 				               Use counterpart with onSet prefix$#
 			'''
 			identifier: method.deprecated
@@ -11739,7 +11704,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method setWhere\(\) of class Joomla\\CMS\\Event\\Table\\BeforeMoveEvent\:
-				4\.4\.0 will be removed in 6\.0
+				4\.4\.0 will be removed in 7\.0
 				               Use counterpart with onSet prefix$#
 			'''
 			identifier: method.deprecated
@@ -11749,7 +11714,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method setQuery\(\) of class Joomla\\CMS\\Event\\Table\\BeforePublishEvent\:
-				4\.4\.0 will be removed in 6\.0
+				4\.4\.0 will be removed in 7\.0
 				               Use counterpart with onSet prefix$#
 			'''
 			identifier: method.deprecated
@@ -11759,7 +11724,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method setState\(\) of class Joomla\\CMS\\Event\\Table\\BeforePublishEvent\:
-				4\.4\.0 will be removed in 6\.0
+				4\.4\.0 will be removed in 7\.0
 				               Use counterpart with onSet prefix$#
 			'''
 			identifier: method.deprecated
@@ -11769,7 +11734,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method setUserId\(\) of class Joomla\\CMS\\Event\\Table\\BeforePublishEvent\:
-				4\.4\.0 will be removed in 6\.0
+				4\.4\.0 will be removed in 7\.0
 				               Use counterpart with onSet prefix$#
 			'''
 			identifier: method.deprecated
@@ -11779,7 +11744,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method setQuery\(\) of class Joomla\\CMS\\Event\\Table\\BeforeReorderEvent\:
-				4\.4\.0 will be removed in 6\.0
+				4\.4\.0 will be removed in 7\.0
 				               Use counterpart with onSet prefix$#
 			'''
 			identifier: method.deprecated
@@ -11789,7 +11754,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method setWhere\(\) of class Joomla\\CMS\\Event\\Table\\BeforeReorderEvent\:
-				4\.4\.0 will be removed in 6\.0
+				4\.4\.0 will be removed in 7\.0
 				               Use counterpart with onSet prefix$#
 			'''
 			identifier: method.deprecated
@@ -11799,7 +11764,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method setUpdateNulls\(\) of class Joomla\\CMS\\Event\\Table\\BeforeStoreEvent\:
-				4\.4\.0 will be removed in 6\.0
+				4\.4\.0 will be removed in 7\.0
 				               Use counterpart with onSet prefix$#
 			'''
 			identifier: method.deprecated
@@ -11809,7 +11774,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method setReplaceTags\(\) of class Joomla\\CMS\\Event\\Table\\SetNewTagsEvent\:
-				4\.4\.0 will be removed in 6\.0
+				4\.4\.0 will be removed in 7\.0
 				               Use counterpart with onSet prefix$#
 			'''
 			identifier: method.deprecated
@@ -11819,7 +11784,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method setResult\(\) of class Joomla\\CMS\\Event\\User\\AuthorisationEvent\:
-				4\.4\.0 will be removed in 6\.0
+				4\.4\.0 will be removed in 7\.0
 				               Use counterpart with onSet prefix$#
 			'''
 			identifier: method.deprecated
@@ -11829,7 +11794,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method setResult\(\) of class Joomla\\CMS\\Event\\User\\BeforeSaveEvent\:
-				4\.4\.0 will be removed in 6\.0
+				4\.4\.0 will be removed in 7\.0
 				               Use counterpart with onSet prefix$#
 			'''
 			identifier: method.deprecated
@@ -11839,7 +11804,7 @@ parameters:
 		-
 			message: '''
 				#^Access to deprecated property \$resultIsFalseable of class Joomla\\CMS\\Event\\User\\LoginButtonsEvent\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             You should use nullable values or exceptions instead of returning boolean false results\.$#
 			'''
 			identifier: property.deprecated
@@ -11849,7 +11814,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method setResult\(\) of class Joomla\\CMS\\Event\\User\\LoginButtonsEvent\:
-				4\.4\.0 will be removed in 6\.0
+				4\.4\.0 will be removed in 7\.0
 				               Use counterpart with onSet prefix$#
 			'''
 			identifier: method.deprecated
@@ -11859,7 +11824,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method setResult\(\) of class Joomla\\CMS\\Event\\User\\LoginEvent\:
-				4\.4\.0 will be removed in 6\.0
+				4\.4\.0 will be removed in 7\.0
 				               Use counterpart with onSet prefix$#
 			'''
 			identifier: method.deprecated
@@ -11869,7 +11834,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method setResult\(\) of class Joomla\\CMS\\Event\\User\\LogoutEvent\:
-				4\.4\.0 will be removed in 6\.0
+				4\.4\.0 will be removed in 7\.0
 				               Use counterpart with onSet prefix$#
 			'''
 			identifier: method.deprecated
@@ -11879,7 +11844,7 @@ parameters:
 		-
 			message: '''
 				#^Access to deprecated property \$legacyArgumentsOrder of class Joomla\\CMS\\Event\\User\\UserEvent\:
-				5\.0 will be removed in 6\.0$#
+				5\.0 will be removed in 7\.0$#
 			'''
 			identifier: property.deprecated
 			count: 2
@@ -11888,7 +11853,7 @@ parameters:
 		-
 			message: '''
 				#^Usage of deprecated trait Joomla\\CMS\\Event\\ReshapeArgumentsAware in class Joomla\\CMS\\Event\\User\\UserEvent\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Will be removed without replacement$#
 			'''
 			identifier: traitUse.deprecatedTrait
@@ -11898,7 +11863,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method setSubject\(\) of class Joomla\\CMS\\Event\\WebAsset\\WebAssetRegistryAssetChanged\:
-				4\.4\.0 will be removed in 6\.0
+				4\.4\.0 will be removed in 7\.0
 				               Use counterpart with onSet prefix$#
 			'''
 			identifier: method.deprecated
@@ -11920,7 +11885,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method getDispatcher\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -11942,7 +11907,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method register\(\) of class JLoader\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Classes should be autoloaded\. Use JLoader\:\:registerPrefix\(\) or JLoader\:\:registerNamespace\(\) to
 				             register an autoloader for your files\.$#
 			'''
@@ -12376,7 +12341,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method register\(\) of class JLoader\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Classes should be autoloaded\. Use JLoader\:\:registerPrefix\(\) or JLoader\:\:registerNamespace\(\) to
 				             register an autoloader for your files\.$#
 			'''
@@ -12807,7 +12772,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method getDispatcher\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -12907,7 +12872,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method getDispatcher\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -13140,7 +13105,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method getDispatcher\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -13196,7 +13161,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method register\(\) of class JLoader\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Classes should be autoloaded\. Use JLoader\:\:registerPrefix\(\) or JLoader\:\:registerNamespace\(\) to
 				             register an autoloader for your files\.$#
 			'''
@@ -13207,7 +13172,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method getDispatcher\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -13281,7 +13246,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method register\(\) of class JLoader\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Classes should be autoloaded\. Use JLoader\:\:registerPrefix\(\) or JLoader\:\:registerNamespace\(\) to
 				             register an autoloader for your files\.$#
 			'''
@@ -13334,7 +13299,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method getDispatcher\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -13524,24 +13489,7 @@ parameters:
 				             Catch thrown Exceptions instead of getError$#
 			'''
 			identifier: method.deprecated
-			count: 6
-			path: libraries/src/MVC/Controller/ApiController.php
-
-		-
-			message: '''
-				#^Call to deprecated method getErrors\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
-				3\.1\.4 will be removed in 7\.0
-				             Will be removed without replacement
-				             Catch thrown Exceptions instead of getErrors$#
-			'''
-			identifier: method.deprecated
-			count: 1
-			path: libraries/src/MVC/Controller/ApiController.php
-
-		-
-			message: '#^Call to method singularize\(\) of deprecated class Doctrine\\Common\\Inflector\\Inflector\.$#'
-			identifier: staticMethod.deprecatedClass
-			count: 4
+			count: 2
 			path: libraries/src/MVC/Controller/ApiController.php
 
 		-
@@ -13569,7 +13517,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method getDispatcher\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -13624,7 +13572,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method register\(\) of class JLoader\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Classes should be autoloaded\. Use JLoader\:\:registerPrefix\(\) or JLoader\:\:registerNamespace\(\) to
 				             register an autoloader for your files\.$#
 			'''
@@ -13972,7 +13920,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method triggerEvent\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -14046,7 +13994,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method getDispatcher\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -14067,7 +14015,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method getDispatcher\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -14088,7 +14036,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method register\(\) of class JLoader\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Classes should be autoloaded\. Use JLoader\:\:registerPrefix\(\) or JLoader\:\:registerNamespace\(\) to
 				             register an autoloader for your files\.$#
 			'''
@@ -14141,7 +14089,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method getDispatcher\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -14278,7 +14226,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method getDispatcher\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -14334,7 +14282,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method getDispatcher\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -14395,7 +14343,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method register\(\) of class JLoader\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Classes should be autoloaded\. Use JLoader\:\:registerPrefix\(\) or JLoader\:\:registerNamespace\(\) to
 				             register an autoloader for your files\.$#
 			'''
@@ -14732,7 +14680,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method getDispatcher\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -14974,7 +14922,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method getDispatcher\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -15007,7 +14955,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method register\(\) of class JLoader\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Classes should be autoloaded\. Use JLoader\:\:registerPrefix\(\) or JLoader\:\:registerNamespace\(\) to
 				             register an autoloader for your files\.$#
 			'''
@@ -15108,7 +15056,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method getDispatcher\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -15228,7 +15176,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method triggerEvent\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -15310,7 +15258,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method getDispatcher\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -15350,7 +15298,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method getDispatcher\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -15571,7 +15519,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method triggerEvent\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -15611,7 +15559,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method register\(\) of class JLoader\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Classes should be autoloaded\. Use JLoader\:\:registerPrefix\(\) or JLoader\:\:registerNamespace\(\) to
 				             register an autoloader for your files\.$#
 			'''
@@ -15808,7 +15756,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method register\(\) of class JLoader\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Classes should be autoloaded\. Use JLoader\:\:registerPrefix\(\) or JLoader\:\:registerNamespace\(\) to
 				             register an autoloader for your files\.$#
 			'''
@@ -15850,7 +15798,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method getDispatcher\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
@@ -16011,12 +15959,6 @@ parameters:
 			count: 2
 			path: plugins/workflow/featuring/src/Extension/Featuring.php
 
-		-
-			message: '#^Call to method singularize\(\) of deprecated class Doctrine\\Common\\Inflector\\Inflector\.$#'
-			identifier: staticMethod.deprecatedClass
-			count: 1
-			path: plugins/workflow/featuring/src/Extension/Featuring.php
-
 		-
 			message: '#^Access to an undefined property Joomla\\Plugin\\Workflow\\Notification\\Extension\\Notification\:\:\$app\.$#'
 			identifier: property.notFound
@@ -16028,9 +15970,3 @@ parameters:
 			identifier: property.notFound
 			count: 2
 			path: plugins/workflow/publishing/src/Extension/Publishing.php
-
-		-
-			message: '#^Call to method singularize\(\) of deprecated class Doctrine\\Common\\Inflector\\Inflector\.$#'
-			identifier: staticMethod.deprecatedClass
-			count: 1
-			path: plugins/workflow/publishing/src/Extension/Publishing.php
diff --git a/plugins/editors/tinymce/src/Extension/TinyMCE.php b/plugins/editors/tinymce/src/Extension/TinyMCE.php
index a6c92585b70bc..585032589f4ef 100644
--- a/plugins/editors/tinymce/src/Extension/TinyMCE.php
+++ b/plugins/editors/tinymce/src/Extension/TinyMCE.php
@@ -39,7 +39,7 @@ final class TinyMCE extends CMSPlugin implements SubscriberInterface, Dispatcher
     use DatabaseAwareTrait;
     use DispatcherAwareTrait;
 
-    // @todo: KnownButtons, ToolbarPresets for backward compatibility. Remove in Joomla 6
+    // @todo: KnownButtons, ToolbarPresets for backward compatibility. Remove in Joomla 7
     use KnownButtons;
     use ToolbarPresets;
 
diff --git a/plugins/system/schemaorg/src/Extension/Schemaorg.php b/plugins/system/schemaorg/src/Extension/Schemaorg.php
index e2269aa6dbe95..5aa1a33b61b6e 100644
--- a/plugins/system/schemaorg/src/Extension/Schemaorg.php
+++ b/plugins/system/schemaorg/src/Extension/Schemaorg.php
@@ -10,6 +10,7 @@
 
 namespace Joomla\Plugin\System\Schemaorg\Extension;
 
+use Joomla\CMS\Event\Application\BeforeCompileHeadEvent as BeforeCompileHeadApplicationEvent;
 use Joomla\CMS\Event\Model;
 use Joomla\CMS\Event\Plugin\System\Schemaorg\BeforeCompileHeadEvent;
 use Joomla\CMS\Event\Plugin\System\Schemaorg\PrepareDataEvent;
@@ -26,6 +27,7 @@
 use Joomla\CMS\Schemaorg\SchemaorgServiceInterface;
 use Joomla\CMS\Uri\Uri;
 use Joomla\CMS\User\UserFactoryAwareTrait;
+use Joomla\CMS\WebAsset\Exception\UnknownAssetException;
 use Joomla\Database\DatabaseAwareTrait;
 use Joomla\Database\ParameterType;
 use Joomla\Event\DispatcherAwareInterface;
@@ -268,9 +270,11 @@ public function onContentAfterSave(Model\AfterSaveEvent $event)
      *
      * @since   5.0.0
      */
-    public function onBeforeCompileHead(): void
+    public function onBeforeCompileHead(BeforeCompileHeadApplicationEvent $event): void
     {
-        $app      = $this->getApplication();
+        $app      = $event->getApplication();
+        $doc      = $event->getDocument();
+        $wa       = $doc->getWebAssetManager();
         $baseType = $this->params->get('baseType', 'organization');
 
         $itemId  = (int) $app->getInput()->getInt('id');
@@ -383,11 +387,30 @@ public function onBeforeCompileHead(): void
         $webPageSchema['about']       = ['@id' => $baseId];
         $webPageSchema['inLanguage']  = $app->getLanguage()->getTag();
 
-        // We support Breadcrumb linking
-        $breadcrumbs = ModuleHelper::getModule('mod_breadcrumbs');
+        // Support Breadcrumb Schema linking
+        try {
+            try {
+                $breadcrumbsAsset = $wa->getRegistry()->get('script', 'inline.breadcrumbs-schemaorg');
+            } catch (UnknownAssetException $e) {
+                // Fallback for older versions of the breadcrumbs module
+                $breadcrumbsAsset = $wa->getRegistry()->get('script', 'inline.mod_breadcrumbs-schemaorg');
+                trigger_deprecation(
+                    'joomla/schemaorg',
+                    '5.4',
+                    'The inline.mod_breadcrumbs-schemaorg asset name is deprecated. Please use the generic inline.breadcrumbs-schemaorg asset name instead.'
+                );
+            }
+
+            $breadcrumbs = json_decode($breadcrumbsAsset->getOption('content'), true, 512, JSON_THROW_ON_ERROR);
+
+            if ($breadcrumbs['@type'] !== 'BreadcrumbList') {
+                trigger_error('The breadcrumbs schema is not of type BreadcrumbList', E_USER_WARNING);
+                throw new UnknownAssetException();
+            }
 
-        if (!empty($breadcrumbs->id)) {
-            $webPageSchema['breadcrumb'] = ['@id' => $domain . '#/schema/BreadcrumbList/' . (int) $breadcrumbs->id];
+            $webPageSchema['breadcrumbs'] = ['@id' => $breadcrumbs['@id']];
+        } catch (UnknownAssetException $e) {
+            // No Breadcrumbs Schema found, so we don't add it
         }
 
         $baseSchema['@graph'][] = $webPageSchema;
@@ -440,7 +463,6 @@ public function onBeforeCompileHead(): void
         $schemaString = $schema->toString('JSON', ['bitmask' => JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE | $prettyPrint]);
 
         if ($schemaString !== '{}') {
-            $wa = $this->getApplication()->getDocument()->getWebAssetManager();
             $wa->addInlineScript($schemaString, ['name' => 'inline.schemaorg'], ['type' => 'application/ld+json']);
         }
     }
diff --git a/tests/Unit/Libraries/Cms/Html/HtmlStringTest.php b/tests/Unit/Libraries/Cms/Html/HtmlStringTest.php
index 97f50b743f4d1..4d41bbace1714 100644
--- a/tests/Unit/Libraries/Cms/Html/HtmlStringTest.php
+++ b/tests/Unit/Libraries/Cms/Html/HtmlStringTest.php
@@ -328,7 +328,7 @@ public function getTestTruncateComplexData(): array
                 '<span>Plain text</span>',
                 8,
                 true,
-                '<span>Plain</span>...',
+                '<span>Plain...</span>',
             ],
             /*
              *  @todo: Check these tests: 'Plain html over the limit splitting first word'
@@ -366,13 +366,13 @@ public function getTestTruncateComplexData(): array
                 '<div><span><i>Plain</i> <b>text</b> foo</span></div>',
                 8,
                 false,
-                '<div><span><i>Plain</i> <b>te</b></span></div>...',
+                '<div><span><i>Plain</i> <b>te</b></span>...</div>',
             ],
             'No split' => [
                 '<div><span><i>Plain</i> <b>text</b> foo</span></div>',
                 8,
                 true,
-                '<div><span><i>Plain</i></span></div>...',
+                '<div><span><i>Plain</i></span>...</div>',
             ],
             'First character is < with a maximum length of 1, no split' => [
                 '<div><span><i>Plain</i> <b>text</b> foo</span></div>',